dm-active_model 1.0.3 → 1.1.0.rc1

data/Gemfile

@@ -1,115 +1,46 @@
-# 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.
+require 'pathname'
 
 source 'http://rubygems.org'
 
-DATAMAPPER = 'http://github.com/datamapper'
-DM_VERSION = '~> 1.0.2'
+SOURCE       = ENV.fetch('SOURCE', :git).to_sym
+REPO_POSTFIX = SOURCE == :path ? ''                                : '.git'
+DATAMAPPER   = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
+DM_VERSION   = '~> 1.1.0.rc1'
 
-group :runtime do # Runtime dependencies (as in the gemspec)
+group :runtime do
 
-  gem 'dm-core',       DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
-  gem 'activesupport', '~> 3.0.0', :git => 'http://github.com/rails/rails.git', :branch => '3-0-stable', :require => nil
-  gem 'activemodel',   '~> 3.0.0', :git => 'http://github.com/rails/rails.git', :branch => '3-0-stable', :require => nil
+  gem 'activesupport', '~> 3.0.4', :require => nil
+  gem 'activemodel',   '~> 3.0.4', :require => nil
+  gem 'dm-core',       DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
+  gem 'i18n',          '~> 0.5.0'
 
 end
 
-group(:development) do # Development dependencies (as in the gemspec)
-
-  gem 'dm-validations', DM_VERSION, :git => "#{DATAMAPPER}/dm-validations.git"
+group :development do
 
+  gem 'dm-validations', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-validations#{REPO_POSTFIX}"
+  gem 'jeweler',        '~> 1.5.2'
   gem 'rake',           '~> 0.8.7'
-  gem 'rspec',          '~> 1.3', :git => 'http://github.com/snusnu/rspec.git', :branch => 'heckle_fix_plus_gemfile'
-  gem 'jeweler',        '~> 1.4'
+  gem 'rspec',          '~> 1.3.1'
   gem 'test-unit',      '= 1.2.3'
 
 end
 
-group :quality do # These gems contain rake tasks that check the quality of the source code
+group :quality do
 
-  gem 'metric_fu',      '~> 1.3'
-  gem 'rcov',           '~> 0.9.8'
-  gem 'reek',           '~> 1.2.8'
-  gem 'roodi',          '~> 2.1'
-  gem 'yard',           '~> 0.5'
-  gem 'yardstick',      '~> 0.1'
+  gem 'rcov',      '~> 0.9.9', :platforms => :mri_18
+  gem 'yard',      '~> 0.6'
+  gem 'yardstick', '~> 0.2'
 
 end
 
-group :datamapper do # We need this because we want to pin these dependencies to their git master sources
+group :datamapper do
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']
   plugins = plugins.to_s.tr(',', ' ').split.uniq
 
   plugins.each do |plugin|
-    gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
+    gem plugin, DM_VERSION, SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}"
   end
 
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Martin Gamsjaeger (snusnu)
+Copyright (c) 2011 Martin Gamsjaeger (snusnu)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -15,4 +15,4 @@ This plugin makes datamapper compliant with active_model conventions and thus co
 
 == Copyright
 
-Copyright (c) 2010 Martin Gamsjaeger (snusnu). See LICENSE for details.
+Copyright (c) 2011 Martin Gamsjaeger (snusnu). See LICENSE for details.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.4'
+  gem 'jeweler', '~> 1.5.2'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -15,13 +15,6 @@ begin
     gem.has_rdoc    = 'yard'
 
     gem.rubyforge_project = 'datamapper'
-
-    gem.add_dependency 'dm-core',     '~> 1.0.2'
-    gem.add_dependency 'activemodel', '~> 3.0.0'
-
-    gem.add_development_dependency 'dm-validations', '~> 1.0.2'
-    gem.add_development_dependency 'rspec',          '~> 1.3'
-    gem.add_development_dependency 'test-unit',      '= 1.2.3'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.1.0.rc1

data/dm-active_model.gemspec

@@ -1,85 +1,90 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dm-active_model}
-  s.version = "1.0.3"
+  s.version = "1.1.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-10-23}
+  s.date = %q{2011-02-28}
   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 = [
     "LICENSE",
-     "README.rdoc",
-     "TODO"
+    "README.rdoc",
+    "TODO"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "CHANGELOG",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "TODO",
-     "VERSION",
-     "dm-active_model.gemspec",
-     "lib/dm-active_model.rb",
-     "lib/dm-active_model/version.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",
-     "tasks/changelog.rake",
-     "tasks/ci.rake",
-     "tasks/local_gemfile.rake",
-     "tasks/metrics.rake",
-     "tasks/spec.rake",
-     "tasks/yard.rake",
-     "tasks/yardstick.rake"
+    "CHANGELOG",
+    "Gemfile",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "TODO",
+    "VERSION",
+    "dm-active_model.gemspec",
+    "lib/dm-active_model.rb",
+    "lib/dm-active_model/version.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",
+    "tasks/changelog.rake",
+    "tasks/spec.rake",
+    "tasks/yard.rake",
+    "tasks/yardstick.rake"
   ]
-  s.has_rdoc = %q{yard}
   s.homepage = %q{http://github.com/datamapper/dm-active_model}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{active_model compliance for datamapper}
   s.test_files = [
     "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/amo_validation_compliance_spec.rb",
+    "spec/dm-active_model_spec.rb",
+    "spec/lib/amo_lint_extensions.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.2"])
-      s.add_runtime_dependency(%q<activemodel>, ["~> 3.0.0"])
-      s.add_development_dependency(%q<dm-validations>, ["~> 1.0.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.4"])
+      s.add_runtime_dependency(%q<activemodel>, ["~> 3.0.4"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
+      s.add_runtime_dependency(%q<i18n>, ["~> 0.5.0"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.1.0.rc1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
       s.add_development_dependency(%q<test-unit>, ["= 1.2.3"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
-      s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
-      s.add_dependency(%q<dm-validations>, ["~> 1.0.2"])
-      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
+      s.add_dependency(%q<activemodel>, ["~> 3.0.4"])
+      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
+      s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.1.0.rc1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
       s.add_dependency(%q<test-unit>, ["= 1.2.3"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
-    s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
-    s.add_dependency(%q<dm-validations>, ["~> 1.0.2"])
-    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
+    s.add_dependency(%q<activemodel>, ["~> 3.0.4"])
+    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
+    s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.1.0.rc1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rake>, ["~> 0.8.7"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     s.add_dependency(%q<test-unit>, ["= 1.2.3"])
   end
 end

data/lib/dm-active_model.rb

@@ -1,3 +1,4 @@
+require 'dm-core'
 require 'active_model/naming'
 
 module DataMapper

data/spec/dm-active_model_spec.rb

@@ -15,6 +15,7 @@ describe 'An active_model compliant DataMapper::Resource' do
     module ::ComplianceTest
       class ProfileInfo
         include DataMapper::Resource
+        extend ActiveModel::Naming
         property :id, Serial
       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,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dm-active_model
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 3
-  version: 1.0.3
+  prerelease: 6
+  version: 1.1.0.rc1
 platform: ruby
 authors: 
 - Martin Gamsjaeger (snusnu)
@@ -15,88 +10,108 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-23 00:00:00 +02:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
+  name: activesupport
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
+        version: 3.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+        version: 3.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: dm-core
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: dm-validations
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.0.rc1
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
+        version: 1.5.2
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+        version: 1.3.1
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 2
-        - 3
         version: 1.2.3
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *id009
 description: A datamapper plugin for active_model compliance and thus rails 3 compatibility.
 email: gamsnjaga [a] gmail [d] com
 executables: []
@@ -109,7 +124,6 @@ extra_rdoc_files:
 - TODO
 files: 
 - .document
-- .gitignore
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -127,19 +141,16 @@ files:
 - spec/rcov.opts
 - spec/spec.opts
 - tasks/changelog.rake
-- tasks/ci.rake
-- tasks/local_gemfile.rake
-- tasks/metrics.rake
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: yard
+has_rdoc: true
 homepage: http://github.com/datamapper/dm-active_model
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -147,23 +158,17 @@ required_ruby_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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: active_model compliance for datamapper

data/.gitignore

@@ -1,36 +0,0 @@
-## 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
-Gemfile.local.lock
-
-## PROJECT::SPECIFIC

data/tasks/ci.rake

@@ -1 +0,0 @@
-task :ci => [ :verify_measurements, 'metrics:all' ]

data/tasks/local_gemfile.rake

@@ -1,16 +0,0 @@
-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
-
-  root.join('Gemfile.local').open('w') do |f|
-    root.join('Gemfile').open.each do |line|
-      line.sub!(/DATAMAPPER = 'git:\/\/github.com\/datamapper'/, "DATAMAPPER = '#{datamapper}'")
-      line.sub!(/:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  ':path => "#{DATAMAPPER}/\1"')
-      line.sub!(/do_options\[:git\] = \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  'do_options[:path] = "#{DATAMAPPER}/\1"')
-      f.puts line
-    end
-  end
-
-end

data/tasks/metrics.rake

@@ -1,36 +0,0 @@
-begin
-  require 'metric_fu'
-rescue LoadError
-  namespace :metrics do
-    task :all do
-      abort 'metric_fu is not available. In order to run metrics:all, you must: gem install metric_fu'
-    end
-  end
-end
-
-begin
-  require 'reek/adapters/rake_task'
-
-  Reek::RakeTask.new do |t|
-    t.fail_on_error = true
-    t.verbose       = false
-    t.source_files  = 'lib/**/*.rb'
-  end
-rescue LoadError
-  task :reek do
-    abort 'Reek is not available. In order to run reek, you must: gem install reek'
-  end
-end
-
-begin
-  require 'roodi'
-  require 'roodi_task'
-
-  RoodiTask.new do |t|
-    t.verbose = false
-  end
-rescue LoadError
-  task :roodi do
-    abort 'Roodi is not available. In order to run roodi, you must: gem install roodi'
-  end
-end