effective_resources 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c8221988f03d56ff83b0119d534ec05cc4da24b
-  data.tar.gz: 90b6ac23aec80640c67a189c389c397d5490562f
+  metadata.gz: 092de6a5657f044dc7d24ef202f01b47b666a2f7
+  data.tar.gz: cb227dbf96b28597e2d8d9e05823895dd383874a
 SHA512:
-  metadata.gz: f8a1bb0a89920994001dc31e28626c79c6ca34909c29d4d52a6b8b87edddf2c4a500982c70e5652643081a447b72daa81f2124adb38e8bf978ee95843e42d367
-  data.tar.gz: 878d4fb2251e0ce4ce0160dc7913e263123b71593a60b796d973443d8f7068b39e127ee96e7326465e80154b2f53d485e5b7e77839eb6c18df7d7c15e8571a2b
+  metadata.gz: 1bccc81b7dc7044112946de7037065d0db21256bf8cd573f9f76fd8cec53d7ea1973018a57df48128459c7282dd1d0fa424ea8ac3707b9597683388728a88a92
+  data.tar.gz: f06f6e0235e2e40dc429c42e1c8b274403457038baa2f1dfc6c2f73508db0d6f79acc9246fec35fb79f76f6d8100576dcac52aa8a61cd7ef5b8931dd22ff6182

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

@@ -8,7 +8,8 @@ module Effective
         when :belongs_to
           { as: :select }.merge(search_form_field_collection(belongs_to(name)))
         when :belongs_to_polymorphic
-          { as: :grouped_select, polymorphic: true, collection: nil}
+          #{ as: :grouped_select, polymorphic: true, collection: nil}
+          { as: :string }
         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/init.rb

@@ -35,7 +35,7 @@ module Effective
         0.upto(names.length-1) do |index|
           class_name = (names[index..-1].map { |name| name.classify } * '::')
 
-          if (@model_klass = class_name.safe_constantize).present?
+          if (@model_klass ||= class_name.safe_constantize).present?
             @class_name = class_name
             @namespaces = names[0...index]
             break

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

@@ -3,11 +3,7 @@ module Effective
     module Klass
 
       def klass
-        @model_klass ||= (
-          namespaced_class_name.safe_constantize ||
-          class_name.safe_constantize ||
-          name.classify.safe_constantize
-        )
+        @model_klass
       end
 
       def datatable_klass

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

@@ -12,7 +12,7 @@ module Effective
       end
 
       def class_name # 'Effective::Post'
-        @class_name
+        @model_klass.try(:name) || @class_name || ''
       end
 
       def class_path # 'effective'
@@ -20,7 +20,7 @@ module Effective
       end
 
       def namespaced_class_name # 'Admin::Effective::Post'
-        (namespaces.map { |name| name.classify } + [class_name]) * '::'
+        (namespaces.to_a.map { |name| name.classify } + [class_name]) * '::'
       end
 
       def namespace # 'admin/things'

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

@@ -54,14 +54,21 @@ module Effective
         end
 
         association = associated(name)
-        term = Effective::Attribute.new(sql_type, klass: association.try(:klass) || klass).parse(value, name: name)
+
+        term = Effective::Attribute.new(sql_type, klass: (association.try(:klass) rescue nil) || klass).parse(value, name: name)
 
         case sql_type
         when :belongs_to, :has_and_belongs_to_many, :has_many, :has_one
           relation.where(search_by_associated_conditions(association, term, fuzzy: fuzzy))
         when :belongs_to_polymorphic
           (type, id) = term.split('_')
-          relation.where("#{sql_column} = ?", id).where("#{sql_column.sub('_id', '_type')} = ?", type)
+
+          if type.present? && id.present?
+            relation.where("#{sql_column} = ?", id).where("#{sql_column.sub('_id', '_type')} = ?", type)
+          else
+            id ||= Effective::Attribute.new(:integer).parse(term)
+            relation.where("#{sql_column} = ? OR #{sql_column.sub('_id', '_type')} = ?", id, (type || term))
+          end
         when :effective_addresses
           raise 'not yet implemented'
         when :effective_obfuscation

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails