effective_resources 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ef79c2ff4b11e7b6fc7c81007b82f1ecb0fa8a0
-  data.tar.gz: 98158d2296aac5e0290d515a1bf82e3a4ace8138
+  metadata.gz: c677c888d40faa747d421ffbeecbf1452e5328db
+  data.tar.gz: 2bf38b93293b53d35a86f1e9c551b1cfec07489f
 SHA512:
-  metadata.gz: 1d49fb28d6eafa486291070b6e3aca1c2f8381f02598d5ef9d0a33f1bf449e701a8f8ecf6e76ae82bf463fc1b002f4e84e8d540eef1f64db2365ecbecffe91ed
-  data.tar.gz: fdb49fb1b934cbf11428eaab0ee6906e813fa782f0b6dee6bfb936705b7edfa24a05d7f211b6370f67d0585a7e08b984c7d3e97c3f5538d6f297566ede2dc845
+  metadata.gz: ab530180ab92b4e5a866b34d38941d0234e73564c4291b02b661f675eb399d4bbd5fcf4445b6db935734da154a36f1a120255fe05839fcc7b814d92784a61cf2
+  data.tar.gz: dd14ce62821ee55c08ded91a33fca6a57a17ecf3a857d9aad138b7586b8590a0304252f652dc7ebb519799836dc3c100699e9b640bf42b014e74d7a45c11aa9e

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2017 Code and Effect Inc.
+Copyright 2018 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/controllers/concerns/effective/crud_controller/actions.rb

@@ -23,10 +23,20 @@ module Effective
 
         self.resource ||= resource_scope.new
 
-        self.resource.assign_attributes(
-          params.to_unsafe_h.except(:controller, :action, :id).select { |k, v| resource.respond_to?("#{k}=") }
-        )
+        # Assign any passed params
+        to_assign = if params[:_datatable_id].present?
+          inline_datatable = EffectiveDatatables.find(params[:_datatable_id])
+          inline_datatable.view = view_context
+          inline_datatable.attributes
+        elsif params.present?
+          params.to_unsafe_h.except(:controller, :action, :id, :duplicate_id)
+        end
+
+        if to_assign.present?
+          resource.assign_attributes(to_assign.select { |k, v| resource.respond_to?("#{k}=") })
+        end
 
+        # Duplicate if possible
         if params[:duplicate_id]
           duplicate = resource_scope.find(params[:duplicate_id])
           EffectiveResources.authorize!(self, :show, duplicate)

data/app/controllers/concerns/effective/crud_controller/permitted_params.rb

@@ -48,7 +48,9 @@ module Effective
               (effective_resource.namespaces & Array(permitted).map(&:to_s)).present?
             end
           end
-        end.keys
+        end
+
+        permitted_params = permitted_params.map { |k, v| v.first == :array ? { k => [] } : k }
 
         # Recursively add any accepts_nested_resources
         effective_resource.nested_resources.each do |nested|

data/app/models/effective/model_reader.rb

@@ -1,6 +1,6 @@
 module Effective
   class ModelReader
-    DATATYPES = [:binary, :boolean, :date, :datetime, :decimal, :float, :hstore, :inet, :integer, :string, :text]
+    DATATYPES = [:binary, :boolean, :date, :datetime, :decimal, :float, :hstore, :inet, :integer, :string, :text, :permitted_param]
 
     attr_reader :attributes
 
@@ -18,6 +18,9 @@ module Effective
         return
       end
 
+      # Not really an attribute, just a permitted param.
+      args.unshift(:permitted_param) if args.first.kind_of?(Hash) && args.first.key?(:permitted)
+
       unless DATATYPES.include?(args.first)
         raise "expected first argument to be a datatype. Try name :string"
       end

data/app/models/effective/resources/associations.rb

@@ -8,7 +8,7 @@ module Effective
 
       def belong_tos
         return [] unless klass.respond_to?(:reflect_on_all_associations)
-        @belong_tos ||= klass.reflect_on_all_associations(:belongs_to)
+        klass.reflect_on_all_associations(:belongs_to)
       end
 
       # author_id, post_id
@@ -16,24 +16,36 @@ module Effective
         belong_tos.map { |ass| (ass.options[:foreign_key] || "#{ass.name}_id").to_sym }
       end
 
+      def has_anys
+        (has_ones + has_manys + has_and_belongs_to_manys)
+      end
+
+      def has_manys_ids
+        (has_manys + has_and_belongs_to_manys).map { |ass| "#{ass.plural_name.singularize}_ids".to_sym }
+      end
+
       def has_ones
         return [] unless klass.respond_to?(:reflect_on_all_associations)
-        @has_ones ||= klass.reflect_on_all_associations(:has_one)
+        klass.reflect_on_all_associations(:has_one)
+      end
+
+      def has_ones_ids
+        has_ones.map { |ass| "#{ass.name}_id".to_sym }
       end
 
       def has_manys
         return [] unless klass.respond_to?(:reflect_on_all_associations)
-        @has_manys ||= klass.reflect_on_all_associations(:has_many).reject { |ass| ass.options[:autosave] }
+        klass.reflect_on_all_associations(:has_many).reject { |ass| ass.options[:autosave] }
       end
 
       def has_and_belongs_to_manys
         return [] unless klass.respond_to?(:reflect_on_all_associations)
-        @has_and_belongs_to_manys ||= klass.reflect_on_all_associations(:has_and_belongs_to_many)
+        klass.reflect_on_all_associations(:has_and_belongs_to_many)
       end
 
       def nested_resources
         return [] unless klass.respond_to?(:reflect_on_all_associations)
-        @nested_resources ||= klass.reflect_on_all_associations(:has_many).select { |ass| ass.options[:autosave] }
+        klass.reflect_on_all_associations(:has_many).select { |ass| ass.options[:autosave] }
       end
 
       def associated(name)

data/app/models/effective/resources/attributes.rb

@@ -8,31 +8,64 @@ module Effective
         (klass_attributes.presence || model_attributes.presence)
       end
 
+      def primary_key_attribute
+        {klass.primary_key.to_sym => [:integer]}
+      end
+
       # The attributes for each belongs_to
       # { :client_id => [:integer], ... }
       def belong_tos_attributes
         belong_tos.inject({}) do |h, ass|
           unless ass.foreign_key == 'site_id' && ass.respond_to?(:acts_as_site_specific)
-            h[ass.foreign_key.to_sym] = [:integer]
+            h[ass.foreign_key.to_sym] = [:integer, :index => true]
           end; h
         end
       end
 
+      def has_manys_attributes
+        has_manys_ids.inject({}) { |h, ass| h[ass] = [:array]; h }
+      end
+
+      # All will include primary_key, created_at, updated_at and belongs_tos
       # This is the attributes as defined by the effective_resources do .. end block
       # { :name => [:string, { permitted: false }], ... }
-      def model_attributes
-        model ? model.attributes : {}
+      def model_attributes(all: false)
+        atts = (model ? model.attributes : {})
+
+        if all # Probably being called by permitted_attributes
+          primary_key_attribute.merge(belong_tos_attributes).merge(has_manys_attributes).merge(atts)
+        else  # This is the migrator. This should match table_attributes
+          belong_tos_attributes.merge(atts.reject { |_, v| v[0] == :permitted_param })
+        end
+      end
+
+      # All table attributes. includes primary_key and belongs_tos
+      def table_attributes
+        attributes = (klass.new().attributes rescue nil)
+        return {} unless attributes
+
+        (attributes.keys - [klass.primary_key]).inject({}) do |h, name|
+          if klass.respond_to?(:column_for_attribute) # Rails 4+
+            h[name.to_sym] = [klass.column_for_attribute(name).type]
+          else
+            h[name.to_sym] = [klass.columns_hash[name].type]
+          end; h
+        end
       end
 
       # Used by effective_crud_controller to generate the permitted params
       def permitted_attributes
-        id = {klass.primary_key.to_sym => [:integer]}
-        bts = belong_tos_ids.inject({}) { |h, ass| h[ass] = [:integer]; h }
-
-        id.merge(bts).merge(model_attributes)
+        # id = {klass.primary_key.to_sym => [:integer]}
+        # bts = belong_tos_ids.inject({}) { |h, ass| h[ass] = [:integer]; h }
+        # has_manys = has_manys_ids.inject({}) { |h, ass| h[ass] = [:array]; h }
+        # has_manys.each { |k, _| has_manys[k] = model_attributes[k] if model_attributes.key?(k) }
+        # Does not include nested, as they are added recursively elsewhere
+        # id.merge(bts).merge(model_attributes).merge(has_manys)
+
+        model_attributes(all: true)
       end
 
-      # All attributes from the klass, sorted as per attributes block.
+      # All attributes from the klass, sorted as per model attributes block.
       # Does not include :id, :created_at, :updated_at unless all is passed
       def klass_attributes(all: false)
         attributes = (klass.new().attributes rescue nil)

data/app/models/effective/resources/controller.rb

@@ -13,11 +13,11 @@ module Effective
           end
 
           if actions.find { |a| a == :index }
-            submits['Continue'] = { action: :save, redirect: :index, default: true }
+            submits['Continue'] = { action: :save, redirect: :index, default: true, unless: -> { params[:_datatable_id] } }
           end
 
           if actions.find { |a| a == :new }
-            submits['Add New'] = { action: :save, redirect: :new, default: true }
+            submits['Add New'] = { action: :save, redirect: :new, default: true, unless: -> { params[:_datatable_id] } }
           end
         end
       end

data/app/models/effective/resources/model.rb

@@ -7,7 +7,7 @@ module Effective
         @model = ModelReader.new(&block)
 
         # If effective_developer is in live mode, this will cause it to refresh the class
-        ActiveSupport.run_load_hooks(:effective_resource, klass)
+        ActiveSupport.run_load_hooks(:effective_resource, self)
       end
 
       def model

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails