ruby_ext 4.0.2 → 4.0.3

data/lib/rspec_ext.rb

@@ -8,6 +8,10 @@ require 'rspec_ext/misc'
 
 # FactoryGirl replacement.
 autoload :Factory, 'rspec_ext/factory'
-def factory name = nil
-  name ? factory.build(name) : $factory ||= Factory.new
+def factory *args
+  if args.empty?
+    $factory ||= Factory.new
+  else
+    factory.auto *args
+  end
 end

data/lib/rspec_ext/factory.rb

@@ -45,15 +45,33 @@ class Factory
   end
 
   def build name, attributes = {}, &block
-    builder = registry[name] || raise("no definition for :#{name}!")
-    builder.build attributes, &block
+    old = creation_method
+    begin
+      self.creation_method ||= :build
+
+      builder = registry[name] || raise("no definition for :#{name}!")
+      builder.build attributes, &block
+    ensure
+      self.creation_method = old
+    end
   end
-  alias_method :[], :build
 
   def create name, attributes = {}, &block
-    o = build name, attributes, &block
-    o.respond_to?(:save!) ? o.save! : o.save
-    o
+    old = creation_method
+    begin
+      self.creation_method ||= :create
+
+      o = build name, attributes, &block
+      o.respond_to?(:save!) ? o.save! : o.save
+      o
+    ensure
+      self.creation_method = old
+    end
+  end
+
+  def auto *args, &block
+    method = creation_method || raise("creation method not defined!")
+    send method, *args, &block
   end
 
   def next name = :general
@@ -61,4 +79,7 @@ class Factory
     counters[name] += 1
     v
   end
+
+  protected
+    attr_accessor :creation_method
 end

data/lib/ruby_ext/more/callbacks_proxy.rb

@@ -9,6 +9,9 @@ class RubyExt::CallbacksProxy < BasicObject
     true
   end
 
+  alias_method :send, :__send__
+  alias_method :public_send, :__send__
+
   protected
     def method_missing m, *args, &block
       object.run_callbacks @callback_name, m do

data/spec/rspec_ext/factory_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe "factory" do
+describe "Factory" do
   before do
     factory.registry.clear
     factory.counters.clear
   end
-  after{remove_constants :User}
+  after{remove_constants :User, :ATmp, :BTmp}
 
-  it "basic" do
+  it "should build objects from definition" do
     factory.define :user, class: 'OpenObject' do |u|
       u.name = 'an_user'
     end
@@ -16,7 +16,7 @@ describe "factory" do
       {name: 'an_user', password: 'abc', roles: %w(user)}.to_openobject
   end
 
-  it "parent" do
+  it "should provide parent to represent hierarchies" do
     factory.define :user, class: 'OpenObject' do |u|
       u.name = 'an_user'
     end
@@ -29,7 +29,7 @@ describe "factory" do
       {name: 'a_manager', password: 'abc', roles: %w(manager)}.to_openobject
   end
 
-  it "create" do
+  it "should create create objects" do
     stub = self.stub
     factory.define :user, class: stub
     factory.define :manager, parent: :user
@@ -39,12 +39,35 @@ describe "factory" do
     factory.create :manager
   end
 
-  it "input validations" do
+  it "should validate input" do
     -> {factory.define :user}.should raise_error(/provided for :user/)
   end
 
-  it "counters" do
+  it "should provide counters" do
     factory.next(:id).should == 0
     factory.next(:id).should == 1
   end
+
+  it "should use correct creation method (build / create) in associations" do
+    class ATmp
+      attr_accessor :b
+      def save!; end
+    end
+
+    class BTmp
+      attr_accessor :saved
+      def save!
+        @saved = true
+      end
+    end
+
+    factory.define :a, class: 'ATmp' do |o|
+      # b will be either build or create, method will be choosen automatically.
+      o.b = factory :b
+    end
+    factory.define :b, class: 'BTmp'
+
+    factory.build(:a).b.saved.should be_nil
+    factory.create(:a).b.saved.should be_true
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ext
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-22 00:00:00.000000000Z
+date: 2011-12-19 00:00:00.000000000Z
 dependencies: []
 description: 
 email: 
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby Extensions