prefactory 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1abdafe59af749590d226bcdb0b63c04f365832
-  data.tar.gz: 8553ebbca23fce19f82b16a8d89928165fafdfd2
+  metadata.gz: 95b877ff898937be95f990b77ae54bdf56cdfc98
+  data.tar.gz: 62fe2f5a16f43f6c24e7163a26ec5d7644eff8fe
 SHA512:
-  metadata.gz: a224b382181a1d36f12adef59627e7f75f82ff11f1d530ce2fb201c6ffa9d759587a9a657b6e6ec2a6260f095870a5cd0296a0c35fad6e2f414a5286b881de2d
-  data.tar.gz: 8b14d70581d33d8993ea9e306573d77d2726e17fab359b8642b216a4743ee998d24cf3a79a79f998df85bdf6a7c70dcaff72532159661d3f9eac09b7cb6f40e2
+  metadata.gz: 3332c9909eeeb534459fbfc2c160e92c9d16b6fb011dccfedaf020f584debc47e03340d613b325c305b3fdd8c910e63064954fef22fe87877ca90c80aca600b2
+  data.tar.gz: 6a4a33926f48246b5a3bb25756b3cc7e64ad2b90e244bc8d23322110e83de4a5ec671e655eedea5f8168900125c4dd7acf86596c7037c3ef017c4ade048cdde2

data/.travis.yml

@@ -2,10 +2,10 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
+  - 2.2.3
 env:
   - ACTIVE_RECORD_VERSION=4.0.0 RSPEC_VERSION=2.99
   - ACTIVE_RECORD_VERSION=4.0.0
   - ACTIVE_RECORD_VERSION=4.1.0 RSPEC_VERSION=2.99
   - ACTIVE_RECORD_VERSION=4.1.0
-  - ACTIVE_RECORD_VERSION=4.2.0.beta3
+  - ACTIVE_RECORD_VERSION=4.2.0

data/lib/prefactory/prefactory_lookup.rb

@@ -5,6 +5,7 @@ class PrefactoryLookup < ActiveRecord::Base
       t.column :key, :string
       t.column :result_class, :string
       t.column :result_id, :integer
+      t.column :result_value, :text
       t.index [:key], :unique => true
     end
   end

data/lib/prefactory/version.rb

@@ -21,5 +21,5 @@
 # SOFTWARE.
 
 module Prefactory
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/rspec/core/prefactory.rb

@@ -23,6 +23,7 @@
 require 'prefactory/active_record_integration'
 require 'rspec_around_all'
 require 'prefactory/prefactory_lookup'
+require 'yaml'
 
 module Prefactory
   class NotDefined
@@ -38,7 +39,11 @@ module Prefactory
     @prefactory_memo[key] ||= begin
                                 lookup = prefactory_lookup(key)
                                 if lookup.present?
-                                  lookup[:result_class].constantize.find(lookup[:result_id])
+                                  if lookup[:result_class]
+                                    lookup[:result_class].constantize.find(lookup[:result_id])
+                                  else
+                                    YAML.load(lookup[:result_value])
+                                  end
                                 else
                                   Prefactory::NotDefined
                                 end
@@ -62,10 +67,20 @@ module Prefactory
       result = create(key, *args) if respond_to?(:create)
     end
     if result.present?
-      PrefactoryLookup.where(:key => key).first_or_initialize.tap do |lookup|
-        lookup.result_class = result.class.name
-        lookup.result_id = result.id
-        lookup.save!
+      if result.respond_to?(:id)
+        PrefactoryLookup.where(:key => key).first_or_initialize.tap do |lookup|
+          lookup.result_class = result.class.name
+          lookup.result_id = result.id
+          lookup.result_value = nil
+          lookup.save!
+        end
+      else
+        PrefactoryLookup.where(:key => key).first_or_initialize.tap do |lookup|
+          lookup.result_class = nil
+          lookup.result_id = nil
+          lookup.result_value = YAML.dump(result)
+          lookup.save!
+        end
       end
     else
       warn "WARNING: Failed to add #{key} to prefactory: block result not present"

data/spec/database_setup.rb

@@ -25,24 +25,25 @@ require 'erb'
 config = YAML.load(ERB.new(File.read(File.dirname(__FILE__) + '/database.yml')).result)
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite3'])
+ActiveRecord::Base.raise_in_transactional_callbacks = true if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks)
 
 ActiveRecord::Schema.define(:version => 2) do
   create_table :blogs, :force => true do |t|
     t.column :title, :string
     t.column :counter, :integer
-    t.timestamps
+    t.timestamps :null => false
   end
   create_table :comments, :force => true do |t|
     t.column :blog_id, :integer
     t.column :counter, :integer
     t.column :text, :string
-    t.timestamps
+    t.timestamps :null => false
   end
   create_table :links, :force => true do |t|
     t.column :blog_id, :integer
     t.column :counter, :integer
     t.column :name, :string
-    t.timestamps
+    t.timestamps :null => false
   end
 end
 

data/spec/prefactory_spec.rb

@@ -118,6 +118,15 @@ describe Prefactory do
         expect(some_other_blog.counter).to eq(24)
       end
     end
+    context 'when the block returns something that does not respond_to? :id' do
+      before :all do
+        prefactory_add(:freeze_time) { Time.parse('2015-09-13 17:15') }
+      end
+      it do
+        expect(freeze_time).to be_a Time
+        expect(freeze_time).to eq Time.parse('2015-09-13 17:15')
+      end
+    end
     context "when referencing the object within the before-all block" do
       before :all do
         prefactory_add :blog
@@ -198,7 +207,7 @@ describe Prefactory do
         expect(@before_each_exception).to be_present
       end
       it "raises an error in an it-context" do
-        expect { prefactory_add(:comment) }.to raise_error
+        expect { prefactory_add(:comment) }.to raise_error(/can only be used in a before\(:all\)/)
       end
       it "works in a before-all context" do
         expect(prefactory(:blog)).to be_present

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefactory
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - developers@socialcast.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec_around_all
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Transaction-wrapped RSpec example groups with FactoryGirl integration