dm-is-versioned 0.10.2 → 1.0.0.rc1

data/.gitignore

@@ -0,0 +1,36 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## Rubinius
+*.rbc
+
+## PROJECT::GENERAL
+*.gem
+coverage
+rdoc
+pkg
+tmp
+doc
+log
+.yardoc
+measurements
+
+## BUNDLER
+.bundle
+Gemfile.local
+Gemfile.lock
+
+## PROJECT::SPECIFIC
+spec/db/

data/Gemfile

@@ -0,0 +1,141 @@
+# If you're working on more than one datamapper gem at a time, then it's
+# recommended to create a local Gemfile and use this instead of the git
+# sources. This will make sure that you are  developing against your
+# other local datamapper sources that you currently work on. Gemfile.local
+# will behave identically to the standard Gemfile apart from the fact that
+# it fetches the datamapper gems from local paths. This means that you can use
+# the same environment variables, like ADAPTER(S) or PLUGIN(S) when running
+# bundle commands. Gemfile.local is added to .gitignore, so you don't need to
+# worry about accidentally checking local development paths into git.
+# In order to create a local Gemfile, all you need to do is run:
+#
+#   bundle exec rake local_gemfile
+#
+# This will give you a Gemfile.local file that points to your local clones of
+# the various datamapper gems. It's assumed that all datamapper repo clones
+# reside in the same directory. You can use the Gemfile.local like so for
+# running any bundle command:
+#
+#   BUNDLE_GEMFILE=Gemfile.local bundle foo
+#
+# You can also specify which adapter(s) should be part of the bundle by setting
+# an environment variable. This of course also works when using the Gemfile.local
+#
+#   bundle foo                        # dm-sqlite-adapter
+#   ADAPTER=mysql bundle foo          # dm-mysql-adapter
+#   ADAPTERS=sqlite,mysql bundle foo  # dm-sqlite-adapter and dm-mysql-adapter
+#
+# Of course you can also use the ADAPTER(S) variable when using the Gemfile.local
+# and running specs against selected adapters.
+#
+# For easily working with adapters supported on your machine, it's recommended
+# that you first install all adapters that you are planning to use or work on
+# by doing something like
+#
+#   ADAPTERS=sqlite,mysql,postgres bundle install
+#
+# This will clone the various repositories and make them available to bundler.
+# Once you have them installed you can easily switch between adapters for the
+# various development tasks. Running something like
+#
+#   ADAPTER=mysql bundle exec rake spec
+#
+# will make sure that the dm-mysql-adapter is part of the bundle, and will be used
+# when running the specs.
+#
+# You can also specify which plugin(s) should be part of the bundle by setting
+# an environment variable. This also works when using the Gemfile.local
+#
+#   bundle foo                                 # dm-migrations
+#   PLUGINS=dm-validations bundle foo          # dm-migrations and dm-validations
+#   PLUGINS=dm-validations,dm-types bundle foo # dm-migrations, dm-validations and dm-types
+#
+# Of course you can combine the PLUGIN(S) and ADAPTER(S) env vars to run specs
+# for certain adapter/plugin combinations.
+#
+# Finally, to speed up running specs and other tasks, it's recommended to run
+#
+#   bundle lock
+#
+# after running 'bundle install' for the first time. This will make 'bundle exec' run
+# a lot faster compared to the unlocked version. With an unlocked bundle you would
+# typically just run 'bundle install' from time to time to fetch the latest sources from
+# upstream. When you locked your bundle, you need to run
+#
+#   bundle install --relock
+#
+# to make sure to fetch the latest updates and then lock the bundle again. Gemfile.lock
+# is added to the .gitignore file, so you don't need to worry about accidentally checking
+# it into version control.
+
+source 'http://rubygems.org'
+
+DATAMAPPER = 'git://github.com/datamapper'
+DM_VERSION = '~> 1.0.0.rc1'
+
+group :runtime do # Runtime dependencies (as in the gemspec)
+
+  if ENV['EXTLIB']
+    gem 'extlib',        '~> 0.9.15',      :git => "#{DATAMAPPER}/extlib.git"
+  else
+    gem 'activesupport', '~> 3.0.0.beta3', :git => 'git://github.com/rails/rails.git', :require => nil
+  end
+
+  gem 'dm-core',         DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
+
+end
+
+group(:development) do # Development dependencies (as in the gemspec)
+
+  gem 'rake',           '~> 0.8.7'
+  gem 'rspec',          '~> 1.3'
+  gem 'jeweler',        '~> 1.4'
+
+end
+
+group :quality do # These gems contain rake tasks that check the quality of the source code
+
+  gem 'metric_fu',      '~> 1.3'
+  gem 'rcov',           '~> 0.9.7'
+  gem 'reek',           '~> 1.2.7'
+  gem 'roodi',          '~> 2.1'
+  gem 'yard',           '~> 0.5'
+  gem 'yardstick',      '~> 0.1'
+
+end
+
+group :datamapper do # We need this because we want to pin these dependencies to their git master sources
+
+  adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
+  adapters = adapters.to_s.gsub(',',' ').split(' ') - ['in_memory']
+
+  unless adapters.empty?
+
+    DO_VERSION     = '~> 0.10.2'
+    DM_DO_ADAPTERS = %w[sqlite postgres mysql oracle sqlserver]
+
+    gem 'data_objects',  DO_VERSION, :git => "#{DATAMAPPER}/do.git"
+
+    adapters.each do |adapter|
+      if DM_DO_ADAPTERS.any? { |dm_do_adapter| dm_do_adapter =~ /#{adapter}/  }
+        adapter = 'sqlite3' if adapter == 'sqlite'
+        gem "do_#{adapter}", DO_VERSION, :git => "#{DATAMAPPER}/do.git"
+      end
+    end
+
+    gem 'dm-do-adapter', DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
+
+    adapters.each do |adapter|
+      gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
+    end
+
+  end
+
+  plugins = ENV['PLUGINS'] || ENV['PLUGIN']
+  plugins = (plugins.to_s.gsub(',',' ').split(' ') + ['dm-migrations']).uniq
+
+  plugins.each do |plugin|
+    gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
+  end
+
+end

data/Rakefile

@@ -15,10 +15,9 @@ begin
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core', '~> 0.10.2'
+    gem.add_dependency 'dm-core', '~> 1.0.0.rc1'
 
-    gem.add_development_dependency 'rspec', '~> 1.2.9'
-    gem.add_development_dependency 'yard',  '~> 0.4.0'
+    gem.add_development_dependency 'rspec', '~> 1.3'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.10.2
+1.0.0.rc1

data/dm-is-versioned.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-is-versioned}
-  s.version = "0.10.2"
+  s.version = "1.0.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bernerd Schaefer"]
-  s.date = %q{2009-12-11}
+  s.date = %q{2010-05-19}
   s.description = %q{DataMapper plugin enabling simple versioning of models}
   s.email = %q{bernerd [a] wieck [d] com}
   s.extra_rdoc_files = [
@@ -17,7 +17,9 @@ Gem::Specification.new do |s|
      "README.rdoc"
   ]
   s.files = [
-    "LICENSE",
+    ".gitignore",
+     "Gemfile",
+     "LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",
@@ -29,6 +31,7 @@ Gem::Specification.new do |s|
      "spec/spec_helper.rb",
      "spec/versioned_spec.rb",
      "tasks/ci.rake",
+     "tasks/local_gemfile.rake",
      "tasks/metrics.rake",
      "tasks/spec.rake",
      "tasks/yard.rake",
@@ -38,26 +41,27 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{DataMapper plugin enabling simple versioning of models}
+  s.test_files = [
+    "spec/spec_helper.rb",
+     "spec/versioned_spec.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 0.10.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
-      s.add_development_dependency(%q<yard>, ["~> 0.4.0"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
-      s.add_dependency(%q<rspec>, ["~> 1.2.9"])
-      s.add_dependency(%q<yard>, ["~> 0.4.0"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
+      s.add_dependency(%q<rspec>, ["~> 1.3"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
-    s.add_dependency(%q<rspec>, ["~> 1.2.9"])
-    s.add_dependency(%q<yard>, ["~> 0.4.0"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
+    s.add_dependency(%q<rspec>, ["~> 1.3"])
   end
 end
 

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

@@ -48,13 +48,7 @@ module DataMapper
       def is_versioned(options = {})
         @on = on = options[:on]
 
-        after_class_method :auto_migrate! do |retval|
-          self::Version.auto_migrate!
-        end
-
-        after_class_method :auto_upgrade! do |retval|
-          self::Version.auto_upgrade!
-        end
+        extend(Migration) if respond_to?(:auto_migrate!)
 
         properties.each do |property|
           name = property.name
@@ -65,13 +59,11 @@ module DataMapper
           end
         end
 
-        after :update do |retval|
-          if retval && pending_version_attributes.key?(on)
+        after :update do
+          if clean? && pending_version_attributes.key?(on)
             model::Version.create(attributes.merge(pending_version_attributes))
             pending_version_attributes.clear
           end
-
-          retval
         end
 
         extend ClassMethods
@@ -84,13 +76,16 @@ module DataMapper
             model = DataMapper::Model.new
 
             properties.each do |property|
-              type = property.type
-              type = Class if type == DataMapper::Types::Discriminator
+              type = case property
+                when DataMapper::Property::Discriminator then Class
+                when DataMapper::Property::Serial        then Integer
+              else
+                property.class
+              end
 
-              options = property.options.merge(
-                :key    => property.name == @on,
-                :serial => false
-              )
+              options = property.options.merge(:key => property.name == @on)
+
+              options[:key] = true if options.delete(:serial)
 
               model.property(property.name, type, options)
             end
@@ -128,6 +123,21 @@ module DataMapper
           version_model.all(query)
         end
       end # InstanceMethods
+
+      module Migration
+
+        def auto_migrate!(repository_name = self.repository_name)
+          super
+          self::Version.auto_migrate!
+        end
+
+        def auto_upgrade!(repository_name = self.repository_name)
+          super
+          self::Version.auto_upgrade!
+        end
+
+      end # Migration
+
     end # Versioned
   end # Is
 end # DataMapper

data/lib/dm-is-versioned.rb

@@ -1,3 +1,4 @@
+require 'dm-core'
 require 'dm-is-versioned/is/versioned'
 
 # Include the plugin in Resource

data/spec/spec_helper.rb

@@ -1,30 +1,9 @@
-require 'rubygems'
-
-# 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'
-
-# Support running specs with 'rake spec' and 'spec'
-$LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
+require 'dm-core/spec/setup'
+require 'dm-core/spec/lib/adapter_helpers'
 
 require 'dm-is-versioned'
+require 'dm-migrations'
 
-def load_driver(name, default_uri)
-  return false if ENV['ADAPTER'] != name.to_s
-
-  begin
-    DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
-    DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]
-    true
-  rescue LoadError => e
-    warn "Could not load do_#{name}: #{e}"
-    false
-  end
+Spec::Runner.configure do |config|
+  config.extend(DataMapper::Spec::Adapters::Helpers)
 end
-
-ENV['ADAPTER'] ||= 'sqlite3'
-
-HAS_SQLITE3  = load_driver(:sqlite3,  'sqlite3::memory:')
-HAS_MYSQL    = load_driver(:mysql,    'mysql://localhost/dm_core_test')
-HAS_POSTGRES = load_driver(:postgres, 'postgres://postgres@localhost/dm_core_test')

data/spec/versioned_spec.rb

@@ -19,8 +19,10 @@ class Story
   is_versioned :on => :updated_at
 end
 
-if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
-  describe 'DataMapper::Is::Versioned' do
+describe 'DataMapper::Is::Versioned' do
+
+  supported_by :sqlite, :mysql, :postgres do
+
     describe 'inner class' do
       it 'should be present' do
         Story::Version.should be_a_kind_of(DataMapper::Model)
@@ -39,7 +41,6 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
     describe '#create' do
       before :all do
-        Story.auto_migrate!
         Story.create(:title => 'A Very Interesting Article')
       end
 
@@ -49,14 +50,10 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     end
 
     describe '#save' do
-      before :all do
-        Story.auto_migrate!
-      end
-
       describe '(with new resource)' do
         before :all do
           @story = Story.new(:title => 'A Story')
-          @story.save
+          @story.save.should be(true)
         end
 
         it 'should not create a versioned copy' do
@@ -67,7 +64,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       describe '(with a clean existing resource)' do
         before :all do
           @story = Story.create(:title => 'A Story')
-          @story.save
+          @story.save.should be(true)
         end
 
         it 'should not create a versioned copy' do
@@ -80,7 +77,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
           @story = Story.create(:title => 'A Story')
           @story.title = 'An Inner Update'
           @story.title = 'An Updated Story'
-          @story.save
+          @story.save.should be(true)
         end
 
         it 'should create a versioned copy' do
@@ -100,8 +97,8 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
     describe '#versions' do
       before :all do
-        Story.auto_migrate!
         @story = Story.create(:title => 'A Story')
+        @story.should be_saved
       end
 
       it 'should return an empty array when there are no versions' do
@@ -115,9 +112,11 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       it "should not return another object's versions" do
         @story2 = Story.create(:title => 'A Different Story')
         @story2.title = 'A Different Title'
-        @story2.save
+        @story2.save.should be(true)
         @story.versions.should == Story::Version.all(:id => @story.id)
       end
     end
+
   end
+
 end

data/tasks/local_gemfile.rake

@@ -0,0 +1,18 @@
+desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
+task :local_gemfile do |t|
+
+  root              = Pathname(__FILE__).dirname.parent
+  datamapper        = root.parent
+
+  source_regex     = /DATAMAPPER = 'git:\/\/github.com\/datamapper'/
+  gem_source_regex = /:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/
+
+  root.join('Gemfile.local').open('w') do |f|
+    root.join('Gemfile').open.each do |line|
+      line.sub!(source_regex,     "DATAMAPPER = '#{datamapper}'")
+      line.sub!(gem_source_regex, ':path => "#{DATAMAPPER}/\1"')
+      f.puts line
+    end
+  end
+
+end

data/tasks/spec.rake

@@ -35,7 +35,4 @@ rescue LoadError
   end
 end
 
-task :spec => :check_dependencies
-task :rcov => :check_dependencies
-
 task :default => :spec

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-versioned
 version: !ruby/object:Gem::Version 
-  version: 0.10.2
+  prerelease: true
+  segments: 
+  - 1
+  - 0
+  - 0
+  - rc1
+  version: 1.0.0.rc1
 platform: ruby
 authors: 
 - Bernerd Schaefer
@@ -9,39 +15,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-11 00:00:00 -08:00
+date: 2010-05-19 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 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.2
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 0
+        - rc1
+        version: 1.0.0.rc1
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: yard
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.4.0
-    version: 
+  version_requirements: *id002
 description: DataMapper plugin enabling simple versioning of models
 email: bernerd [a] wieck [d] com
 executables: []
@@ -52,6 +56,8 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -64,6 +70,7 @@ files:
 - spec/spec_helper.rb
 - spec/versioned_spec.rb
 - tasks/ci.rake
+- tasks/local_gemfile.rake
 - tasks/metrics.rake
 - tasks/spec.rake
 - tasks/yard.rake
@@ -81,20 +88,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin enabling simple versioning of models
-test_files: []
-
+test_files: 
+- spec/spec_helper.rb
+- spec/versioned_spec.rb