migrant 0.1.2 → 0.1.3

data/Rakefile

@@ -14,9 +14,8 @@ begin
     gem.add_development_dependency "ansi", "= 1.2.2"
     gem.add_development_dependency "turn", "= 0.8.1"  
     gem.add_development_dependency "sqlite3-ruby", ">= 0"
-    gem.add_development_dependency "simplecov", ">= 0.3.5"
-    gem.add_dependency "activerecord", ">= 3.0.0"
-    gem.add_dependency "activesupport", ">= 3.0.0"    
+    gem.add_development_dependency "simplecov", "= 0.3.5"
+    gem.add_dependency "rails", ">= 3.0.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/datatype/base.rb

@@ -55,6 +55,7 @@ end
 require 'datatype/boolean'
 require 'datatype/currency'
 require 'datatype/date'
+require 'datatype/fixnum'
 require 'datatype/float'
 require 'datatype/foreign_key'
 require 'datatype/hash'

data/lib/datatype/fixnum.rb

@@ -0,0 +1,7 @@
+module DataType
+  class Fixnum < Base
+    def column
+      {:type => :integer}
+    end
+  end
+end

data/lib/migrant/model_extensions.rb

@@ -21,13 +21,13 @@ module Migrant
       structure {}
     end
     
-    def mock(recursive=true)
+    def mock(attributes={}, recursive=true)
       attribs = @schema.columns.reject { |column| column.is_a?(DataType::ForeignKey)}.collect { |name, data_type| [name, data_type.mock] }.flatten
       # Only recurse to one level, otherwise things get way too complicated
       if recursive
         attribs += self.reflect_on_all_associations(:belongs_to).collect do |association| 
                     begin
-                      (association.klass.respond_to?(:mock))? [association.name, association.klass.mock(false)] : nil
+                      (association.klass.respond_to?(:mock))? [association.name, association.klass.mock({}, false)] : nil
                     rescue NameError; nil; end # User hasn't defined association, just skip it
                    end.compact.flatten
       end

data/migrant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{migrant}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pascal Houliston"]
-  s.date = %q{2010-11-22}
+  s.date = %q{2010-11-23}
   s.description = %q{Migrant gives you a super-clean DSL to describe your ActiveRecord models (somewhat similar to DataMapper) and generates all your migrations for you so you can spend more time coding the stuff that counts!}
   s.email = %q{101pascal@gmail.com}
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
     "lib/datatype/boolean.rb",
     "lib/datatype/currency.rb",
     "lib/datatype/date.rb",
+    "lib/datatype/fixnum.rb",
     "lib/datatype/float.rb",
     "lib/datatype/foreign_key.rb",
     "lib/datatype/hash.rb",
@@ -69,7 +70,6 @@ Gem::Specification.new do |s|
     "test/rails_app/config/initializers/session_store.rb",
     "test/rails_app/config/locales/en.yml",
     "test/rails_app/config/routes.rb",
-    "test/rails_app/db/schema.rb",
     "test/rails_app/db/seeds.rb",
     "test/rails_app/lib/tasks/.gitkeep",
     "test/rails_app/public/404.html",
@@ -116,7 +116,6 @@ Gem::Specification.new do |s|
     "test/rails_app/config/initializers/secret_token.rb",
     "test/rails_app/config/initializers/session_store.rb",
     "test/rails_app/config/routes.rb",
-    "test/rails_app/db/schema.rb",
     "test/rails_app/db/seeds.rb",
     "test/rails_app/test/performance/browsing_test.rb",
     "test/rails_app/test/test_helper.rb",
@@ -141,26 +140,23 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<ansi>, ["= 1.2.2"])
       s.add_development_dependency(%q<turn>, ["= 0.8.1"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0.3.5"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_development_dependency(%q<simplecov>, ["= 0.3.5"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<ansi>, ["= 1.2.2"])
       s.add_dependency(%q<turn>, ["= 0.8.1"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0.3.5"])
-      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_dependency(%q<simplecov>, ["= 0.3.5"])
+      s.add_dependency(%q<rails>, [">= 3.0.0"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     s.add_dependency(%q<ansi>, ["= 1.2.2"])
     s.add_dependency(%q<turn>, ["= 0.8.1"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0.3.5"])
-    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+    s.add_dependency(%q<simplecov>, ["= 0.3.5"])
+    s.add_dependency(%q<rails>, [">= 3.0.0"])
   end
 end
 

data/test/additional_models/review.rb

@@ -6,5 +6,6 @@ class Review < ActiveRecord::Base
     name
     rating  -5..5
     body    "Lots of text\nMore text\nMore lines. Etc."
+    views   550
   end
 end

data/test/verified_output/migrations/create_reviews.rb

@@ -6,6 +6,7 @@ class CreateReviews < ActiveRecord::Migration
       t.string :name
       t.integer :rating, :limit=>1
       t.text :body
+      t.integer :views
     end
     add_index :reviews, :business_id
     add_index :reviews, :user_id

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Pascal Houliston
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 +02:00
+date: 2010-11-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,7 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -89,7 +89,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: rails
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -103,21 +103,6 @@ dependencies:
         version: 3.0.0
   type: :runtime
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  type: :runtime
-  version_requirements: *id007
 description: Migrant gives you a super-clean DSL to describe your ActiveRecord models (somewhat similar to DataMapper) and generates all your migrations for you so you can spend more time coding the stuff that counts!
 email: 101pascal@gmail.com
 executables: []
@@ -136,6 +121,7 @@ files:
 - lib/datatype/boolean.rb
 - lib/datatype/currency.rb
 - lib/datatype/date.rb
+- lib/datatype/fixnum.rb
 - lib/datatype/float.rb
 - lib/datatype/foreign_key.rb
 - lib/datatype/hash.rb
@@ -180,7 +166,6 @@ files:
 - test/rails_app/config/initializers/session_store.rb
 - test/rails_app/config/locales/en.yml
 - test/rails_app/config/routes.rb
-- test/rails_app/db/schema.rb
 - test/rails_app/db/seeds.rb
 - test/rails_app/lib/tasks/.gitkeep
 - test/rails_app/public/404.html
@@ -254,7 +239,6 @@ test_files:
 - test/rails_app/config/initializers/secret_token.rb
 - test/rails_app/config/initializers/session_store.rb
 - test/rails_app/config/routes.rb
-- test/rails_app/db/schema.rb
 - test/rails_app/db/seeds.rb
 - test/rails_app/test/performance/browsing_test.rb
 - test/rails_app/test/test_helper.rb

data/test/rails_app/db/schema.rb

@@ -1,82 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20101122122964) do
-
-  create_table "business_categories", :force => true do |t|
-    t.integer  "business_id"
-    t.integer  "category_id"
-    t.decimal  "test_currency_mockup", :precision => 10, :scale => 2
-    t.datetime "test_date_mockup"
-    t.float    "test_float_mockup"
-    t.integer  "test_range_mockup"
-  end
-
-  add_index "business_categories", ["business_id"], :name => "index_business_categories_on_business_id"
-  add_index "business_categories", ["category_id"], :name => "index_business_categories_on_category_id"
-
-  create_table "businesses", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "owner_type"
-    t.integer  "owner_id"
-    t.string   "name"
-    t.string   "website"
-    t.text     "address"
-    t.string   "summary"
-    t.text     "description"
-    t.text     "landline",         :limit => 255
-    t.string   "mobile"
-    t.integer  "operating_days",   :limit => 1
-    t.datetime "date_established"
-    t.datetime "next_sale"
-    t.boolean  "verified"
-    t.string   "location",         :limit => 127
-    t.float    "estimated_value"
-    t.string   "notes"
-  end
-
-  add_index "businesses", ["owner_id"], :name => "index_businesses_on_owner_id"
-  add_index "businesses", ["owner_type", "owner_id"], :name => "index_businesses_on_owner_type_and_owner_id"
-  add_index "businesses", ["user_id"], :name => "index_businesses_on_user_id"
-
-  create_table "categories", :force => true do |t|
-    t.string "title"
-    t.string "summary"
-  end
-
-  add_index "categories", ["title"], :name => "index_categories_on_title"
-
-  create_table "reviews", :force => true do |t|
-    t.integer "business_id"
-    t.integer "user_id"
-    t.string  "name"
-    t.integer "rating",      :limit => 1
-    t.text    "body"
-  end
-
-  add_index "reviews", ["business_id"], :name => "index_reviews_on_business_id"
-  add_index "reviews", ["user_id"], :name => "index_reviews_on_user_id"
-
-  create_table "users", :force => true do |t|
-    t.string  "name"
-    t.string  "email"
-    t.string  "encrypted_password", :limit => 48
-    t.string  "password_salt",      :limit => 42
-    t.decimal "money_spent",                      :precision => 10, :scale => 2
-    t.decimal "money_gifted",                     :precision => 10, :scale => 2
-    t.float   "average_rating"
-    t.integer "business_id"
-  end
-
-  add_index "users", ["business_id"], :name => "index_users_on_business_id"
-
-end