HornsAndHooves-moribus 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de348b300137b8ce46c31b042de38e77a0880a5b
-  data.tar.gz: 675265b328868a116411c59fe89f7f89e369fcdd
+  metadata.gz: ff0aab79e8583ad02f5eeea9b364f1675d893399
+  data.tar.gz: 2c299a91b8eb26c99a91896b01100dcd04626409
 SHA512:
-  metadata.gz: 0cfa65026b301739a2cb71b0027160f26978b1212f66df68d8dd681815a5e472a0f3a59d737a9e59a8c74cf9df77892093f4e16c32b0b58678880acc04bf3149
-  data.tar.gz: 862712050f65298176c83c3191582b38574d10cdc12025574c8309c3056b9ca472bd1ed93892563037b51ca61ad8a0169cb7be876d9c96a8e6a0ebefb73028c1
+  metadata.gz: c66b62b01b54222d549dbd8e038d3b073cf850a9f394450dcde325bf32d644e796ce234720c53cbebd1c0f8cd156a5479571b5d59021798fc5b48f1a5ecdbbe8
+  data.tar.gz: 86c8695bd44971914bc00f5f60fd72a1a697a1625810cafd9575b2287ee3e2112b74b0c51e92411868609e5f3e3d48dba35e2bf81c032216efbf40fd9f1d2a16

data/.simplecov

@@ -12,7 +12,7 @@ SimpleCov.start do
   # Fail the build when coverage is weak:
   at_exit do
     SimpleCov.result.format!
-    threshold, actual = 98.475, SimpleCov.result.covered_percent
+    threshold, actual = 97.118, SimpleCov.result.covered_percent
     if actual < threshold
       msg = "\nLow coverage: "
       msg << red("#{actual}%")

data/Gemfile

@@ -3,10 +3,14 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in moribus.gemspec
 gemspec
 
+group :development, :test do
+  gem "pry"
+  gem "pry-nav"
+end
+
 group :development do
   gem "redcarpet"
   gem "yard"
-  gem "pry"
 end
 
 group :test do

data/HornsAndHooves-moribus.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_dependency "rails",      "~> 4.0.5"
+  s.add_dependency "rails",      "> 4.0", "< 4.2"
   s.add_dependency "power_enum", ">= 2.7.0"
   s.add_dependency "yard",       ">= 0"
 

data/lib/moribus/alias_association.rb

@@ -19,11 +19,17 @@ module Moribus
 
     # Class methods for ActiveRecord::Base
     module ClassMethods
-      # Aliases association reflection in reflections hash and
-      # association-specific methods. See module description for example
+      # Aliases association reflection in ActiveRecord's (internal) reflections hash and
+      # association-specific methods. See module description for example.
       def alias_association(alias_name, association_name)
         if reflection = reflect_on_association(association_name)
-          reflections[alias_name] = reflections[association_name]
+          # Use Rails 4.1.x+ behavior, if available:
+          if ActiveRecord::Reflection.respond_to? :add_reflection then
+            ActiveRecord::Reflection.add_reflection self, alias_name, reflection
+          else
+            # Rails 4.0.x behavior:
+            reflections[alias_name] = reflection
+          end
           alias_association_methods(alias_name, reflection)
           reflection
         end

data/lib/moribus/macros.rb

@@ -92,6 +92,8 @@ module Moribus
       end
 
       reflection = has_one(name, scope, options)
+      # Rails 4.1 compatibility fix:
+      reflection = reflection[name] if reflection.respond_to? :[]
       reflection.options[:is_current] = true
       accepts_nested_attributes_for name
       define_effective_reader_for name
@@ -106,6 +108,8 @@ module Moribus
     # Extensions::HasAggregatedExtension)
     def has_aggregated(name, options = {})
       reflection = belongs_to(name, options)
+      # Rails 4.1 compatibility fix:
+      reflection = reflection[name] if reflection.respond_to? :[]
       reflection.options[:aggregated] = true
       accepts_nested_attributes_for name
       define_effective_reader_for name

data/lib/moribus/tracked_behavior.rb

@@ -77,13 +77,15 @@ module Moribus
 
     # Generate SQL statement to be used to update 'is_current' state of record to false.
     def current_to_false_sql_statement
-      klass = self.class
-      lock_col = klass.locking_column
-      lock_value = respond_to?(lock_col) && send(lock_col).to_i
-      "UPDATE #{klass.quoted_table_name} SET \"is_current\" = #{klass.quote_value(false)} ".tap do |sql|
-        sql << ", #{klass.quoted_locking_column} = #{klass.quote_value(lock_value + 1)} " if lock_value
-        sql << "WHERE #{klass.quoted_primary_key} = #{klass.quote_value(@_before_to_new_record_values[:id])} "
-        sql << "AND #{klass.quoted_locking_column} = #{klass.quote_value(lock_value)}" if lock_value
+      klass           = self.class
+      is_current_col  = klass.columns.detect{|c| c.name == "is_current" }
+      lock_col        = klass.locking_column
+      lock_value      = respond_to?(lock_col) && send(lock_col).to_i
+      quoted_lock_col = klass.connection.quote_column_name(lock_col)
+      "UPDATE #{klass.quoted_table_name} SET \"is_current\" = #{klass.quote_value(false, is_current_col)} ".tap do |sql|
+        sql << ", #{quoted_lock_col} = #{klass.quote_value(lock_value + 1, lock_col)} " if lock_value
+        sql << "WHERE #{klass.quoted_primary_key} = #{klass.quote_value(@_before_to_new_record_values[:id], "id")} "
+        sql << "AND #{quoted_lock_col} = #{klass.quote_value(lock_value, lock_col)}" if lock_value
       end
     end
     private :current_to_false_sql_statement

data/lib/moribus/version.rb

@@ -1,3 +1,3 @@
 module Moribus # :nodoc:
-  VERSION = "0.1.0" # :nodoc:
-end
+  VERSION = "0.2.0" # :nodoc:
+end

data/spec/moribus/alias_association_spec.rb

@@ -38,51 +38,51 @@ describe Moribus::AliasAssociation do
 
   describe "reflection aliasing" do
     it "alias association name in reflections" do
-      SpecPost.reflect_on_association(:author).should_not be_nil
+      expect(SpecPost.reflect_on_association(:author)).not_to be_nil
     end
 
     it "should not raise error when using aliased name in scopes" do
       expect{
         SpecPost.includes(:comments).first
-      }.to_not raise_error
+      }.not_to raise_error
     end
   end
 
   describe "association accessor alias methods" do
     subject{ @post }
 
-    it{ should respond_to :author }
-    it{ should respond_to :author= }
-    it{ should respond_to :comments }
-    it{ should respond_to :comments= }
-    it{ should respond_to :post_info }
-    it{ should respond_to :post_info= }
+    it{ is_expected.to respond_to :author }
+    it{ is_expected.to respond_to :author= }
+    it{ is_expected.to respond_to :comments }
+    it{ is_expected.to respond_to :comments= }
+    it{ is_expected.to respond_to :post_info }
+    it{ is_expected.to respond_to :post_info= }
   end
 
   describe "singular association alias method" do
     subject{ @post }
 
-    it{ should respond_to :build_author }
-    it{ should respond_to :create_author }
-    it{ should respond_to :create_author! }
+    it{ is_expected.to respond_to :build_author }
+    it{ is_expected.to respond_to :create_author }
+    it{ is_expected.to respond_to :create_author! }
 
-    it{ should respond_to :build_post_info }
-    it{ should respond_to :create_post_info }
-    it{ should respond_to :create_post_info! }
+    it{ is_expected.to respond_to :build_post_info }
+    it{ is_expected.to respond_to :create_post_info }
+    it{ is_expected.to respond_to :create_post_info! }
   end
 
   describe "collection association alias method" do
     subject{ @post }
 
-    it{ should respond_to :comment_ids }
-    it{ should respond_to :comment_ids= }
+    it{ is_expected.to respond_to :comment_ids }
+    it{ is_expected.to respond_to :comment_ids= }
   end
 
   describe ":alias => alias_name shortcuts" do
     subject{ @post }
 
-    it { should respond_to :creator }
-    it { should respond_to :remarks }
-    it { should respond_to :information }
+    it { is_expected.to respond_to :creator }
+    it { is_expected.to respond_to :remarks }
+    it { is_expected.to respond_to :information }
   end
 end

data/spec/moribus_spec.rb

@@ -102,9 +102,9 @@ describe Moribus do
         }.not_to change(SpecCustomerInfo, :count)
       end
       expect(@info.new_record?).to eq false
-      @info.id.should == old_id
-      @info.updated_at.should == old_updated_at
-      @info.created_at.should == old_created_at
+      expect(@info.id         ).to eq old_id
+      expect(@info.updated_at ).to eq old_updated_at
+      expect(@info.created_at ).to eq old_created_at
     end
   end
 
@@ -140,7 +140,7 @@ describe Moribus do
     it "should lookup self and replace id with existing on create" do
       name = SpecPersonName.new :first_name => 'John', :last_name => 'Smith'
       name.save
-      name.id.should == @existing.id
+      expect(name.id).to eq @existing.id
     end
 
     it "should create a new record if lookup fails" do
@@ -152,7 +152,7 @@ describe Moribus do
     it "should lookup self and replace id with existing on update" do
       name = SpecPersonName.create :first_name => 'Alice', :last_name => 'Smith'
       name.update_attributes :first_name => 'John'
-      name.id.should == @existing.id
+      expect(name.id).to eq @existing.id
     end
 
     context "with caching" do
@@ -164,7 +164,7 @@ describe Moribus do
       it "should lookup the existing value and add it to the cache" do
         feature = SpecCustomerFeature.new :feature_name => @existing.feature_name
         expect{ feature.save }.to change(SpecCustomerFeature.aggregated_records_cache, :length).by(1)
-        feature.id.should == @existing.id
+        expect(feature.id).to eq @existing.id
       end
 
       it "should add the freshly-created record to the cache" do
@@ -173,12 +173,12 @@ describe Moribus do
 
       it "should freeze the cached object" do
         feature = SpecCustomerFeature.create(:feature_name => 'Cancelled')
-        SpecCustomerFeature.aggregated_records_cache[feature.feature_name].should be_frozen
+        expect(SpecCustomerFeature.aggregated_records_cache[feature.feature_name]).to be_frozen
       end
 
       it "should cache the clone of the record, not the record itself" do
         feature = SpecCustomerFeature.create(:feature_name => 'Returned')
-        SpecCustomerFeature.aggregated_records_cache[feature.feature_name].object_id.should_not == feature.object_id
+        expect(SpecCustomerFeature.aggregated_records_cache[feature.feature_name].object_id).not_to eq feature.object_id
       end
     end
   end
@@ -198,7 +198,7 @@ describe Moribus do
     it "should replace itself with new id" do
       old_id = @info.id
       @info.update_attributes(:spec_person_name_id => 2)
-      @info.id.should_not == old_id
+      expect(@info.id).not_to eq old_id
     end
 
     it "should set is_current record to false for superseded record" do
@@ -210,14 +210,14 @@ describe Moribus do
     it "should set previous_id to the id of the previous record" do
       old_id = @info.id
       @info.update_attributes(:spec_person_name_id => 2)
-      @info.previous_id.should == old_id
+      expect(@info.previous_id).to eq old_id
     end
 
     it "assigning a new current record should change is_current to false for previous one" do
       new_info = SpecCustomerInfo.new :spec_person_name_id => 2, :is_current => true
       @customer.spec_customer_info = new_info
-      new_info.spec_customer_id.should == @customer.id
-      expect(@info.is_current).to eq false
+      expect(new_info.spec_customer_id).to eq @customer.id
+      expect(@info.is_current         ).to eq false
     end
 
     it "should not crash on superseding with 'is_current' conditional constraint" do
@@ -234,14 +234,14 @@ describe Moribus do
 
       it "should be updated on change" do
         info = @customer.create_spec_customer_info :spec_person_name_id => 1
-        info.updated_at.should == first_time
-        info.created_at.should == first_time
+        expect(info.updated_at).to eq first_time
+        expect(info.created_at).to eq first_time
 
         Timecop.freeze(second_time)
         info.spec_person_name_id = 2
         info.save!
-        info.updated_at.should == second_time
-        info.created_at.should == second_time
+        expect(info.updated_at).to eq second_time
+        expect(info.created_at).to eq second_time
       end
     end
 
@@ -274,8 +274,8 @@ describe Moribus do
         old_id = @info.id
         @customer.spec_customer_info.spec_person_name.first_name = 'Alice'
         expect{ @customer.save }.to change(@info, :spec_person_name_id)
-        @info.id.should_not == old_id
-        @info.is_current.should == true
+        expect(@info.id).not_to eq old_id
+        expect(@info.is_current).to eq true
         expect(SpecCustomerInfo.find(old_id).is_current).to eq false
       end
     end
@@ -290,39 +290,39 @@ describe Moribus do
     end
 
     it "should have delegated column information" do
-      @customer.column_for_attribute(:first_name).should_not be_nil
+      expect(@customer.column_for_attribute(:first_name)).not_to be_nil
     end
 
     it "should not delegate special methods" do
-      @customer.should_not respond_to(:reset_first_name)
-      @customer.should_not respond_to(:first_name_was)
-      @customer.should_not respond_to(:first_name_before_type_cast)
-      @customer.should_not respond_to(:first_name_will_change!)
-      @customer.should_not respond_to(:first_name_changed?)
-      @customer.should_not respond_to(:lock_version)
+      expect(@customer).not_to respond_to(:reset_first_name)
+      expect(@customer).not_to respond_to(:first_name_was)
+      expect(@customer).not_to respond_to(:first_name_before_type_cast)
+      expect(@customer).not_to respond_to(:first_name_will_change!)
+      expect(@customer).not_to respond_to(:first_name_changed?)
+      expect(@customer).not_to respond_to(:lock_version)
     end
 
     it "should delegate methods to aggregated parts" do
-      @info.should respond_to(:first_name)
-      @info.should respond_to(:first_name=)
-      @info.should respond_to(:spec_suffix)
-      @info.last_name.should == 'Smith'
+      expect(@info).to respond_to(:first_name)
+      expect(@info).to respond_to(:first_name=)
+      expect(@info).to respond_to(:spec_suffix)
+      expect(@info.last_name).to eq 'Smith'
     end
 
     it "should delegate methods to representation" do
-      @customer.should respond_to(:first_name)
-      @customer.should respond_to(:first_name=)
-      @customer.should respond_to(:spec_suffix)
-      @customer.last_name.should == 'Smith'
-      @customer.should respond_to(:custom_field)
-      @customer.should respond_to(:custom_field=)
+      expect(@customer).to respond_to(:first_name)
+      expect(@customer).to respond_to(:first_name=)
+      expect(@customer).to respond_to(:spec_suffix)
+      expect(@customer.last_name).to eq 'Smith'
+      expect(@customer).to respond_to(:custom_field)
+      expect(@customer).to respond_to(:custom_field=)
     end
 
     it 'should properly delegate enumerated attributes' do
-      @customer.should respond_to(:spec_type)
-      @customer.should respond_to(:spec_type=)
+      expect(@customer).to respond_to(:spec_type)
+      expect(@customer).to respond_to(:spec_type=)
       @customer.spec_type = :important
-      @customer.spec_type.should === :important
+      expect(@customer.spec_type === :important).to eq true
     end
 
     it "should raise NoMethodError if unknown method received" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: HornsAndHooves-moribus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - HornsAndHooves
@@ -10,22 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: power_enum
   requirement: !ruby/object:Gem::Requirement