hoodoo 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64349a6945a30beac7d4b9f79dd8b71a4a58027805e22097643ce8c6500a4a9b
-  data.tar.gz: c06b01af44c143d470786840df373ffb8baf9699d1a293ca00b6561a487b4966
+  metadata.gz: 8faac53f6f7027ef0eb75a9bbf911b3206914880261b44be9cef926b6449623b
+  data.tar.gz: 2e285f61106912bb90aa10f251bcd36d284d649c8199270cb75f8232562a0472
 SHA512:
-  metadata.gz: 05572a42507a1c94c95605e35ed7ad2318666204e107db421ca6b37a32ae07ff45338e826f2ed540289b1958e2dda7df613ea9c48ef77bba06718ae1e65ae82d
-  data.tar.gz: bb7c170f76f86651d5904303ad62dcbf7e7e4ec10a925c661962c4d25c12739a86563cf2eecbb4c079e33e631e7e0cd6a75b866b0d8ec90f05e240f0d39cc7ed
+  metadata.gz: 5c47a9c16545aac86f9ddb7af7017aab704a106427f6dfae2e091d081ba999861dfa35cefe7a820b82d3c62d651dc070a2d43630c8134e043d33fcd365e0f769
+  data.tar.gz: a7db2209730adaa2dd3235a4ac66c21b4194f3135ef585f75e957e484258100636532b458a88bd83188107efc9b66610cc925184d397822162e009820233797d

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

@@ -120,10 +120,7 @@ module Hoodoo
           #       things we currently require - set "created_at"/"updated_at".
           #
           unless context.request.dated_from.nil?
-            instance.created_at = instance.updated_at = context.request.dated_from if (
-              ( self.include?( Hoodoo::ActiveRecord::Dated         ) && self.dating_enabled?()        ) ||
-              ( self.include?( Hoodoo::ActiveRecord::ManuallyDated ) && self.manual_dating_enabled?() )
-            )
+            instance.created_at = instance.updated_at = context.request.dated_from
           end
 
           return instance

data/lib/hoodoo/version.rb

@@ -12,11 +12,11 @@ module Hoodoo
   # The Hoodoo gem version. If this changes, be sure to re-run
   # <tt>bundle install</tt> or <tt>bundle update</tt>.
   #
-  VERSION = '2.7.0'
+  VERSION = '2.8.0'
 
   # The Hoodoo gem date. If this changes, be sure to re-run
   # <tt>bundle install</tt> or <tt>bundle update</tt>.
   #
-  DATE = '2018-08-06'
+  DATE = '2018-08-07'
 
 end

data/spec/active/active_record/creator_spec.rb

@@ -2,6 +2,25 @@ require 'spec_helper'
 require 'active_record'
 
 describe Hoodoo::ActiveRecord::Creator do
+
+  class RSpecModelCreatorTest < ActiveRecord::Base
+    include Hoodoo::ActiveRecord::Creator
+  end
+
+  class RSpecModelCreatorTestManuallyDated < ActiveRecord::Base
+    self.table_name = :r_spec_model_creator_tests
+
+    include Hoodoo::ActiveRecord::Creator
+    include Hoodoo::ActiveRecord::ManuallyDated
+  end
+
+  class RSpecModelCreatorTestAutoDated < ActiveRecord::Base
+    self.table_name = :r_spec_model_creator_tests
+
+    include Hoodoo::ActiveRecord::Creator
+    include Hoodoo::ActiveRecord::Dated
+  end
+
   before :all do
     spec_helper_silence_stdout() do
       ActiveRecord::Migration.create_table( :r_spec_model_creator_tests, :id => :string ) do | t |
@@ -11,19 +30,12 @@ describe Hoodoo::ActiveRecord::Creator do
         t.timestamps :null => true
       end
     end
-
-    class RSpecModelCreatorTest < ActiveRecord::Base
-      include Hoodoo::ActiveRecord::Creator
-      include Hoodoo::ActiveRecord::Dated
-      include Hoodoo::ActiveRecord::ManuallyDated
-    end
   end
 
   # ==========================================================================
 
   context 'new_in' do
     before :each do
-
       # Get a good-enough-for-test interaction which has a context
       # that contains a Session we can modify.
 
@@ -39,94 +51,57 @@ describe Hoodoo::ActiveRecord::Creator do
       @session = @interaction.context.session
     end
 
-    it 'creates with no special values' do
-      instance = RSpecModelCreatorTest.new_in( @context )
+    shared_examples 'Creator-enabled model' do | klass |
+      it 'creates with no special values' do
+        instance = klass.new_in( @context )
 
-      expect( instance.created_at ).to be_nil
-      expect( instance.updated_at ).to be_nil
-    end
+        expect( instance.created_at ).to be_nil
+        expect( instance.updated_at ).to be_nil
+      end
 
-    context 'with "dated_from" given' do
-      before :each do
+      it 'creates with given values' do
         @time                       = Time.now
         @context.request.dated_from = @time
-      end
 
-      shared_examples 'a dated model' do
-        it 'using the specified dated-from value' do
-          instance = RSpecModelCreatorTest.new_in( @context )
+        instance = klass.new_in( @context )
 
-          expect( instance.created_at ).to eq( @time )
-          expect( instance.updated_at ).to eq( @time )
-        end
+        expect( instance.created_at ).to eq( @time )
+        expect( instance.updated_at ).to eq( @time )
       end
 
-      shared_examples 'a normal model' do
-        it 'creating with no default timestamps' do
-          instance = RSpecModelCreatorTest.new_in( @context )
+      it 'creates with provided attributes' do
+        instance = klass.new_in( @context, code: 'code', field_one: 'one' )
 
-          expect( instance.created_at ).to eq( nil )
-          expect( instance.updated_at ).to eq( nil )
-        end
+        expect( instance.code      ).to eq( 'code' )
+        expect( instance.field_one ).to eq( 'one'  )
       end
 
-      context 'automatic dating present' do
-        context 'and enabled it' do
-          before :each do
-            expect( RSpecModelCreatorTest ).to receive( :dating_enabled? ).once.and_return( true )
-          end
-
-          it_behaves_like 'a dated model'
+      it 'creates with a block' do
+        instance = klass.new_in( @context ) do | i |
+          i.code      = 'code'
+          i.field_one = 'one'
         end
 
-        context 'and not enabled it' do
-          it_behaves_like 'a normal model'
-        end
+        expect( instance.code      ).to eq( 'code' )
+        expect( instance.field_one ).to eq( 'one'  )
       end
 
-      context 'manual dating present' do
-        context 'and enabled it' do
-          before :each do
-            expect( RSpecModelCreatorTest ).to receive( :manual_dating_enabled? ).once.and_return( true )
-          end
-
-          it_behaves_like 'a dated model'
+      # Technically ActiveRecord documentation seems to indicate this is an
+      # either-or choice, but the code certainly supports both and it isn't
+      # *explicitly* stated as such, so we assume both can be mixed here.
+      #
+      it 'creates with provided attributes and a block' do
+        instance = klass.new_in( @context, code: 'code' ) do | i |
+          i.field_one = 'one'
         end
 
-        context 'and not enabled it' do
-          it_behaves_like 'a normal model'
-        end
+        expect( instance.code      ).to eq( 'code' )
+        expect( instance.field_one ).to eq( 'one'  )
       end
     end
 
-    it 'creates with provided attributes' do
-      instance = RSpecModelCreatorTest.new_in( @context, code: 'code', field_one: 'one' )
-
-      expect( instance.code      ).to eq( 'code' )
-      expect( instance.field_one ).to eq( 'one'  )
-    end
-
-    it 'creates with a block' do
-      instance = RSpecModelCreatorTest.new_in( @context ) do | i |
-        i.code      = 'code'
-        i.field_one = 'one'
-      end
-
-      expect( instance.code      ).to eq( 'code' )
-      expect( instance.field_one ).to eq( 'one'  )
-    end
-
-    # Technically ActiveRecord documentation seems to indicate this is an
-    # either-or choice, but the code certainly supports both and it isn't
-    # *explicitly* stated as such, so we assume both can be mixed here.
-    #
-    it 'creates with provided attributes and a block' do
-      instance = RSpecModelCreatorTest.new_in( @context, code: 'code' ) do | i |
-        i.field_one = 'one'
-      end
-
-      expect( instance.code      ).to eq( 'code' )
-      expect( instance.field_one ).to eq( 'one'  )
-    end
+    it_behaves_like 'Creator-enabled model', RSpecModelCreatorTest
+    it_behaves_like 'Creator-enabled model', RSpecModelCreatorTestManuallyDated
+    it_behaves_like 'Creator-enabled model', RSpecModelCreatorTestAutoDated
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2018-08-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: alchemy-flux
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement