joshbuddy-has_many_versions 0.0.4 → 0.0.6

data/Rakefile

@@ -0,0 +1,41 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "has_many_versions"
+    gem.summary = %Q{Versioning for has_many relationships}
+    gem.email = "joshbuddy@gmail.com"
+    gem.homepage = "http://github.com/joshbuddy/has_many_versions"
+    gem.authors = ["Joshua Hull"]
+    gem.files = FileList["[A-Z]*", "{lib,spec,rails,bin}/**/*.rb", 'spec/database.yml', 'spec/spec.opts']
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = 'has_many_versions'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_opts << "--options" << "spec/spec.opts"
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+desc "Run all examples with RCov"
+Spec::Rake::SpecTask.new('spec_with_rcov') do |t|
+  t.spec_files = FileList['spec/**/*.rb']
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec']
+end
+
+task :default => :spec

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 4
+:patch: 6
 :major: 0
 :minor: 0

data/lib/has_many_versions.rb

@@ -8,6 +8,8 @@ end
 
 module HasManyVersions
   
+  HistoryItem = Struct.new(:version, :state)
+
   def upgrade_proxy_object
     proxy_owner.transaction do
       new_version = proxy_owner.version + 1
@@ -28,21 +30,25 @@ module HasManyVersions
 
     upgrade_proxy_object do |new_version|
       delete_records_without_versioning_transaction(new_version, @target.select { |v| !other.include?(v) })
-      add_records_without_versioning_transaction(new_version, *other_array.select { |v| !current.include?(v) })
+      add_records_without_versioning_transaction(new_version, other_array.select { |v| !current.include?(v) }, @target.select { |v| !other.include?(v) }.collect(&:id))
     end
   end
   
-  def add_records_without_versioning_transaction(new_version, *records)
-    changing_records = flatten_deeper(records).select{|r| !r.new_record? && r.changed?}
-    changing_records.empty? ? proxy_reflection.klass.update_all(
-      ['version = ?', new_version], 
-      ["#{proxy_reflection.primary_key_name} = ? and version = ?", proxy_owner.id, new_version - 1]
-    ) : proxy_reflection.klass.update_all(
-          ['version = ?', new_version], 
-          ["#{proxy_reflection.primary_key_name} = ? and version = ? and #{proxy_reflection.klass.primary_key} not in (?)", proxy_owner.id, new_version - 1, changing_records.collect(&:id)]
-        )
+  def add_records_without_versioning_transaction(new_version, records, excluded_ids = [])
+    changing_records = flatten_deeper(records).select{ |r|
+      (!r.new_record? && (r.changed? || (r.version != (new_version - 1))))
+    }
+    excluded_ids.concat(changing_records.collect(&:id)) unless changing_records.empty?
+    excluded_ids.empty? ? 
+      proxy_reflection.klass.update_all(
+        ['version = ?', new_version], 
+        ["#{proxy_reflection.primary_key_name} = ? and version = ?", proxy_owner.id, new_version - 1]
+      ) : proxy_reflection.klass.update_all(
+        ['version = ?', new_version], 
+        ["#{proxy_reflection.primary_key_name} = ? and version = ? and #{proxy_reflection.klass.primary_key} not in (?)", proxy_owner.id, new_version - 1, excluded_ids]
+      )
     records = flatten_deeper(records).collect do |r|
-      if !r.new_record? && r.changed?
+      if changing_records.include?(r)
         new_r = r.clone
         new_r.from_version = r.id if new_r.respond_to?(:from_version=)
         new_r
@@ -51,7 +57,7 @@ module HasManyVersions
       end
     end
     flatten_deeper(records).each do |record|
-      record.initial_version = proxy_owner.version if record.new_record?
+      record.initial_version = proxy_owner.version if record.initial_version.nil? or record.new_record?
       record.version = proxy_owner.version
     end
     __concat__(*records)
@@ -60,7 +66,7 @@ module HasManyVersions
   
   def <<(*records)
     upgrade_proxy_object do |new_version|
-      add_records_without_versioning_transaction(new_version, *records)
+      add_records_without_versioning_transaction(new_version, records)
     end
   end
   
@@ -83,9 +89,21 @@ module HasManyVersions
       '%s.version = #{version}' % [proxy_reflection.quoted_table_name])
   end
   
+  def history(from = [proxy_owner.version - 10, 1].max, to = proxy_owner.version)
+    history_items = proxy_reflection.klass.find(:all, :conditions => ["#{proxy_reflection.primary_key_name} = ? and version >= ? and initial_version <= ?", proxy_owner.id, from, to])
+    to = proxy_owner.version if to > proxy_owner.version
+    from = 1 if from < 1
+    (from..to).collect do |version|
+      HistoryItem.new(version, history_items.select { |item| 
+        item.initial_version <= version && item.version >= version
+      })
+    end
+  end
+  
   def rollback(target_version = proxy_owner.version - 1)
+    return if target_version == proxy_owner.version
     upgrade_proxy_object do |new_version|
-      proxy_reflection.klass.find(:all, :conditions => ['initial_version <= ? and version >= ?', target_version, target_version]).each do |new_record|
+      proxy_reflection.klass.find(:all, :conditions => ["#{proxy_reflection.primary_key_name} = ? and initial_version <= ? and version >= ?", proxy_owner.id, target_version, target_version]).each do |new_record|
         new_record = new_record.clone
         new_record.initial_version = new_version
         new_record.version = new_version

data/rails/init.rb

@@ -0,0 +1 @@
+autoload :HasManyVersions, 'lib/has_many_versions'

data/spec/history_spec.rb

@@ -0,0 +1,37 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe "HasManyVersions history" do
+
+  before(:each) do
+    Database.reset!
+  end
+  
+  it "should give you a history" do
+    Database.reset!(true)
+    jasper = Author.new(:name => 'Jasper Fforde')
+    
+    books = (1..100).collect do |i|
+      book = Book.new(:name => "Book #{i}", :id => i)
+      book.save!
+      book
+    end
+    jasper.save!
+    titles = [[]]
+    jasper.books = [Book.find(1), Book.find(10), Book.find(11), Book.find(23), Book.find(99)]
+    titles << jasper.books.collect(&:name)
+    jasper.books = [Book.find(1), Book.find(10), Book.find(12), Book.find(25), Book.find(94)]
+    titles << jasper.books.collect(&:name)
+    jasper.books = [Book.find(1), Book.find(10), Book.find(12), Book.find(25), Book.find(94), Book.find(87)]
+    titles << jasper.books.collect(&:name)
+    jasper.books = [Book.find(2), Book.find(4), Book.find(5)]
+    titles << jasper.books.collect(&:name)
+    jasper.books = [Book.find(1), Book.find(10), Book.find(11), Book.find(23), Book.find(99)]
+    titles << jasper.books.collect(&:name)
+    
+    jasper.books.history.each do |history|
+      history.state.collect(&:name).should == titles.shift
+    end
+    
+  end
+  
+end

data/spec/update_spec.rb

@@ -51,7 +51,7 @@ describe "HasManyVersions updating" do
     
     jasper.books = [shades_of_grey2, eyre_affair]
     jasper.version.should == 3
-    
+    jasper.books.collect(&:name).should == ['The Eyre Affair', 'Shades of Grey 2']
     jasper.books.rollback
     jasper.books.collect(&:name).should == ['The Eyre Affair', 'Shades of Grey']
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joshbuddy-has_many_versions
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors: 
 - Joshua Hull
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-15 00:00:00 -07:00
+date: 2009-04-22 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -23,17 +23,20 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
+- LICENSE
+- Rakefile
 - README.rdoc
 - VERSION.yml
 - lib/has_many_versions.rb
 - spec/add_spec.rb
-- spec/database.yml
 - spec/delete_spec.rb
+- spec/history_spec.rb
 - spec/rollback_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/update_spec.rb
-- LICENSE
+- rails/init.rb
+- spec/database.yml
+- spec/spec.opts
 has_rdoc: true
 homepage: http://github.com/joshbuddy/has_many_versions
 post_install_message: