migrant 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/migrant/model_extensions.rb

@@ -23,6 +23,7 @@ module Migrant
     
     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| 
@@ -31,7 +32,7 @@ module Migrant
                     rescue NameError; nil; end # User hasn't defined association, just skip it
                    end.compact.flatten
       end
-      new Hash[*attribs]
+      new Hash[*attribs].merge(attributes)
     end
   end
 end

data/migrant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{migrant}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pascal Houliston"]
-  s.date = %q{2010-11-23}
+  s.date = %q{2010-11-25}
   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 = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Pascal Houliston
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 +02:00
+date: 2010-11-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency