effective_developer 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a6c65c15c6025e2d82b06fd85be1dedf34a3b23
-  data.tar.gz: 9fad65447322c44cac74cfa244304877b2dd468d
+  metadata.gz: 40d2df5dba437c7112b719f129fb5304d88fd3b5
+  data.tar.gz: f485802d6fbf8ae8ae1375478650b20d56e381aa
 SHA512:
-  metadata.gz: db915fe8e34c03a300ce5e5d12f917793415df03305d885743eb8b88080de5125b3f010f049f7ab6852dacc7bf54c5fa58a51d1a77e630139c7af40080a80ffb
-  data.tar.gz: 5d8004e9236644ac16e6e80b699f2e9e1e735101552f783d996694b0c0caa461dc59ead50b2f2980f6789481c09bfdd0327eabceae6f869cff9d4a6ce770e231
+  metadata.gz: 0ceb56e3450b4ea6a447294289f3d9f9e8825dc2ac2cd569b3748278798fc1ff83b90da973776f5196b452a78235423f167c9318c9602e29b028779f390f5b7d
+  data.tar.gz: 187897199ea333c4d9423a724e74a5b39d0697b4e55f8321fea23a30f0ba8ec4bb003151880a015b715249901525b9c8074d3b7e1616c6a464f96e8b49d0588a

data/app/models/effective/migrator.rb

@@ -0,0 +1,60 @@
+module Effective
+  class Migrator
+    attr_accessor :resource  # The class level effective_resource do ... end object
+
+    def initialize(obj)
+      @resource = (obj.kind_of?(Effective::Resource) ? obj: Effective::Resource.new(obj))
+
+      unless @resource.respond_to?(:model) && @resource.model.present?
+        raise 'expected effective_resource or klass to have an effective_resource do ... end block defined'
+      end
+    end
+
+    # Writes database migrations automatically based on effective_resources do ... end block
+    def migrate!
+      table_attributes = resource.table_attributes
+      model_attributes = resource.model_attributes
+
+      table_keys = table_attributes.keys
+      model_keys = model_attributes.keys
+
+      # Create table
+      if table_keys.blank?
+        Rails.logger.info "effective_developer migrate #{resource.plural_name}: create table"
+        return rails_migrate("create_#{resource.plural_name}", model_attributes)
+      end
+
+      # 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))
+      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))
+      end
+    end
+
+    private
+
+    def rails_migrate(filename, attributes)
+      invokable = attributes.map { |name, (type, _)| "#{name}:#{type}" }
+
+      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'])
+
+      system("rails generate migration #{filename} #{invokable.join(' ')}")
+      ActiveRecord::Tasks::DatabaseTasks.migrate
+
+      true
+    end
+
+  end
+end

data/lib/effective_developer/engine.rb

@@ -11,6 +11,7 @@ module EffectiveDeveloper
     # Include acts_as_addressable concern and allow any ActiveRecord object to call it
     initializer 'effective_developer.effective_resources' do |app|
       ActiveSupport.on_load :effective_resource do
+        #Effective::Migrator.new(self).migrate!
       end
     end
 

data/lib/effective_developer/version.rb

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

data/lib/generators/effective/helpers.rb

@@ -58,7 +58,6 @@ module Effective
         klass_attributes = resource.klass_attributes(all: all)
 
         if klass_attributes.blank?
-
           if ActiveRecord::Migration.respond_to?(:check_pending!)
             pending = (ActiveRecord::Migration.check_pending! rescue true)
           else
@@ -73,7 +72,7 @@ module Effective
           klass_attributes = resource.klass_attributes(all: all)
         end
 
-        klass_attributes.presence || resource.model_attributes
+        klass_attributes.presence || resource.model_attributes(all: all)
       end
 
     end

data/lib/generators/effective/migration_generator.rb

@@ -27,7 +27,7 @@ module Effective
         elsif resource.klass_attributes.present?
           raise 'klass_attributes already exist.  We cant migrate (yet). Exiting.'
         elsif resource.model_attributes.present?
-          Rails::Generators.invoke('migration', ["create_#{plural_name}"] + invokable(resource.belong_tos_attributes) + (invokable(resource.model_attributes) | timestamps))
+          Rails::Generators.invoke('migration', ["create_#{plural_name}"] + invokable(resource.model_attributes))
         else
           raise 'You need to specify some attributes or have a model file present'
         end

data/lib/generators/effective/scaffold_generator.rb

@@ -62,7 +62,7 @@ module Effective
           say_status(:skipped, :form, :yellow) and return
         end
 
-        Rails::Generators.invoke('effective:form', [name] + invokable(invoked_attributes))
+        Rails::Generators.invoke('effective:form', [name] + invoked_attributes_args)
       end
 
     end

data/lib/scaffolds/datatables/datatable.rb

@@ -1,24 +1,27 @@
 class <%= resource.namespaced_class_name.pluralize %>Datatable < Effective::Datatable
 
+  bulk_actions do
+    bulk_action 'Delete selected', <%= [resource.namespaces, resource, 'path'].flatten.compact.join('_') %>(:ids), data: { method: :delete, confirm: 'Really delete selected?' }
+  end
+
   datatable do
-    length 25
-    order :<%= (attributes[:updated_at] ? :updated_at : attributes.keys.first) %>
+    order :updated_at
+
+    bulk_actions_col
 
-<% if attributes[:updated_at] -%>
     col :updated_at, visible: false
-<% end -%>
-<% if attributes[:created_at] -%>
     col :created_at, visible: false
-<% end -%>
     col :id, visible: false
 
+<% if resource.belong_tos.present? || resource.has_anys.present? -%>
 <% resource.belong_tos.each do |reference| -%>
     col :<%= reference.name %>
 <% end -%>
-<% resource.nested_resources.each do |reference| -%>
+<% resource.has_anys.each do |reference| -%>
     col :<%= reference.name %>
 <% end -%>
 
+<% end -%>
 <% attributes.except(:created_at, :updated_at, :id).each do |name, _| -%>
     col :<%= name %>
 <% end -%>

data/lib/scaffolds/models/model.rb

@@ -8,9 +8,11 @@ class <%= resource.class_name %> < <%= parent_class_name.classify %>
 <% invoked_attributes.each do |name, (type, _)| -%>
     <%= name.to_s.ljust(max_attribute_name_length) %> :<%= type %>
 <% end -%>
+
+    timestamps
   end
 
-  scope :deep, -> { <%= resource.class_name %>.all }
+  scope :deep, -> { all }
 
 <% invoked_attributes.each do |name, (type, _)| -%>
   validates :<%= name %>, presence: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,6 +50,7 @@ files:
 - Rakefile
 - app/models/effective/code_writer.rb
 - app/models/effective/csv_importer.rb
+- app/models/effective/migrator.rb
 - config/effective_developer.rb
 - lib/effective_developer.rb
 - lib/effective_developer/engine.rb
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Provides some quality of life developer tools.