has_accounts 2.1.0 → 3.0.0.beta0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 403d094803675510f38b33a494676ed9f70050b5
-  data.tar.gz: 0a39e6943b89d82857bf0386c9342c97c395a355
+  metadata.gz: 7536557b72ba28c4867b5e4397b03f8a06d5dfb3
+  data.tar.gz: b73be36ba1905821003318b7a836700c5343538a
 SHA512:
-  metadata.gz: 06fad61f4d896918f0bb135062f4a7f29504699e2f1d7544f6e711d25d16034bfa85bf03218b90ed2699453026e6d2ef31543ee7ba6ab18a7ee9181dd4e98589
-  data.tar.gz: f9a03bb6639014b0de59b8a98ba80ef84d1fead4b9f6f922772fecc9d1df65e894d1b14f4426882be1f9abce270e45cfe8754d2248f824baf9e6009b3cf99a91
+  metadata.gz: 56d71c0b21006327dcbf25351c3c7ae7d11fba23afaa254138ef45f0a3b064c4d07b9bd33772bb7fc7054e273175afbc013e24e3a69a9dac1baffbf27fd82a9b
+  data.tar.gz: 3379c6d6c3f491728d922247d999f8576366b0295d45cef037db6ff6a6d06c42257e979e95178bda3ef9180e081068c477871d4a1a89b314342b2b03a6713361

data/app/models/booking.rb

@@ -75,6 +75,61 @@ class Booking < ActiveRecord::Base
     end
   }
 
+  # Scope filter for date range
+  scope :by_date_period, lambda {|date_from, date_to|
+    if date_from.present? && date_to.present?
+      where(:value_date => date_from..date_to)
+    elsif date_from.present?
+      where('value_date >= ?', date_from)
+    elsif date_to.present?
+      where('value_date <= ?', date_to)
+    end
+  }
+
+  # Scope for date filter
+  #
+  # @param from [Date]
+  # @param to [Date]
+  scope :by_date, lambda {|*args|
+    dates = args.map do |date|
+      begin
+        date.to_date
+      rescue
+        nil
+      end
+    end
+
+    if dates.count == 0
+      scoped
+    elsif dates.count == 1
+      where(:value_date => dates[0])
+    elsif dates.count == 2
+      by_date_period(dates[0], dates[1])
+    end
+  }
+
+  # Scope for amount range filter
+  scope :by_amount_range, lambda {|amount_from, amount_to|
+    if amount_from.present? && amount_to.present?
+      where(:amount => amount_from..amount_to)
+    elsif amount_from.present?
+      where('amount >= ?', amount_from)
+    elsif amount_to.present?
+      where('amount <= ?', amount_to)
+    end
+  }
+
+  # Scope for amount filter
+  scope :by_amount, lambda {|*args|
+    if args.count == 0
+      scoped
+    elsif args.count == 1
+      where(:amount => args[0])
+    elsif args.count == 2
+      by_amount_range(args[0], args[1])
+    end
+  }
+
   # Scope for all accounts assigned to account
   #
   # @param account_id [Integer]

data/lib/has_accounts/version.rb

@@ -1,3 +1,3 @@
 module HasAccounts
-  VERSION = '2.1.0'
+  VERSION = '3.0.0.beta0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_accounts
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0.beta0
 platform: ruby
 authors:
 - Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,9 +84,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -94,3 +94,4 @@ signing_key:
 specification_version: 4
 summary: HasAccounts provides models for financial accounting.
 test_files: []
+has_rdoc: