search_object 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfd3ff677d11a1e11bed9b477960df1e286a162d
-  data.tar.gz: 60cabe41c79f8596ce290c52cfe88317fb28fd00
+  metadata.gz: 3dcf24c846042501f789fdc3da39a47b15b33874
+  data.tar.gz: 80448932ff7fc522f8a20890ba8ef7ecda8f4eb3
 SHA512:
-  metadata.gz: 331c98690d13135b9a3fb0427c9a6df1139785af9df0c53755fddd1c30db4b93c48a38f094156829f4d6a419eea9ba1b381f9fcd105dabcb06f04a6a936acaf4
-  data.tar.gz: c9d14a709fd31ad3cdafdda6ce8028edd80da3549ae6e0c0e96e4f9afa64384cf3805a258f46776a684ed19c605f7d69e472e96864d4ac30cb874ebad03f7c92
+  metadata.gz: 3d4139961ee6295d3abe3a987d0d224a2197b6040a30b1da252989654a1d3892c215022132ef0407a75c9d4a7c37a4cfd62447f9f345acc8702a72e5f5d7a5b9
+  data.tar.gz: decde34bdf851ff385715e646107091fd6c3ac4debf860268f513e1b1105c8aaa6a904ca6eee64794572f1a8956f295525276f545879f560588ebe4c0d81e8bc

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 1.1.3 (unreleased)
+
+* __[feature]__ Passing nil as `scope` in constructor, falls back to default scope (@rstankov)
+
 ## Version 1.1.2
 
 * __[fix]__ Fix a warning due to Rails 5 `ActionController::Parameters` not being a Hash (@rstankov)

data/lib/search_object/helper.rb

@@ -1,63 +1,63 @@
 module SearchObject
   # :api: private
   module Helper
-    class << self
-      def stringify_keys(hash)
-        # Note(rstankov): From Rails 5+ ActionController::Parameters aren't Hash
-        #   In a lot of cases `stringify_keys` is used on action params
-        hash = hash.to_unsafe_h if hash.respond_to? :to_unsafe_h
-        Hash[(hash || {}).map { |k, v| [k.to_s, v] }]
-      end
+    module_function
 
-      def slice_keys(hash, keys)
-        keys.inject({}) do |memo, key|
-          memo[key] = hash[key] if hash.key? key
-          memo
-        end
-      end
+    def stringify_keys(hash)
+      # Note(rstankov): From Rails 5+ ActionController::Parameters aren't Hash
+      #   In a lot of cases `stringify_keys` is used on action params
+      hash = hash.to_unsafe_h if hash.respond_to? :to_unsafe_h
+      Hash[(hash || {}).map { |k, v| [k.to_s, v] }]
+    end
 
-      def camelize(text)
-        text.to_s.gsub(/(?:^|_)(.)/) { Regexp.last_match[1].upcase }
+    def slice_keys(hash, keys)
+      keys.inject({}) do |memo, key|
+        memo[key] = hash[key] if hash.key? key
+        memo
       end
+    end
 
-      def ensure_included(item, collection)
-        if collection.include? item
-          item
-        else
-          collection.first
-        end
+    def camelize(text)
+      text.to_s.gsub(/(?:^|_)(.)/) { Regexp.last_match[1].upcase }
+    end
+
+    def ensure_included(item, collection)
+      if collection.include? item
+        item
+      else
+        collection.first
       end
+    end
 
-      def define_module(&block)
-        Module.new do
-          define_singleton_method :included do |base|
-            base.class_eval(&block)
-          end
+    def define_module(&block)
+      Module.new do
+        define_singleton_method :included do |base|
+          base.class_eval(&block)
         end
       end
+    end
 
-      def normalize_search_handler(handler, name)
-        case handler
-        when Symbol then ->(scope, value) { method(handler).call scope, value }
-        when Proc then handler
-        else ->(scope, value) { scope.where name => value unless value.blank? }
-        end
+    def normalize_search_handler(handler, name)
+      case handler
+      when Symbol then ->(scope, value) { method(handler).call scope, value }
+      when Proc then handler
+      else ->(scope, value) { scope.where name => value unless value.blank? }
       end
+    end
 
-      def deep_copy(object) # rubocop:disable Metrics/MethodLength
-        case object
-        when Array
-          object.map { |element| deep_copy(element) }
-        when Hash
-          object.inject({}) do |result, (key, value)|
-            result[key] = deep_copy(value)
-            result
-          end
-        when NilClass, FalseClass, TrueClass, Symbol, Method, Numeric
-          object
-        else
-          object.dup
+    def deep_copy(object) # rubocop:disable Metrics/MethodLength
+      case object
+      when Array
+        object.map { |element| deep_copy(element) }
+      when Hash
+        object.inject({}) do |result, (key, value)|
+          result[key] = deep_copy(value)
+          result
         end
+      when NilClass, FalseClass, TrueClass, Symbol, Method, Numeric
+        object
+      else
+        object.dup
       end
     end
   end

data/lib/search_object/search.rb

@@ -4,7 +4,7 @@ module SearchObject
 
     class << self
       def build_for(config, options)
-        scope   = options.fetch(:scope) { config[:scope] && config[:scope].call }
+        scope   = options[:scope] || (config[:scope] && config[:scope].call)
         filters = Helper.stringify_keys(options.fetch(:filters, {}))
         params  = config[:defaults].merge Helper.slice_keys(filters, config[:actions].keys)
 

data/lib/search_object/version.rb

@@ -1,3 +1,3 @@
 module SearchObject
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.1.3'.freeze
 end

data/spec/search_object/base_spec.rb

@@ -100,18 +100,27 @@ module SearchObject
 
         expect(search_class.new(scope: 'other scope').results).to eq 'other scope'
       end
+
+      it 'passing nil as scope in constructor, falls back to default scope' do
+        search_class = define_search_class do
+          scope { 'scope' }
+        end
+
+        expect(search_class.new(scope: nil).results).to eq 'scope'
+      end
     end
 
     describe 'option' do
       it 'has default filter' do
         scope = [1, 2, 3]
-        expect(scope).to receive(:where).with('value' => 1) { 'results' }
+        allow(scope).to receive(:where).and_return 'results'
 
         search = new_search scope, value: 1 do
           option :value
         end
 
         expect(search.results).to eq 'results'
+        expect(scope).to have_received(:where).with('value' => 1)
       end
 
       it 'returns the scope if nil returned' do

data/spec/search_object/search_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'ostruct'
 
 module SearchObject
   describe Search do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_object
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Radoslav Stankov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2017-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler