yesterday 1.0.rc1 → 1.0.rc2

data/README.rdoc

@@ -14,9 +14,17 @@ And then run the generator in your Rails 3 project:
 
 == Use tracking in your models
 
+First create model that will hold your changesets:
+
+  class Changeset < ActiveRecord::Base
+    include Yesterday::ChangesetBase
+  end
+
+Now assign the models you want to track:
+
   class Contact < ActiveRecord::Base
     has_many :addresses
-    track_changes
+    track_changes :with => :changesets
   end
 
   class Address < ActiveRecord::Base

data/lib/generators/yesterday/templates/create_changesets.rb

@@ -8,6 +8,9 @@ class CreateChangesets < ActiveRecord::Migration
       t.datetime :created_at
       t.datetime :updated_at
     end
+
+    create_index :changesets, [ :changed_object_id, :changed_object_type ]
+    create_index :changesets, [ :changed_object_id, :changed_object_type, :version_number ]
   end
 
   def self.down

data/lib/yesterday.rb

@@ -2,7 +2,7 @@ require 'active_support'
 require 'active_support/core_ext'
 require 'active_record'
 
-require 'yesterday/changeset'
+require 'yesterday/changeset_base'
 require 'yesterday/versioning'
 require 'yesterday/differ'
 require 'yesterday/versioned_object_creator'

data/lib/yesterday/{changeset.rb → changeset_base.rb}

@@ -1,25 +1,11 @@
 module Yesterday
-  class Changeset < ActiveRecord::Base
+  module ChangesetBase
 
-    before_create :determine_version_number, :determine_object_attributes
-    belongs_to :changed_object, :polymorphic => true
-
-    serialize :object_attributes
-
-    def self.version(version_number)
-      where(:version_number => version_number)
-    end
-
-    def self.for_changed_object(object)
-      where(:changed_object_type => object.class.to_s, :changed_object_id => object.id)
-    end
-
-    def self.last_for(object)
-      for_changed_object(object).order('created_at DESC').first
-    end
-
-    def self.version_number_for(object)
-      last_for(object).try(:version_number) || 0
+    def self.included(base)
+      base.extend ClassMethods
+      base.before_create :determine_version_number, :determine_object_attributes
+      base.belongs_to :changed_object, :polymorphic => true
+      base.serialize :object_attributes
     end
 
     def object
@@ -50,5 +36,24 @@ module Yesterday
       self.object_attributes = Yesterday::Serializer.new(changed_object).to_hash
     end
 
+
+    module ClassMethods
+      def version(version_number)
+        where(:version_number => version_number)
+      end
+
+      def for_changed_object(object)
+        where(:changed_object_type => object.class.to_s, :changed_object_id => object.id)
+      end
+
+      def last_for(object)
+        for_changed_object(object).order('created_at DESC').first
+      end
+
+      def version_number_for(object)
+        last_for(object).try(:version_number) || 0
+      end
+    end
+
   end
 end

data/lib/yesterday/model.rb

@@ -46,11 +46,21 @@ module Yesterday
         @tracked_attributes || []
       end
 
+      def changeset_model
+        @changeset_model
+      end
+
+      def changeset_klass
+        changeset_model.classify.constantize
+      end
+
       def track_changes(options = {})
-        send :include, InstanceMethods
+        with = options[:with] || :changeset
+        @changeset_model = with.to_s
 
+        send :include, InstanceMethods
         after_save :serialize_current_state
-        exclude_tracking_for :associations => :changesets
+        exclude_tracking_for :associations => with.to_s.pluralize.to_sym
       end
 
       def version(version_number)

data/lib/yesterday/version.rb

@@ -1,3 +1,3 @@
 module Yesterday
-  VERSION = "1.0.rc1"
+  VERSION = "1.0.rc2"
 end

data/lib/yesterday/versioning.rb

@@ -2,11 +2,11 @@ module Yesterday
   class Versioning
     class << self
       def create_changeset_for(object)
-        Changeset.create :changed_object => object
+        object.class.changeset_klass.create :changed_object => object
       end
 
       def changesets_for(object)
-        Changeset.for_changed_object(object)
+        object.class.changeset_klass.for_changed_object(object)
       end
 
       def current_version_number_for(object)
@@ -26,7 +26,7 @@ module Yesterday
       end
 
       def changeset_for(version_number, object)
-        Changeset.for_changed_object(object).version(version_number).first
+        object.class.changeset_klass.for_changed_object(object).version(version_number).first
       end
 
       def object_attributes_for(version_number, object)

data/spec/models.rb

@@ -1,20 +1,22 @@
+class Changeset < ActiveRecord::Base
+  include Yesterday::ChangesetBase
+end
+
 class Report < ActiveRecord::Base
   has_many :contacts
   has_many :companies
 
-  track_changes
+  track_changes :with => :changesets
 end
 
 class Contact < ActiveRecord::Base
   has_and_belongs_to_many :addresses
 end
 
-class Address < ActiveRecord::Base
-end
+class Address < ActiveRecord::Base; end
 
 class Company < ActiveRecord::Base
   has_and_belongs_to_many :addresses
-
-  track_changes
+  track_changes :with => :changesets
   exclude_tracking_for :attributes => [:created_at, :updated_at]
 end

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ RSpec.configure do |config|
   config.before(:each) do
     Contact.delete_all
     Address.delete_all
-    Yesterday::Changeset.delete_all
+    Changeset.delete_all
   end
 end
 

data/spec/yesterday_model_spec.rb

@@ -10,9 +10,9 @@ describe Yesterday::Model do
   end
 
   it 'should create a new changeset when saved' do
-    Yesterday::Changeset.count.should == 0
+    Changeset.count.should == 0
     Report.create :description => 'bar'
-    Yesterday::Changeset.count.should == 1
+    Changeset.count.should == 1
   end
 
   it 'should return all related changesets' do

metadata

@@ -1,56 +1,75 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: yesterday
-version: !ruby/object:Gem::Version
-  version: 1.0.rc1
+version: !ruby/object:Gem::Version 
+  hash: 15424241
   prerelease: 4
+  segments: 
+  - 1
+  - 0
+  - rc
+  - 2
+  version: 1.0.rc2
 platform: ruby
-authors:
+authors: 
 - Diederick Lawson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-09 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-09-20 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70215422679120 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70215422679120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &70215422678700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70215422678700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &70215422678280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70215422678280
+  version_requirements: *id003
 description: Track history and view any made changes in your active record models
-email:
+email: 
 - webmaster@altovista.nl
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.rdoc
@@ -58,7 +77,7 @@ files:
 - lib/generators/yesterday/install_generator.rb
 - lib/generators/yesterday/templates/create_changesets.rb
 - lib/yesterday.rb
-- lib/yesterday/changeset.rb
+- lib/yesterday/changeset_base.rb
 - lib/yesterday/differ.rb
 - lib/yesterday/historical_value.rb
 - lib/yesterday/model.rb
@@ -79,29 +98,40 @@ files:
 - yesterday.gemspec
 homepage: http://www.altovista.nl
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: yesterday
-rubygems_version: 1.8.10
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Track history in your active record models
-test_files:
+test_files: 
 - spec/database.yml
 - spec/differ_spec.rb
 - spec/models.rb