double_entry 0.5.0 → 0.6.0

data/lib/double_entry/account.rb

@@ -81,11 +81,7 @@ module DoubleEntry
       end
 
       def <=>(account)
-        if scoped?
-          [scope_identity, identifier.to_s] <=> [account.scope_identity, account.identifier.to_s]
-        else
-          identifier.to_s <=> account.identifier.to_s
-        end
+        [scope_identity.to_s, identifier.to_s] <=> [account.scope_identity.to_s, account.identifier.to_s]
       end
 
       def hash

data/lib/double_entry/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module DoubleEntry
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/double_entry/locking_spec.rb

@@ -24,6 +24,7 @@ describe DoubleEntry::Locking do
         accounts.define(:identifier => :account_b, :scope_identifier => scope)
         accounts.define(:identifier => :account_c, :scope_identifier => scope)
         accounts.define(:identifier => :account_d, :scope_identifier => scope)
+        accounts.define(:identifier => :account_e)
       end
 
       config.define_transfers do |transfers|
@@ -36,6 +37,7 @@ describe DoubleEntry::Locking do
     @account_b = DoubleEntry.account(:account_b, :scope => "2")
     @account_c = DoubleEntry.account(:account_c, :scope => "3")
     @account_d = DoubleEntry.account(:account_d, :scope => "4")
+    @account_e = DoubleEntry.account(:account_e)
   end
 
   it "creates missing account balance records" do
@@ -130,6 +132,14 @@ describe DoubleEntry::Locking do
     expect(DoubleEntry.balance(@account_b)).to eq Money.new(0)
   end
 
+  it "allows locking a scoped account and a non scoped account" do
+    expect do
+      DoubleEntry::Locking.lock_accounts(@account_d, @account_e) do
+        # do nothing
+      end
+    end.to_not raise_error
+  end
+
   # sqlite cannot handle these cases so they don't run when DB=sqlite
   describe "concurrent locking", :unless => ENV['DB'] == 'sqlite' do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: double_entry
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money