fabrication 2.0.2 → 2.0.3

data/lib/fabrication/config.rb

@@ -17,8 +17,7 @@ module Fabrication
     alias fabricator_dir= fabricator_path=
 
     def reset_defaults
-      OPTIONS.clear
-      OPTIONS.merge!(DEFAULTS)
+      OPTIONS.replace(DEFAULTS)
     end
 
     def active_support?

data/lib/fabrication/schematic/definition.rb

@@ -25,7 +25,7 @@ class Fabrication::Schematic::Definition
   end
 
   def attribute(name)
-    attributes.select { |a| a.name == name }.first
+    attributes.detect { |a| a.name == name }
   end
 
   def append_or_update_attribute(attribute_name, value, params={}, &block)
@@ -99,7 +99,7 @@ class Fabrication::Schematic::Definition
 
   def method_missing(method_name, *args, &block)
     method_name = parse_method_name(method_name)
-    params = args.extract_options!
+    params = Fabrication::Support.extract_options!(args)
     value = args.first
     block = generate_value(method_name, params) if args.empty? && !block_given?
     append_or_update_attribute(method_name, value, params, &block)

data/lib/fabrication/support.rb

@@ -18,6 +18,10 @@ class Fabrication::Support
     rescue NameError
     end
 
+    def extract_options!(args)
+      args.last.is_a?(::Hash) ? args.pop : {}
+    end
+
     def variable_name_to_class_name(name)
       name.to_s.gsub(/\/(.?)/){"::#{$1.upcase}"}.gsub(/(?:^|_)(.)/){$1.upcase}
     end

data/lib/fabrication/syntax/make.rb

@@ -13,14 +13,14 @@ module Fabrication
     #
     module Make
       def make(*args, &block)
-        overrides = args.extract_options!
+        overrides = Fabrication::Support.extract_options!(args)
         klass = name.underscore.to_sym
         fabricator_name = args.first.is_a?(Symbol) ? "#{klass}_#{args.first}" : klass
         Fabricate.build(fabricator_name, overrides, &block)
       end
 
       def make!(*args, &block)
-        overrides = args.extract_options!
+        overrides = Fabrication::Support.extract_options!(args)
         klass = name.underscore.to_sym
         fabricator_name = args.first.is_a?(Symbol) ? "#{klass}_#{args.first}" : klass
         Fabricate(fabricator_name, overrides, &block)

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70276559067500 !ruby/object:Gem::Requirement
+  requirement: &70219167985080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276559067500
+  version_requirements: *70219167985080
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70276559067080 !ruby/object:Gem::Requirement
+  requirement: &70219167984660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276559067080
+  version_requirements: *70219167984660
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70276559066660 !ruby/object:Gem::Requirement
+  requirement: &70219167984240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276559066660
+  version_requirements: *70219167984240
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70276559066240 !ruby/object:Gem::Requirement
+  requirement: &70219167983820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276559066240
+  version_requirements: *70219167983820
 - !ruby/object:Gem::Dependency
   name: dm-active_model
-  requirement: &70276559065820 !ruby/object:Gem::Requirement
+  requirement: &70219167983400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276559065820
+  version_requirements: *70219167983400
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &70276559065400 !ruby/object:Gem::Requirement
+  requirement: &70219167982980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276559065400
+  version_requirements: *70219167982980
 - !ruby/object:Gem::Dependency
   name: dm-migrations
-  requirement: &70276559064980 !ruby/object:Gem::Requirement
+  requirement: &70219167982560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276559064980
+  version_requirements: *70219167982560
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
-  requirement: &70276559064560 !ruby/object:Gem::Requirement
+  requirement: &70219167982140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276559064560
+  version_requirements: *70219167982140
 - !ruby/object:Gem::Dependency
   name: turnip
-  requirement: &70276559064040 !ruby/object:Gem::Requirement
+  requirement: &70219167981620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70276559064040
+  version_requirements: *70219167981620
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70276559063620 !ruby/object:Gem::Requirement
+  requirement: &70219167981200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276559063620
+  version_requirements: *70219167981200
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70276559063160 !ruby/object:Gem::Requirement
+  requirement: &70219167980740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276559063160
+  version_requirements: *70219167980740
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70276559062740 !ruby/object:Gem::Requirement
+  requirement: &70219167980320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276559062740
+  version_requirements: *70219167980320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70276559062320 !ruby/object:Gem::Requirement
+  requirement: &70219167979900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276559062320
+  version_requirements: *70219167979900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70276559061900 !ruby/object:Gem::Requirement
+  requirement: &70219167979480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276559061900
+  version_requirements: *70219167979480
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70276559061480 !ruby/object:Gem::Requirement
+  requirement: &70219167979060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,7 +175,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276559061480
+  version_requirements: *70219167979060
 description: Fabrication is an object generation framework for ActiveRecord, Mongoid,
   DataMapper, Sequel, or any other Ruby object.
 email: