hoodoo 1.12.0 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30fd454d84a35502e8c324645a1c8c981521aa7e
-  data.tar.gz: fae766337e9034cf46e9c030c64d5d6ea0609827
+  metadata.gz: 9cd0bbca0d44ff8c52c354e140565325d8447f10
+  data.tar.gz: 5faa6103ed09143226c2d869069af59c0ea5a76f
 SHA512:
-  metadata.gz: be4607dfff0f5f798b48eb83abbd3985562df696570137f1c7c9fa7fbaad5df227659c274c758c323fb12901365d665c9a1642d743c17103708cb1509b23db3f
-  data.tar.gz: 0c35e38a6740d1e689c361fcf2f0ab07bac09540eb46a9bb1d7ac2f3ab40319c3711b26741fe85c0836e5b1d277208c9c06152f3aa5369745c936714de7a4bf7
+  metadata.gz: b3a8f6e8f61b54b65b9842fffe90aa1e0503fc4678a876ffcdf75de4075792cf8ff1c444bdb9b72c722a9ced24f4916ebfbdff338425c97dbe53c18e153bfd7a
+  data.tar.gz: 47ff963da7a1ff972fba27090290398bfcd35612d5657df877b3f623c3726dbd8e3fd2ed3668df1a43c6df5e3f5caf6b04ec0489bfd0f3ae441aa7ba387eab42

data/lib/hoodoo/active/active_record/finder.rb

@@ -82,6 +82,14 @@ module Hoodoo
       #
       def self.instantiate( model )
         model.extend( ClassMethods )
+
+        framework_data = Hoodoo::ActiveRecord::Support.framework_search_and_filter_data()
+
+        model.nz_co_loyalty_hoodoo_search_with ||= {}
+        model.nz_co_loyalty_hoodoo_filter_with ||= {}
+
+        model.nz_co_loyalty_hoodoo_search_with.merge!( framework_data )
+        model.nz_co_loyalty_hoodoo_filter_with.merge!( framework_data )
       end
 
       # Collection of class methods that get defined on an including class via
@@ -711,7 +719,6 @@ module Hoodoo
         #         which assist with filling in non-nil values for this Hash.
         #
         def search_with( hash )
-          self.nz_co_loyalty_hoodoo_search_with ||= Hoodoo::ActiveRecord::Support.framework_search_and_filter_data()
           self.nz_co_loyalty_hoodoo_search_with.merge!( Hoodoo::ActiveRecord::Support.process_to_map( hash ) )
         end
 
@@ -733,7 +740,6 @@ module Hoodoo
         # +map+:: As #search_with.
         #
         def filter_with( hash )
-          self.nz_co_loyalty_hoodoo_filter_with ||= Hoodoo::ActiveRecord::Support.framework_search_and_filter_data()
           self.nz_co_loyalty_hoodoo_filter_with.merge!( Hoodoo::ActiveRecord::Support.process_to_map( hash ) )
         end
 

data/lib/hoodoo/services/services/interface.rb

@@ -67,7 +67,7 @@ module Hoodoo; module Services
       #
       attr_reader :filter
 
-      # Array of prohibited framewor filter keys as Strings; empty for none
+      # Array of prohibited framework filter keys as Strings; empty for none
       # defined.
       #
       attr_reader :do_not_filter

data/lib/hoodoo/version.rb

@@ -12,6 +12,6 @@ module Hoodoo
   # The Hoodoo gem version. If this changes, ensure that the date in
   # "hoodoo.gemspec" is correct and run "bundle install" (or "update").
   #
-  VERSION = '1.12.0'
+  VERSION = '1.12.3'
 
 end

data/spec/active/active_record/finder_spec.rb

@@ -85,6 +85,36 @@ describe Hoodoo::ActiveRecord::Finder do
       search_with( search_and_filter_map )
       filter_with( search_and_filter_map )
     end
+
+    class RSpecModelFinderWithoutSearchOrFilterTest < ActiveRecord::Base
+      include Hoodoo::ActiveRecord::Finder
+
+      self.primary_key = :id
+      self.table_name = :r_spec_model_finder_tests
+    end
+
+    class RSpecModelFinderSubclassTest < Hoodoo::ActiveRecord::Base
+      self.primary_key = :id
+      self.table_name = :r_spec_model_finder_tests
+
+      search_and_filter_map = {
+        'mapped_code' => Hoodoo::ActiveRecord::Finder::SearchHelper.cs_match( 'code' )
+      }
+
+      search_with( search_and_filter_map )
+      filter_with( search_and_filter_map )
+    end
+
+    class RSpecModelFinderSubclassATest < RSpecModelFinderSubclassTest; end
+    class RSpecModelFinderSubclassBTest < RSpecModelFinderSubclassTest; end
+
+    class RSpecModelFinderSubclassWithoutSearchOrFilterTest < Hoodoo::ActiveRecord::Base
+      self.primary_key = :id
+      self.table_name = :r_spec_model_finder_tests
+    end
+
+    class RSpecModelFinderSubclassWithoutSearchOrFilterATest < RSpecModelFinderSubclassWithoutSearchOrFilterTest; end
+    class RSpecModelFinderSubclassWithoutSearchOrFilterBTest < RSpecModelFinderSubclassWithoutSearchOrFilterTest; end
   end
 
   before :each do
@@ -124,9 +154,37 @@ describe Hoodoo::ActiveRecord::Finder do
     @c.save!
     @code = @c.code
 
-    @a_wh = RSpecModelFinderTestWithHelpers.find( @a.id )
-    @b_wh = RSpecModelFinderTestWithHelpers.find( @b.id )
-    @c_wh = RSpecModelFinderTestWithHelpers.find( @c.id )
+    @a_wh        = RSpecModelFinderTestWithHelpers.find( @a.id )
+    @b_wh        = RSpecModelFinderTestWithHelpers.find( @b.id )
+    @c_wh        = RSpecModelFinderTestWithHelpers.find( @c.id )
+
+    @a_wosf      = RSpecModelFinderWithoutSearchOrFilterTest.find( @a.id )
+    @b_wosf      = RSpecModelFinderWithoutSearchOrFilterTest.find( @b.id )
+    @c_wosf      = RSpecModelFinderWithoutSearchOrFilterTest.find( @c.id )
+
+    @a_sc        = RSpecModelFinderSubclassTest.find( @a.id )
+    @b_sc        = RSpecModelFinderSubclassTest.find( @b.id )
+    @c_sc        = RSpecModelFinderSubclassTest.find( @c.id )
+
+    @a_sc_a      = RSpecModelFinderSubclassATest.find( @a.id )
+    @b_sc_a      = RSpecModelFinderSubclassATest.find( @b.id )
+    @c_sc_a      = RSpecModelFinderSubclassATest.find( @c.id )
+
+    @a_sc_b      = RSpecModelFinderSubclassBTest.find( @a.id )
+    @b_sc_b      = RSpecModelFinderSubclassBTest.find( @b.id )
+    @c_sc_b      = RSpecModelFinderSubclassBTest.find( @c.id )
+
+    @a_sc_wosf   = RSpecModelFinderSubclassWithoutSearchOrFilterTest.find( @a.id )
+    @b_sc_wosf   = RSpecModelFinderSubclassWithoutSearchOrFilterTest.find( @b.id )
+    @c_sc_wosf   = RSpecModelFinderSubclassWithoutSearchOrFilterTest.find( @c.id )
+
+    @a_sc_wosf_a = RSpecModelFinderSubclassWithoutSearchOrFilterATest.find( @a.id )
+    @b_sc_wosf_a = RSpecModelFinderSubclassWithoutSearchOrFilterATest.find( @b.id )
+    @c_sc_wosf_a = RSpecModelFinderSubclassWithoutSearchOrFilterATest.find( @c.id )
+
+    @a_sc_wosf_b = RSpecModelFinderSubclassWithoutSearchOrFilterBTest.find( @a.id )
+    @b_sc_wosf_b = RSpecModelFinderSubclassWithoutSearchOrFilterBTest.find( @b.id )
+    @c_sc_wosf_b = RSpecModelFinderSubclassWithoutSearchOrFilterBTest.find( @c.id )
 
     @list_params = Hoodoo::Services::Request::ListParameters.new
   end
@@ -773,6 +831,81 @@ describe Hoodoo::ActiveRecord::Finder do
 
   # ==========================================================================
 
+  context 'pure framework search' do
+    it 'on created_after' do
+      @list_params.search_data = {
+        'created_after' => @tn - 1.month
+      }
+
+      finder = RSpecModelFinderWithoutSearchOrFilterTest.list( @list_params )
+      expect( finder ).to eq( [ @c_wosf ] )
+    end
+
+    it 'on created_before' do
+      @list_params.search_data = {
+        'created_before' => @tn - 1.month
+      }
+
+      finder = RSpecModelFinderWithoutSearchOrFilterTest.list( @list_params )
+      expect( finder ).to eq( [ @a_wosf ] )
+    end
+  end
+
+  # ==========================================================================
+
+  context 'as a Hoodoo::ActiveRecord::Base subclass and sub-subclass' do # (instead of explicitly including the Finder module)
+    context 'custom search' do
+      it 'on mapped_code' do
+        @list_params.search_data = {
+          'mapped_code' => @code
+        }
+
+        finder = RSpecModelFinderSubclassTest.list( @list_params )
+        expect( finder ).to eq( [ @c_sc ] )
+
+        finder = RSpecModelFinderSubclassATest.list( @list_params )
+        expect( finder ).to eq( [ @c_sc_a ] )
+
+        finder = RSpecModelFinderSubclassBTest.list( @list_params )
+        expect( finder ).to eq( [ @c_sc_b ] )
+      end
+    end
+
+    context 'pure framework search' do
+      it 'on created_after' do
+        @list_params.search_data = {
+          'created_after' => @tn - 1.month
+        }
+
+        finder = RSpecModelFinderSubclassWithoutSearchOrFilterTest.list( @list_params )
+        expect( finder ).to eq( [ @c_sc_wosf ] )
+
+        finder = RSpecModelFinderSubclassWithoutSearchOrFilterATest.list( @list_params )
+        expect( finder ).to eq( [ @c_sc_wosf_a ] )
+
+        finder = RSpecModelFinderSubclassWithoutSearchOrFilterBTest.list( @list_params )
+        expect( finder ).to eq( [ @c_sc_wosf_b ] )
+      end
+
+      it 'on created_before' do
+        @list_params.search_data = {
+          'created_before' => @tn - 1.month
+        }
+
+        finder = RSpecModelFinderSubclassWithoutSearchOrFilterTest.list( @list_params )
+        expect( finder ).to eq( [ @a_sc_wosf ] )
+
+        finder = RSpecModelFinderSubclassWithoutSearchOrFilterATest.list( @list_params )
+        expect( finder ).to eq( [ @a_sc_wosf_a ] )
+
+        finder = RSpecModelFinderSubclassWithoutSearchOrFilterBTest.list( @list_params )
+        expect( finder ).to eq( [ @a_sc_wosf_b ] )
+      end
+    end
+  end
+
+  # ==========================================================================
+
   context 'filter' do
     it 'filters without chain' do
       @list_params.filter_data = {
@@ -978,6 +1111,81 @@ describe Hoodoo::ActiveRecord::Finder do
 
   # ==========================================================================
 
+  context 'pure framework filter' do
+    it 'on created_after' do
+      @list_params.filter_data = {
+        'created_after' => @tn - 1.month
+      }
+
+      finder = RSpecModelFinderWithoutSearchOrFilterTest.list( @list_params )
+      expect( finder ).to eq( [ @b_wosf, @a_wosf ] )
+    end
+
+    it 'on created_before' do
+      @list_params.filter_data = {
+        'created_before' => @tn - 1.month
+      }
+
+      finder = RSpecModelFinderWithoutSearchOrFilterTest.list( @list_params )
+      expect( finder ).to eq( [ @c_wosf, @b_wosf ] )
+    end
+  end
+
+  # ==========================================================================
+
+  context 'as a Hoodoo::ActiveRecord::Base subclass and sub-subclass' do # (instead of explicitly including the Finder module)
+    context 'custom filter' do
+      it 'on mapped_code' do
+        @list_params.filter_data = {
+          'mapped_code' => @code
+        }
+
+        finder = RSpecModelFinderSubclassTest.list( @list_params )
+        expect( finder ).to eq( [ @b_sc, @a_sc ] )
+
+        finder = RSpecModelFinderSubclassATest.list( @list_params )
+        expect( finder ).to eq( [ @b_sc_a, @a_sc_a ] )
+
+        finder = RSpecModelFinderSubclassBTest.list( @list_params )
+        expect( finder ).to eq( [ @b_sc_b, @a_sc_b ] )
+      end
+    end
+
+    context 'pure framework filter' do
+      it 'on created_after' do
+        @list_params.filter_data = {
+          'created_after' => @tn - 1.month
+        }
+
+        finder = RSpecModelFinderSubclassWithoutSearchOrFilterTest.list( @list_params )
+        expect( finder ).to eq( [ @b_sc_wosf, @a_sc_wosf ] )
+
+        finder = RSpecModelFinderSubclassWithoutSearchOrFilterATest.list( @list_params )
+        expect( finder ).to eq( [ @b_sc_wosf_a, @a_sc_wosf_a ] )
+
+        finder = RSpecModelFinderSubclassWithoutSearchOrFilterBTest.list( @list_params )
+        expect( finder ).to eq( [ @b_sc_wosf_b, @a_sc_wosf_b ] )
+      end
+
+      it 'on created_before' do
+        @list_params.filter_data = {
+          'created_before' => @tn - 1.month
+        }
+
+        finder = RSpecModelFinderSubclassWithoutSearchOrFilterTest.list( @list_params )
+        expect( finder ).to eq( [ @c_sc_wosf, @b_sc_wosf ] )
+
+        finder = RSpecModelFinderSubclassWithoutSearchOrFilterATest.list( @list_params )
+        expect( finder ).to eq( [ @c_sc_wosf_a, @b_sc_wosf_a ] )
+
+        finder = RSpecModelFinderSubclassWithoutSearchOrFilterBTest.list( @list_params )
+        expect( finder ).to eq( [ @c_sc_wosf_b, @b_sc_wosf_b ] )
+      end
+    end
+  end
+
+  # ==========================================================================
+
   context '#list_in' do
     before :each do
       @scoped_1 = RSpecModelFinderTest.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.3
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio