hoodoo 1.1.1 → 1.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDliMjQ5YTcwM2ExNTU4YzgxY2U4NTNmZTM1ODFkMTI0NzY0MmMzZQ==
+    ZGUwNzBiZDE0NDVjYjljNDM0MzNjYzYzMjYxMWY0MzhhYmY4NTI2OQ==
   data.tar.gz: !binary |-
-    ZWY4NTg4ODEzOTliMGQyMTBjMmFkZGNmMmYzZmFjZjc0NDlmMWJlZQ==
+    YmUxY2FiOWQzMDY1ZmEwZGM1NzYxM2YzNDVjYzFhNWE2N2FmNDZmNA==
 SHA512:
   metadata.gz: !binary |-
-    NjlkZTI4NjZhNDczZTdmZTM5ODlmNjVhNTY0MjQ1MGI3MDg4YmMxNDE3MDQw
-    NjMzOWY1MTE0MmM0N2E1MGYwNTEwODlmMzQ0M2I5YjEwZGY0ZWY4MTA5MGYw
-    NmRlZWViMWJiOGVlNDdkMTFmNjYzYjYxZTFhM2M4MzgyY2ZkYTE=
+    YjJkZGJkMTM4MmM5ZWNhYmQxOWI3Y2JkYzdmN2I3OGFjZTU4OGQ4MDY3MDI0
+    MWYwZGI5MDIzZDNmYjI2ZTJiNzE4ZmU3MjNkZDM5YjA0ZjU1ODA1OTM1MzA0
+    OWNmYjFlNjRlZTVjZThiMWIxNTJlZTA1NzU0MTQ1Y2U5NDFhMTA=
   data.tar.gz: !binary |-
-    MzUzNmJlYTM4ZTc3ZDgyZTExMzU5ZjhhNzE2OTQxMWY1OWFlMWQwY2Q2NTgy
-    N2FiNmU3YmJkYjJhZDBlMjQ5NzNkZmJmYmIxY2JmMTZjYmQ0MDgzNmNmMGRj
-    YmRmNjJiMTY3NGU2OTRkNTc1ZGNkZDNkZjZmNjY5NTM1YmNiODI=
+    MDdmOTMyNTVhMGZiZDAxMzkyNDE1OGQ3MTIxNTJiMzViZWQ2MGJhMTUzYjRh
+    MGEwMWM1M2EyZTI3MWVlZTA5ZTE4ZjkwN2M5OGRiZDBlMTY3NjE3M2JhNTYw
+    NWQ5ZTYyN2EzODI2MWVmODBmMmQ4YzMyMDMyZjQ0OTc1MDdjMGI=

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

@@ -144,27 +144,6 @@ module Hoodoo
         model.extend( ClassMethods )
       end
 
-      # Returns a String containing the specified +model_klass+'s attribute
-      # names considered as column names, escaped by the in-use database
-      # adaptor and joined into with commas.
-      #
-      # +model_klass+:: Class which responds to <tt>#attribute_names</tt>.
-      #
-      def self.sanitised_column_string( model_klass )
-        self.sanitised_column_string_for( model_klass.attribute_names )
-      end
-
-      # As ::sanitised_column_string but takes the array of attribute or
-      # column names directly.
-      #
-      # +attribute_array+:: Array of column names, as Strings or Symbols.
-      #
-      def self.sanitised_column_string_for( attribute_array )
-        attribute_array.map do | c |
-          ActiveRecord::Base.connection.quote_column_name( c )
-        end.join( ',' )
-      end
-
       # Collection of class methods that get defined on an including class via
       # Hoodoo::ActiveRecord::Dated::included.
       #
@@ -392,7 +371,7 @@ module Hoodoo
         #
         def quoted_column_name_string( unquoted_column_names: nil )
           unquoted_column_names ||= self.attribute_names()
-          unquoted_column_names << 'id' unless unquoted_column_names.include?( 'id' )
+          unquoted_column_names   = unquoted_column_names + [ 'id' ] unless unquoted_column_names.include?( 'id' )
 
           return self.quoted_column_names( unquoted_column_names ).join( ',' )
         end
@@ -413,8 +392,8 @@ module Hoodoo
           primary_key_index       = unquoted_column_names.index( 'id' )
 
           if primary_key_index.nil?
-            unquoted_column_names << 'id'
-            primary_key_index = unquoted_column_names.count - 1
+            unquoted_column_names = unquoted_column_names + [ 'id' ]
+            primary_key_index     = unquoted_column_names.count - 1
           end
 
           quoted_column_names     = self.quoted_column_names( unquoted_column_names )

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

@@ -152,7 +152,7 @@ module Hoodoo
         # Returns a found model instance or +nil+ for no match.
         #
         def acquire( ident )
-          extra_fields = self.nz_co_loyalty_hoodoo_show_id_fields || []
+          extra_fields = self.acquired_with()
 
           id_fields = [ :id ] + extra_fields
           id_fields.each do | field |
@@ -270,12 +270,28 @@ module Hoodoo
 
         # Describe the list of model fields _in_ _addition_ _to_ +id+ which
         # are to be used to "find-by-identifier" through calls #acquire and
-        # #acquire_in. See those for more details.
+        # #acquire_in. See those methods for more details.
+        #
+        # Fields will be searched in the order listed. If duplicate items are
+        # present, the first occurrence is kept and the rest are removed.
         #
         # *args:: One or more field names as Strings or Symbols.
         #
+        # See also: #acquired_with
+        #
         def acquire_with( *args )
-          self.nz_co_loyalty_hoodoo_show_id_fields = args
+          self.nz_co_loyalty_hoodoo_show_id_fields = args.map( & :to_s ).uniq!()
+        end
+
+        # Return the list of model fields _in_ _addition_ _to_ +id+ which
+        # are being used to "find-by-identifier" through calls to #acquire
+        # and #acquire_in. The returned Array contains de-duplicated String
+        # values only.
+        #
+        # See also: #acquire_with
+        #
+        def acquired_with
+          self.nz_co_loyalty_hoodoo_show_id_fields || []
         end
 
         # Generate an ActiveRecord::Relation instance which can be used to

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.1.1'
+  VERSION = '1.1.2'
 
 end

data/spec/active/active_record/finder_spec.rb

@@ -20,7 +20,7 @@ describe Hoodoo::ActiveRecord::Finder do
       include Hoodoo::ActiveRecord::Finder
 
       self.primary_key = :id
-      acquire_with :uuid, :code
+      acquire_with :uuid, :code, :uuid # Deliberate duplication
 
       # These forms follow quite closely the RDoc comments in
       # the finder.rb source.
@@ -238,6 +238,15 @@ describe Hoodoo::ActiveRecord::Finder do
       @session = @interaction.context.session
     end
 
+    it 'knowns how to acquire' do
+
+      # Note the corresponding 'acquire_with' used Symbols and had a
+      # duplicated entry - we expect Strings and no duplicates here.
+      #
+      expect( RSpecModelFinderTest.acquired_with() ).to eq( [ 'uuid', 'code' ] )
+
+    end
+
     it 'finds with secure scopes from the class' do
       @session.scoping = { :authorised_uuids => [ 'uuid 1' ], :authorised_code => 'code 1' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools