fabrication 2.14.1 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad8f6d00828ef2c427facbc0d1ee74c0ecb94cc3
-  data.tar.gz: 2e032870ae0816c39d87d07e7c71e8daeddbfeeb
+  metadata.gz: 7ca83ffb9ee5c148c97f69e49b53abea8a7d6824
+  data.tar.gz: 16786e33e23d47aa85002d4b625d42e48464806d
 SHA512:
-  metadata.gz: dd36d36887c0e11ca4ff79f989504a7a4d5ff3c982376ea54ffacd7e63340d2db7a9b5f02d2af4be58f6cd9753d23a34eb9411291b1267666dbc031ecd2022b6
-  data.tar.gz: cff7cb786ac414d4bc1278f9d63a1ae15a592aa4bfaac660f855c2df047fbc135cb1dd9116479167034aecc7b9409d88f9fba9209cc8471ba545fd7e2d15a9c4
+  metadata.gz: 499cd61316ffe755dae558da80a46e475d46d5b42a2728666eb952c9e691281feb1d2dd6a49882b5430de2ff3ae1d512c68321c108e3d4aa7f3122c919498252
+  data.tar.gz: 5970658104e0ab9e9572c7f68272ba9e8ff9f8167da59ace22e3053b720cba0056cdebc806fb4561594343c2cbaa90bd2da1243ad294ee4bf4ea344b26036b57

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, 2.1.x, and Rubinius.
+Fabrication is tested against Ruby 1.9.3 and above.
 
 [![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/lib/fabrication/generator/active_record.rb

@@ -12,10 +12,44 @@ class Fabrication::Generator::ActiveRecord < Fabrication::Generator::Base
     end
   end
 
-  protected
+  def build_default_expansion(field_name, params)
+    # When an inverse field is found, we can override this in the fabricator so we
+    # don't run into an endless recursion
+    build_args = {}
+    if inverse_of = inverse_of(field_name)
+      inverse_name = inverse_of.name.to_s
+      if belongs_to_or_has_one?(inverse_of)
+        build_args[inverse_name] = nil
+      else
+        build_args[inverse_name] = []
+      end
+    end
+
+    if params[:count]
+      fabricator_name = params[:fabricator] || Fabrication::Support.singularize(field_name.to_s)
+      proc { Fabricate.build(params[:fabricator] || fabricator_name, build_args) }
+    else
+      fabricator_name = params[:fabricator] || field_name
+      proc { Fabricate(params[:fabricator] || fabricator_name, build_args) }
+    end
+  end
+
+  private
 
-  def validate_instance
-    _instance.valid?
+  # Returns the inverse field name of a given relation
+  def inverse_of(name)
+    reflection = _klass.reflections.fetch(name.to_s, nil) || # >= Rails 4.3
+      _klass.reflections.fetch(name.to_sym, nil) # < Rails 4.3
+    reflection.inverse_of if reflection
   end
 
+  # Returns true if the reflection is a belongs_to or has_one association
+  def belongs_to_or_has_one?(reflection)
+    if reflection.respond_to?(:macro) # < Rails 4.3
+      return true if reflection.macro == :belongs_to || reflection.macro == :has_one
+    else # >= Rails 5.3
+      return true if reflection.instance_of?(ActiveRecord::Reflection::BelongsToReflection) ||
+        reflection.instance_of?(ActiveRecord::Reflection::HasOneReflection)
+    end
+  end
 end

data/lib/fabrication/generator/base.rb

@@ -19,7 +19,6 @@ class Fabrication::Generator::Base
   def create(attributes=[], callbacks=[])
     build(attributes, callbacks)
     execute_callbacks(callbacks[:before_validation])
-    validate_instance
     execute_callbacks(callbacks[:after_validation])
     execute_callbacks(callbacks[:before_save])
     execute_callbacks(callbacks[:before_create])
@@ -80,7 +79,14 @@ class Fabrication::Generator::Base
     _attributes[method_name] || super
   end
 
-  def validate_instance; end
+  def build_default_expansion(name, params)
+    if params[:count]
+      name = Fabrication::Support.singularize(name.to_s)
+      proc { Fabricate.build(params[:fabricator] || name) }
+    else
+      proc { Fabricate(params[:fabricator] || name) }
+    end
+  end
 
   protected
 

data/lib/fabrication/generator/data_mapper.rb

@@ -8,10 +8,6 @@ class Fabrication::Generator::DataMapper < Fabrication::Generator::Base
     self._instance = _klass.new(_attributes)
   end
 
-  def validate_instance
-    _instance.valid?
-  end
-
   protected
 
   def persist

data/lib/fabrication/generator/mongoid.rb

@@ -12,8 +12,4 @@ class Fabrication::Generator::Mongoid < Fabrication::Generator::Base
     end
   end
 
-  def validate_instance
-    _instance.valid?
-  end
-
 end

data/lib/fabrication/generator/sequel.rb

@@ -26,10 +26,6 @@ class Fabrication::Generator::Sequel < Fabrication::Generator::Base
     _instance.save
   end
 
-  def validate_instance
-    _instance.valid?
-  end
-
   private
 
   def load_instance_hooks

data/lib/fabrication/schematic/definition.rb

@@ -105,12 +105,7 @@ class Fabrication::Schematic::Definition
   end
 
   def generate_value(name, params)
-    if params[:count]
-      name = Fabrication::Support.singularize(name.to_s)
-      proc { Fabricate.build(params[:fabricator] || name) }
-    else
-      proc { Fabricate(params[:fabricator] || name) }
-    end
+    generator.new(klass).build_default_expansion(name, params)
   end
 
   def merge(overrides={}, &block)

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '2.14.1'
+  VERSION = '2.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 2.14.1
+  version: 2.15.0
 platform: ruby
 authors:
 - Paul Elliott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2016-03-13 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.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Implementing the factory pattern in Ruby so you don't have to.