effective_resources 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 092de6a5657f044dc7d24ef202f01b47b666a2f7
-  data.tar.gz: cb227dbf96b28597e2d8d9e05823895dd383874a
+  metadata.gz: 80f8bb76be22a155d74952c74d008382e1ba7cd7
+  data.tar.gz: 06fa5f406c156ed2dbe2ef413e3f0f5a57a6214c
 SHA512:
-  metadata.gz: 1bccc81b7dc7044112946de7037065d0db21256bf8cd573f9f76fd8cec53d7ea1973018a57df48128459c7282dd1d0fa424ea8ac3707b9597683388728a88a92
-  data.tar.gz: f06f6e0235e2e40dc429c42e1c8b274403457038baa2f1dfc6c2f73508db0d6f79acc9246fec35fb79f76f6d8100576dcac52aa8a61cd7ef5b8931dd22ff6182
+  metadata.gz: 6a3aab4b276571bdf76024ea8b381173b640fb748c06126d565f84f3fdf92c62177fd5ac61f13dce78cff23dce3fbc25799ecae87273cc5347a8925fcc778e60
+  data.tar.gz: 42ed251bf078e6b173639083e8b68bc5b2fa0955b3bba97e3214c9330e9d0a284d3664304acadf1242916a7f09665f95850ea401a527b15cb4def8ffcc7f2c9b

data/app/models/effective/attribute.rb

@@ -92,7 +92,7 @@ module Effective
         value.to_s
       when :belongs_to_polymorphic
         value.to_s
-      when :belongs_to, :has_many, :has_and_belongs_to_many, :has_one, :resource  # Returns an Array of ints, an Int or String
+      when :belongs_to, :has_many, :has_and_belongs_to_many, :has_one, :resource, :effective_addresses  # Returns an Array of ints, an Int or String
         if value.kind_of?(Integer) || value.kind_of?(Array)
           value
         else
@@ -109,7 +109,7 @@ module Effective
           end
         end
       else
-        raise 'unsupported type'
+        raise "unsupported type #{type}"
       end
     end
 

data/app/models/effective/resource.rb

@@ -12,8 +12,8 @@ module Effective
     include Effective::Resources::Sql
 
     # post, Post, Admin::Post, admin::Post, admin/posts, admin/post, admin/effective::post
-    def initialize(input)
-      _initialize(input)
+    def initialize(input, namespace: nil)
+      _initialize(input, namespace: namespace)
     end
 
     def to_s

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

@@ -33,7 +33,7 @@ module Effective
 
       def associated(name)
         name = (name.to_s.end_with?('_id') ? name.to_s[0...-3] : name).to_sym
-        klass.reflect_on_all_associations.find { |ass| ass.name == name }
+        klass.reflect_on_all_associations.find { |ass| ass.name == name } || effective_addresses(name)
       end
 
       def belongs_to(name)
@@ -61,6 +61,18 @@ module Effective
         has_ones.find { |ass| ass.name == name }
       end
 
+      def effective_addresses(name)
+        return unless defined?(EffectiveAddresses) && has_many(:addresses).try(:klass) == Effective::Address
+
+        name = name.to_s.downcase
+        return unless name.end_with?('_address') || name.end_with?('_addresses')
+
+        category = name.split('_').reject { |name| name == 'address' || name == 'addresses' }.join('_')
+        return unless category.present?
+
+        Effective::Address.where(category: category).where(addressable_type: class_name)
+      end
+
       def nested_resource(name)
         name = name.to_sym
         nested_resources.find { |ass| ass.name == name }

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

@@ -23,7 +23,7 @@ module Effective
         when :effective_obfuscation
           { as: :effective_obfuscation }
         when :boolean
-          { as: :boolean, collection: [['true', true], ['false', false]] }
+          { as: :boolean, collection: [['Yes', true], ['No', false]] }
         when :datetime
           { as: :datetime }
         when :date

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

@@ -4,41 +4,42 @@ module Effective
 
       private
 
-      def _initialize(obj)
-        @input_name = _initialize_input_name(obj)
-        _initialize_names(@input_name)
+      def _initialize(input, namespace: nil)
+        @namespaces = (namespace.kind_of?(String) ? namespace.split('/') : Array(namespace)) if namespace
 
-        @relation = _initialize_relation(obj)
-        @instance = obj if (klass && obj.instance_of?(klass))
-      end
-
-      def _initialize_input_name(input)
-        case input
-        when String ; input.start_with?('/') ? input[1..-1] : input
-        when Symbol ; input
-        when Class  ; input.name
+        @model_klass = case input
+        when String, Symbol
+          _klass_by_name(input)
         when ActiveRecord::Relation
           input.klass
         when ActiveRecord::Reflection::AbstractReflection
-          @model_klass = input.klass unless input.options[:polymorphic]
-          input.name
+          input.klass unless input.options[:polymorphic]
         when ActionDispatch::Journey::Route
-          input.defaults[:controller]
+          _klass_by_name(input.defaults[:controller])
+        when Class
+          input
         when nil    ; raise 'expected a string or class'
-        else        ; input.class.name
-        end.to_s.underscore
+        else        ; _klass_by_name(input.class.name)
+        end
+
+        @relation = _initialize_relation(input)
+        @instance = input if (klass && input.instance_of?(klass))
       end
 
-      def _initialize_names(input)
+      def _klass_by_name(input)
+        input = input.to_s
+        input = input[1..-1] if input.start_with?('/')
+
         names = input.split('/')
 
         0.upto(names.length-1) do |index|
           class_name = (names[index..-1].map { |name| name.classify } * '::')
+          klass = (class_name.safe_constantize rescue nil)
 
-          if (@model_klass ||= class_name.safe_constantize).present?
-            @class_name = class_name
+          if klass.present?
             @namespaces = names[0...index]
-            break
+            @model_klass = klass
+            return klass
           end
         end
       end

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

@@ -4,7 +4,7 @@ module Effective
       SPLIT = /\/|::/  # / or ::
 
       def name # 'post'
-        @name ||= @input_name.split(SPLIT).last.singularize
+        @name ||= (klass.try(:name).to_s.split(SPLIT).last || '').singularize.downcase
       end
 
       def plural_name # 'posts'
@@ -12,7 +12,7 @@ module Effective
       end
 
       def class_name # 'Effective::Post'
-        @model_klass.try(:name) || @class_name || ''
+        @model_klass.try(:name).to_s
       end
 
       def class_path # 'effective'
@@ -20,7 +20,7 @@ module Effective
       end
 
       def namespaced_class_name # 'Admin::Effective::Post'
-        (namespaces.to_a.map { |name| name.classify } + [class_name]) * '::'
+        (Array(namespaces).map { |name| name.classify } + [class_name]) * '::'
       end
 
       def namespace # 'admin/things'

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

@@ -31,6 +31,10 @@ module Effective
           relation
             .order(order_by_associated_conditions(association, sort: sort, direction: direction))
             .order("#{sql_column(klass.primary_key)} #{sql_direction}")
+        when :effective_addresses
+          relation
+            .order(order_by_associated_conditions(associated(:addresses), sort: sort, direction: direction))
+            .order("#{sql_column(klass.primary_key)} #{sql_direction}")
         when :effective_roles
           relation.order("#{sql_column(:roles_mask)} #{sql_direction}")
         when :string, :text
@@ -57,6 +61,10 @@ module Effective
 
         term = Effective::Attribute.new(sql_type, klass: (association.try(:klass) rescue nil) || klass).parse(value, name: name)
 
+        if term == 'nil' && ![:has_and_belongs_to_many, :has_many, :has_one, :belongs_to_polymorphic, :effective_roles].include?(sql_type)
+          return relation.where("#{sql_column} IS NULL")
+        end
+
         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))
@@ -70,7 +78,7 @@ module Effective
             relation.where("#{sql_column} = ? OR #{sql_column.sub('_id', '_type')} = ?", id, (type || term))
           end
         when :effective_addresses
-          raise 'not yet implemented'
+          relation.where(id: Effective::Resource.new(association).search_any(value, fuzzy: fuzzy).pluck(:addressable_id))
         when :effective_obfuscation
           # If value == term, it's an invalid deobfuscated id
           relation.where("#{sql_column} = ?", (value == term ? 0 : term))
@@ -124,7 +132,7 @@ module Effective
             relation.where("#{sql_column} = ?", term)
           end
         else
-          raise 'unsupported sql type'
+          raise "unsupported sql type #{sql_type}"
         end
       end
 
@@ -200,7 +208,7 @@ module Effective
         # Order the target model for its matching records / keys
         sort_column = (sort unless sort == true) || resource.sort_column
 
-        relation = resource.relation.order("#{resource.sql_column(sort_column)} #{sql_direction(direction)}")
+        relation = resource.relation.reorder(nil).order("#{resource.sql_column(sort_column)} #{sql_direction(direction)}")
 
         if association.options[:as] # polymorphic
           relation = relation.where(association.type => klass.name)

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

@@ -20,7 +20,7 @@ module Effective
       end
 
       def max_id
-        @max_id ||= klass.maximum(klass.primary_key).to_i
+        @max_id ||= klass.unscoped.maximum(klass.primary_key).to_i
       end
 
       def sql_column(name)
@@ -52,6 +52,8 @@ module Effective
           :effective_obfuscation
         elsif name == 'roles' && defined?(EffectiveRoles) && klass.respond_to?(:with_role)
           :effective_roles
+        elsif (name.include?('_address') || name.include?('_addresses')) && defined?(EffectiveAddresses) && (klass.new rescue nil).respond_to?(:effective_addresses)
+          :effective_addresses
         elsif (column = column(name))
           column.type
         elsif name.ends_with?('_id')
@@ -64,7 +66,7 @@ module Effective
       # This tries to figure out the column we should order this collection by.
       # Whatever would match up with the .to_s
       def sort_column
-        ['name', 'title', 'label', 'first_name', 'subject', 'description', 'email'].each do |name|
+        ['name', 'title', 'label', 'subject', 'full_name', 'first_name', 'email', 'description'].each do |name|
           return name if column_names.include?(name)
         end
 

data/lib/effective_resources/version.rb

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

metadata

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