dm-is-versioned 0.9.11 → 0.10.0

data/{History.txt → History.rdoc}

@@ -1,3 +1,7 @@
+=== 0.10.0 / 2009-10-15
+
+* Updated to work with dm-core 0.10.0
+
 === 0.9.11 / 2009-03-29
 
 * No changes this version

data/Manifest.txt

@@ -1,7 +1,7 @@
-History.txt
+History.rdoc
 LICENSE
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 TODO
 lib/dm-is-versioned.rb

data/Rakefile

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'rubygems'
 
 ROOT    = Pathname(__FILE__).dirname.expand_path
 JRUBY   = RUBY_PLATFORM =~ /java/
@@ -14,10 +13,10 @@ GEM_NAME = 'dm-is-versioned'
 GEM_VERSION = DataMapper::Is::Versioned::VERSION
 GEM_DEPENDENCIES = [['dm-core', GEM_VERSION]]
 GEM_CLEAN = %w[ log pkg coverage ]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.rdoc LICENSE TODO History.rdoc ] }
 
 PROJECT_NAME = 'datamapper'
-PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_URL  = "http://github.com/datamapper/dm-more/tree/master/#{GEM_NAME}"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin enabling simple versioning of models'
 
 [ ROOT, ROOT.parent ].each do |dir|

data/lib/dm-is-versioned.rb

@@ -1,14 +1,9 @@
-require 'rubygems'
-require 'pathname'
-
-gem 'dm-core', '0.9.11'
-require 'dm-core'
-
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-versioned' / 'is' / 'versioned.rb'
+require 'dm-is-versioned/is/versioned'
+require 'dm-is-versioned/is/version'
 
 # Include the plugin in Resource
 module DataMapper
   module Model
     include DataMapper::Is::Versioned
-  end # module Model
-end # module DataMapper
+  end
+end

data/lib/dm-is-versioned/is/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module Is
     module Versioned
-      VERSION = '0.9.11'
+      VERSION = '0.10.0'.freeze
     end
   end
 end

data/lib/dm-is-versioned/is/versioned.rb

@@ -45,54 +45,62 @@ module DataMapper
     #
     # TODO: enable replacing a current version with an old version.
     module Versioned
-
       def is_versioned(options = {})
-        on = options[:on]
-
-        class << self; self end.class_eval do
-          define_method :const_missing do |name|
-            storage_name = Extlib::Inflection.tableize(self.name + "Version")
-            model = DataMapper::Model.new(storage_name)
-
-            if name == :Version
-              properties.each do |property|
-                options = property.options
-                options[:key] = true if property.name == on || options[:serial] == true
-                options[:serial] = false
-                model.property property.name, property.type, options
-              end
+        @on = on = options[:on]
 
-              self.const_set("Version", model)
-            else
-              super(name)
-            end
-          end
-        end
-
-        self.after_class_method :auto_migrate! do
+        after_class_method :auto_migrate! do |retval|
           self::Version.auto_migrate!
         end
 
-        self.after_class_method :auto_upgrade! do
+        after_class_method :auto_upgrade! do |retval|
           self::Version.auto_upgrade!
         end
 
-        self.before :attribute_set do |property, value|
-          pending_version_attributes[property] ||= self.attribute_get(property)
+        properties.each do |property|
+          name = property.name
+          before "#{name}=".to_sym do
+            unless (value = property.get(self)).nil? || pending_version_attributes.key?(name)
+              pending_version_attributes[name] = value
+            end
+          end
         end
 
-        self.after :update do |result|
-          if result && dirty_attributes.has_key?(properties[on])
-            self.class::Version.create(self.attributes.merge(pending_version_attributes))
-            self.pending_version_attributes.clear
+        after :update do |retval|
+          if retval && pending_version_attributes.key?(on)
+            model::Version.create(attributes.merge(pending_version_attributes))
+            pending_version_attributes.clear
           end
 
-          result
+          retval
         end
 
-        include DataMapper::Is::Versioned::InstanceMethods
+        extend ClassMethods
+        include InstanceMethods
       end
 
+      module ClassMethods
+        def const_missing(name)
+          if name == :Version
+            model = DataMapper::Model.new
+
+            properties.each do |property|
+              type = property.type
+              type = Class if type == DataMapper::Types::Discriminator
+
+              options = property.options.merge(
+                :key    => property.name == @on,
+                :serial => false
+              )
+
+              model.property(property.name, type, options)
+            end
+
+            const_set(name, model)
+          else
+            super
+          end
+        end
+      end # ClassMethods
 
       module InstanceMethods
         ##
@@ -114,14 +122,12 @@ module DataMapper
         # --
         # @return <Collection>
         def versions
-          query = {}
-          version = self.class.const_get("Version")
-          self.class.key.zip(self.key) { |property, value| query[property.name] = value }
-          query.merge(:order => version.key.collect { |key| key.name.desc })
-          version.all(query)
+          version_model = model.const_get(:Version)
+          query = model.key.zip(key).map { |p, v| [ p.name, v ] }.to_hash
+          query.merge(:order => version_model.key.map { |k| k.name.desc })
+          version_model.all(query)
         end
-      end
-
+      end # InstanceMethods
     end # Versioned
   end # Is
 end # DataMapper

data/spec/spec.opts

@@ -1 +1,2 @@
 --colour
+--loadby random

data/spec/spec_helper.rb

@@ -1,10 +1,14 @@
-require 'pathname'
 require 'rubygems'
 
-gem 'rspec', '~>1.2'
-require 'spec'
+# Use local dm-core if running from a typical dev checkout.
+lib = File.join('..', '..', 'dm-core', 'lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'dm-core'
 
-require Pathname(__FILE__).dirname.expand_path.parent + 'lib/dm-is-versioned'
+# Support running specs with 'rake spec' and 'spec'
+$LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
+
+require 'dm-is-versioned'
 
 def load_driver(name, default_uri)
   return false if ENV['ADAPTER'] != name.to_s

data/spec/versioned_spec.rb

@@ -1,184 +1,123 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require 'spec_helper'
 
 class Story
   include DataMapper::Resource
 
-  property :id, Integer, :serial => true
-  property :title, String
+  property :id,         Serial
+  property :title,      String
   property :updated_at, DateTime
+  property :type,       Discriminator
 
   before :save do
     # For the sake of testing, make sure the updated_at is always unique
-    time = self.updated_at ? self.updated_at + 1 : Time.now
-    self.updated_at = time if self.dirty?
+    if dirty?
+      time = self.updated_at ? self.updated_at + 1 : Time.now
+      self.updated_at = time
+    end
   end
 
   is_versioned :on => :updated_at
-
 end
 
 if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
-  describe 'DataMapper' do
-    describe "#auto_migrate!" do
-      before do
-        # I *think* AutoMigrator breaks toplevel auto_migrate
-        # into two calls to reduce redundancy, so auto_migrate!
-        # never actually gets called on decendents after a
-        # DataMapper.auto_migrate! call.
-        Story::Version.should_receive(:auto_migrate_down!)
-        Story::Version.should_receive(:auto_migrate_up!)
-      end
-      it "should get called on a versioned inner class" do
-        DataMapper.auto_migrate!
-      end
-    end # #auto_migrate!
-
-    describe "#auto_upgrade!" do
-      before do
-        # AutoMigrator collects all descendents, triggering once
-        # but triggers a second time after Story gets upgraded.
-        # Since it's non-destructive, shouldn't matter that it
-        # gets called twice though.
-        Story::Version.should_receive(:auto_upgrade!).twice
-      end
-      it "should get called on a versioned inner class" do
-        DataMapper.auto_upgrade!
-      end
-    end # #auto_upgrade!
-  end
-
   describe 'DataMapper::Is::Versioned' do
-    describe "inner class" do
-      it "should be present" do
-        Story::Version.should be_a_kind_of(Class)
+    describe 'inner class' do
+      it 'should be present' do
+        Story::Version.should be_a_kind_of(DataMapper::Model)
       end
 
-      it "should have a default storage name" do
-        Story::Version.storage_name.should == "story_versions"
+      it 'should have a default storage name' do
+        Story::Version.storage_name.should == 'story_versions'
       end
 
-      it "should have its parent's properties" do
-        Story.properties.each do |property|
-          Story::Version.properties.should have_property(property.name)
+      Story.properties.each do |property|
+        it "should have its parent's property #{property.name}" do
+          Story::Version.properties.should include(property)
         end
       end
-    end # inner class
+    end
 
-    describe "#auto_migrate!" do
-      before do
-        Story::Version.should_receive(:auto_migrate!)
-      end
-      it "should get called on the inner class" do
+    describe '#create' do
+      before :all do
         Story.auto_migrate!
+        Story.create(:title => 'A Very Interesting Article')
       end
-    end # #auto_migrate!
-
-    describe "#auto_upgrade!" do
-      before do
-        Story::Version.should_receive(:auto_upgrade!)
-      end
-      it "should get called on the inner class" do
-        Story.auto_upgrade!
-      end
-    end # #auto_upgrade!
 
-    describe "#create" do
-      before do
-        Story.auto_migrate!
-        Story.create(:title => "A Very Interesting Article")
-      end
-      it "should not create a versioned copy" do
+      it 'should not create a versioned copy' do
         Story::Version.all.size.should == 0
       end
-    end # #create
+    end
 
-    describe "#save" do
-      before do
+    describe '#save' do
+      before :all do
         Story.auto_migrate!
       end
 
-      describe "(with new resource)" do
-        before do
-          @story = Story.new(:title => "A Story")
+      describe '(with new resource)' do
+        before :all do
+          @story = Story.new(:title => 'A Story')
           @story.save
         end
-        it "should not create a versioned copy" do
+
+        it 'should not create a versioned copy' do
           Story::Version.all.size.should == 0
         end
       end
 
-      describe "(with a clean existing resource)" do
-        before do
-          @story = Story.create(:title => "A Story")
+      describe '(with a clean existing resource)' do
+        before :all do
+          @story = Story.create(:title => 'A Story')
           @story.save
         end
 
-        it "should not create a versioned copy" do
+        it 'should not create a versioned copy' do
           Story::Version.all.size.should == 0
         end
       end
 
-      describe "(with a dirty existing resource)" do
-        before do
-          @story = Story.create(:title => "A Story")
-          @story.title = "An Inner Update"
-          @story.title = "An Updated Story"
+      describe '(with a dirty existing resource)' do
+        before :all do
+          @story = Story.create(:title => 'A Story')
+          @story.title = 'An Inner Update'
+          @story.title = 'An Updated Story'
           @story.save
         end
 
-        it "should create a versioned copy" do
+        it 'should create a versioned copy' do
           Story::Version.all.size.should == 1
         end
 
-        it "should not have the same value for the versioned field" do
+        it 'should not have the same value for the versioned field' do
           @story.updated_at.should_not == Story::Version.first.updated_at
         end
 
-        it "should save the original value, not the inner update" do
+        it 'should save the original value, not the inner update' do
           # changes to the story between saves shouldn't be updated.
-          @story.versions.last.title.should == "A Story"
+          @story.versions.last.title.should == 'A Story'
         end
       end
+    end
 
-    end # #save
-
-    describe "#pending_version_attributes" do
-      before do
-        @story = Story.create(:title => "A Story")
-      end
-
-      it "should be updated when a property changes" do
-        @story.title = "A New Title"
-        @story.pending_version_attributes[:title].should == "A Story"
-      end
-
-      it "should be cleared when a resource is saved" do
-        @story.title = "A New Title"
-        @story.save
-        @story.pending_version_attributes.should be_empty
-      end
-    end # #pending_version_attributes
-
-    describe "#versions" do
-      before do
+    describe '#versions' do
+      before :all do
         Story.auto_migrate!
-        @story = Story.create(:title => "A Story")
+        @story = Story.create(:title => 'A Story')
       end
 
-      it "should return an empty array when there are no versions" do
+      it 'should return an empty array when there are no versions' do
         @story.versions.should == []
       end
 
-      it "should return a collection when there are versions" do
+      it 'should return a collection when there are versions' do
         @story.versions.should == Story::Version.all(:id => @story.id)
       end
 
       it "should not return another object's versions" do
-        @story2 = Story.create(:title => "A Different Story")
-        @story2.title = "A Different Title"
+        @story2 = Story.create(:title => 'A Different Story')
+        @story2.title = 'A Different Title'
         @story2.save
         @story.versions.should == Story::Version.all(:id => @story.id)
       end
-    end # #versions
+    end
   end
 end

data/tasks/install.rb

@@ -4,7 +4,7 @@ end
 
 desc "Install #{GEM_NAME} #{GEM_VERSION}"
 task :install => [ :package ] do
-  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+  sudo_gem "install pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
 end
 
 desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"

data/tasks/spec.rb

@@ -1,6 +1,4 @@
 begin
-  gem 'rspec', '~>1.2'
-  require 'spec'
   require 'spec/rake/spectask'
 
   task :default => [ :spec ]
@@ -8,16 +6,18 @@ begin
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
+    t.libs      << 'lib' << 'spec' # needed for CI rake spec task, duplicated in spec_helper
 
     begin
-      gem 'rcov', '~>0.8'
+      require 'rcov'
       t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
       t.rcov_opts << '--exclude' << 'spec'
       t.rcov_opts << '--text-summary'
       t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
     rescue LoadError
       # rcov not installed
+    rescue SyntaxError
+      # rcov syntax invalid
     end
   end
 rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-versioned
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors: 
 - Bernerd Schaefer
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
+dependencies: []
+
 description: DataMapper plugin enabling simple versioning of models
 email: 
 - bernerd [a] wieck [d] com
@@ -30,15 +21,15 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.rdoc
 - LICENSE
 - TODO
-- History.txt
+- History.rdoc
 files: 
-- History.txt
+- History.rdoc
 - LICENSE
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - TODO
 - lib/dm-is-versioned.rb
@@ -50,11 +41,13 @@ files:
 - tasks/install.rb
 - tasks/spec.rb
 has_rdoc: true
-homepage: http://github.com/sam/dm-more/tree/master/dm-is-versioned
+homepage: http://github.com/datamapper/dm-more/tree/master/dm-is-versioned
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -72,9 +65,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: DataMapper plugin enabling simple versioning of models
 test_files: []