has_accounts 0.8.2 → 0.8.3

data/Rakefile

@@ -7,7 +7,7 @@ rescue LoadError
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/app/models/account.rb

@@ -51,9 +51,10 @@ class Account < ActiveRecord::Base
   
   # Calculations
   def turnover(selector = Date.today, inclusive = true)
+    equality = "=" if inclusive
+
     if selector.is_a? Range or selector.is_a? Array
       if selector.first.is_a? Booking
-        equality = "=" if inclusive
         if selector.first.value_date == selector.last.value_date
           condition = ["date(value_date) = :value_date AND id >#{equality} :first_id AND id <#{equality} :last_id", {
             :value_date => selector.first.value_date,
@@ -82,11 +83,9 @@ class Account < ActiveRecord::Base
       end
     else
       if selector.is_a? Booking
-        equality = "=" if inclusive
         # date(value_date) is needed on sqlite!
         condition = ["(value_date < :value_date) OR (date(value_date) = :value_date AND id <#{equality} :id)", {:value_date => selector.value_date, :id => selector.id}]
       else
-        equality = "=" if inclusive
         condition = ["date(value_date) <#{equality} ?", selector]
       end
     end

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/booking.rb

@@ -1,6 +1,7 @@
 class Booking < ActiveRecord::Base
   # Validation
-  validates_presence_of :debit_account, :credit_account, :title, :amount, :value_date
+  validates_presence_of :debit_account, :credit_account, :title, :value_date
+  validates :amount, :presence => true, :numericality => true
   validates_time :value_date
 
   # Account
@@ -74,24 +75,6 @@ class Booking < ActiveRecord::Base
     end
   end
 
-  def self.scope_by_value_date(value_date)
-    scoping = self.default_scoping - [@by_value_scope]
-    
-    @by_value_scope = {:find => {:conditions => {:value_date => value_date}}}
-    scoping << @by_value_scope
-    
-    Thread.current["#{self}_scoped_methods"] = nil
-    self.default_scoping = scoping
-  end
-  
-  def self.filter(controller, &block)
-    if controller.value_date_scope
-      with_scope(:find => {:conditions => {:value_date => controller.value_date_scope}}, &block)
-    else
-      block.call
-    end
-  end
-  
   # Standard methods
   def to_s(format = :default)
     case format

data/app/models/booking.rb~

@@ -64,7 +64,7 @@ class Booking < ActiveRecord::Base
     rescue ArgumentError
     end
     
-    where("title LIKE :text OR comments = :text OR amount = :amount OR value_date = :value_date", :text => text, :amount => amount, :value_date => date)
+    where("title LIKE :text OR comments LIKE :text OR amount = :amount OR value_date = :value_date", :text => text, :amount => amount, :value_date => date)
   }
   
   # Returns array of all years we have bookings for
@@ -74,24 +74,6 @@ class Booking < ActiveRecord::Base
     end
   end
 
-  def self.scope_by_value_date(value_date)
-    scoping = self.default_scoping - [@by_value_scope]
-    
-    @by_value_scope = {:find => {:conditions => {:value_date => value_date}}}
-    scoping << @by_value_scope
-    
-    Thread.current["#{self}_scoped_methods"] = nil
-    self.default_scoping = scoping
-  end
-  
-  def self.filter(controller, &block)
-    if controller.value_date_scope
-      with_scope(:find => {:conditions => {:value_date => controller.value_date_scope}}, &block)
-    else
-      block.call
-    end
-  end
-  
   # Standard methods
   def to_s(format = :default)
     case format

data/lib/generators/has_accounts/templates/migration.rb~

@@ -0,0 +1,59 @@
+class SetupHasAccountsEngine < ActiveRecord::Migration
+  def self.up
+    create_table "account_types", :force => true do |t|
+      t.string   "name",       :limit => 100
+      t.string   "title",      :limit => 100
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    create_table "accounts", :force => true do |t|
+      t.string   "title",           :limit => 100
+      t.integer  "parent_id"
+      t.integer  "account_type_id"
+      t.integer  "number"
+      t.string   "code"
+      t.integer  "type"
+      t.integer  "holder_id"
+      t.string   "holder_type"
+      t.integer  "bank_id"
+      t.integer  "esr_id"
+      t.integer  "pc_id"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    add_index "accounts", ["bank_id"], :name => "index_accounts_on_bank_id"
+    add_index "accounts", ["code"], :name => "index_accounts_on_code"
+    add_index "accounts", ["holder_id", "holder_type"], :name => "index_accounts_on_holder_id_and_holder_type"
+    add_index "accounts", ["type"], :name => "index_accounts_on_type"
+
+    create_table "banks", :force => true do |t|
+      t.integer  "vcard_id"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    create_table "bookings", :force => true do |t|
+      t.string   "title",             :limit => 100
+      t.decimal  "amount"
+      t.integer  "credit_account_id"
+      t.integer  "debit_account_id"
+      t.date     "value_date"
+      t.text     "comments",          :limit => 1000, :default => ""
+      t.string   "scan"
+      t.string   "debit_currency",                    :default => "CHF"
+      t.string   "credit_currency",                   :default => "CHF"
+      t.float    "exchange_rate",                     :default => 1.0
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.integer  "reference_id"
+      t.string   "reference_type"
+    end
+  end
+
+  def self.down
+    drop_table :account_types, :accounts, :banks, :bookings
+  end
+end
+

data/lib/generators/migration_generator.rb~

@@ -0,0 +1,27 @@
+require 'rails/generators/base'
+require 'rails/generators/migration'
+  
+module HasVcards
+  class MigrationGenerator < Rails::Generators::Base
+    include Rails::Generators::Migration
+
+    def self.source_root
+      @source_root ||= File.join(File.dirname(__FILE__), 'templates')
+    end
+
+    # Implement the required interface for Rails::Generators::Migration.
+    # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
+    def self.next_migration_number(dirname)
+      if ActiveRecord::Base.timestamped_migrations
+        Time.now.utc.strftime("%Y%m%d%H%M%S")
+      else
+        "%.3d" % (current_migration_number(dirname) + 1)
+      end
+    end
+
+    def create_migration_file
+      migration_template 'migration.rb', 'db/migrate/create_has_vcards.rb'
+    end
+
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_accounts
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 +02:00
+date: 2011-07-06 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -29,25 +29,23 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- app/models/account.rb~
 - app/models/account_scope_extension.rb
+- app/models/booking.rb~
 - 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~
-- lib/generators/has_accounts/templates/migration.rb
-- lib/generators/has_accounts/migration_generator.rb
-- lib/has_accounts.rb
-- lib/has_accounts/model.rb~
+- app/models/account_type.rb
+- app/models/booking.rb
+- app/models/account.rb~
+- lib/has_accounts/railtie.rb
 - lib/has_accounts/class_methods.rb
-- lib/has_accounts/railtie.rb~
-- lib/has_accounts/core_ext/rounding.rb~
 - lib/has_accounts/core_ext/rounding.rb
-- lib/has_accounts/railtie.rb
 - lib/has_accounts/model.rb
+- lib/has_accounts.rb
+- lib/generators/has_accounts/migration_generator.rb
+- lib/generators/has_accounts/templates/migration.rb~
+- lib/generators/has_accounts/templates/migration.rb
+- lib/generators/migration_generator.rb~
 - MIT-LICENSE
 - Rakefile
 - README.md
@@ -81,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: HasAccounts provides models for financial accounting.

data/app/models/account_type.rb~

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

data/lib/has_accounts/core_ext/rounding.rb~

@@ -1,31 +0,0 @@
-module HasAccounts #:nodoc:
-  module CoreExtensions #:nodoc:
-    module Rounding
-      # Rounds the float according to currency rules.
-      # Currently targeted to Swiss Francs (CHF), usable
-      # for all currencies having 0.05 as smallest unit.
-      #
-      #   x = 1.337
-      #   x.round    # => 1.35
-      def currency_round
-        if self.nil?
-          return 0.0
-        else
-          return (self * 20).round / 20.0
-        end
-      end
-    end
-    
-    module BigDecimal
-      module Rounding
-        def currency_round
-          if self.nil?
-            return BigDecimal.new("0")
-          else
-            return (self * 20).round / 20
-          end
-        end
-      end
-    end
-  end
-end

data/lib/has_accounts/model.rb~

@@ -1,58 +0,0 @@
-module HasAccounts
-  module Model
-    extend ActiveSupport::Concern
-    
-    included do
-      class_inheritable_accessor :direct_account
-
-      has_many :bookings, :as => :reference, :dependent => :destroy do
-        # TODO: duplicated in Booking (without parameter)
-        def direct_balance(value_date = nil, direct_account = nil)
-          return BigDecimal.new('0') unless proxy_owner.direct_account
-          
-          direct_account ||= proxy_owner.direct_account
-          balance = BigDecimal.new('0')
-
-          direct_bookings = scoped
-          direct_bookings = direct_bookings.where("date(value_date) <= ?", value_date) if value_date
-
-          for booking in direct_bookings.all
-            balance += booking.accounted_amount(direct_account)
-          end
-
-          balance
-        end
-      end
-    end
-
-    module ClassMethods
-    end
-    
-    module InstanceMethods
-      # Delegate to class
-      def direct_account
-        self.class.direct_account
-      end
-
-      # Build booking
-      def build_booking(params = {}, template_code = nil)
-        template_code ||= self.class.to_s.underscore + ':invoice'
-        booking_template = BookingTemplate.find_by_code(template_code)
-        
-        # Prepare booking parameters
-        booking_params = {:reference => self}
-        booking_params.merge!(params)
-
-        # Build and assign booking
-        booking = booking_template.build_booking(booking_params)
-        bookings << booking
-        
-        booking
-      end
-
-      def balance(value_date = nil, direct_account = nil)
-        bookings.direct_balance(value_date, direct_account)
-      end
-    end
-  end
-end

data/lib/has_accounts/railtie.rb~

@@ -1,10 +0,0 @@
-require 'has_accounts'
-require 'rails'
-
-module HasAccounts
-  class Railtie < Rails::Engine
-    Float.send :include, HasAccounts::CoreExtensions::Rounding
-    Fixnum.send :include, HasAccounts::CoreExtensions::Rounding
-    BigDecimal.send :include, HasAccounts::CoreExtensions::Rounding
-  end
-end