has_accounts 3.0.0.beta1 → 3.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8806313d5c398494b0e1b60afe3a17ff4668dac
-  data.tar.gz: 6eedb23cab48c97e30091ad035ad5ac7b2750e6a
+  metadata.gz: 579e264a5e2414301a5525c6b97dfe24cc8c5f64
+  data.tar.gz: 846d989c4b8192f05c4447c7a94ca2e334296870
 SHA512:
-  metadata.gz: 6dcac2203c5128d8e3f342f7e5f75754d02c16b637a0353d8de1302991b32db46dddbc16ab54ec773cbf8a6713836ff95f36fe99bb11105115e1d9a72a2925e7
-  data.tar.gz: 78c214b9b67659bbc56aed363b6c4d4e0c87ad9d785d16acd29b12a0737e5c493d6b92896626bd81998f19b11d8bdbc464605a1f396983ca15950e881518b424
+  metadata.gz: 79b725ac935eb1fe671a12574ce1a92f97a712735b00683472381016b815249c4bd30ca012cf1fef17c7ec27cf752a5f4e1f8cd2fdc8e3cf28b640fd53203699
+  data.tar.gz: e02026c59e428421d0ed3675ee8d7dc04328b6402aeca15936da9bb9a8336d976462a9b2dcb0afab30294303132d61920e8f952844088dd0da3eb125c081737c

data/app/models/account.rb

@@ -51,6 +51,17 @@ class Account < ActiveRecord::Base
   # Tagging
   # =======
   if defined?(ActsAsTaggableOn) && ActsAsTaggableOn::Tag.table_exists?
+    class Account::AmbiguousTag < StandardError
+      def initialize(tag, count)
+        @tag = tag
+        @count = count
+      end
+
+      def to_s
+        "Given tag '#{@tag}' is ambiguous, found #{@count} records"
+      end
+    end
+
     acts_as_taggable
     attr_accessible :tag_list
 
@@ -61,6 +72,13 @@ class Account < ActiveRecord::Base
     def self.tag_collection
       (default_tags + Account.tag_counts.pluck(:name)).uniq
     end
+
+    def self.find_by_tag(tag)
+      accounts = tagged_with(tag)
+      count = accounts.count
+      raise Account::AmbiguousTag.new(tag, count) if count > 1
+      accounts.first
+    end
   end
 
   # Holder

data/app/models/booking.rb

@@ -77,6 +77,9 @@ class Booking < ActiveRecord::Base
     end
   }
 
+  # Scope for code filter
+  scope :by_code, -> (code) { where(code: code) }
+
   # Scope for date filter
   #
   # @param from [Date]
@@ -160,7 +163,7 @@ class Booking < ActiveRecord::Base
 
   # Accounted bookings
   # ==================
-  SELECT_ACCOUNTED_AMOUNT =     'CASE WHEN credit_account_id = debit_account_id THEN 0.0 WHEN credit_account_id = %{account_id} THEN -bookings.amount WHEN debit_account_id = %{account_id} THEN bookings.amount ELSE 0 END'
+  SELECT_ACCOUNTED_AMOUNT = 'CASE WHEN credit_account_id = debit_account_id THEN 0.0 WHEN credit_account_id = %{account_id} THEN -bookings.amount WHEN debit_account_id = %{account_id} THEN bookings.amount ELSE 0 END'
 
   private
 
@@ -170,7 +173,7 @@ class Booking < ActiveRecord::Base
     elsif Account.exists?(account_or_id)
       return account_or_id
     else
-      fail 'argument needs to be a record of type Account or an id for an existing Account record.'
+      raise ActiveRecord::RecordNotFound, 'argument needs to be a record of type Account or an id for an existing Account record.'
     end
   end
 

data/app/models/booking_template.rb

@@ -117,7 +117,7 @@ class BookingTemplate < ActiveRecord::Base
   # @return [Booking] unsaved Booking
   def self.build_booking(code, params = {})
     template = find_by_code(code)
-    fail "BookingTemplate not found for '#{code}'" unless template
+    raise ActiveRecord::RecordNotFound,  "BookingTemplate not found for '#{code}'" unless template
 
     template.build_booking params
   end

data/lib/has_accounts/version.rb

@@ -1,3 +1,3 @@
 module HasAccounts
-  VERSION = '3.0.0.beta1'
+  VERSION = '3.0.0.beta2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_accounts
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta1
+  version: 3.0.0.beta2
 platform: ruby
 authors:
 - Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,3 +94,4 @@ signing_key:
 specification_version: 4
 summary: HasAccounts provides models for financial accounting.
 test_files: []
+has_rdoc: