acts_as_account 2.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e4b9d9a8021a37ab77cd81cb132783f6a97a6a2
-  data.tar.gz: 6a814f056664c1ac989a4475409968b3dbd0b11e
+  metadata.gz: b7bc13b86109af52ad3c4ea1e49d3388e6f6bd27
+  data.tar.gz: 3981321a1ae869e72270881953704e7bc4a8b4e6
 SHA512:
-  metadata.gz: 62dc3234a50a85aa9e26d9ddc59580cfb01386262b0d981c956f05b07c09655e77e40562ae7887fc4734d78f6674525a1b3a33e86f11d7e75a7c6ff6278645f4
-  data.tar.gz: 42fa52c418890778f3ec3d9a8ffa69b8be79574bba1f9b545dd20d380c07770cc988f95400029b964d65baf0db0c97dd06edd794d6cce9c0e487f82c3057060c
+  metadata.gz: 91489dd37949d4288748296de2d67d972c78d38a2bcdb19affb789d7f10ddc9d2b151f8b45a21424644aec7cc62da45a04c56ce9d3f4270f864298dbe08099ab
+  data.tar.gz: 34a8d296b69f07de19701c66f3bf1ba68e6c905e0e52cc26d41fb857ce14d0f1b41128d80c266965cc82a80f0b235819839910098811903aae12fac2082ce10d

data/.ruby-gemset

@@ -0,0 +1 @@
+acts_as_account

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+
+[jop] 2014-08-18
+  * Rails 4 compatibility
+  * Added changelog

data/Gemfile

@@ -1,13 +1,14 @@
 source "http://rubygems.org"
 
 group :development do
-  gem 'jeweler',  '~> 2.0'
-  gem 'cucumber', '~> 1.3'
-  gem 'mysql',    '~> 2.9'
+  gem 'rspec'
+  gem 'jeweler'
+  gem 'cucumber'
+  gem 'mysql'
 end
 
 group :default do
-  gem 'activerecord', '~> 3.2'
-  gem 'actionpack'  , '~> 3.2'
-  gem 'database_cleaner', '~> 1.3'
+  gem 'activerecord', '~> 4.1.0'
+  gem 'actionpack'  , '~> 4.1.0'
+  gem 'database_cleaner'
 end

data/Gemfile.lock

@@ -1,108 +1,108 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-      builder (~> 3.0.0)
+    actionpack (4.1.0)
+      actionview (= 4.1.0)
+      activesupport (= 4.1.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.19)
-      activesupport (= 3.2.19)
-      builder (~> 3.0.0)
-    activerecord (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.19)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    addressable (2.3.6)
-    arel (3.0.3)
-    builder (3.0.4)
-    cucumber (1.3.17)
+    activemodel (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+    activerecord (4.1.0)
+      activemodel (= 4.1.0)
+      activesupport (= 4.1.0)
+      arel (~> 5.0.0)
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    addressable (2.3.5)
+    arel (5.0.1.20140414130214)
+    builder (3.1.4)
+    cucumber (1.3.10)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
-    database_cleaner (1.3.0)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
+      multi_test (>= 0.0.2)
+    database_cleaner (1.2.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    git (1.2.8)
-    github_api (0.12.1)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.3)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
       oauth2
-    hashie (3.3.1)
-    highline (1.6.21)
-    hike (1.2.3)
-    i18n (0.6.11)
-    jeweler (2.0.1)
+    hashie (2.0.5)
+    highline (1.6.20)
+    httpauth (0.2.0)
+    i18n (0.6.9)
+    jeweler (1.8.8)
       builder
-      bundler (>= 1.0)
+      bundler (~> 1.0)
       git (>= 1.2.5)
-      github_api
+      github_api (= 0.10.1)
       highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    journey (1.0.4)
     json (1.8.1)
-    jwt (1.0.0)
-    mini_portile (0.6.0)
-    multi_json (1.10.1)
-    multi_test (0.1.1)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    minitest (5.3.3)
+    multi_json (1.8.2)
+    multi_test (0.0.2)
     multi_xml (0.5.5)
-    multipart-post (2.0.0)
+    multipart-post (1.2.0)
     mysql (2.9.1)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
+    nokogiri (1.5.10)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.3.2)
-    rdoc (4.1.2)
+    rake (10.1.0)
+    rdoc (4.0.1)
       json (~> 1.4)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    tzinfo (0.3.41)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+    thread_safe (0.3.3)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 3.2)
-  activerecord (~> 3.2)
-  cucumber (~> 1.3)
-  database_cleaner (~> 1.3)
-  jeweler (~> 2.0)
-  mysql (~> 2.9)
+  actionpack (~> 4.1.0)
+  activerecord (~> 4.1.0)
+  cucumber
+  database_cleaner
+  jeweler
+  mysql
+  rspec

data/README.rdoc

@@ -13,6 +13,10 @@ tables is needed.
 We also hook into the ActionController request cycle to warn the developer
 if a request has left the uncommitted changes in the system.
 
+== Support
+
+Rails 4 is supported since version 3.1.0
+
 == How to test
 
 Run the cucumber features from the acs_as_account gem, just execute
@@ -33,4 +37,4 @@ This gem was written for the payment backend of betterplace.org by Thies C. Arnt
 
 == Copyright
 
-Copyright (c) 2010 gut.org gAG
+Copyright (c) 2010 gut.org gAG

data/Rakefile

@@ -13,43 +13,28 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "acts_as_account"
-    gem.summary = %Q{acts_as_account implements double entry accounting for Rails models}
+    gem.name        = "acts_as_account"
+    gem.summary     = %Q{acts_as_account implements double entry accounting for Rails models}
     gem.description = %Q{acts_as_account implements double entry accounting for Rails models. Your models get accounts and you can do consistent transactions between them. Since the documentation is sparse, see the transfer.feature for usage examples.}
-    gem.email = "thieso@gmail.com"
-    gem.homepage = "http://github.com/betterplace/acts_as_account"
-    gem.authors = ["Thies C. Arntzen, Norman Timmler, Matthias Frick, Phillip Oertel"]
-    gem.license = 'Apache-2.0'
-    #gem.add_dependency 'activerecord'
-    #gem.add_dependency 'actionpack'
-    #gem.add_dependency 'database_cleaner'
+    gem.email       = "developers@betterplace.org"
+    gem.homepage    = "http://github.com/betterplace/acts_as_account"
+    gem.authors     = ["Thies C. Arntzen, Norman Timmler, Matthias Frick, Phillip Oertel"]
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-def connect_database
-  require 'rubygems'
-  require 'active_record'
-  access_data = YAML.load_file(File.dirname(__FILE__) + '/db/database.yml')['acts_as_account']
-  ActiveRecord::Base.establish_connection(Hash[access_data.select { |k, v| k != 'database'}]).connection
-end
-
 namespace :features do
   desc "create test database out of db/schema.rb"
   task :create_database do
-    conn = connect_database
+    require 'rubygems'
+    require 'active_record'
+    access_data = YAML.load_file(File.dirname(__FILE__) + '/db/database.yml')['acts_as_account']
+    conn = ActiveRecord::Base.establish_connection(Hash[access_data.select { |k, v| k != 'database'}]).connection
     conn.execute('DROP DATABASE IF EXISTS acts_as_account')
     conn.execute('CREATE DATABASE acts_as_account')
     conn.execute('USE acts_as_account')
     load(File.dirname(__FILE__) + '/db/schema.rb')
   end
 end
-
-desc "Run features"
-task :features => :'features:create_database' do
-  ruby '-S', 'cucumber'
-end
-
-task :default => :features

data/VERSION

@@ -1 +1 @@
-2.0.3
+3.1.0

data/acts_as_account.gemspec

@@ -2,23 +2,27 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: acts_as_account 3.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "acts_as_account"
-  s.version = "2.0.1"
+  s.version = "3.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Thies C. Arntzen, Norman Timmler, Matthias Frick, Phillip Oertel"]
-  s.date = "2012-10-04"
+  s.date = "2014-08-19"
   s.description = "acts_as_account implements double entry accounting for Rails models. Your models get accounts and you can do consistent transactions between them. Since the documentation is sparse, see the transfer.feature for usage examples."
-  s.email = "thieso@gmail.com"
+  s.email = "developers@betterplace.org"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
   ]
   s.files = [
-    ".rvmrc",
+    ".ruby-gemset",
+    ".ruby-version",
     ".specification",
+    "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
@@ -49,44 +53,37 @@ Gem::Specification.new do |s|
     "lib/acts_as_account/transfer.rb"
   ]
   s.homepage = "http://github.com/betterplace/acts_as_account"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.2.2"
   s.summary = "acts_as_account implements double entry accounting for Rails models"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, ["~> 3.2.8"])
-      s.add_runtime_dependency(%q<actionpack>, ["~> 3.2.8"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 4.1.0"])
+      s.add_runtime_dependency(%q<actionpack>, ["~> 4.1.0"])
       s.add_runtime_dependency(%q<database_cleaner>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<mysql>, [">= 0"])
-      s.add_runtime_dependency(%q<actionpack>, [">= 0"])
-      s.add_runtime_dependency(%q<database_cleaner>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, ["~> 3.2.8"])
-      s.add_dependency(%q<actionpack>, ["~> 3.2.8"])
+      s.add_dependency(%q<activerecord>, ["~> 4.1.0"])
+      s.add_dependency(%q<actionpack>, ["~> 4.1.0"])
       s.add_dependency(%q<database_cleaner>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<mysql>, [">= 0"])
-      s.add_dependency(%q<actionpack>, [">= 0"])
-      s.add_dependency(%q<database_cleaner>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, ["~> 3.2.8"])
-    s.add_dependency(%q<actionpack>, ["~> 3.2.8"])
+    s.add_dependency(%q<activerecord>, ["~> 4.1.0"])
+    s.add_dependency(%q<actionpack>, ["~> 4.1.0"])
     s.add_dependency(%q<database_cleaner>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<mysql>, [">= 0"])
-    s.add_dependency(%q<actionpack>, [">= 0"])
-    s.add_dependency(%q<database_cleaner>, [">= 0"])
   end
 end
 

data/features/account/account_creation.feature

@@ -10,12 +10,18 @@ Feature: Creating an Account
     And I create an Account named default for User A
     Then I get the original account
 
+  Scenario: Creating a Account with a different name
+    And I create an Account named default for User A
+    And I create an Account named not_default for User A
+    Then I can get the default Account of User A
+    Then I can get the not_default Account of User A
+
   Scenario: Race condition while creating account
     Given I have the same user in memory
     And I disable the account existence check on those
     When I call 'account' on both it should be possible
 
- Scenario: Accounts on a sublcass
+ Scenario: Accounts on a subclass
     Given I have a user A that inherits from an abstract class
     And I autocreate an account for inheriting user A
-    Then the account of user A should be there
+    Then the account of user A should be there

data/features/step_definitions/account_steps.rb

@@ -16,12 +16,12 @@ end
 
 Given /^I autocreate an account for inheriting user (\w+)$/ do |name|
   @created_account = InheritingUser.find_by_name(name).account
-  assert_not_nil @created_account
+  @created_account.should_not be_nil
 end
 
 Then /^the account of user (\w+) should be there$/ do |name|
   account = InheritingUser.find_by_name(name).account
-  assert_equal @created_account, account
+  @created_account.should eq account
 end
 
 Given /^I create a global ([_\w]+) account$/ do |name|
@@ -30,7 +30,7 @@ end
 
 Then /^an account for user (\w+) exists$/ do |name|
   @account = User.find_by_name(name).account
-  assert_not_nil @account
+  @account.should_not be_nil
 end
 
 Then /^the account has (\d+) journals?$/ do |num_journals|
@@ -42,23 +42,23 @@ Then /^the account has (\d+) journals?$/ do |num_journals|
     @journals = @account.journals
   end
 
-  assert_equal num_journals, @account.journals.count
+  num_journals.should eq @account.journals.count
 end
 
 Then /^the journal has (\d+) postings? with an amount of (\d+) €$/ do |num_postings, amount|
   @postings = @journal.postings
-  assert_equal num_postings.to_i, @postings.size
+  num_postings.to_i.should eq @postings.size
   @postings.each do |posting|
-    assert_equal amount.to_i, posting.amount
+    amount.to_i.should eq posting.amount
   end
 end
 
 Then /^(\w+)'s account balance is (-?\d+) €$/ do |name, balance|
-  assert_equal balance.to_i, User.find_by_name(name).account.balance
+  balance.to_i.should eq User.find_by_name(name).account.balance
 end
 
 Then /^the global (\w+) account balance is (-?\d+) €$/ do |name, balance|
-  assert_equal balance.to_i, Account.for(name).balance
+  balance.to_i.should eq Account.for(name).balance
 end
 
 When /^I transfer (-?\d+) € from (\w+)'s account to (\w+)'s account$/ do |amount, from, to|
@@ -75,12 +75,12 @@ end
 
 Then /^the balance\-sheet should be:$/ do |table|
   table.hashes.each do |row|
-    assert_equal row['Balance'].to_i, User.find_by_name(row['User']).account.balance
+    row['Balance'].to_i.should eq User.find_by_name(row['User']).account.balance
   end
 end
 
 Then /^I fail with (.+)$/ do |exception|
-  assert_equal exception.constantize, @last_exception.class
+  exception.constantize.should eq @last_exception.class
 end
 
 When /^I create a Journal via (.+)$/ do |method|
@@ -94,12 +94,12 @@ When /^I create a Journal via (.+)$/ do |method|
 end
 
 Then /^I have a Journal$/ do
-  assert_equal Journal, @journal.class
+  Journal.should eq @journal.class
 end
 
 Then /^User (\w+) has an Account named (\w+)$/ do |user_name, account_name|
   @account = User.find_by_name(user_name).account
-  assert_equal account_name, @account.name
+  account_name.should eq @account.name
 end
 
 Given /^I create an Account named (\w+) for User (\w+)$/ do |account_name, user_name|
@@ -108,7 +108,12 @@ Given /^I create an Account named (\w+) for User (\w+)$/ do |account_name, user_
 end
 
 Then /^I get the original account$/ do
-  assert_equal @account, @created_account
+  @account.should eq @created_account
+end
+
+Then(/^I can get the (\w+) Account of User (\w+)$/) do |account_name, user_name|
+  account = User.find_by_name(user_name).__send__(:"#{account_name}_account")
+  account.should be_kind_of ActsAsAccount::Account
 end
 
 Given /I transfer (\d+) € from (\w+)'s account to (\w+)'s account referencing a (\w+) with (\w+) (\w+)$/ do |amount, from, to, reference, name, value|
@@ -117,9 +122,9 @@ Given /I transfer (\d+) € from (\w+)'s account to (\w+)'s account referencing
 end
 
 Then /^all postings reference (\w+) with (\w+) (\w+)$/ do |reference_class, name, value|
-  reference = reference_class.constantize.find(:first, :conditions => "#{name} = #{value}")
+  reference = reference_class.constantize.where("#{name} = #{value}").first
   Posting.all.each do |posting|
-    assert_equal reference, posting.reference
+    reference.should eq posting.reference
   end
 end
 
@@ -131,20 +136,20 @@ end
 Then /^all postings have (\S+) (\S+) as the booking time$/ do |booking_date, booking_time|
   valuta = german_date_time_to_local(booking_date, booking_time)
   Posting.all.each do |posting|
-    assert_equal valuta, posting.valuta
+    valuta.should eq posting.valuta
   end
 end
 
 Then /^(\w+) with (\w+) (\w+) references all postings$/ do |reference_class, name, value|
-  reference = reference_class.constantize.find(:first, :conditions => "#{name} = #{value}")
-  assert_equal Posting.all, reference.postings
+  reference = reference_class.constantize.where("#{name} = #{value}").first
+  Posting.all.to_a.should eq reference.postings
 end
 
 Then /^the order of the postings is correct$/ do
   # make sure we always book "Soll an Haben"
   Posting.all.in_groups_of(2) do |from, to|
-    assert from.amount < 0
-    assert to.amount > 0
+    from.amount.should be < 0
+    to.amount.should be > 0
   end
 end
 
@@ -161,4 +166,4 @@ end
 
 When /^I call 'account' on both it should be possible$/ do
   [@user1, @user2].each { |user| user.account }
-end
+end

data/features/support/env.rb

@@ -1,12 +1,6 @@
-require 'test/unit/assertions'
-
-World(Test::Unit::Assertions)
-
 require File.dirname(__FILE__) + '/../../lib/acts_as_account'
 ActiveRecord::Base.establish_connection(YAML.load_file(File.dirname(__FILE__) + '/../../db/database.yml')['acts_as_account'])
 
-#ActiveRecord::Base.logger = Logger.new(STDOUT)
-
 require 'database_cleaner'
 require 'database_cleaner/cucumber'
 DatabaseCleaner.strategy = :transaction

data/features/support/user.rb

@@ -1,3 +1,4 @@
 class User < ActiveRecord::Base
   has_account
-end
+  has_account(:not_default)
+end

data/lib/acts_as_account/account.rb

@@ -42,7 +42,7 @@ module ActsAsAccount
       end
 
       def for(name)
-        GlobalAccount.find_or_create_by_name(name.to_s).account
+        GlobalAccount.find_or_create_by(name: name).account
       end
 
       def create!(attributes = nil)

data/lib/acts_as_account/active_record_extensions.rb

@@ -12,14 +12,15 @@ module ActsAsAccount
     module ClassMethods
 
       def has_account(name = :default)
-        has_one "#{name}_account", :conditions => "name = '#{name}'", :class_name => "ActsAsAccount::Account", :as => :holder
+        has_one :"#{name}_account", -> { where name: name }, class_name: "ActsAsAccount::Account", as: :holder
+
         unless instance_methods.include?('accounts')
-          has_many :accounts, :class_name => "ActsAsAccount::Account", :as => :holder
+          has_many :accounts, class_name: "ActsAsAccount::Account", as: :holder
         end
       end
 
       def is_reference
-        has_many :postings, :class_name => "ActsAsAccount::Posting", :as => :reference
+        has_many :postings, class_name: "ActsAsAccount::Posting", as: :reference
         class_eval <<-EOS
           def booked?
             postings.any?
@@ -36,4 +37,4 @@ module ActsAsAccount
       end
     end
   end
-end
+end

data/lib/acts_as_account/posting.rb

@@ -1,5 +1,3 @@
-require 'time'
-
 module ActsAsAccount
   class Posting < ActiveRecord::Base
     self.table_name = :acts_as_account_postings
@@ -9,15 +7,9 @@ module ActsAsAccount
     belongs_to :journal,       :class_name => 'ActsAsAccount::Journal'
     belongs_to :reference, :polymorphic => true
 
-    scope :soll,  where('amount >= 0')
-    scope :haben, where('amount < 0')
-    scope :start_date,  lambda { |date|
-      date = Time.parse(date.to_s).utc.to_s(:db)
-      { :conditions => [ 'valuta >= ?', date ] }
-    }
-    scope :end_date,    lambda{ |date|
-      date = Time.parse(date.to_s).utc.to_s(:db)
-      { :conditions => [ 'valuta <= ?', date ] }
-    }
+    scope :soll,       -> { where('amount >= 0') }
+    scope :haben,      -> { where('amount < 0') }
+    scope :start_date, -> date { where ['DATE(valuta) >= ?', date] }
+    scope :end_date,   -> date { where ['DATE(valuta) <= ?', date] }
   end
 end

metadata

@@ -1,111 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_account
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Thies C. Arntzen, Norman Timmler, Matthias Frick, Phillip Oertel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0'
 description: acts_as_account implements double entry accounting for Rails models.
   Your models get accounts and you can do consistent transactions between them. Since
   the documentation is sparse, see the transfer.feature for usage examples.
-email: thieso@gmail.com
+email: developers@betterplace.org
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
-- ".specification"
-- ".travis.yml"
+- .ruby-gemset
+- .ruby-version
+- .specification
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -135,8 +151,7 @@ files:
 - lib/acts_as_account/posting.rb
 - lib/acts_as_account/transfer.rb
 homepage: http://github.com/betterplace/acts_as_account
-licenses:
-- Apache-2.0
+licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -144,12 +159,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/.travis.yml

@@ -1,13 +0,0 @@
-rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
-  - ruby-head
-  - rbx-19mode
-  - jruby-19mode
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: rbx-19mode
-    - rvm: jruby-19mode