Streamline naming

Author: fidel

ruby_event_store-active_record/lib/ruby_event_store/active_record/generators/rails_foreign_key_on_event_id_migration_generator.rb

@@ -19,15 +19,13 @@ class Error < Thor::Error
         def initialize(*args)
           super
 
-          @database_adapter = DatabaseAdapter.new(adapter)
+          @database_adapter = DatabaseAdapter.new(adapter_name)
         rescue UnsupportedAdapter => e
           raise Error, e.message
         end
 
-        private attr_reader :database_adapter
-
         def create_migration
-          case database_adapter
+          case @database_adapter
           when DatabaseAdapter::PostgreSQL
             template "#{template_directory}add_foreign_key_on_event_id_to_event_store_events_in_streams_template.erb",
                      "db/migrate/#{timestamp}_add_foreign_key_on_event_id_to_event_store_events_in_streams.rb"
@@ -41,7 +39,7 @@ def create_migration
 
         private
 
-        def adapter
+        def adapter_name
           ::ActiveRecord::Base.connection.adapter_name
         end
 
@@ -54,7 +52,7 @@ def timestamp
         end
 
         def template_directory
-          TemplateDirectory.for_adapter(adapter)
+          TemplateDirectory.for_adapter(@database_adapter)
         end
       end
     end

ruby_event_store-active_record/lib/ruby_event_store/active_record/generators/rails_migration_generator.rb

@@ -25,10 +25,10 @@ class Error < Thor::Error
       def initialize(*args)
         super
 
-        @adapter = DatabaseAdapter.new(adapter_name, data_type)
+        @database_adapter = DatabaseAdapter.new(adapter_name, data_type)
       rescue UnsupportedAdapter => e
         raise Error, e.message
-      rescue InvalidDataTypeForAdapter => e
+      rescue InvalidDataTypeForAdapter
         raise Error,
               "Invalid value for --data-type option. Supported for options are: #{DatabaseAdapter.new(adapter_name).supported_data_types.join(", ")}."
       end
@@ -41,7 +41,7 @@ def create_migration
       private
 
       def template_directory
-        TemplateDirectory.for_adapter(@adapter)
+        TemplateDirectory.for_adapter(@database_adapter)
       end
 
       def data_type

ruby_event_store-active_record/spec/migration_test_spec.rb

@@ -149,7 +149,7 @@ def data_type_to_mysql_type(data_type)
       def pg_show_create_table(table_name)
         db_config = ::ActiveRecord::Base.connection_db_config
         <<~RESULT.strip
-          #{IO.popen("psql #{db_config.adapter_name}://postgres:#{db_config.configuration_hash[:password]}@#{db_config.host}:#{db_config.configuration_hash[:port]}/#{db_config.database}  -c '\\d #{table_name}'").readlines.join}
+          #{IO.popen("psql #{db_config.adapter}://postgres:#{db_config.configuration_hash[:password]}@#{db_config.host}:#{db_config.configuration_hash[:port]}/#{db_config.database}  -c '\\d #{table_name}'").readlines.join}
         RESULT
       end