easy_rails_money 0.0.1 → 0.0.2

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+!vendor/cache/*
 *.rbc
 .bundle
 .config

data/.travis.yml

@@ -0,0 +1,20 @@
+language: ruby
+
+rvm:
+  - "1.9.2" 
+  - "1.9.3"
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-19mode
+  - 2.0.0
+  # - jruby-18mode # JRuby in 1.8 mode
+  # - rbx-18mode
+  # - "1.8.7"
+
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec
+
+matrix:
+  allow_failures:
+    - rvm: 2.0.0
+    - rvm: jruby-19mode
+    - rvm: rbx-19mode

data/README.md

@@ -1,4 +1,8 @@
-Under Development. only the migration part is done now
+[![Build Status](https://travis-ci.org/deepak/easy_rails_money.png?branch=master)](https://travis-ci.org/deepak/easy_rails_money)
+[![Dependency Status](https://gemnasium.com/deepak/easy_rails_money.png)](https://gemnasium.com/deepak/easy_rails_money)
+[![Code Climate](https://codeclimate.com/github/deepak/easy_rails_money.png)](https://codeclimate.com/github/deepak/easy_rails_money)
+
+### Under Development. Only the migration part is done now
 
 # EasyRailsMoney
 
@@ -60,7 +64,7 @@ Watch [Rubyconf 2011 Float-is-legacy](http://www.confreaks.com/videos/698-rubyco
 We have encoded the currency in the column name. I like it because
 there is no need to define another column and it is simple. But the
 disadvantage is that it is inflexible and changing the column name in
-Mysql might require downtime for a big table
+MySQL might require downtime for a big table
 
 So let us go with the first option. The disadvantage is that currency
 is stored as a string. Integer might be better for storing in the database

data/easy_rails_money.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = EasyRailsMoney::VERSION
   gem.authors       = ["Deepak Kannan"]
   gem.email         = ["kannan.deepak@gmail.com"]
-  gem.description   = %q{Integrate Rails's ActiveRecord gem and the money gem. Focus is on a simple code and API}
-  gem.summary       = %q{Integrate rails and the money gem}
+  gem.description   = "Integrate Rail's ActiveRecord gem and the money gem. Focus is on a simple code and API"
+  gem.summary       = "Integrate Rail's ActiveRecord gem and the money gem"
   gem.homepage      = "https://github.com/deepak/easy_rails_money"
 
   gem.files         = `git ls-files`.split($/)
@@ -19,10 +19,10 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "money",         "~> 5.1.1"
   gem.add_dependency "activesupport", "~> 3.2"
-  
+
+  gem.add_development_dependency "rake",         "~> 10.0.4"
   gem.add_development_dependency "rspec",        "~> 2.12"
-  gem.add_development_dependency "rails",        "~> 3.2"
   gem.add_development_dependency "activerecord", "~> 3.2"
   gem.add_development_dependency "sqlite3",      "~> 1.3.7"
-  gem.add_development_dependency "debugger",     "~> 1.3.3"
+  gem.add_development_dependency "debugger",     "~> 1.5.0"
 end

data/lib/easy_rails_money/active_record/migration/schema_statements.rb

@@ -4,14 +4,14 @@ module EasyRailsMoney
       module SchemaStatements
         def add_money(table_name, *columns)
           columns.each do |name|
-            add_column table_name, name,               :integer
+            add_column table_name, "#{name}_money",    :integer
             add_column table_name, "#{name}_currency", :string
           end
         end
 
         def remove_money(table_name, *columns)
           columns.each do |name|
-            remove_column table_name, name
+            remove_column table_name, "#{name}_money"
             remove_column table_name, "#{name}_currency"
           end
         end

data/lib/easy_rails_money/active_record/migration/table.rb

@@ -2,19 +2,57 @@ module EasyRailsMoney
   module ActiveRecord
     module Migration
       module Table
-        def money(*columns)
-          columns.each do |name|
-            column name,               :integer
-            column "#{name}_currency", :string
+        # called for change_table
+        # currency and #money defined in TableDefinition
+
+        def money(*column_names)
+          column_names.each do |name|
+            column "#{name}_money",      :integer
+            unless columns.select { |x| x.name == "currency" }.any?
+              column "#{name}_currency", :string
+            end
+          end
+        end
+
+        def currency
+          remove_currency_columns
+          column :currency, :string
+        end
+
+        def remove_money(*column_names)
+          column_names.each do |name|
+            remove "#{name}_money"
+            remove "#{name}_currency"
           end
         end
 
-        def remove_money(*columns)
-          columns.each do |name|
-            remove name,               :integer
-            remove "#{name}_currency", :string
+        def remove_currency
+          remove :currency
+          money_columns do |money_column|
+            column "#{money_column}_currency", "string"
           end
         end
+
+        def remove_currency_columns
+          money_columns do |money_column|
+            remove "#{money_column}_currency"
+          end
+        end
+
+        protected
+        def columns
+          @base.schema_cache.columns[@table_name]
+        end
+
+        def money_columns
+          columns.select do |col|
+            col.name =~ /_money/
+          end.map do |col|
+            money_column = col.name.match(/(.+)_money/)[1]
+            yield money_column
+          end
+        end
+
       end
     end
   end

data/lib/easy_rails_money/active_record/migration/table_definition.rb

@@ -0,0 +1,28 @@
+module EasyRailsMoney
+  module ActiveRecord
+    module Migration
+      module TableDefinition
+        # called for create_table
+        
+        def currency
+          remove_currency_columns
+          column :currency, :string
+        end
+        
+        def money(*column_names)
+          column_names.each do |name|
+            column "#{name}_money",      :integer
+            unless columns.select { |x| x.name == "currency" }.any?
+              column "#{name}_currency", :string
+            end
+          end
+        end
+
+        def remove_currency_columns
+          columns.delete_if { |x| x.name =~ /_currency/ }
+        end
+        
+      end
+    end
+  end
+end

data/lib/easy_rails_money/active_record.rb

@@ -1,8 +1,12 @@
 require "easy_rails_money/active_record/money_dsl"
 require "easy_rails_money/active_record/migration/schema_statements"
 require "easy_rails_money/active_record/migration/table"
+require "easy_rails_money/active_record/migration/table_definition"
 
 ActiveRecord::Base.send :include, EasyRailsMoney::ActiveRecord::MoneyDsl
+
 ActiveRecord::Migration.send :include, EasyRailsMoney::ActiveRecord::Migration::SchemaStatements
-ActiveRecord::ConnectionAdapters::TableDefinition.send :include, EasyRailsMoney::ActiveRecord::Migration::Table
+
+ActiveRecord::ConnectionAdapters::TableDefinition.send :include, EasyRailsMoney::ActiveRecord::Migration::TableDefinition
 ActiveRecord::ConnectionAdapters::Table.send :include, EasyRailsMoney::ActiveRecord::Migration::Table
+

data/lib/easy_rails_money/version.rb

@@ -1,3 +1,3 @@
 module EasyRailsMoney
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/active_record/migration_spec.rb

@@ -2,16 +2,30 @@ require 'spec_helper'
 require 'active_record_spec_helper'
 require 'tempfile'
 
-class String
-  def strip_spaces
-    strip.gsub(/\s+/, ' ')
-  end
-end
-
 if defined? ActiveRecord
 
   require 'active_record/schema_dumper'
 
+  class CreateLoan < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        create_table :loans do |t|
+          t.string :name
+        end
+      end
+    end
+  end
+
+  class AddPrincipalToLoan < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        change_table :loans do |t|
+          t.money :principal
+        end
+      end
+    end
+  end
+
   class CreateLoanWithPrincipal < ActiveRecord::Migration
     def change
       suppress_messages do
@@ -51,6 +65,81 @@ if defined? ActiveRecord
       end
     end
   end
+
+  class CreateLoanWithMultipleMoneyColumns < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        create_table :loans, force: true do |t|
+          t.string :name
+          t.money  :principal
+          t.money  :repaid
+          t.money  :npa
+        end
+      end
+    end
+  end
+
+  class CreateLoanWithSingleCurrencyColumnGivenLast < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        create_table :loans, force: true do |t|
+          t.string :name
+          t.money  :principal
+          t.money  :repaid
+          t.money  :npa
+          t.currency
+        end
+      end
+    end
+  end
+
+  class CreateLoanWithSingleCurrencyColumnGivenFirst < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        create_table :loans, force: true do |t|
+          t.string :name
+          t.currency
+          t.money  :principal
+          t.money  :repaid
+          t.money  :npa
+        end
+      end
+    end
+  end
+
+  class CreateLoanWithSingleCurrencyColumnOrderDoesNotMatter < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        create_table :loans, force: true do |t|
+          t.string :name
+          t.money  :principal
+          t.money  :repaid
+          t.currency
+          t.money  :npa
+        end
+      end
+    end
+  end
+
+  class RemoveCurrencyFromLoan < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        change_table :loans, force: true do |t|
+          t.remove_currency
+        end
+      end
+    end
+  end
+
+  class AddSingleCurrencyToLoan < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        change_table :loans, force: true do |t|
+          t.currency
+        end
+      end
+    end
+  end
   
   # class Loan < ActiveRecord::Base   
   #   attr_accessible :principal, :name
@@ -63,7 +152,7 @@ if defined? ActiveRecord
       <<-EOF.strip_spaces
   create_table "loans", :force => true do |t|
     t.string  "name"
-    t.integer "principal"
+    t.integer "principal_money"
     t.string  "principal_currency"
   end
 EOF
@@ -77,6 +166,32 @@ EOF
 EOF
     end
 
+    let(:schema_with_single_currency_column) do
+      <<-EOF.strip_spaces
+  create_table "loans", :force => true do |t|
+    t.string  "name"
+    t.integer "npa_money"
+    t.integer "principal_money"
+    t.integer "repaid_money"
+    t.string "currency"
+  end
+EOF
+    end
+
+    let(:schema_with_multiple_currency_columns) do
+      <<-EOF.strip_spaces
+  create_table "loans", :force => true do |t|
+    t.string  "name"
+    t.string  "npa_currency"
+    t.integer "npa_money"
+    t.string  "principal_currency"
+    t.integer "principal_money"
+    t.string  "repaid_currency"
+    t.integer "repaid_money"
+  end
+EOF
+    end
+
     context "schema_statements" do
       before(:each) do
         migrate CreateLoanWithPrincipal
@@ -112,9 +227,40 @@ EOF
         end
       end
     end
-    
-    
-  end
-end
 
+    context "single currency column", :single_currency do
+      it "creates integer columns for money and a single string column for currency" do
+        migrate CreateLoanWithSingleCurrencyColumnGivenLast
+        expect(dump_schema).to eq schema_with_single_currency_column
+      end
+
+      context "order does not matter" do
+        it "creates integer columns for money and a single string column for currency even when currency column is given first"  do
+          migrate CreateLoanWithSingleCurrencyColumnGivenFirst
+          expect(dump_schema).to eq schema_with_single_currency_column
+        end
+
+        it "creates integer columns for money and a single string column for currency even when currency column is given in between" do
+          migrate CreateLoanWithSingleCurrencyColumnOrderDoesNotMatter
+          expect(dump_schema).to eq schema_with_single_currency_column
+        end
+      end
+
+      it "can remove the currency column later" do
+        migrate CreateLoanWithSingleCurrencyColumnGivenLast
+        expect { migrate RemoveCurrencyFromLoan }.to change { dump_schema }.from(schema_with_single_currency_column).to(schema_with_multiple_currency_columns)
+      end
+
+      it "can add a single currrency column later" do
+        migrate CreateLoanWithMultipleMoneyColumns
+        expect { migrate AddSingleCurrencyToLoan }.to change { dump_schema }.from(schema_with_multiple_currency_columns).to(schema_with_single_currency_column)
+      end
+    end
+
+    it "can add a money column later" do
+      migrate CreateLoan
+      expect { migrate AddPrincipalToLoan }.to change { dump_schema }.from(schema_with_only_name).to(schema_with_principal)
+    end
 
+  end # describe "migration"
+end # if defined? ActiveRecord

data/spec/active_record_spec_helper.rb

@@ -1,9 +1,61 @@
+class String
+  def strip_spaces
+    strip.gsub(/\s+/, ' ')
+  end
+end
+
+module DumpSchemaHelpers
+  # we have a single canonical representation for testing
+  # different migrations insert the currency column in different
+  # places. but for representation we would like it at the end
+  # also the money and currency columns are represented as following
+  # each other. eg.
+  # t.string "principal_currency"
+  # t.string "principal_currency"
+  def canonical_representation schema
+    schema = schema.strip.split("\n")
+    return "" if schema.blank?
+
+    schema = move_currency_column_last schema
+    schema = interleave_money_and_currency_columns schema
+
+    schema.join('').strip_spaces
+  end
+  module_function :canonical_representation
+
+  def interleave_money_and_currency_columns schema
+    money_columns = schema.select {|x| x =~ /_money/ }
+    currency_columns = schema.select {|x| x =~ /_currency/ }
+
+    schema.delete_if {|x| x =~ /_money/ }
+    schema.delete_if {|x| x =~ /_currency/ }
+
+    schema[0..1] +
+      (money_columns + currency_columns).sort_by { |x| x.match(/t\.(.+)\"(?<logical_column>.+)_(money|currency).+/)[:logical_column] } +
+      schema[2..-1]
+  end
+  module_function :interleave_money_and_currency_columns
+
+  def move_currency_column_last schema
+    currency_column = "    t.string  \"currency\""
+
+    unless schema.select {|x| x == currency_column }.empty?
+      schema.delete_if {|x| x == currency_column }
+      last = schema.pop
+      schema.push currency_column
+      schema.push last
+    end
+    schema
+  end
+  module_function :move_currency_column_last
+end
+
 module SchemaHelpers
   def dump_schema
     Tempfile.open('schema', encoding: "utf-8") do |schema_file|
       ActiveRecord::SchemaDumper.send(:new, ActiveRecord::Base.connection).send(:tables, schema_file)
       schema_file.rewind
-      schema_file.read.strip_spaces
+      DumpSchemaHelpers.canonical_representation schema_file.read
     end
   end
 

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require 'active_record'
 require_relative '../lib/easy_rails_money'
 
-
+RSpec.configure do |c|
+  c.treat_symbols_as_metadata_keys_with_true_values = true
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_rails_money
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: 10.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,15 +58,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: 10.0.4
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,8 +122,8 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
-description: Integrate Rails's ActiveRecord gem and the money gem. Focus is on a simple
+        version: 1.5.0
+description: Integrate Rail's ActiveRecord gem and the money gem. Focus is on a simple
   code and API
 email:
 - kannan.deepak@gmail.com
@@ -132,6 +132,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -141,6 +142,7 @@ files:
 - lib/easy_rails_money/active_record.rb
 - lib/easy_rails_money/active_record/migration/schema_statements.rb
 - lib/easy_rails_money/active_record/migration/table.rb
+- lib/easy_rails_money/active_record/migration/table_definition.rb
 - lib/easy_rails_money/active_record/money_dsl.rb
 - lib/easy_rails_money/configuration.rb
 - lib/easy_rails_money/version.rb
@@ -149,6 +151,26 @@ files:
 - spec/active_record_spec_helper.rb
 - spec/configuration_spec.rb
 - spec/spec_helper.rb
+- vendor/cache/activemodel-3.2.12.gem
+- vendor/cache/activerecord-3.2.12.gem
+- vendor/cache/activesupport-3.2.12.gem
+- vendor/cache/arel-3.0.2.gem
+- vendor/cache/builder-3.0.4.gem
+- vendor/cache/columnize-0.3.6.gem
+- vendor/cache/debugger-1.5.0.gem
+- vendor/cache/debugger-linecache-1.2.0.gem
+- vendor/cache/debugger-ruby_core_source-1.2.0.gem
+- vendor/cache/diff-lcs-1.2.1.gem
+- vendor/cache/i18n-0.6.4.gem
+- vendor/cache/money-5.1.1.gem
+- vendor/cache/multi_json-1.7.2.gem
+- vendor/cache/rake-10.0.4.gem
+- vendor/cache/rspec-2.13.0.gem
+- vendor/cache/rspec-core-2.13.1.gem
+- vendor/cache/rspec-expectations-2.13.0.gem
+- vendor/cache/rspec-mocks-2.13.0.gem
+- vendor/cache/sqlite3-1.3.7.gem
+- vendor/cache/tzinfo-0.3.37.gem
 homepage: https://github.com/deepak/easy_rails_money
 licenses: []
 post_install_message: 
@@ -172,7 +194,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Integrate rails and the money gem
+summary: Integrate Rail's ActiveRecord gem and the money gem
 test_files:
 - spec/active_record/migration_spec.rb
 - spec/active_record/money_dsl_spec.rb