baja 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7865790b5076e7a83469d1c8650e8cfb3ce8f0b1
-  data.tar.gz: dc2190fa49db5c7c444cc4302a16df45bf0d0f6e
+  metadata.gz: c45e7bc26e75b78ce72209fab907c4e30ea91bdd
+  data.tar.gz: b8d4446f7d602adf4d44b34f594825dad2daec7c
 SHA512:
-  metadata.gz: 7a62091474c6a202a757762efca1b133815b71c4f68d0f3e6804b967661618cbf0b608fb8464793f63c6f787bb2b10efed13fca405c277091ccfc743c4a7b1a3
-  data.tar.gz: f18c5ba8e48f656966da2dfe59de251842e6cadc26ce6b5091f683a9ae0b31a95591518fad7e29778ef99c4811c48447ae74f1fc3183a7b5641a9276cf556a51
+  metadata.gz: eadd74f1339ff8ca9c642039678ee1314322e50d5a6777216a1e00a979cbd16a4c7d9e909fbd28010610f8322f70266d60eb8f5098574bab73e095ef432850bb
+  data.tar.gz: 147c3f33fce5865975eb7c8c8c36fefd6091e8c9535242a124b65686958231235565a5553f031d2753a098c7a523339be6d3788fa43d2e21db628d853225ed98

data/lib/baja/version.rb

@@ -1,3 +1,3 @@
 module Baja
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/lib/baja.rb

@@ -25,7 +25,37 @@ module Baja
       load "tasks/baja.rake"
     end
   end
+module FactoryLoad
+  @@path
+  def self.load_path(path)
+    @@path = path
+    puts path
+    load(path) 
+  end
+  def self.path
+    @@path
+  end
+  FactoryGirl::Syntax::Default::DSL
+  class FactoryGirl::Syntax::Default::DSL
+
+    def factory(name, options = {}, &block)  
+      puts "path: #{FactoryLoad.path}"
+      options[:class] = name.to_s.gsub(/_list/,'') unless options.has_key?(:class) 
+      name = :"#{@namespace}___#{name.to_s}" unless @namespace.nil?
+      puts name
+      factory = FactoryGirl::Factory.new(name, options)
+      proxy = FactoryGirl::DefinitionProxy.new(factory.definition)
+      proxy.instance_eval(&block) if block_given?
+
+      FactoryGirl.register_factory(factory)
 
+      proxy.child_factories.each do |(child_name, child_options, child_block)|
+        parent_factory = child_options.delete(:parent) || name
+        factory(child_name, child_options.merge(parent: parent_factory), &child_block)
+      end
+    end
+  end
+end 
 end
 
   FactoryGirl::Syntax::Default::DSL
@@ -58,45 +88,15 @@ module FactoryGirl
     puts "defpath: #{definition_file_paths}"
     absolute_definition_file_paths.uniq.each do |path|
       puts "abspath: #{path}"
-      FactoryLoad.load_path("#{path}.rb") if File.exist?("#{path}.rb")
+      Baja::FactoryLoad.load_path("#{path}.rb") if File.exist?("#{path}.rb")
 
       if File.directory? path
         Dir[File.join(path, '**', '*.rb')].sort.each do |file|
-          FactoryLoad.load_path(file)
+          Baja::FactoryLoad.load_path(file)
         end
       end
     end
   end
 end
 
-module FactoryLoad
-  @@path
-  def self.load_path(path)
-    @@path = path
-    puts path
-    load(path) 
-  end
-  def self.path
-    @@path
-  end
-  FactoryGirl::Syntax::Default::DSL
-  class FactoryGirl::Syntax::Default::DSL
-
-    def factory(name, options = {}, &block)  
-      puts "path: #{FactoryLoad.path}"
-      options[:class] = name.to_s.gsub(/_list/,'') unless options.has_key?(:class) 
-      name = :"#{@namespace}___#{name.to_s}" unless @namespace.nil?
-      puts name
-      factory = FactoryGirl::Factory.new(name, options)
-      proxy = FactoryGirl::DefinitionProxy.new(factory.definition)
-      proxy.instance_eval(&block) if block_given?
-
-      FactoryGirl.register_factory(factory)
 
-      proxy.child_factories.each do |(child_name, child_options, child_block)|
-        parent_factory = child_options.delete(:parent) || name
-        factory(child_name, child_options.merge(parent: parent_factory), &child_block)
-      end
-    end
-  end
-end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baja
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Tim Zuercher