fabrication 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e953b16555d4952d603134e3a609f2e18351a01
-  data.tar.gz: 88df71f9858b36e5911193238d5711ece3058fc5
+  metadata.gz: 96031c7fe931f6f70a4e0e8b0a51c999151e0865
+  data.tar.gz: 1714692bcc5f754e34855020a647750322a24fbe
 SHA512:
-  metadata.gz: c128fe8be585de63e07538b52743672449980bf8c9b09a0c7ec7e105a04a9eb9795ab186315182eaed2b89e1250efcaa1df6f369513ceb264b41968292d5e812
-  data.tar.gz: c89cf69b9395208ab787f58d9141db782ea37ab1c9ffda90e30a09729250edb045d71cd00c0f985fbd9adfc4d6ef2ce1028ab116d418f4fd777d19eeccccfb04
+  metadata.gz: db66d3fe1d78fcdae6fe36fa3c4ddbd0b32c31364f1540ddfc99ed654bcaff0c73e09cb33e8033ec2b580d55da206165ef3970d399c25ef0ca24737634931efa
+  data.tar.gz: 5b786db9b68d5c6db2b1d23016f9143dba83b6e465aca3cebe9a7b1464ebf3932ed712049f374979281daccefeb1eb3e6be91deb3318f1952c7453fc0ad8a30c

data/README.markdown

@@ -6,7 +6,7 @@ Fabrication is an object generation framework for Ruby.
 
 ## Compatibility
 
-Fabrication is tested against Ruby 1.9.3, 2.0.0, and Rubinius.
+Fabrication is tested against Ruby 1.9.3, 2.0.0, 2.1.x, and Rubinius.
 
 [![Build Status](https://secure.travis-ci.org/paulelliott/fabrication.png)](http://travis-ci.org/paulelliott/fabrication)
 [![Code Climate](https://codeclimate.com/github/paulelliott/fabrication.png)](https://codeclimate.com/github/paulelliott/fabrication)

data/Rakefile

@@ -14,7 +14,7 @@ task :cucumber do
 end
 
 if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
-  task default: %i(cucumber appraisal)
+  task default: [:cucumber, :appraisal]
 else
   task default: :spec
 end

data/lib/fabrication/schematic/attribute.rb

@@ -31,6 +31,9 @@ class Fabrication::Schematic::Attribute
     end
   end
 
+  def value_static?; !value_proc? end
+  def value_proc?; Proc === value end
+
   private
 
   def execute(*args, &block)
@@ -49,6 +52,4 @@ class Fabrication::Schematic::Attribute
     Kernel.rand((1..params[:rand])) if params[:rand]
   end
 
-  def value_proc?; Proc === value end
-
 end

data/lib/fabrication/schematic/definition.rb

@@ -46,6 +46,10 @@ class Fabrication::Schematic::Definition
     @generator ||= GENERATORS.detect { |gen| gen.supports?(klass) }
   end
 
+  def sorted_attributes
+    attributes.select(&:value_static?) + attributes.select(&:value_proc?)
+  end
+
   def build(overrides={}, &block)
     if Fabrication.manager.to_params_stack.any?
       to_params(overrides, &block)
@@ -53,7 +57,7 @@ class Fabrication::Schematic::Definition
       begin
         Fabrication.manager.build_stack << self
         merge(overrides, &block).instance_eval do
-          generator.new(klass).build(attributes, callbacks)
+          generator.new(klass).build(sorted_attributes, callbacks)
         end
       ensure
         Fabrication.manager.build_stack.pop
@@ -68,7 +72,7 @@ class Fabrication::Schematic::Definition
       to_params(overrides, &block)
     else
       merge(overrides, &block).instance_eval do
-        generator.new(klass).create(attributes, callbacks)
+        generator.new(klass).create(sorted_attributes, callbacks)
       end
     end
   end
@@ -76,7 +80,7 @@ class Fabrication::Schematic::Definition
   def to_params(overrides={}, &block)
     Fabrication.manager.to_params_stack << self
     merge(overrides, &block).instance_eval do
-      generator.new(klass).to_params(attributes)
+      generator.new(klass).to_params(sorted_attributes)
     end
   ensure
     Fabrication.manager.to_params_stack.pop
@@ -84,7 +88,7 @@ class Fabrication::Schematic::Definition
 
   def to_attributes(overrides={}, &block)
     merge(overrides, &block).instance_eval do
-      generator.new(klass).to_hash(attributes, callbacks)
+      generator.new(klass).to_hash(sorted_attributes, callbacks)
     end
   end
 

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '2.10.0'
+  VERSION = '2.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Paul Elliott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies: []
 description: Fabrication is an object generation framework for ActiveRecord, Mongoid,
   DataMapper, Sequel, or any other Ruby object.
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Implementing the factory pattern in Ruby so you don't have to.