migrant 1.0.2 → 1.1.0

data/Gemfile

@@ -1,6 +1,7 @@
 source :gemcutter
 
 gem "rails", ">= 3.0.0"
+gem "faker"
 
 group :development do
   gem "thoughtbot-shoulda"

data/Gemfile.lock

@@ -2,12 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.4)
-      actionpack (= 3.0.4)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
       mail (~> 2.2.15)
-    actionpack (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4)
@@ -15,24 +15,26 @@ GEM
       rack-mount (~> 0.6.13)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-    activesupport (3.0.4)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
     ansi (1.2.2)
     arel (2.0.9)
     builder (2.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    faker (0.9.5)
+      i18n (~> 0.4)
     git (1.2.5)
     i18n (0.5.0)
     jeweler (1.5.2)
@@ -46,22 +48,22 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.16)
     polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.2.2)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.4)
-      actionmailer (= 3.0.4)
-      actionpack (= 3.0.4)
-      activerecord (= 3.0.4)
-      activeresource (= 3.0.4)
-      activesupport (= 3.0.4)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
       bundler (~> 1.0)
-      railties (= 3.0.4)
-    railties (3.0.4)
-      actionpack (= 3.0.4)
-      activesupport (= 3.0.4)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
@@ -75,13 +77,14 @@ GEM
       polyglot (>= 0.3.1)
     turn (0.8.1)
       ansi (>= 1.2.2)
-    tzinfo (0.3.24)
+    tzinfo (0.3.25)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   ansi
+  faker
   jeweler
   rails (>= 3.0.0)
   simplecov

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/lib/datatype/base.rb

@@ -1,3 +1,5 @@
+require 'faker'
+
 module DataType
   class DangerousMigration < Exception; end;
 
@@ -9,8 +11,10 @@ module DataType
     def initialize(options={})
       @options = options
       @value = options.delete(:value)
+      @example = options.delete(:example)
       @field = options.delete(:field)
       @aliases = options.delete(:was) || Array.new
+      options[:type] = options.delete(:as) if options[:as] # Nice little DSL alias for 'type'      
     end
 
     # Default is 'ye good ol varchar(255)
@@ -22,8 +26,17 @@ module DataType
       @value || self.class.default_mock
     end
 
+    # Default mock should be overridden in derived classes
     def self.default_mock
-      "Some string"
+      short_text_mock
+    end
+    
+    def self.long_text_mock    
+      (1..3).to_a.collect { Faker::Lorem.paragraph }.join("\n")
+    end
+    
+    def self.short_text_mock
+      Faker::Lorem.sentence
     end
 
     # Decides if and how a column will be changed

data/lib/datatype/fixnum.rb

@@ -3,5 +3,9 @@ module DataType
     def column
       {:type => :integer}
     end
+    
+    def self.default_mock
+      rand(999999).to_i
+    end
   end
 end

data/lib/datatype/foreign_key.rb

@@ -3,6 +3,10 @@ module DataType
     def column
       {:type => :integer}
     end
+    
+    def self.default_mock
+      nil # Will get overridden later by ModelExtensions
+    end
   end
 end
   

data/lib/datatype/range.rb

@@ -5,9 +5,5 @@ module DataType
       definition[:limit] = @value.max.to_s.length if @value.respond_to?(:max)
       definition
     end
-    
-    def self.default_mock
-      0..100
-    end
   end
 end

data/lib/datatype/string.rb

@@ -14,7 +14,7 @@ module DataType
     end
     
     def mock
-      @value || ((self.column[:type] == :text)? %W{Several lines of long text.}.join("\n") : "Some string")
+      @value || ((self.column[:type] == :text)? self.class.long_text_mock : self.class.default_mock )
     end
   end
 end

data/lib/datatype/symbol.rb

@@ -4,6 +4,16 @@ module DataType
       # Just construct whatever the user wants
       {:type => @value || :string }.merge(@options)
     end  
+    
+    def mock
+      case @value || :string
+        when :text then self.class.long_text_mock
+        when :string then self.class.short_text_mock
+        when :integer then Fixnum.default_mock
+        when :decimal, :float then Float.default_mock
+        when :datetime, :date then Date.default_mock
+      end
+    end
   end
 end
   

data/lib/migrant/model_extensions.rb

@@ -30,7 +30,7 @@ module Migrant
     end
 
     def mock(attributes={}, recursive=true)
-      attribs = @schema.columns.reject { |column| column.is_a?(DataType::ForeignKey)}.collect { |name, data_type| [name, data_type.mock] }.flatten
+      attribs = @schema.columns.collect { |name, data_type| [name, data_type.mock] }.flatten
 
       # Only recurse to one level, otherwise things get way too complicated
       if recursive

data/lib/migrant/schema.rb

@@ -28,7 +28,8 @@ module Migrant
 
     def add_associations(associations)
       associations.each do |association|
-        field = association.association_foreign_key.to_sym
+        # Rails 3.1 changes primary_key_name to foreign_key (correct behaviour), so this is essentially backwards compatibility for Rails 3.0
+        field = (association.respond_to?(:foreign_key))? association.foreign_key.to_sym : association.primary_key_name.to_sym
         case association.macro
           when :belongs_to
             if association.options[:polymorphic]

data/migrant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{migrant}
-  s.version = "1.0.2"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pascal Houliston"]
-  s.date = %q{2011-03-01}
+  s.date = %q{2011-03-28}
   s.description = %q{Easier schema management for Rails that compliments your domain model.}
   s.email = %q{101pascal@gmail.com}
   s.extra_rdoc_files = [
@@ -144,6 +144,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<faker>, [">= 0"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_development_dependency(%q<ansi>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -152,6 +153,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<faker>, [">= 0"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<ansi>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -161,6 +163,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<faker>, [">= 0"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     s.add_dependency(%q<ansi>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

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

@@ -10,7 +10,7 @@ class Business < ActiveRecord::Base
     website          "http://www.google.co.za/", :was => [:site, :homepage]
     address          ["11 Test Drive", "Gardens", "Cape Town" ,"South Africa"].join("\n")
     summary          :string
-    description      :text
+    description      "Founded in 1898", :as => :text
     landline         :string
     mobile           :string
     operating_days   0..6

data/test/test_data_schema.rb

@@ -39,7 +39,6 @@ class TestDataSchema < Test::Unit::TestCase
     end
     
     should "generate a text column when given a long paragraph" do
-      assert_schema(Business, :description, :type => :text)
       assert_schema(Business, :address, :type => :text)      
     end
     
@@ -69,6 +68,10 @@ class TestDataSchema < Test::Unit::TestCase
       assert_schema(User, :email, :type => :string)    
     end
     
+    should "generate the column type specified by the :as key irrespective of the data type" do
+    
+    end
+    
     should "generate indexes for all foreign keys automatically" do
       assert_contains(Business.schema.indexes, :user_id, 'Missing index on belongs_to')
       assert_contains(Business.schema.indexes, [:owner_type, :owner_id], 'Missing index on polymorphic belongs_to')      

data/test/test_migration_generator.rb

@@ -101,25 +101,33 @@ class TestMigrationGenerator < Test::Unit::TestCase
       assert_equal(Dir.glob(File.join(File.dirname(__FILE__), 'rails_app', 'db' ,'migrate', '*.rb')).select { |migration_file| migration_file.include?('new_field_i_made_up') }.length,
                    1,
                    "Migration should have been generated (without a duplicate)")
+      rake_migrate                   
     end
 
     should "recursively generate mocks for every model" do
       BusinessCategory.structure do
-        test_currency_mockup DataType::Currency
-        test_date_mockup DataType::Date
-        test_float_mockup DataType::Float
-        test_range_mockup DataType::Range
-
+        test_mockup_of_text :text
+        test_mockup_of_string :string
+        test_mockup_of_integer :integer
+        test_mockup_of_float   :float
+        test_mockup_of_datetime :datetime
+        test_mockup_of_currency DataType::Currency
       end
-      BusinessCategory.belongs_to(:nonexistant_class, :polymorphic => true)
+
+      BusinessCategory.belongs_to(:notaclass, :polymorphic => true)
       assert_equal true, Migrant::MigrationGenerator.new.run, "Migration Generator reported an error"
       rake_migrate
       BusinessCategory.reset_column_information
       mock = BusinessCategory.mock
       assert_not_nil(mock)
-      # TODO: Spice this up a bit .. it covers everything, but doesn't test output
+      assert(mock.test_mockup_of_text.is_a?(String))
+      assert(mock.test_mockup_of_string.is_a?(String))
+      assert(mock.test_mockup_of_integer.is_a?(Fixnum))
+      assert(mock.test_mockup_of_float.is_a?(Float))
+      assert(mock.test_mockup_of_currency.is_a?(BigDecimal))    
+      assert(mock.test_mockup_of_datetime.is_a?(Time))    
+      assert(DataType::Base.default_mock.is_a?(String))
     end
-
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: migrant
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Pascal Houliston
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +00:00
+date: 2011-03-28 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,18 +25,18 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: faker
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ansi
+  name: thoughtbot-shoulda
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,7 +47,7 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: ansi
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -58,7 +58,7 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: turn
+  name: jeweler
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -69,7 +69,7 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: turn
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,7 +80,7 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: sqlite3
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -90,6 +90,17 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id008
 description: Easier schema management for Rails that compliments your domain model.
 email: 101pascal@gmail.com
 executables: []
@@ -192,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -270062193
+      hash: 480929263
       segments: 
       - 0
       version: "0"