easy_rails_money 0.0.6 → 0.0.7

data/CHANGELOG.md

@@ -38,4 +38,12 @@
   EasyRailsMoney::ActiveRecord::MoneyDsl.single_currency?  
   is dependent on the database adapter being used, which sucks. 
   can test on other database adapters or handle a generic error
+  
+## 0.0.7
+- money and currency column can take options
+  activerecord DSL for columns can take options for
+  not-null constraints and default. all options are
+  passed forward to activerecord
 
+  add_column and change_table do not work for now
+  with this syntax

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

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/array/extract_options'
+
 module EasyRailsMoney
   module ActiveRecord
     module Migration
@@ -22,10 +24,11 @@ module EasyRailsMoney
         # @see EasyRailsMoney::ActiveRecord::Migration::Table#money
         # @see EasyRailsMoney::ActiveRecord::Migration::TableDefinition#currency
         # @see EasyRailsMoney::ActiveRecord::Migration::SchemaStatements#remove_money
-        def add_money table_name, *column_names
-          column_names.each do |name|
-            add_column table_name, "#{name}_money",    :integer
-            add_column table_name, "#{name}_currency", :string unless has_currency_column?(table_name)
+        def add_money table_name, *args
+          options = args.extract_options!
+          Array(args).each do |name|
+            add_column table_name, "#{name}_money",    :integer, options
+            add_column table_name, "#{name}_currency", :string,  options unless has_currency_column?(table_name)
           end
         end
 
@@ -44,12 +47,13 @@ module EasyRailsMoney
         # @see EasyRailsMoney::ActiveRecord::Migration::SchemaStatements#add_money
         # @see EasyRailsMoney::ActiveRecord::Migration::TableDefinition#currency
         # @note multiple remove_money calls are not supported in one migration. because at this point the schema is different from the migration defined
-        def remove_money table_name, *column_names
-          column_names.each do |name|
+        def remove_money table_name, *args
+          options = args.extract_options!
+          Array(args).each do |name|
             remove_column table_name, "#{name}_money"
             remove_column table_name, "#{name}_currency"
           end
-          remove_currency table_name unless has_money_columns?(table_name)
+          remove_currency table_name, options unless has_money_columns?(table_name)
         end
 
         # Removes the common currency column
@@ -64,14 +68,15 @@ module EasyRailsMoney
         # column is prefixed by '_money' and the currency column by '_currency'
         #
         # @param table_name [Symbol|String]
+        # @param options [Hash] optional
         #
         # @see EasyRailsMoney::ActiveRecord::Migration::Table#remove_currency
         # @see EasyRailsMoney::ActiveRecord::Migration::SchemaStatements#remove_money
         # @see EasyRailsMoney::ActiveRecord::Migration::TableDefinition#currency
-        def remove_currency table_name
+        def remove_currency table_name, options={}
           remove_column table_name, :currency
           money_columns(table_name) do |money_column|
-            add_column table_name, "#{money_column}_currency", :string
+            add_column table_name, "#{money_column}_currency", :string, options
           end
         end
 

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

@@ -24,10 +24,10 @@ module EasyRailsMoney
         # @see EasyRailsMoney::ActiveRecord::Migration::TableDefinition#money
         # @see EasyRailsMoney::ActiveRecord::Migration::TableDefinition#currency
         # @see EasyRailsMoney::ActiveRecord::Migration::SchemaStatements#remove_money
-        def money(*column_names)
-          column_names.each do |name|
-            column "#{name}_money",    :integer
-            column "#{name}_currency", :string unless has_currency_column?
+        def money(column_names, options={})
+          Array(column_names).each do |name|
+            column "#{name}_money",    :integer, options
+            column "#{name}_currency", :string,  options unless has_currency_column?
           end
         end
 
@@ -60,9 +60,9 @@ module EasyRailsMoney
         #
         # Add a common currency column and remove the individual
         # currrency columns if they exist
-        def currency
+        def currency options = {}
           remove_currency_columns
-          column :currency, :string
+          column :currency, :string, options
         end
 
         # Removes the common currency column

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

@@ -14,9 +14,9 @@ module EasyRailsMoney
         # @return is not important and can change
         #
         # @see EasyRailsMoney::ActiveRecord::Migration::SchemaStatements#remove_currency
-        def currency
+        def currency options={}
           remove_currency_columns
-          column :currency, :string
+          column :currency, :string, options
         end
 
         # Creates one or two columns to represent a Money object in the named table
@@ -38,11 +38,11 @@ module EasyRailsMoney
         # @see EasyRailsMoney::ActiveRecord::Migration::Table#money
         # @see EasyRailsMoney::ActiveRecord::Migration::TableDefinition#currency
         # @see EasyRailsMoney::ActiveRecord::Migration::SchemaStatements#remove_money
-        def money(*column_names)
-          column_names.each do |name|
-            column "#{name}_money",      :integer
+        def money(column_names, options={})
+          Array(column_names).each do |name|
+            column "#{name}_money",      :integer, options
             unless columns.select { |x| x.name == "currency" }.any?
-              column "#{name}_currency", :string
+              column "#{name}_currency", :string,  options
             end
           end
         end

data/lib/easy_rails_money/version.rb

@@ -1,3 +1,3 @@
 module EasyRailsMoney
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/active_record/migration_spec.rb

@@ -147,6 +147,18 @@ module CreateTableDefinition
       end
     end
   end
+
+  class CreateLoanWithConstraint < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        create_table :loans, :force => true do |t|
+          t.string :name
+          t.currency           :null => false
+          t.money  :principal, :null => false
+        end
+      end
+    end
+  end
   
   class CreateLoanWithCurrencySpecifiedFirst < ActiveRecord::Migration
     def change
@@ -232,6 +244,16 @@ EOF
   end
 EOF
   end
+
+  let(:schema_with_constraint) do
+    <<-EOF.strip_spaces
+  create_table "loans", :force => true do |t|
+    t.string  "name"
+    t.integer "principal_money", :null => false
+    t.string  "currency", :null => false
+  end
+EOF
+  end
   
   context "and testing schema statements", :schema_statements do
     context "which have one currency column for each money column" do
@@ -286,12 +308,19 @@ EOF
   end # context "schema_statements"
 
   context "and testing table statements", :table_statements do
+
+    describe "#money" do
+      it "can create a schema with not-null constraints on columns", :constraint do
+        expect { migrate CreateTableDefinition::CreateLoanWithConstraint }.to change { dump_schema }.from("").to(schema_with_constraint)
+      end
+    end
+    
     context "which have one currency column for each money column" do
       before(:each) do
         migrate CreateTableDefinition::CreateLoanAndMoney
       end
       
-      describe "#add_money" do
+      describe "#money" do
         it "creates two columns for each money attribute. one to store the lower denomination as an integer and the currency as a string" do
           expect(dump_schema).to eq schema_with_principal
         end
@@ -305,7 +334,7 @@ EOF
     end
 
     context "which has a single currency", :single_currency do
-      describe "#add_money" do
+      describe "#money" do
         context "and tests that order of statements does not matter" do
           it "creates money and common currency cilumns when currency column is specified last" do
             migrate CreateTableDefinition::CreateLoanWithCurrency

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_rails_money
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -242,7 +242,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3096620913811458787
+      hash: -1659709329796999212
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -251,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3096620913811458787
+      hash: -1659709329796999212
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24