dm-active_model 0.3.0 → 0.4.0

data/.gitignore

@@ -3,3 +3,5 @@
 coverage
 rdoc
 pkg
+.bundle
+

data/Gemfile

@@ -0,0 +1,27 @@
+# This will setup a complete development environment
+#
+#   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
+#
+
+source 'http://gemcutter.org'
+
+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'
+
+git 'git://github.com/snusnu/dm-core.git', 'branch' => 'active_support'
+gem 'dm-core', '~> 0.10'
+
+group(:test) do
+  gem 'rspec',      '~> 1.3'
+  gem 'do_sqlite3', '~> 0.10.1'
+end
+
+group(:development) do
+  gem 'rake'
+  gem 'jeweler', '~> 1.4'
+end

data/Rakefile

@@ -1,4 +1,15 @@
-require 'rubygems'
+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 'rake'
 
 require File.expand_path('../lib/dm-active_model/version', __FILE__)

data/dm-active_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-active_model}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Gamsjaeger (snusnu)"]
-  s.date = %q{2010-01-20}
+  s.date = %q{2010-02-23}
   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 = [
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
     ".document",
      ".gitignore",
      "CHANGELOG",
+     "Gemfile",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -43,7 +44,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/snusnu/dm-active_model}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{active_model compliance for datamapper}
   s.test_files = [
     "spec/amo_compliance_spec.rb",

data/lib/dm-active_model/version.rb

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

data/lib/dm-active_model.rb

@@ -15,16 +15,27 @@ module DataMapper
 
     module InstanceMethods
 
-      def self.included(host)
-        host.class_eval do
-          alias :new_record? :new?
-        end
-      end
-
       def to_model
         self
       end
 
+      def persisted?
+        saved?
+      end
+
+      def to_key
+        key
+      end
+
+      def to_param
+        return nil if key.nil?
+        if key.length > 1
+          raise "You need to implement #to_param yourself to support this key: #{self.class.key.inspect}"
+        else
+          self.key.first.to_s
+        end
+      end
+
       # Define the minimum requirements if the resource
       # has no concept of validation baked in, which
       # happens if dm-validations is not required.

data/spec/amo_compliance_spec.rb

@@ -11,16 +11,20 @@ share_examples_for 'an active_model compliant object' do
 
   include ActiveModel::Lint::Tests
 
-  it 'must implement the #valid? interface' do
-    test_valid?
+  it 'must implement the #to_key interface' do
+    test_to_key
+  end
+
+  it 'must implement the #to_param interface' do
+    test_to_param
   end
 
-  it 'must implement the #new_record? interface' do
-    test_new_record?
+  it 'must implement the #valid? interface' do
+    test_valid?
   end
 
-  it 'must implement the #destroyed? interface' do
-    test_destroyed?
+  it 'must implement the #persisted? interface' do
+    test_persisted?
   end
 
   it 'must implement the #model_naming interface' do

data/spec/dm-active_model_spec.rb

@@ -17,7 +17,7 @@ describe 'An active_model compliant DataMapper::Resource' do
   end
 
   before :each do
-    @model = ComplianceTest::ProfileInfo.create.to_model
+    @model = ComplianceTest::ProfileInfo.new.to_model
   end
 
   it_should_behave_like 'an active_model compliant object'

data/spec/spec_helper.rb

@@ -1,4 +1,13 @@
-require 'rubygems'
+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__)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dm-active_model
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Martin Gamsjaeger (snusnu)
@@ -9,39 +14,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-20 00:00:00 +01:00
+date: 2010-02-23 00:00:00 +01: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 
+        segments: 
+        - 0
+        - 10
         version: "0.10"
-    version: 
+  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 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
         version: "0.5"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: A datamapper plugin for active_model compliance and thus rails 3 compatibility.
 email: gamsnjaga [a] gmail [d] com
 executables: []
@@ -56,6 +71,7 @@ files:
 - .document
 - .gitignore
 - CHANGELOG
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -87,18 +103,20 @@ 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 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: active_model compliance for datamapper