baja 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63987f72233df2c1154316f91478509143d88661
-  data.tar.gz: 124a5d88ea899005a9dfcb780a4f0dccc26788ae
+  metadata.gz: e5f0ef69ac8fac2874ab93f73c07e16ae228453b
+  data.tar.gz: 86d5815131539b9b4b976f91d2b202f7929eadd7
 SHA512:
-  metadata.gz: e5eec89aadee4f9b25ddd7b2f0abf1d135b92e1d62d865ff934c845ba7050e1308b26d4622ed7c316ca6f8487fa2a63571ad3e2b3c750ff9b9231a48423187ea
-  data.tar.gz: 0d8849bfb1b42a23a9c345a9050241a9f93675a15454cd85a0bfdb9d23560a9f1b3a12b4ec349703d5c78b572076fecdb7ea1b2d8e6ddbd6394d7d9557906fbe
+  metadata.gz: c69fccfb7bd049586fd83eb10de5975546e7acc6176954548bf133632a4bd7d2da2f4d214263bed7a9da0b9e2565b07d19d9c082a390deaa797d8b2686026a4d
+  data.tar.gz: 4532fbb0d9e6cf8bce6eec48e04f1423869efc05f1f2da88bd9a8c320e82eea53b923d4c25007c4530cc090c1d814f898e28b9051ae0260d56f83c36f1297df4

data/lib/baja/version.rb

@@ -1,3 +1,3 @@
 module Baja
-  VERSION = "0.7.6"
+  VERSION = "0.7.7"
 end

data/lib/baja.rb

@@ -71,39 +71,39 @@ module FactoryLoad
   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) 
-
-      unless @namespace.nil?
-        name = :"#{@namespace}__#{name.to_s}" 
-      else
-        puts "else lol nut"
-        Baja::Blast.baja.each do |dew|
-          puts "dew: #{dew}"
-          if FactoryLoad.path.include?(dew)
+  # 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) 
+
+  #     unless @namespace.nil?
+  #       name = :"#{@namespace}__#{name.to_s}" 
+  #     else
+  #       puts "else lol nut"
+  #       Baja::Blast.baja.each do |dew|
+  #         puts "dew: #{dew}"
+  #         if FactoryLoad.path.include?(dew)
             
-            name = :"#{dew}__#{name.to_s}" 
-          end
-        end
-      end
-
-      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
+  #           name = :"#{dew}__#{name.to_s}" 
+  #         end
+  #       end
+  #     end
+
+  #     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 
 
 
@@ -119,6 +119,19 @@ end
     def factory(name, options = {}, &block)  
       options[:class] = name.to_s.gsub(/_list/,'') unless options.has_key?(:class) 
       name = :"#{@namespace}___#{name.to_s}" unless @namespace.nil?
+
+      unless @namespace.nil?
+        name = :"#{@namespace}__#{name.to_s}" 
+      else
+        puts "else lol nut"
+        Baja::Blast.baja.each do |dew|
+          puts "dew: #{dew}"
+          if FactoryLoad.path.include?(dew)            
+            name = :"#{dew}__#{name.to_s}" 
+          end
+        end
+      end
+
       puts name
       factory = FactoryGirl::Factory.new(name, options)
       proxy = FactoryGirl::DefinitionProxy.new(factory.definition)

metadata

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