effective_developer 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40d2df5dba437c7112b719f129fb5304d88fd3b5
-  data.tar.gz: f485802d6fbf8ae8ae1375478650b20d56e381aa
+  metadata.gz: 987dc444541f73d96d4ef8639822910e52cfb47c
+  data.tar.gz: 7ab798c262fbcf37680b5333d8bb5c856a9a933e
 SHA512:
-  metadata.gz: 0ceb56e3450b4ea6a447294289f3d9f9e8825dc2ac2cd569b3748278798fc1ff83b90da973776f5196b452a78235423f167c9318c9602e29b028779f390f5b7d
-  data.tar.gz: 187897199ea333c4d9423a724e74a5b39d0697b4e55f8321fea23a30f0ba8ec4bb003151880a015b715249901525b9c8074d3b7e1616c6a464f96e8b49d0588a
+  metadata.gz: 4df59039d6e5728ce6c92165b682bb3894ea6e314612e05c91bd1f23b8aaf98d6f19953542874ddcac6d71b47067dc5c5829447cba278348ef5ce2561a47cc59
+  data.tar.gz: 98ee05f7b84c9f894c27ac52f58fa853b76c1253d4e6e2b12ef2fc95750b3876f5ac40957e6f2825d568f8df42547b81bb0349dfcb61dc8f99b6480faf724cab

data/app/models/effective/{migrator.rb → live_generator.rb}

@@ -1,5 +1,7 @@
+require 'rails/generators/active_record/migration/migration_generator'
+
 module Effective
-  class Migrator
+  class LiveGenerator
     attr_accessor :resource  # The class level effective_resource do ... end object
 
     def initialize(obj)
@@ -8,10 +10,12 @@ module Effective
       unless @resource.respond_to?(:model) && @resource.model.present?
         raise 'expected effective_resource or klass to have an effective_resource do ... end block defined'
       end
+
+      true
     end
 
     # Writes database migrations automatically based on effective_resources do ... end block
-    def migrate!
+    def generate!
       table_attributes = resource.table_attributes
       model_attributes = resource.model_attributes
 
@@ -27,31 +31,34 @@ module Effective
       # Fields are not in database, but present in model.rb
       if(add_keys = (model_keys - table_keys)).present?
         Rails.logger.info "effective_developer migrate #{resource.plural_name}: add #{add_keys.to_sentence}"
-        rails_migrate("add_fields_to_#{resource.plural_name}", model_attributes.slice(*add_keys))
+        rails_migrate("add_ATTRIBUTES_to_#{resource.plural_name}", model_attributes.slice(*add_keys))
       end
 
       # Fields are in database, but no longer in our effective_resource do block
       if (remove_keys = (table_keys - model_keys)).present?
         Rails.logger.info "effective_developer migrate #{resource.plural_name}: remove #{remove_keys.to_sentence}"
-        rails_migrate("remove_fields_from_#{resource.plural_name}", table_attributes.slice(*remove_keys))
+        rails_migrate("remove_ATTRIBUTES_from_#{resource.plural_name}", table_attributes.slice(*remove_keys))
       end
     end
 
     private
 
     def rails_migrate(filename, attributes)
-      invokable = attributes.map { |name, (type, _)| "#{name}:#{type}" }
+      # The filename needs to be unique, but it shouldn't be annoyingly long
+      name = (attributes.keys.first(2) + [("and_#{attributes.length - 2}_more" if attributes.length > 2)]).compact.join('_')
+      filename.sub!('ATTRIBUTES', name)
 
-      pending = (ActiveRecord::Migration.check_pending! rescue true)
-      ActiveRecord::Tasks::DatabaseTasks.migrate if pending
+      # I don't need to check pending. But if I did:
+      #pending = (ActiveRecord::Migration.check_pending! rescue true)
+      #ActiveRecord::Tasks::DatabaseTasks.migrate if pending
 
-      # Can't get this to work
-      # Rails.logger.info "INVOKING!!!!!"
-      # binding.pry
-      # Rails::Generators.invoke('migration', [filename] + invokable, behavior: :invoke, destination_root: Rails.root, migration_paths: ['db/migrate'])
+      args = [filename] + attributes.map { |name, (type, _)| "#{name}:#{type}" }
+      options = {}
+      config = { destination_root: Rails.root }
 
-      system("rails generate migration #{filename} #{invokable.join(' ')}")
+      ActiveRecord::Generators::MigrationGenerator.new(args, options, config).invoke_all
       ActiveRecord::Tasks::DatabaseTasks.migrate
+      resource.klass.reset_column_information
 
       true
     end

data/config/effective_developer.rb

@@ -1,5 +1,5 @@
 EffectiveDeveloper.setup do |config|
-
-  # This doesn't do anything. Yet.
-  config.live = true
+  # Tracks changes to the effective_resource do .. end block
+  # And automatically writes database migration changes
+  config.live = false
 end

data/lib/effective_developer/engine.rb

@@ -8,10 +8,10 @@ module EffectiveDeveloper
       eval File.read("#{config.root}/config/effective_developer.rb")
     end
 
-    # Include acts_as_addressable concern and allow any ActiveRecord object to call it
+    # Whenever the effective_resource do block is evaluated, check for changes
     initializer 'effective_developer.effective_resources' do |app|
       ActiveSupport.on_load :effective_resource do
-        #Effective::Migrator.new(self).migrate!
+        Effective::LiveGenerator.new(self).generate! if EffectiveDeveloper.live
       end
     end
 

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

data/lib/tasks/rename_class.rake

@@ -1,4 +1,4 @@
-# bundle exec rake rename_class[account, team]
+# bundle exec rake rename_class[account,team]
 
 desc 'Rename a rails class to another'
 task :rename_class, [:source, :target, :db] => :environment do |t, args|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-15 00:00:00.000000000 Z
+date: 2018-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,7 +50,7 @@ files:
 - Rakefile
 - app/models/effective/code_writer.rb
 - app/models/effective/csv_importer.rb
-- app/models/effective/migrator.rb
+- app/models/effective/live_generator.rb
 - config/effective_developer.rb
 - lib/effective_developer.rb
 - lib/effective_developer/engine.rb