has_accounts 0.6.1 → 0.7.0

data/Rakefile

@@ -1,16 +1,20 @@
+# encoding: UTF-8
+require 'rubygems'
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
 require 'rake'
-require 'rake/testtask'
 require 'rake/rdoctask'
 
-desc 'Default: run unit tests.'
-task :default => :test
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
-desc 'Test the has_accounts plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
 
 desc 'Generate documentation for the has_accounts plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|

data/app/models/booking.rb

@@ -31,8 +31,8 @@ class Booking < ActiveRecord::Base
   # Scoping
   default_scope order('value_date, id')
 
-  scope :by_value_date, lambda {|value_date| where(:value_date => value_date) }
-  scope :by_value_period, lambda {|from, to| where(:value_date => (from..to)) }
+  scope :by_value_date, lambda {|value_date| where("date(value_date) = ?", value_date) }
+  scope :by_value_period, lambda {|from, to| where("date(value_date) BETWEEN :from AND :to", :from => from, :to => to) }
   
   scope :by_account, lambda {|account_id|
     { :conditions => ["debit_account_id = :account_id OR credit_account_id = :account_id", {:account_id => account_id}] }

data/app/models/booking.rb~

@@ -169,7 +169,7 @@ class Booking < ActiveRecord::Base
       new_booking[key] = value
     }
     
-    new_booking
+    [self, new_booking]
   end
   
   # Reference

data/lib/generators/has_accounts/migration_generator.rb

@@ -0,0 +1,26 @@
+require 'rails/generators/base'
+require 'rails/generators/migration'
+  
+module HasAccounts
+  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/setup_has_accounts_engine.rb'
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+class SetupHasAccountsEngine < ActiveRecord::Migration
+  def self.up
+    create_table "account_types" do |t|
+      t.string   "name",       :limit => 100
+      t.string   "title",      :limit => 100
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    create_table "accounts" 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" do |t|
+      t.integer  "vcard_id"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    create_table "bookings" 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/has_accounts/model.rb

@@ -14,7 +14,7 @@ module HasAccounts
           balance = BigDecimal.new('0')
 
           direct_bookings = scoped
-          direct_bookings = direct_bookings.where("value_date <= ?", value_date) if value_date
+          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)

data/lib/has_accounts/model.rb~

@@ -40,10 +40,7 @@ module HasAccounts
         booking_template = BookingTemplate.find_by_code(template_code)
         
         # Prepare booking parameters
-        booking_params = {
-          :value_date      => value_date,
-          :reference       => self
-        }
+        booking_params = {:reference => self}
         booking_params.merge!(params)
 
         # Build and assign booking

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 +02:00
+date: 2011-04-29 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,8 @@ files:
 - 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~
 - lib/has_accounts/class_methods.rb