prefactory 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c1ddab3ed8d9c159db541d5011985dd2c60aebd
-  data.tar.gz: 0a91f6a21b04da2ba70625301c48ad59ae0e4717
+  metadata.gz: b705b09aea1ed091cbd6a46aabd4df33438cb214
+  data.tar.gz: 7f82cb399ee76a7d2aea8ceed15dc6d57b849b7b
 SHA512:
-  metadata.gz: 879ff9d5bad02048965b36d0eec6b6404891ca3c9c7df24c50e4b55c3e41ac73e0d46fe4f9d9a6497f8557cd97a25edea5e4abf0da56185fee783aaf76cfcb0e
-  data.tar.gz: f588c5ccb00de311fb867e3ec0e36332fa6959fd396cf04f65b888dc70307c2070b6cdbb15a860a1e47f1f21b5e3c99bec511ea87e36cf68c4a22befcd42cbdc
+  metadata.gz: c3e66b35c17a5cccda2760a423962ba89f04d9882aa6d7dbdebd006915ae1a706534bd5162ebaef35e04af29203024e86f11e726fc61dbf7b0c294e907049924
+  data.tar.gz: 6324783baa9b74fe4870ff811f21866b091aa4f89ca4ddc6eefde4359a6ac0a17e023335a63ab01d7903c11cb814ccdea80838c25daa6386fdb7a3bae08be434

data/.ruby-gemset

@@ -0,0 +1 @@
+prefactory

data/.ruby-version

@@ -0,0 +1 @@
+default

data/README.md

@@ -68,34 +68,34 @@ describe User do
   # end
   set!(:other_friend) { create :user }
 
-  context 'a new user has no friends' do
+  context 'a new user' do
 
-    it { user.friends.count.should == 0 }
+    it { expect(user.friends.count).to eq 0 }
 
     context 'with a friend' do
       before(:all) { user.add_friend(friend) }   # executes once
 
-      it { user.friends.count.should == 1 }
+      it { expect(user.friends.count).to eq 1 }
 
       # these changes will be transparently rolled back
       it "allows removing the friend" do
         expect { user.remove_friend(friend) }.to_not raise_error
-        user.friends.count.should == 0
+        expect(user.friends.count).to eq 0
       end
 
       it "disallows adding the same friend again" do
         expect { user.add_friend(friend) }.to raise_error
-        user.friends.count.should == 1
+        expect(user.friends.count).to eq 1
       end
 
       # these changes will be transparently rolled back
       it "allows adding a different friend" do
         expect { user.add_friend(other_friend) }.to_not raise_error
-        user.friends.count.should == 2
+        expect(user.friends.count).to eq 2
       end
 
-      it { user.friends.should include friend }
-      it { user.friends.should_not include other_friend }
+      it { expect(user.friends).to include friend }
+      it { expect(user.friends).not_to include other_friend }
     end
   end
 end

data/lib/prefactory/prefactory_lookup.rb

@@ -0,0 +1,11 @@
+class PrefactoryLookup < ActiveRecord::Base
+  def self.create_table
+    conn = ActiveRecord::Base.connection
+    conn.create_table :prefactory_lookups, :force => true do |t|
+      t.column :key, :string
+      t.column :result_class, :string
+      t.column :result_id, :integer
+      t.index [:key], :unique => true
+    end
+  end
+end

data/lib/prefactory/version.rb

@@ -21,5 +21,5 @@
 # SOFTWARE.
 
 module Prefactory
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/rspec/core/prefactory.rb

@@ -22,23 +22,28 @@
 
 require 'prefactory/active_record_integration'
 require 'rspec_around_all'
+require 'prefactory/prefactory_lookup'
 
 module Prefactory
+  class NotDefined
+  end
 
   def prefactory_lookup(key)
-    @prefactory[key]
+    PrefactoryLookup.where(:key => key).first
   end
 
   # instantiate, or access an already-instantiated-and-memoized, prefabricated object.
   def prefactory(key)
-    lookup = prefactory_lookup(key)
-    return nil unless lookup.present?
     @prefactory_memo ||= {}
-    begin
-      @prefactory_memo[key] ||= lookup[:class].find(lookup[:id])
-    rescue
-    end
-    @prefactory_memo[key]
+    @prefactory_memo[key] ||= begin
+                                lookup = prefactory_lookup(key)
+                                if lookup.present?
+                                  lookup[:result_class].constantize.find(lookup[:result_id])
+                                else
+                                  Prefactory::NotDefined
+                                end
+                              rescue
+                              end
   end
 
   def in_before_all?
@@ -57,7 +62,11 @@ module Prefactory
       result = create(key, *args) if respond_to?(:create)
     end
     if result.present?
-      @prefactory[key] = { :class => result.class, :id => result.id }
+      PrefactoryLookup.where(:key => key).first_or_initialize.tap do |lookup|
+        lookup.result_class = result.class.name
+        lookup.result_id = result.id
+        lookup.save!
+      end
     else
       warn "WARNING: Failed to add #{key} to prefactory: block result not present"
     end
@@ -67,10 +76,10 @@ module Prefactory
 
   def self.included(base)
     base.extend RSpecAroundAll
+    PrefactoryLookup.create_table
 
     # Wrap outermost describe block in a transaction, so before(:all) data is rolled back at the end of this suite.
     base.before(:all) do
-      clear_prefactory_map
       clear_prefactory_memoizations
     end
     base.around(:all) do |group|
@@ -78,7 +87,6 @@ module Prefactory
     end
     base.after(:all) do
       clear_prefactory_memoizations
-      clear_prefactory_map
     end
 
     # Wrap each example in a transaction, instead of using Rails' transactional
@@ -145,11 +153,8 @@ module Prefactory
     # by invoking the 'prefactory' method.
     base.class_eval do
       def method_missing(key, *args, &block)
-        if prefactory_lookup(key)
-          prefactory(key)
-        else
-          super
-        end
+        result = prefactory(key)
+        result == Prefactory::NotDefined ? super : result
       end
     end
 
@@ -161,8 +166,4 @@ module Prefactory
     @prefactory_memo = {}
   end
 
-  def clear_prefactory_map
-    @prefactory = {}
-  end
-
 end

data/spec/prefactory_spec.rb

@@ -238,7 +238,7 @@ describe Prefactory do
     context "when passed a nonexistent key" do
       let(:key) { :frog }
       it do
-        is_expected.to be_nil
+        is_expected.to eq Prefactory::NotDefined
         expect { frog }.to raise_error(NameError)
       end
     end
@@ -281,4 +281,16 @@ describe Prefactory do
       expect(some_other_comment.text).to eq(blog.title)
     end
   end
+
+  describe "when the same key is overridden in different contexts at the same depth" do
+    set!(:some_blog) { create :blog, :title => 'original' }
+    it { expect(some_blog.title).to eq 'original' }
+    context "nested override" do
+      set!(:some_blog) { create :blog, :title => 'nested' }
+      it { expect(some_blog.title).to eq 'nested' }
+    end
+    context "nested unset" do
+      it { expect(some_blog.title).to eq 'original' }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefactory
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - developers@socialcast.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec_around_all
@@ -130,7 +130,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rvmrc"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -138,6 +139,7 @@ files:
 - Rakefile
 - lib/prefactory.rb
 - lib/prefactory/active_record_integration.rb
+- lib/prefactory/prefactory_lookup.rb
 - lib/prefactory/version.rb
 - lib/rspec/core/prefactory.rb
 - prefactory.gemspec

data/.rvmrc

@@ -1 +0,0 @@
-rvm use default@prefactory --create