effective_resources 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12e0851418c01ba4290cee861341751689d05963
-  data.tar.gz: a9ee4c64ac47d1abac493d72eece30383d77fad4
+  metadata.gz: c2ca1a9b6a0534a0caad17123408d88fdeea90ac
+  data.tar.gz: 309cb6aaf4f19f681fdd73964a223116923292f2
 SHA512:
-  metadata.gz: d27c675dc474aaf51403453d98ce32b83264cfe7437d4178f58fc45dafbeb20b454d6450235e775fd9bee049eb94db8444ab8979e88752e26f68a9ef7a1e224b
-  data.tar.gz: 0a749056b57fdd205fba43497bff68bbfd61d0ed61617efea637902453b9974886064345a01e50cb388d375bd82abf2bf69769e48bad0cbdd37e5c684048b58b
+  metadata.gz: 1ec2cd136f7c917caa82dba82a140ef833f87a1e1aae1d060aa3f662de5092acbb2dc194dab2e5712cdd1edf74278d6449ded873bc89bf0140401778c8fad26f
+  data.tar.gz: fab0e5230b8ce493cb1355f4bca6aa90ef9c206abe266e73e8f1f9e1ea2e1c6919b7a846b7812fdc4d946aec01d96234ca283a9e0ea01c2e8e345e8bbfc6628d

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

@@ -72,7 +72,7 @@ module Effective
         effective_resource.nested_resources.each do |nested|
           if (nested_params = permitted_params_for(nested.klass)).present?
             nested_params.insert(nested_params.rindex { |obj| !obj.kind_of?(Hash)} + 1, :_destroy)
-            permitted_params << { "#{nested.plural_name}_attributes".to_sym => nested_params }
+            permitted_params << { "#{nested.name}_attributes".to_sym => nested_params }
           end
         end
 

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

@@ -14,9 +14,7 @@ module Effective
 
         on = ons[params[:commit].to_s] || ons[action] || ons[commit[:action]]
 
-        commit.reverse_merge!(on) if on.present?
-
-        commit
+        on.present? ? commit.reverse_merge(on) : commit
       end
 
       # This calls the appropriate member action, probably save!, on the resource.

data/app/helpers/effective_resources_helper.rb

@@ -60,6 +60,7 @@ module EffectiveResourcesHelper
     raise 'expected first argument to be an ActiveRecord::Base object or Array of objects' unless resource.kind_of?(ActiveRecord::Base) || resource.kind_of?(Class) || resource.kind_of?(Array)
     raise 'expected attributes to be a Hash' unless atts.kind_of?(Hash)
 
+    btn_class = atts.delete(:btn_class)
     locals = atts.delete(:locals) || {}
     partial = atts.delete(:partial)
     spacer_template = locals.delete(:spacer_template)
@@ -80,7 +81,7 @@ module EffectiveResourcesHelper
     partial = (partial.presence || 'effective/resource/actions') + '.html'
 
     # Assign Locals
-    locals = { resource: resource, effective_resource: effective_resource, namespace: namespace, actions: actions }.compact.merge(locals)
+    locals = { resource: resource, effective_resource: effective_resource, namespace: namespace, actions: actions, btn_class: btn_class.to_s }.compact.merge(locals)
 
     # Render
     if resource.kind_of?(Array)

data/app/helpers/effective_resources_private_helper.rb

@@ -24,12 +24,12 @@ module EffectiveResourcesPrivateHelper
 
       # Replace resource name in any token strings
       if opts.key?('data-confirm')
-        opts['data-confirm'].gsub!('@resource', (resource.to_s.presence || resource.class.name.gsub('::', ' ').underscore.gsub('_', ' ')).to_s)
+        opts['data-confirm'] = opts['data-confirm'].gsub('@resource', (resource.to_s.presence || resource.class.name.gsub('::', ' ').underscore.gsub('_', ' ')).to_s)
       end
 
       # Assign class
       opts[:class] ||= (
-        if opts['data-method'] == 'delete'
+        if opts['data-method'].to_s == 'delete'
           'btn btn-danger'
         elsif h.length == 0
           'btn btn-primary'

data/app/models/effective/attribute.rb

@@ -34,7 +34,8 @@ module Effective
         when :duration    ; :duration
         when :email       ; :email
         when :integer     ; :integer
-        when :percentage  ; :percentage
+        when :percent     ; :percent
+        when :percentage  ; :percent
         when :phone       ; :phone
         when :price       ; :price
         when :nil         ; :nil
@@ -101,14 +102,8 @@ module Effective
         EffectiveRoles.roles.include?(value.to_sym) ? value : EffectiveRoles.roles_for(value)
       when :integer
         (value.kind_of?(String) ? value.gsub(/\D/, '') : value).to_i
-      when :percentage
-        # We want this to return 0.81 when we type 81% or 0.81 or 81.5
-        if value.to_s.include?('.')
-          value = value.to_s.gsub(/[^0-9|\-|\.]/, '').to_f
-          value >= 1.0 ? (value / 100.0) : value
-        else
-          (value.to_s.gsub(/\D/, '').to_f / 100.0)
-        end
+      when :percent # Integer * 1000. Percentage to 3 digits.
+        value.kind_of?(Integer) ? value : (value.to_s.gsub(/[^0-9|\-|\.]/, '').to_f * 1000.0).round
       when :phone
         digits = value.to_s.gsub(/\D/, '').chars
         digits = (digits.first == '1' ? digits[1..10] : digits[0..9]) # Throw away a leading 1
@@ -120,8 +115,8 @@ module Effective
         (value.kind_of?(String) ? value.gsub(/\D/, '') : value).to_i
       when :nil
         value.presence
-      when :price
-        (value.kind_of?(Integer) ? value : (value.to_s.gsub(/[^0-9|\-|\.]/, '').to_f * 100.0)).to_i
+      when :price # Integer * 100. Number of cents.
+        value.kind_of?(Integer) ? value : (value.to_s.gsub(/[^0-9|\-|\.]/, '').to_f * 100.0).round
       when :string, :text, :email
         value.to_s
       when :belongs_to_polymorphic

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

@@ -36,6 +36,10 @@ module Effective
       # Effective::Resource.new('admin/posts').action_path(:edit, Post.last) => '/admin/posts/3/edit'
       # Will work for any action. Returns the real path
       def action_path(action, resource = nil, opts = {})
+        if klass.nil? && resource.present? && initialized_name.kind_of?(ActiveRecord::Reflection::BelongsToReflection)
+          return Effective::Resource.new(resource, namespace: namespace).action_path(action, resource, opts)
+        end
+
         return unless routes[action]
 
         if resource.kind_of?(Hash)
@@ -43,7 +47,7 @@ module Effective
         end
 
         # edge case: Effective::Resource.new('admin/comments').action_path(:new, @post)
-        if resource.present? && !resource.kind_of?(klass)
+        if resource && klass && !resource.kind_of?(klass)
           if (bt = belongs_to(resource)).present? && instance.respond_to?("#{bt.name}=")
             return routes[action].format(klass.new(bt.name => resource)).presence
           end

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

@@ -45,7 +45,8 @@ module Effective
 
       def nested_resources
         return [] unless klass.respond_to?(:reflect_on_all_associations)
-        klass.reflect_on_all_associations(:has_many).select { |ass| ass.options[:autosave] }
+        klass.reflect_on_all_associations(:has_many).select { |ass| ass.options[:autosave] } +
+        klass.reflect_on_all_associations(:has_one).select { |ass| ass.options[:autosave] }
       end
 
       def associated(name)

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

@@ -8,8 +8,16 @@ module Effective
         when :belongs_to
           { as: :select }.merge(search_form_field_collection(belongs_to(name)))
         when :belongs_to_polymorphic
-          #{ as: :select, grouped: true, polymorphic: true, collection: nil}
-          { as: :string }
+          constant_pluralized = name.to_s.upcase
+          constant = name.to_s.pluralize.upcase
+
+          if defined?("#{klass.name}::#{constant}")
+            { as: :select, polymorphic: true, collection: klass.const_get(constant) }
+          elsif defined?("#{klass.name}::#{constant_pluralized}")
+            { as: :select, polymorphic: true, collection: klass.const_get(constant_pluralized) }
+          else
+            { as: :string }
+          end
         when :has_and_belongs_to_many
           { as: :select }.merge(search_form_field_collection(has_and_belongs_to_many(name)))
         when :has_many

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

@@ -79,7 +79,9 @@ module Effective
         when :belongs_to_polymorphic
           (type, id) = term.split('_')
 
-          if type.present? && id.present?
+          if term == 'nil'
+            relation.where(is_null("#{sql_column}_id")).where(is_null("#{sql_column}_type"))
+          elsif type.present? && id.present?
             relation.where("#{sql_column}_id = ?", id).where("#{sql_column}_type = ?", type)
           else
             id ||= Effective::Attribute.new(:integer).parse(term)
@@ -133,8 +135,8 @@ module Effective
           end
         when :integer
           relation.where("#{sql_column} = ?", term)
-        when :percentage
-          relation.where("#{sql_column} = ?", sql_type(name) == :integer ? (term * 100).to_i : term)
+        when :percent
+          relation.where("#{sql_column} = ?", term)
         when :price
           relation.where("#{sql_column} = ?", term)
         when :string, :text, :email
@@ -193,38 +195,54 @@ module Effective
           key = sql_column(klass.primary_key)
           values = relation.pluck(association.source_reflection.klass.primary_key).uniq.compact
 
-          keys = klass.joins(association.name)
-            .where(association.name => { association.source_reflection.klass.primary_key => values })
-            .pluck(klass.primary_key)
+          keys = if value == 'nil'
+            klass.where.not(klass.primary_key => klass.joins(association.name)).pluck(klass.primary_key)
+          else
+            klass.joins(association.name)
+              .where(association.name => { association.source_reflection.klass.primary_key => values })
+              .pluck(klass.primary_key)
+          end
         elsif association.options[:through].present?
-          key = sql_column(klass.primary_key)
+          scope = association.through_reflection.klass.all
 
           if association.source_reflection.options[:polymorphic]
             reflected_klass = association.klass
+            scope = scope.where(association.source_reflection.foreign_type => reflected_klass.name)
           else
             reflected_klass = association.source_reflection.klass
           end
 
-          values = relation.pluck(reflected_klass.primary_key).uniq.compact
-
-          scope = association.through_reflection.klass.where(association.source_reflection.foreign_key => values)
-
-          if association.source_reflection.options[:polymorphic]
-            scope = scope.where(association.source_reflection.foreign_type => reflected_klass.name)
-          end
-
           if association.through_reflection.macro == :belongs_to
             key = association.through_reflection.foreign_key
-            keys = scope.pluck(association.through_reflection.klass.primary_key)
+            pluck_key = association.through_reflection.klass.primary_key
           else
-            keys = scope.pluck(association.through_reflection.foreign_key)
+            key = sql_column(klass.primary_key)
+            pluck_key = association.through_reflection.foreign_key
           end
+
+          if value == 'nil'
+            keys = klass.where.not(klass.primary_key => scope.pluck(pluck_key)).pluck(klass.primary_key)
+          else
+            keys = scope.where(association.source_reflection.foreign_key => relation).pluck(pluck_key)
+          end
+
         elsif association.macro == :has_many
           key = sql_column(klass.primary_key)
-          keys = relation.pluck(association.foreign_key)
+
+          keys = if value == 'nil'
+            klass.where.not(klass.primary_key => resource.klass.pluck(association.foreign_key)).pluck(klass.primary_key)
+          else
+            relation.pluck(association.foreign_key)
+          end
+
         elsif association.macro == :has_one
           key = sql_column(klass.primary_key)
-          keys = relation.pluck(association.foreign_key)
+
+          keys = if value == 'nil'
+            klass.where.not(klass.primary_key => resource.klass.pluck(association.foreign_key)).pluck(klass.primary_key)
+          else
+            relation.pluck(association.foreign_key)
+          end
         end
 
         "#{key} IN (#{(keys.uniq.compact.presence || [0]).join(',')})"

data/app/views/effective/resource/_actions_dropleft.html.haml

@@ -1,6 +1,6 @@
-= dropdown(variation: :dropleft) do
+= dropdown(variation: :dropleft, btn_class: btn_class) do
   - permitted_resource_actions(resource, actions).each do |label, opts|
-    = dropdown_link_to(label, (effective_resource.action_path(opts[:action], resource) || '#'), opts.except(:action, :class))
+    = dropdown_link_to(label, (effective_resource.action_path(opts[:action], resource) || '#'), opts.except(:action, :class).merge(btn_class: btn_class))
 
   = instance_exec(resource, &format_block) if local_assigns[:format_block]
   = yield(resource) if block_given?

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails