rice_cooker 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2552edc5a29457e713b7b2fa3c505a5a306f402
-  data.tar.gz: 2c5b2b4dabb9a65006042602f29be764bacd3e79
+  metadata.gz: 79a905f421f6309592feb240c8da2fb710cbebfa
+  data.tar.gz: 63b3dfbcbb3a4dd4ad9b9150c9c16caf9869d096
 SHA512:
-  metadata.gz: bc79b23fd67e5c673c052dd0a0a67f33cf11b64c0eac4baca51a349be02a05068c28f1e357e54a31897082fa1f47f777f29e22ce0004a2b73d3c9dd0e547b433
-  data.tar.gz: 422b1198716ab050ffe818b4b72e1b2c25f52dd180284115fffdc8e4b14aad3bd2970c2cd104f50045b406e9a1842c6b43ea77a5602a96dbe969839ac858fdc9
+  metadata.gz: 3bd712a942907035e48a995a0997fd6434a1420bb6fefe5e272a77f5fe294ec4893ae4b09e7095d38a12b36244425891037c5e0b88a3c0c9d00d93537df09a7d
+  data.tar.gz: 299452845ba785aa6f18f3ce7958db7e189b1fd074c6dcb3221ab9b0730aea91697b7bdb3d39d17266382e7ad1ecab46af2aa5cfa3c12c857366ee6ae5a7f80d

data/lib/rice_cooker/base/helpers.rb

@@ -48,15 +48,24 @@ module RiceCooker
       end
     end
 
-    # Overridable method for available rangeable fields
+    # Overridable method for available searchable fields
     def searchable_fields_for(model)
       if model.respond_to?(:searchable_fields)
-        model.rangeable_fields.map(&:to_sym)
+        model.searchable_fields.map(&:to_sym)
       else
         filterable_fields_for(model)
       end
     end
 
+    # Overridable method for available fuzzy fields
+    def fuzzy_fields_for(model)
+      if model.respond_to?(:fuzzy_fields)
+        model.fuzzy_fields.map(&:to_sym)
+      else
+        searchable_fields_for(model)
+      end
+    end
+
     # Overridable method for available rangeable fields
     def rangeable_fields_for(model)
       if model.respond_to?(:rangeable_fields)
@@ -177,6 +186,7 @@ module RiceCooker
       return collection if collection.nil?
 
       filtering_params.each do |field, value|
+        puts "Filtering param #{field} -> #{value}"
         if additional.key?(field) && additional[field].key?(:proc)
 
           # Si on a fourni des valeurs, on verifie qu'elle matchent
@@ -186,6 +196,8 @@ module RiceCooker
           end
 
           collection = collection.instance_exec(value, &(additional[field][:proc]))
+        elsif field =~ /_at$/ && (value.is_a?(String) || value.is_a?(Array))
+          collection = collection.where("DATE(#{field}) = ?", [*value])
         elsif value.is_a?(String) || value.is_a?(Array)
           collection = collection.where(field => value)
         elsif value.is_a?(Hash) && value.key?(:proc)
@@ -274,6 +286,25 @@ module RiceCooker
       col.where(reducer)
     end
 
+    def reduce_fields_where(col, fields, value)
+      reducer = nil
+      fields.each do |f|
+        case col.model.columns.select{|e| e.name.to_sym == f.to_sym}.first.type
+        when :string
+          query = col.model.arel_table[f.to_sym].matches("%#{value.to_s}%")
+        when :integer
+          query = col.model.arel_table[f.to_sym].eq(value.to_i)
+        # when :boolean
+        #   query = col.model.where(false)
+        else
+          query = false
+        end
+
+        reducer = (reducer ? reducer.or(query) : query) if query
+      end
+      col.where(reducer)
+    end
+
     def apply_search_to_collection(col, searching_params, additional = {})
       return col if col.nil?
 
@@ -281,7 +312,7 @@ module RiceCooker
         if additional.key?(field) && additional[field].key?(:proc)
           col = col.instance_exec(value, &(additional[field][:proc]))
         elsif value.is_a?(String)
-          col = col.where(col.model.arel_table[field.to_sym].matches("%#{value.join(' ')}%"))
+          col = (col.where(col.model.arel_table[field.to_sym].matches("%#{value.join(' ')}%")) rescue col)
         elsif value.is_a?(Array)
           col = reduce_where(col, field, value)
         elsif value.is_a?(Hash) && value.key?(:proc)

data/lib/rice_cooker/class_methods.rb

@@ -1,18 +1,24 @@
 require 'active_support'
 
+# require "pry"
+
 module RiceCooker
   module ClassMethods
     protected
 
     def initialize_model_class!
       # First priority is the namespaced model, e.g. User::Group
+      # binding.pry
 
       # Handle InhRes computing
-      if self.respond_to? :resource_class
+      # puts "[#{self}] In initialization, resource_class: #{self.respond_to?(:resource_class) && self.resource_class.inspect}"
+      if self.respond_to?(:resource_class) && self.resource_class
         self.resource_model = self.resource_class
         return self.resource_model
       end
+      # binding.pry
 
+      # puts "[1/5] Resource model: #{self.resource_model.inspect}"
       self.resource_model ||= begin
         namespaced_class = name.sub(/Controller$/, '').singularize
         namespaced_class.constantize
@@ -21,6 +27,7 @@ module RiceCooker
       end
 
       # Second priority is the top namespace model, e.g. EngineName::Article for EngineName::Admin::ArticlesController
+      # puts "[2/5] Resource model: #{self.resource_model.inspect}"
       self.resource_model ||= begin
         namespaced_classes = name.sub(/Controller$/, '').split('::')
         namespaced_class = [namespaced_classes.first, namespaced_classes.last].join('::').singularize
@@ -29,7 +36,17 @@ module RiceCooker
         nil
       end
 
+      # Second second priority is the top namespace model, e.g. EngineName::Article for EngineName::Admin::ArticlesController
+      # puts "[3/5] Resource model: #{self.resource_model.inspect}"
+      self.resource_model ||= begin
+        namespaced_class = name.sub(/Controller$/, '').split('::')[1..3].join('::').singularize
+        namespaced_class.constantize
+      rescue NameError
+        nil
+      end
+
       # Third priority the camelcased c, i.e. UserGroup
+      # puts "[4/5] Resource model: #{self.resource_model.inspect}"
       self.resource_model ||= begin
         camelcased_class = name.sub(/Controller$/, '').gsub('::', '').singularize
         camelcased_class.constantize
@@ -38,6 +55,7 @@ module RiceCooker
       end
 
       # Otherwise use the Group class, or fail
+      # puts "[5/5] Resource model: #{self.resource_model.inspect}"
       self.resource_model ||= begin
         class_name = controller_name.classify
         class_name.constantize

data/lib/rice_cooker/search.rb

@@ -30,6 +30,17 @@ module RiceCooker
         end
       end
 
+      def fuzzy_searched
+        cattr_accessor :fuzzy_keys
+
+        # On recupere tous les filtres autorisés
+        self.fuzzy_keys = fuzzy_fields_for(resource_model)
+        has_scope :fuzzy, only: [:index] do |_controller, scope, value|
+          scope = reduce_fields_where(scope, fuzzy_keys, value)
+          scope
+        end
+      end
+
       # Ajoute un filtre custom
       #
       # name: le nom du filtre custom (ex: with_mark)

data/lib/rice_cooker/version.rb

@@ -1,3 +1,3 @@
 module RiceCooker
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'.freeze
 end

data/rice_cooker.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- spec/*`.split(/\n/)
   s.require_paths = ['lib']
 
-  s.add_dependency 'rails', '>= 4.2.0', '< 5.1'
-  s.add_dependency 'actionpack', '>= 4.2.0', '< 5.1'
-  s.add_dependency 'railties', '>= 4.2.0', '< 5.1'
+  s.add_dependency 'rails', '>= 4.2.0', '<= 5.1'
+  s.add_dependency 'actionpack', '>= 4.2.0', '<= 5.1'
+  s.add_dependency 'railties', '>= 4.2.0', '<= 5.1'
   s.add_dependency 'has_scope', '~> 0.7.0', '>= 0.6.0'
 
   s.add_development_dependency 'sqlite3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rice_cooker
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Andre Aubin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,7 +17,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '5.1'
   type: :runtime
@@ -27,7 +27,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '5.1'
 - !ruby/object:Gem::Dependency
@@ -37,7 +37,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '5.1'
   type: :runtime
@@ -47,7 +47,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '5.1'
 - !ruby/object:Gem::Dependency
@@ -57,7 +57,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '5.1'
   type: :runtime
@@ -67,7 +67,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '5.1'
 - !ruby/object:Gem::Dependency