migrant 1.2.5 → 1.2.7

data/Rakefile

@@ -8,40 +8,6 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "migrant"
-    gem.summary = %Q{All the fun of ActiveRecord, without writing your migrations, and a dash of mocking.}
-    gem.description = %Q{Easier schema management for Rails that compliments your domain model.}
-    gem.email = "101pascal@gmail.com"
-    gem.homepage = "http://github.com/pascalh1011/migrant"
-    gem.authors = ["Pascal Houliston"]
-    gem.version = File.read('VERSION')
-
-    gem.add_runtime_dependency "rails", ">= 3.0.0"
-    gem.add_runtime_dependency "faker"
-    gem.add_runtime_dependency "term-ansicolor"
-    
-    gem.add_development_dependency "thoughtbot-shoulda"
-    gem.add_development_dependency "ansi"
-    gem.add_development_dependency "jeweler"
-    gem.add_development_dependency "turn"
-    gem.add_development_dependency "sqlite3"
-    gem.add_development_dependency "simplecov"
-    gem.add_development_dependency "terminal-table"
-    gem.add_development_dependency "term-ansicolor"
-    gem.add_development_dependency "rake", "0.8.7" # Until API gets sorted
-
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'

data/VERSION

@@ -1 +1 @@
-1.2.5
+1.2.7

data/lib/dsl/data_type.rb

@@ -18,8 +18,12 @@ module DataType
     end
 
     # Default is 'ye good ol varchar(255)
+    def column_defaults
+      { :type => :string }
+    end
+    
     def column
-      {:type => :string}.merge(@options)
+      column_defaults.merge(@options)
     end
             
     def ==(compared_column)
@@ -48,13 +52,12 @@ module DataType
     # Provide the details of a previously column, or simply nil to create a new column
     def structure_changes_from(current_structure = nil)
       new_structure = column
-
+     
       if current_structure
         # General RDBMS data loss scenarios
         raise DataType::DangerousMigration if (new_structure[:type] != :text && [:string, :text].include?(current_structure[:type]) && new_structure[:type] != current_structure[:type])
 
         if new_structure[:limit] && current_structure[:limit].to_i != new_structure[:limit].to_i ||
-           new_structure[:default] && current_structure[:default].to_s != new_structure[:default].to_s ||
            new_structure[:type] != current_structure[:type]
            column
         else

data/lib/dsl/data_types/primitives.rb

@@ -1,7 +1,7 @@
 module DataType
   # Boolean
   class TrueClass < Base
-    def column
+    def column_defaults
       {:type => :boolean}
     end  
     
@@ -22,7 +22,7 @@ module DataType
   
   # Datetime
   class Date < Base
-    def column
+    def column_defaults
       {:type => :datetime}
     end
     
@@ -35,7 +35,7 @@ module DataType
 
   # Integers
   class Fixnum < Base
-    def column
+    def column_defaults
       {:type => :integer}.tap do |options|
         options.merge!(:limit => @value.size) if @value > 2147483647 # 32-bit limit. Not checking size here because a 64-bit OS always has at least 8 byte size
       end
@@ -47,13 +47,13 @@ module DataType
   end  
   
   class Bignum < Fixnum
-    def column
+    def column_defaults
       {:type => :integer, :limit => ((@value.size > 8)? @value.size : 8) }
     end
   end
   
   class Float < Base
-    def column
+    def column_defaults
       {:type => :float}
     end
     
@@ -64,7 +64,7 @@ module DataType
   
   # Range (0..10)
   class Range < Base
-    def column
+    def column_defaults
       definition = {:type => :integer}
       definition[:limit] = @value.max.to_s.length if @value.respond_to?(:max)
       definition
@@ -78,22 +78,22 @@ module DataType
       @value ||= ''
     end
   
-    def column
+    def column_defaults
       if @value.match(/[\d,]+\.\d{2}$/)
-        return Currency.new(@options).column
+        return Currency.new(@options).column_defaults
       else
         return @value.match(/[\r\n\t]/)? { :type => :text }.merge(@options) : super
       end
     end
     
     def mock
-      @value || ((self.column[:type] == :text)? self.class.long_text_mock : self.class.default_mock )
+      @value || ((self.column_defaults[:type] == :text)? self.class.long_text_mock : self.class.default_mock )
     end
   end
   
   # Symbol (defaults, specified by user)
   class Symbol < Base
-    def column
+    def column_defaults
       # Just construct whatever the user wants
       {:type => @value || :string }.merge(@options)
     end  

data/lib/dsl/data_types/semantic.rb

@@ -1,6 +1,6 @@
 module DataType
   class Currency < Base
-    def column
+    def column_defaults
       {:type => :decimal, :precision => 10, :scale => 2}
     end
    

data/migrant.gemspec

@@ -23,13 +23,12 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   s.add_development_dependency(%q<ansi>, [">= 0"])
-  s.add_development_dependency(%q<jeweler>, [">= 0"])
   s.add_development_dependency(%q<turn>, [">= 0"])
   s.add_development_dependency(%q<sqlite3>, [">= 0"])
   s.add_development_dependency(%q<simplecov>, [">= 0"])
   s.add_development_dependency(%q<terminal-table>, [">= 0"])
   s.add_development_dependency(%q<term-ansicolor>, [">= 0"])
-  s.add_development_dependency(%q<rake>, ["0.8.7"])
+  s.add_development_dependency(%q<rake>, [">= 0.8.7"])
   s.add_dependency(%q<rails>, [">= 3.0.0"])
   s.add_dependency(%q<faker>, [">= 0"])
   s.add_dependency(%q<term-ansicolor>, [">= 0"])

data/test/rails_app/app/models/customer.rb

@@ -2,6 +2,6 @@ class Customer < User
   structure do
     money_spent   "$5.00"
     money_gifted  "NOK 550.00" 
-    average_rating 5.00
+    average_rating 5.00, :default => 0.0
   end
 end

data/test/test_data_schema.rb

@@ -46,6 +46,10 @@ class TestDataSchema < Test::Unit::TestCase
       assert_schema(Business, :address, :type => :text)      
     end
     
+    should "pass on any options provided in a structure block" do
+      assert_schema(User, :average_rating, :type => :float, :default => 0.0)
+    end
+    
     should "generate a boolean column when a true or false is given" do
       assert_schema(Business, :verified, :type => :boolean)      
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: migrant
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-05-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  requirement: &18281100 !ruby/object:Gem::Requirement
+  requirement: &24516100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18281100
+  version_requirements: *24516100
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &18280620 !ruby/object:Gem::Requirement
+  requirement: &24515620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18280620
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &18280140 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *18280140
+  version_requirements: *24515620
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &18279660 !ruby/object:Gem::Requirement
+  requirement: &24515140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18279660
+  version_requirements: *24515140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &18279180 !ruby/object:Gem::Requirement
+  requirement: &24514660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18279180
+  version_requirements: *24514660
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &18278700 !ruby/object:Gem::Requirement
+  requirement: &24514180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18278700
+  version_requirements: *24514180
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &18278220 !ruby/object:Gem::Requirement
+  requirement: &24513700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18278220
+  version_requirements: *24513700
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &18277740 !ruby/object:Gem::Requirement
+  requirement: &24513220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,21 +87,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18277740
+  version_requirements: *24513220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18277260 !ruby/object:Gem::Requirement
+  requirement: &24512740 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *18277260
+  version_requirements: *24512740
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &18276780 !ruby/object:Gem::Requirement
+  requirement: &24512260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +109,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *18276780
+  version_requirements: *24512260
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &18276300 !ruby/object:Gem::Requirement
+  requirement: &24511780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18276300
+  version_requirements: *24511780
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &18275820 !ruby/object:Gem::Requirement
+  requirement: &24511300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +131,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18275820
+  version_requirements: *24511300
 description: Easier schema management for Rails that compliments your domain model.
 email: 101pascal@gmail.com
 executables: []
@@ -253,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: All the fun of ActiveRecord, without writing your migrations, and a dash