has_accounts 0.8.0 → 0.8.1

data/app/models/account.rb

@@ -16,6 +16,7 @@ class Account < ActiveRecord::Base
   # Account Type
   # ============
   belongs_to :account_type
+  validates_presence_of :account_type
 
   def is_asset_account?
     Account.by_type(['current_assets', 'capital_assets', 'costs']).exists?(self)

data/app/models/account.rb~

@@ -18,14 +18,14 @@ class Account < ActiveRecord::Base
   belongs_to :account_type
 
   def is_asset_account?
-    AccountType.by_type(['current_assets', 'capital_assets', 'costs']).include? account_type
+    Account.by_type(['current_assets', 'capital_assets', 'costs']).exists?(self)
   end
   
   def is_liability_account?
     !is_asset_account?
   end
 
-  scope :by_type, lambda {|value| includes(:account_type).where('account_types.name' => value.underscore)} do
+  scope :by_type, lambda {|value| includes(:account_type).where('account_types.name' => value)} do
     include AccountScopeExtension
   end
 

data/app/models/account_type.rb

@@ -1,4 +1,7 @@
 class AccountType < ActiveRecord::Base
+  # Validation
+  validates_presence_of :name, :title
+
   # Helpers
   def to_s
     title

data/app/models/account_type.rb~

@@ -0,0 +1,6 @@
+class AccountType < ActiveRecord::Base
+  # Helpers
+  def to_s
+    title
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -33,6 +33,7 @@ files:
 - app/models/bank.rb
 - app/models/account.rb
 - app/models/booking.rb
+- app/models/account_type.rb~
 - app/models/account_type.rb
 - app/models/bank_account.rb
 - app/models/booking.rb~