revertible_paper_trail 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/revertible_paper_trail/version.rb

@@ -17,14 +17,8 @@ module RevertiblePaperTrail
     end
 
     def active_item
-      # Fast track if item currently exists
-      active_item = item
-      return active_item if active_item
-
-      # Take latest and reify
-      latest_version = self.class.subsequent(self).last || self
-
-      return latest_version.reify
+      # Take current item or reify latest version
+      item || versions.last.reify
     end
 
     def current_item
@@ -50,7 +44,7 @@ module RevertiblePaperTrail
     end
 
     def versions
-      active_item.versions
+      sibling_versions
     end
   end
 end

data/revertible_paper_trail.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "revertible_paper_trail"
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simon H\u{fc}rlimann"]
-  s.date = "2012-09-03"
+  s.date = "2012-09-10"
   s.description = "This project adds undo/redo functionality to PaperTrail"
   s.email = "simon.huerlimann@cyt.ch"
   s.extra_rdoc_files = [

data/spec/revertible_paper_trail_spec.rb

@@ -66,7 +66,7 @@ describe RevertiblePaperTrail do
 
     it "should return latest destroyed version if no current item exists" do
       data = create(:dummy_data, :trailed_field => 'orig', :untrailed_field => 'orig')
-      
+
       # Do an update
       data.trailed_field = 'new'
       data.save
@@ -78,9 +78,21 @@ describe RevertiblePaperTrail do
       # remember this version
       latest_version = data.versions.last
 
-      # 
       first_version.active_item.trailed_field.should == 'new'
       latest_version.active_item.trailed_field.should == 'new'
     end
+
+    it "should not return version for other items if no current item exists" do
+      data = create(:dummy_data, :trailed_field => 'orig', :untrailed_field => 'orig')
+
+      # Destroy
+      data.destroy
+      # remember this version
+      data_version = data.versions.last
+
+      create(:dummy_data, :trailed_field => 'other', :untrailed_field => 'other')
+
+      data_version.active_item.trailed_field.should == 'orig'
+    end
   end
 end

data/spec/spec_helper.rb

@@ -26,7 +26,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 require 'factory_girl'
 Dir["#{File.dirname(__FILE__)}/factories/**/*.rb"].each { |f| require f }
 RSpec.configure do |config|
-  config.include Factory::Syntax::Methods
+  config.include FactoryGirl::Syntax::Methods
 end
   
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: revertible_paper_trail
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 137501693
+      hash: -55832145
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: