baja 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d3834a475808e353a0ab7f7ed6afcf8b8c3e265
-  data.tar.gz: 27e8847aaae4d9826c7a3e50f23ec52956393a35
+  metadata.gz: ae641db99767c78f8e4556d37ba81fba0a49a74a
+  data.tar.gz: fddfb8fda0a79e41db0ce250849c1327f31c79d6
 SHA512:
-  metadata.gz: 0f412cd92590b0f2917a2a78133c9d1c5194da8359fcd9cf23f8e75569c908e34b6e028f3a55bdc0db08d453cd7aab33a7a817fe9d72ee362da4b1c0fe7c128b
-  data.tar.gz: 441025ac2445bd0c0817ed47a4c5e64fde30137295d28c7763d3d54a75b71b62da4d2d16cf247d5401ebd67788bc888b10afd375b1099ba03b91a89cd4a81083
+  metadata.gz: 472722e3324220a793acad687e69c7a6e3ddd8a76f097bdb4460a7f32eef9576cf3e8e1af1d57c094e1fdb8fc88696070ea1c5214be692bbb1a52c28760d5c63
+  data.tar.gz: b3fbe39c7ebcb7b72a480cfacaaebc47c84e6ae392ae43fa85bec0f0c6ac083e41510a6b1c6fa091295964926f380f40192a39d19b0e2e218d823799e14859e0

data/lib/baja/version.rb

@@ -1,3 +1,3 @@
 module Baja
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/lib/baja.rb

@@ -25,28 +25,26 @@ module Baja
   end
 
 end
-FactoryGirl::Syntax::Default::DSL
-class FactoryGirl::Syntax::Default::DSL
-  def factory(name, options = {}, &block)
-    namespace =""
-    baja = YAML.load_file('baja.yml')
-    baja = JSON.parse(baja.to_json,:symbolize_names => true)
-    baja[:factories].each do |dew|
-      puts "is #{dew} in #{File.expand_path File.dirname(__FILE__)}"
-      namespace = dew if File.expand_path(File.dirname(__FILE__)).to_s.include?(dew)
+
+  FactoryGirl::Syntax::Default::DSL
+  class FactoryGirl::Syntax::Default::DSL
+    @namespace
+    def namespace(name)
+      @namespace = name
     end
-    puts "#{namespace}_#{name.to_s}"
-    name = :"#{namespace}_#{name.to_s}" unless namespace.empty?
-    #************check for option 'class'***********
-    factory = FactoryGirl::Factory.new(name, options)
-    proxy = FactoryGirl::DefinitionProxy.new(factory.definition)
-    proxy.instance_eval(&block) if block_given?
+    def factory(name, options = {}, &block)  
+      options[:class] = name unless options.has_key?("class")    
+      puts "#{@namespace}::#{name.to_s}"
+      name = :"#{@namespace}::#{name.to_s}" unless @namespace.empty?
+      factory = FactoryGirl::Factory.new(name, options)
+      proxy = FactoryGirl::DefinitionProxy.new(factory.definition)
+      proxy.instance_eval(&block) if block_given?
 
-    FactoryGirl.register_factory(factory)
+      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)
+      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.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Tim Zuercher