dm-active_model 0.4.0 → 1.0.0.rc1

data/.gitignore

@@ -1,7 +1,35 @@
-*.sw?
+## 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

data/Gemfile

@@ -1,27 +1,115 @@
-# This will setup a complete development environment
+# 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:
 #
-#   git clone git://github.com/snusnu/dm-active_model
-#   cd dm-active_model
-#   gem install bundler (if you haven't done so before)
-#   bundle install
-#   rake spec
+#   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)
+
+  gem 'dm-core',       DM_VERSION,       :git => "#{DATAMAPPER}/dm-core.git"
+  gem 'activesupport', '~> 3.0.0.beta3', :git => 'git://github.com/rails/rails.git', :require => nil
+  gem 'activemodel',   '~> 3.0.0.beta3', :git => 'git://github.com/rails/rails.git', :require => nil
+
+end
 
-source 'http://gemcutter.org'
+group(:development) do # Development dependencies (as in the gemspec)
 
-git 'git://github.com/rails/rails.git'
-gem 'activesupport', '~> 3.0.0.beta1', :require => 'active_support'
-gem 'activemodel',   '~> 3.0.0.beta1', :require => 'active_model'
+  gem 'dm-validations', DM_VERSION, :git => "#{DATAMAPPER}/dm-validations.git"
 
-git 'git://github.com/snusnu/dm-core.git', 'branch' => 'active_support'
-gem 'dm-core', '~> 0.10'
+  gem 'rake',           '~> 0.8.7'
+  gem 'rspec',          '~> 1.3'
+  gem 'jeweler',        '~> 1.4'
+  gem 'test-unit',      '= 1.2.3'
 
-group(:test) do
-  gem 'rspec',      '~> 1.3'
-  gem 'do_sqlite3', '~> 0.10.1'
 end
 
-group(:development) do
-  gem 'rake'
-  gem 'jeweler', '~> 1.4'
+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
+
+  plugins = ENV['PLUGINS'] || ENV['PLUGIN']
+  plugins = (plugins.to_s.gsub(',',' ').split(' ')).uniq
+
+  plugins.each do |plugin|
+    gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
+  end
+
 end

data/Rakefile

@@ -1,39 +1,25 @@
-begin
-  # Just in case the bundle was locked
-  # This shouldn't happen in a dev environment but lets be safe
-  require File.expand_path('../../.bundle/environment', __FILE__)
-rescue LoadError
-  require 'rubygems'
-  require 'bundler'
-  Bundler.setup
-end
-
-Bundler.require(:default, :development, :test)
-
+require 'rubygems'
 require 'rake'
 
-require File.expand_path('../lib/dm-active_model/version', __FILE__)
-
 begin
 
-  gem 'jeweler', '~> 1.4'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
 
-    gem.version     = DataMapper::ActiveModel::VERSION
-
     gem.name        = 'dm-active_model'
     gem.summary     = 'active_model compliance for datamapper'
     gem.description = 'A datamapper plugin for active_model compliance and thus rails 3 compatibility.'
     gem.email       = 'gamsnjaga [a] gmail [d] com'
-    gem.homepage    = 'http://github.com/snusnu/dm-active_model'
+    gem.homepage    = 'http://github.com/datamapper/dm-active_model'
     gem.authors     = [ 'Martin Gamsjaeger (snusnu)' ]
 
-    gem.add_dependency 'dm-core', '~> 0.10'
+    gem.add_dependency 'dm-core',                    '~> 1.0.0.rc1'
+    gem.add_dependency 'activemodel',                '~> 3.0.0.beta3'
 
-    gem.add_development_dependency 'rspec', '>= 1.2.9'
-    gem.add_development_dependency 'yard',  '~> 0.5'
+    gem.add_development_dependency 'dm-validations', '~> 1.0.0.rc1'
+    gem.add_development_dependency 'rspec',          '~> 1.3'
+    gem.add_development_dependency 'test-unit',      '= 1.2.3'
 
   end
 

data/VERSION

@@ -0,0 +1 @@
+1.0.0.rc1

data/dm-active_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-active_model}
-  s.version = "0.4.0"
+  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 = ["Martin Gamsjaeger (snusnu)"]
-  s.date = %q{2010-02-23}
+  s.date = %q{2010-05-19}
   s.description = %q{A datamapper plugin for active_model compliance and thus rails 3 compatibility.}
   s.email = %q{gamsnjaga [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -26,30 +26,34 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "TODO",
+     "VERSION",
      "dm-active_model.gemspec",
      "lib/dm-active_model.rb",
      "lib/dm-active_model/version.rb",
-     "spec/amo_compliance_spec.rb",
+     "spec/amo_interface_compliance_spec.rb",
+     "spec/amo_validation_compliance_spec.rb",
      "spec/dm-active_model_spec.rb",
+     "spec/lib/amo_lint_extensions.rb",
      "spec/rcov.opts",
      "spec/spec.opts",
-     "spec/spec_helper.rb",
      "tasks/changelog.rake",
      "tasks/ci.rake",
+     "tasks/local_gemfile.rake",
      "tasks/metrics.rake",
      "tasks/spec.rake",
      "tasks/yard.rake",
      "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/snusnu/dm-active_model}
+  s.homepage = %q{http://github.com/datamapper/dm-active_model}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{active_model compliance for datamapper}
   s.test_files = [
-    "spec/amo_compliance_spec.rb",
+    "spec/amo_interface_compliance_spec.rb",
+     "spec/amo_validation_compliance_spec.rb",
      "spec/dm-active_model_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/lib/amo_lint_extensions.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -57,18 +61,24 @@ Gem::Specification.new do |s|
     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"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<yard>, ["~> 0.5"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
+      s.add_runtime_dependency(%q<activemodel>, ["~> 3.0.0.beta3"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.0.0.rc1"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_development_dependency(%q<test-unit>, ["= 1.2.3"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 0.10"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<yard>, ["~> 0.5"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
+      s.add_dependency(%q<activemodel>, ["~> 3.0.0.beta3"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.0.0.rc1"])
+      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<test-unit>, ["= 1.2.3"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 0.10"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<yard>, ["~> 0.5"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
+    s.add_dependency(%q<activemodel>, ["~> 3.0.0.beta3"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.0.0.rc1"])
+    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<test-unit>, ["= 1.2.3"])
   end
 end
 

data/lib/dm-active_model/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module ActiveModel
 
-    VERSION = '0.4.0'.freeze
+    VERSION = '1.0.0.rc1'.freeze
 
   end
 end

data/spec/{amo_compliance_spec.rb → amo_interface_compliance_spec.rb}

@@ -1,4 +1,5 @@
 require 'spec/test/unit'
+require 'active_model/lint'
 
 # This must be kept in sync with active_model/lint tests
 # at least for as long as

data/spec/amo_validation_compliance_spec.rb

@@ -0,0 +1,14 @@
+require 'spec/test/unit'
+require 'lib/amo_lint_extensions'
+
+share_examples_for 'an active_model/validations compliant object' do
+
+  include ActiveModel::Lint::Tests::Validations
+
+  ActiveModel::Lint::Tests::Validations::VALIDATION_METHODS.each do |validation_method|
+    it "must implement the .#{validation_method} interface" do
+      send("test_#{validation_method}")
+    end
+  end
+
+end

data/spec/dm-active_model_spec.rb

@@ -1,18 +1,25 @@
-require 'spec_helper'
+require 'dm-core'
+require 'dm-active_model'
+
+require 'amo_interface_compliance_spec'
+
+if ENV['DM_VALIDATIONS'] || ENV['AMO_VALIDATIONS']
+  require 'dm-validations'
+  require 'amo_validation_compliance_spec'
+end
 
 describe 'An active_model compliant DataMapper::Resource' do
 
   before :all do
 
-    module ComplianceTest
+    module ::ComplianceTest
       class ProfileInfo
         include DataMapper::Resource
         property :id, Serial
       end
     end
 
-    DataMapper.setup(:default, 'sqlite3::memory:')
-    DataMapper.auto_migrate!
+    DataMapper.setup(:default, { :adapter => :in_memory })
 
   end
 
@@ -22,4 +29,8 @@ describe 'An active_model compliant DataMapper::Resource' do
 
   it_should_behave_like 'an active_model compliant object'
 
+  if ENV['AMO_VALIDATIONS'] == 'true'
+    it_should_behave_like 'an active_model/validations compliant object'
+  end
+
 end

data/spec/lib/amo_lint_extensions.rb

@@ -0,0 +1,30 @@
+module ActiveModel
+  module Lint
+    module Tests
+      module Validations
+
+        VALIDATION_METHODS = %w[
+          validate
+          validates
+          validates_each
+          validates_with
+          validates_acceptance_of
+          validates_confirmation_of
+          validates_exclusion_of
+          validates_format_of
+          validates_inclusion_of
+          validates_length_of
+          validates_numericality_of
+          validates_presence_of
+        ]
+
+        VALIDATION_METHODS.each do |validation_method|
+          define_method "test_#{validation_method}" do
+            assert model.class.respond_to?(validation_method)
+          end
+        end
+
+      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 exec 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

@@ -19,7 +19,4 @@ RCov::VerifyTask.new(:verify_rcov => :rcov) do |rcov|
   rcov.threshold = 100
 end
 
-task :spec => :check_dependencies
-task :rcov => :check_dependencies
-
 task :default => :spec

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-active_model
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
+  - 1
   - 0
-  - 4
   - 0
-  version: 0.4.0
+  - rc1
+  version: 1.0.0.rc1
 platform: ruby
 authors: 
 - Martin Gamsjaeger (snusnu)
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 +01:00
+date: 2010-05-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,38 +26,70 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 0
         - 0
-        - 10
-        version: "0.10"
+        - rc1
+        version: 1.0.0.rc1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activemodel
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
-  type: :development
+        - 3
+        - 0
+        - 0
+        - beta3
+        version: 3.0.0.beta3
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: dm-validations
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 0
         - 0
-        - 5
-        version: "0.5"
+        - rc1
+        version: 1.0.0.rc1
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 3
+        version: 1.2.3
+  type: :development
+  version_requirements: *id005
 description: A datamapper plugin for active_model compliance and thus rails 3 compatibility.
 email: gamsnjaga [a] gmail [d] com
 executables: []
@@ -76,22 +109,25 @@ files:
 - README.rdoc
 - Rakefile
 - TODO
+- VERSION
 - dm-active_model.gemspec
 - lib/dm-active_model.rb
 - lib/dm-active_model/version.rb
-- spec/amo_compliance_spec.rb
+- spec/amo_interface_compliance_spec.rb
+- spec/amo_validation_compliance_spec.rb
 - spec/dm-active_model_spec.rb
+- spec/lib/amo_lint_extensions.rb
 - spec/rcov.opts
 - spec/spec.opts
-- spec/spec_helper.rb
 - tasks/changelog.rake
 - tasks/ci.rake
+- tasks/local_gemfile.rake
 - tasks/metrics.rake
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
 has_rdoc: true
-homepage: http://github.com/snusnu/dm-active_model
+homepage: http://github.com/datamapper/dm-active_model
 licenses: []
 
 post_install_message: 
@@ -108,11 +144,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -121,6 +159,7 @@ signing_key:
 specification_version: 3
 summary: active_model compliance for datamapper
 test_files: 
-- spec/amo_compliance_spec.rb
+- spec/amo_interface_compliance_spec.rb
+- spec/amo_validation_compliance_spec.rb
 - spec/dm-active_model_spec.rb
-- spec/spec_helper.rb
+- spec/lib/amo_lint_extensions.rb

data/spec/spec_helper.rb

@@ -1,58 +0,0 @@
-begin
-  # Just in case the bundle was locked
-  # This shouldn't happen in a dev environment but lets be safe
-  require File.expand_path('../../.bundle/environment', __FILE__)
-rescue LoadError
-  require 'rubygems'
-  require 'bundler'
-  Bundler.setup
-end
-Bundler.require(:default, :test)
-
-# Use local dm-core if running from a typical dev checkout.
-lib = File.expand_path('../../../dm-core/lib', __FILE__)
-$LOAD_PATH.unshift(lib) if File.directory?(lib)
-require 'dm-core'
-
-# Use local active_model if running from a typical dev checkout.
-lib = File.expand_path('../../../rails/activemodel/lib', __FILE__)
-$LOAD_PATH.unshift(lib) if File.directory?(lib)
-require 'active_model/lint'
-
-require 'dm-active_model'
-require 'amo_compliance_spec'
-
-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
-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')
-
-
-Spec::Runner.configure do |config|
-
-  config.before(:all) do
-
-    # Support testing with(out)
-    # dm-validations enabled
-
-    if ENV['USE_DM_VALIDATIONS'] == 'true'
-      require 'dm-validations'
-    end
-
-  end
-
-end