fabrication 2.11.0 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96031c7fe931f6f70a4e0e8b0a51c999151e0865
-  data.tar.gz: 1714692bcc5f754e34855020a647750322a24fbe
+  metadata.gz: 51cda89ea052783eaff7e7f54a15c20384806c6f
+  data.tar.gz: 5fc0e39c30dbcc8d3c87156aefcf40f8b2f37906
 SHA512:
-  metadata.gz: db66d3fe1d78fcdae6fe36fa3c4ddbd0b32c31364f1540ddfc99ed654bcaff0c73e09cb33e8033ec2b580d55da206165ef3970d399c25ef0ca24737634931efa
-  data.tar.gz: 5b786db9b68d5c6db2b1d23016f9143dba83b6e465aca3cebe9a7b1464ebf3932ed712049f374979281daccefeb1eb3e6be91deb3318f1952c7453fc0ad8a30c
+  metadata.gz: b9bee0dd2589ae8ca4909052f2f3b72fc9832baf3c2baf15af93c6faa9ac1e86c020a21d5447231c6827dde2446e39bbee815a337ad00abf53138ee34903699a
+  data.tar.gz: 7ff5b3cf881b233b1ebe2c1f851d1e4b00657cdf4f94e9e2188e7159e0af1d11dfea5be9cebba8f263ebaf48f2f34d667f00cb07e6e67060db0c30e9f8bad53c

data/lib/fabricate.rb

@@ -34,7 +34,7 @@ class Fabricate
   end
 
   def self.schematic(name)
-    Fabrication::Support.find_definitions if Fabrication.manager.empty?
+    Fabrication.manager.load_definitions if Fabrication.manager.empty?
     Fabrication.manager[name] || raise(Fabrication::UnknownFabricatorError.new(name))
   end
 

data/lib/fabrication/schematic/manager.rb

@@ -39,6 +39,19 @@ class Fabrication::Schematic::Manager
     @to_params_stack ||= []
   end
 
+  def load_definitions
+    preinitialize
+    Fabrication::Config.fabricator_path.each do |folder|
+      Dir.glob(File.join(Fabrication::Config.path_prefix, folder, '**', '*.rb')).sort.each do |file|
+        load file
+      end
+    end
+  rescue Exception => e
+    raise e
+  ensure
+    freeze
+  end
+
   protected
 
   def raise_if_registered(name)
@@ -69,4 +82,5 @@ class Fabrication::Schematic::Manager
       Fabrication::Schematic::Definition.new(klass, &block)
     end
   end
+
 end

data/lib/fabrication/support.rb

@@ -8,13 +8,32 @@ class Fabrication::Support
 
     def class_for(class_or_to_s)
       class_name = variable_name_to_class_name(class_or_to_s)
-      klass = class_name.split('::').inject(Object) do |object, string|
-        object.const_get(string)
-      end
+      klass = constantize(class_name)
     rescue NameError => original_error
       raise Fabrication::UnfabricatableError.new(class_or_to_s, original_error)
     end
 
+    def constantize(camel_cased_word)
+      names = camel_cased_word.split('::')
+      Object.const_get(camel_cased_word) if names.empty?
+      names.shift if names.size > 1 && names.first.empty?
+      names.inject(Object) do |constant, name|
+        if constant == Object
+          constant.const_get(name)
+        else
+          candidate = constant.const_get(name)
+          next candidate if constant.const_defined?(name, false)
+          next candidate unless Object.const_defined?(name)
+          constant = constant.ancestors.inject do |const, ancestor|
+            break const    if ancestor == Object
+            break ancestor if ancestor.const_defined?(name, false)
+            const
+          end
+          constant.const_get(name, false)
+        end
+      end
+    end
+
     def extract_options!(args)
       args.last.is_a?(::Hash) ? args.pop : {}
     end
@@ -24,18 +43,8 @@ class Fabrication::Support
     end
 
     def find_definitions
-      Fabrication.manager.preinitialize
-      Fabrication::Config.path_prefix.each do |prefix|
-        Fabrication::Config.fabricator_path.each do |folder|
-          Dir.glob(File.join(prefix, folder, '**', '*.rb')).sort.each do |file|
-            load file
-          end
-        end
-      end
-    rescue Exception => e
-      raise e
-    ensure
-      Fabrication.manager.freeze
+      puts "DEPRECATION WARNING: Fabrication::Support.find_definitions has been replaced by Fabrication.manager.load_definitions and will be removed in 3.0.0."
+      Fabrication.manager.load_definitions
     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.manager.empty?
+      Fabrication.manager.load_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.11.0'
+  VERSION = '2.11.1'
 end

data/lib/tasks/defined_fabricators.rake

@@ -1,7 +1,7 @@
 namespace :fabrication do
   desc "Display all registered fabricators by class"
   task :list => :environment do
-    Fabrication::Support.find_definitions if Fabrication.manager.empty?
+    Fabrication.manager.laod_definitions if Fabrication.manager.empty?
 
     if Fabrication.manager.schematics.none?
       puts "No fabricators found"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.1
 platform: ruby
 authors:
 - Paul Elliott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies: []
 description: Fabrication is an object generation framework for ActiveRecord, Mongoid,
   DataMapper, Sequel, or any other Ruby object.