fabrication 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d0a893a4b3d57bcfb26ab42020cc3150f716438
-  data.tar.gz: 8b7c2f8933feb8ab5de7bc35c5eb7808ca2f4b1c
+  metadata.gz: 19952424220acd0d916eafbecf996fecc9870bd6
+  data.tar.gz: 443657b59d5cabc84f349a2063882304cb0b7d74
 SHA512:
-  metadata.gz: 6348e9098f88d32c05351ad60832764592fa79d18a129735490914b41b37658438c5bafe9ba7ae9be6522c3faeec256e32673ca121686fc168f1023c7f1f5474
-  data.tar.gz: 237b5061848736772ab368fbb98e7daa6780a1de425c65736b2572c99e3bc687ffe0493a8b8db40c0d5e6964486e8d6249879ac4c6506d670fababf92536d1b2
+  metadata.gz: fe4bf4524f3c8a7cf1d0a331e03a09a26e54cc77198ad0ea2e0b87d57a95da9915288c0f6f7bd209f7beffea8ce75b0549cd058785989633ec37543865751e2f
+  data.tar.gz: efd348378470208dd2b23539e97210024b34a16ceb3bba0c5584340adb136aeddb0353014d1633b8e59cae3ae9ead87aa3e049ef62471adb2fa9692da00f65de

data/lib/fabrication.rb

@@ -31,7 +31,7 @@ module Fabrication
   end
 
   def self.clear_definitions
-    @schematics = nil
+    @manager = nil
     Sequencer.sequences.clear
   end
 
@@ -39,13 +39,18 @@ module Fabrication
     Fabrication::Config.configure(&block)
   end
 
+  def self.manager
+    @manager ||= Fabrication::Schematic::Manager.new
+  end
+
   def self.schematics
-    @schematics ||= Fabrication::Schematic::Manager.new
+    puts "DEPRECATION WARNING: Fabrication.schematics has been replaced by Fabrication.manager"
+    manager
   end
 end
 
 def Fabricator(name, options={}, &block)
-  Fabrication.schematics.register(name, options, &block)
+  Fabrication.manager.register(name, options, &block)
 end
 
 def Fabricate(name, overrides={}, &block)

data/lib/fabrication/cucumber/step_fabricator.rb

@@ -54,7 +54,7 @@ module Fabrication
       end
 
       def schematic
-        Fabrication.schematics[@fabricator].tap do |schematic|
+        Fabrication.manager[@fabricator].tap do |schematic|
           raise Fabrication::UnknownFabricatorError, "No Fabricator defined for '#{@model}'" unless schematic
         end
       end

data/lib/fabrication/fabricator.rb

@@ -20,12 +20,12 @@ class Fabrication::Fabricator
   def self.fail_if_initializing(name)
     raise Fabrication::MisplacedFabricateError.new(
       "You tried to fabricate `#{name}` while Fabricators were still loading. Check your fabricator files and make sure you didn't accidentally type `Fabricate` instead of `Fabricator` in there somewhere."
-    ) if Fabrication.schematics.initializing?
+    ) if Fabrication.manager.initializing?
   end
 
   def self.schematic(name)
-    Fabrication::Support.find_definitions if Fabrication.schematics.empty?
-    Fabrication.schematics[name].tap do |schematic|
+    Fabrication::Support.find_definitions if Fabrication.manager.empty?
+    Fabrication.manager[name].tap do |schematic|
       raise Fabrication::UnknownFabricatorError, "No Fabricator defined for '#{name}'" unless schematic
     end
   end

data/lib/fabrication/generator/active_record.rb

@@ -4,14 +4,22 @@ class Fabrication::Generator::ActiveRecord < Fabrication::Generator::Base
     defined?(ActiveRecord) && klass.ancestors.include?(ActiveRecord::Base)
   end
 
-  private
+  def build_instance
+    if self.class.without_protection?
+      self._instance = _klass.new(_attributes, without_protection: true)
+    else
+      self._instance = _klass.new(_attributes)
+    end
+  end
 
-  def validate_instance
-    __instance.valid?
+  protected
+
+  def self.without_protection?
+    Gem::Version.new(ActiveRecord::VERSION::STRING).between?(Gem::Version.new('3.1.0'), Gem::Version.new('3.9'))
   end
 
-  def build_instance
-    self.__instance = __klass.new(__attributes, without_protection: true)
+  def validate_instance
+    _instance.valid?
   end
 
 end

data/lib/fabrication/generator/base.rb

@@ -1,6 +1,6 @@
 class Fabrication::Generator::Base
 
-  def self.supports?(__klass); true end
+  def self.supports?(_klass); true end
 
   def build(attributes=[], callbacks={})
     process_attributes(attributes)
@@ -13,7 +13,7 @@ class Fabrication::Generator::Base
       build_instance
     end
     execute_callbacks(callbacks[:after_build])
-    __instance
+    _instance
   end
 
   def create(attributes=[], callbacks=[])
@@ -26,17 +26,17 @@ class Fabrication::Generator::Base
     persist
     execute_callbacks(callbacks[:after_create])
     execute_callbacks(callbacks[:after_save])
-    __instance
+    _instance
   end
 
   def execute_callbacks(callbacks)
-    callbacks.each { |callback| __instance.instance_exec(__instance, __transient_attributes, &callback) } if callbacks
+    callbacks.each { |callback| _instance.instance_exec(_instance, _transient_attributes, &callback) } if callbacks
   end
 
   def to_hash(attributes=[], callbacks=[])
     process_attributes(attributes)
     Fabrication::Support.hash_class.new.tap do |hash|
-      __attributes.map do |name, value|
+      _attributes.map do |name, value|
         if value && value.respond_to?(:id)
           hash["#{name}_id"] = value.id
         else
@@ -47,57 +47,57 @@ class Fabrication::Generator::Base
   end
 
   def build_instance_with_constructor_override(callback)
-    self.__instance = instance_eval &callback
+    self._instance = instance_eval &callback
     set_attributes
   end
 
   def build_instance_with_init_callback(callback)
-    self.__instance = __klass.new(*callback.call)
+    self._instance = _klass.new(*callback.call)
     set_attributes
   end
 
   def build_instance
-    self.__instance = __klass.new
+    self._instance = _klass.new
     set_attributes
   end
 
   def set_attributes
-    __attributes.each do |k,v|
-      __instance.send("#{k}=", v)
+    _attributes.each do |k,v|
+      _instance.send("#{k}=", v)
     end
   end
 
   def initialize(klass)
-    self.__klass = klass
+    self._klass = klass
   end
 
   def method_missing(method_name, *args, &block)
-    __attributes[method_name] || super
+    _attributes[method_name] || super
   end
 
   def validate_instance; end
 
   protected
 
-  attr_accessor :__klass, :__instance, :__transient_attributes
+  attr_accessor :_klass, :_instance, :_transient_attributes
 
-  def __attributes
-    @__attributes ||= {}
+  def _attributes
+    @_attributes ||= {}
   end
 
   def persist
-    __instance.save! if __instance.respond_to?(:save!)
+    _instance.save! if _instance.respond_to?(:save!)
   end
 
   def post_initialize; end
 
   def process_attributes(attributes)
-    self.__transient_attributes = Hash.new
+    self._transient_attributes = Hash.new
     attributes.each do |attribute|
-      __attributes[attribute.name] = attribute.processed_value(__attributes)
-      __transient_attributes[attribute.name] = __attributes[attribute.name] if attribute.transient?
+      _attributes[attribute.name] = attribute.processed_value(_attributes)
+      _transient_attributes[attribute.name] = _attributes[attribute.name] if attribute.transient?
     end
-    __attributes.reject! { |k| __transient_attributes.keys.include?(k) }
+    _attributes.reject! { |k| _transient_attributes.keys.include?(k) }
   end
 
 end

data/lib/fabrication/generator/data_mapper.rb

@@ -5,17 +5,17 @@ class Fabrication::Generator::DataMapper < Fabrication::Generator::Base
   end
 
   def build_instance
-    self.__instance = __klass.new(__attributes)
+    self._instance = _klass.new(_attributes)
   end
 
   def validate_instance
-    __instance.valid?
+    _instance.valid?
   end
 
   protected
 
   def persist
-    __instance.save
+    _instance.save
   end
 
 end

data/lib/fabrication/generator/keymaker.rb

@@ -5,11 +5,11 @@ class Fabrication::Generator::Keymaker < Fabrication::Generator::Base
   end
 
   def persist
-    __instance.save
+    _instance.save
   end
 
   def validate_instance
-    __instance.valid?
+    _instance.valid?
   end
 
 end

data/lib/fabrication/generator/mongoid.rb

@@ -6,14 +6,14 @@ class Fabrication::Generator::Mongoid < Fabrication::Generator::Base
 
   def build_instance
     if Gem::Version.new(Mongoid::VERSION).between?(Gem::Version.new('2.3.0'), Gem::Version.new('3.9'))
-      self.__instance = __klass.new(__attributes, without_protection: true)
+      self._instance = _klass.new(_attributes, without_protection: true)
     else
-      self.__instance = __klass.new(__attributes)
+      self._instance = _klass.new(_attributes)
     end
   end
 
   def validate_instance
-    __instance.valid?
+    _instance.valid?
   end
 
 end

data/lib/fabrication/generator/sequel.rb

@@ -10,30 +10,30 @@ class Fabrication::Generator::Sequel < Fabrication::Generator::Base
   end
 
   def set_attributes
-    __attributes.each do |key, value|
-      if (reflection = __klass.association_reflections[key]) && value.is_a?(Array)
-        __instance.associations[key] = value
-        __instance.after_save_hook do
-          value.each { |o| __instance.send(reflection.add_method, o) }
+    _attributes.each do |key, value|
+      if (reflection = _klass.association_reflections[key]) && value.is_a?(Array)
+        _instance.associations[key] = value
+        _instance.after_save_hook do
+          value.each { |o| _instance.send(reflection.add_method, o) }
         end
       else
-        __instance.send("#{key}=", value)
+        _instance.send("#{key}=", value)
       end
     end
   end
 
   def persist
-    __instance.save
+    _instance.save
   end
 
   def validate_instance
-    __instance.valid?
+    _instance.valid?
   end
 
   private
 
   def load_instance_hooks
-    klass = __klass.respond_to?(:cti_base_model) ? __klass.cti_base_model : __klass
+    klass = _klass.respond_to?(:cti_base_model) ? _klass.cti_base_model : _klass
     klass.plugin :instance_hooks unless klass.new.respond_to? :after_save_hook
   end
 

data/lib/fabrication/schematic/definition.rb

@@ -1,7 +1,6 @@
 class Fabrication::Schematic::Definition
 
   GENERATORS = [
-    Fabrication::Generator::ActiveRecord4,
     Fabrication::Generator::ActiveRecord,
     Fabrication::Generator::DataMapper,
     Fabrication::Generator::Sequel,
@@ -49,16 +48,16 @@ class Fabrication::Schematic::Definition
   end
 
   def build(overrides={}, &block)
-    Fabrication.schematics.build_stack << self
+    Fabrication.manager.build_stack << self
     merge(overrides, &block).instance_eval do
       generator.new(klass).build(attributes, callbacks)
     end
   ensure
-    Fabrication.schematics.build_stack.pop
+    Fabrication.manager.build_stack.pop
   end
 
   def fabricate(overrides={}, &block)
-    if Fabrication.schematics.build_stack.empty?
+    if Fabrication.manager.build_stack.empty?
       merge(overrides, &block).instance_eval do
         generator.new(klass).create(attributes, callbacks)
       end

data/lib/fabrication/support.rb

@@ -3,7 +3,7 @@ class Fabrication::Support
   class << self
 
     def fabricatable?(name)
-      Fabrication.schematics[name] || class_for(name)
+      Fabrication.manager[name] || class_for(name)
     end
 
     def class_for(class_or_to_s)
@@ -27,13 +27,13 @@ class Fabrication::Support
     end
 
     def find_definitions
-      Fabrication.schematics.preinitialize
+      Fabrication.manager.preinitialize
       Fabrication::Config.fabricator_dir.each do |folder|
         Dir.glob(File.join(Fabrication::Config.path_prefix, folder, '**', '*.rb')).sort.each do |file|
           load file
         end
       end
-      Fabrication.schematics.freeze
+      Fabrication.manager.freeze
     end
 
     def hash_class

data/lib/fabrication/transform.rb

@@ -3,7 +3,7 @@ class Fabrication::Transform
   class << self
 
     def apply_to(schematic, attributes_hash)
-      Fabrication::Support.find_definitions if Fabrication.schematics.empty?
+      Fabrication::Support.find_definitions if Fabrication.manager.empty?
       attributes_hash.inject({}) {|h,(k,v)| h.update(k => apply_transform(schematic, k, v)) }
     end
 

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '2.7.1'
+  VERSION = '2.7.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Paul Elliott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -236,7 +236,6 @@ files:
 - lib/fabrication/errors/unknown_fabricator_error.rb
 - lib/fabrication/fabricator.rb
 - lib/fabrication/generator/active_record.rb
-- lib/fabrication/generator/active_record_4.rb
 - lib/fabrication/generator/base.rb
 - lib/fabrication/generator/data_mapper.rb
 - lib/fabrication/generator/keymaker.rb

data/lib/fabrication/generator/active_record_4.rb

@@ -1,17 +0,0 @@
-class Fabrication::Generator::ActiveRecord4 < Fabrication::Generator::ActiveRecord
-
-  def self.supports?(klass)
-    super && active_record_4?
-  end
-
-  def build_instance
-    self.__instance = __klass.new(__attributes)
-  end
-
-  private
-
-  def self.active_record_4?
-    ActiveRecord::VERSION::MAJOR == 4
-  end
-
-end