dm-active_model 0.2.0 → 0.3.0

data/Rakefile

@@ -21,8 +21,8 @@ begin
 
     gem.add_dependency 'dm-core', '~> 0.10'
 
-    gem.add_development_dependency 'rspec', '~> 1.2.9'
-    gem.add_development_dependency 'yard',  '~> 0.4.0'
+    gem.add_development_dependency 'rspec', '>= 1.2.9'
+    gem.add_development_dependency 'yard',  '~> 0.5'
 
   end
 

data/dm-active_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-active_model}
-  s.version = "0.2.0"
+  s.version = "0.3.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-14}
+  s.date = %q{2010-01-20}
   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 = [
@@ -27,11 +27,9 @@ Gem::Specification.new do |s|
      "TODO",
      "dm-active_model.gemspec",
      "lib/dm-active_model.rb",
-     "lib/dm-active_model/extlib.rb",
      "lib/dm-active_model/version.rb",
      "spec/amo_compliance_spec.rb",
      "spec/dm-active_model_spec.rb",
-     "spec/rails_compliance_spec.rb",
      "spec/rcov.opts",
      "spec/spec.opts",
      "spec/spec_helper.rb",
@@ -50,7 +48,6 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/amo_compliance_spec.rb",
      "spec/dm-active_model_spec.rb",
-     "spec/rails_compliance_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -60,17 +57,17 @@ Gem::Specification.new do |s|
 
     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.4.0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<yard>, ["~> 0.5"])
     else
       s.add_dependency(%q<dm-core>, ["~> 0.10"])
-      s.add_dependency(%q<rspec>, ["~> 1.2.9"])
-      s.add_dependency(%q<yard>, ["~> 0.4.0"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<yard>, ["~> 0.5"])
     end
   else
     s.add_dependency(%q<dm-core>, ["~> 0.10"])
-    s.add_dependency(%q<rspec>, ["~> 1.2.9"])
-    s.add_dependency(%q<yard>, ["~> 0.4.0"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<yard>, ["~> 0.5"])
   end
 end
 

data/lib/dm-active_model.rb

@@ -1,8 +1,4 @@
-if Object.const_defined?('Extlib')
-  require 'dm-active_model/extlib'
-else
-  require 'active_model/naming'
-end
+require 'active_model/naming'
 
 module DataMapper
   module ActiveModel
@@ -19,7 +15,6 @@ module DataMapper
 
     module InstanceMethods
 
-
       def self.included(host)
         host.class_eval do
           alias :new_record? :new?

data/lib/dm-active_model/version.rb

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

data/spec/amo_compliance_spec.rb

@@ -1,6 +1,14 @@
 require 'spec/test/unit'
 
+# This must be kept in sync with active_model/lint tests
+# at least for as long as
+#
+#   http://rspec.lighthouseapp.com/projects/5645/tickets/900
+#
+# isn't resolved in some way (probably with rspec2)
+
 share_examples_for 'an active_model compliant object' do
+
   include ActiveModel::Lint::Tests
 
   it 'must implement the #valid? interface' do
@@ -15,12 +23,13 @@ share_examples_for 'an active_model compliant object' do
     test_destroyed?
   end
 
-  it 'must implement the #destroyed? interface' do
-    test_destroyed?
+  it 'must implement the #model_naming interface' do
+    test_model_naming
   end
 
   it 'must implement the #errors interface' do
     test_errors_aref
     test_errors_full_messages
   end
+
 end

data/spec/spec_helper.rb

@@ -1,19 +1,16 @@
 require 'rubygems'
 
 # Use local dm-core if running from a typical dev checkout.
-lib = File.join('..', '..', 'dm-core', 'lib')
+lib = File.expand_path('../../../dm-core/lib', __FILE__)
 $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-active_model'
-
-# test with official active_model lint
+# 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'
 
-# run our own specs for the time being. lint still needs to be updated
+require 'dm-active_model'
 require 'amo_compliance_spec'
 
 def load_driver(name, default_uri)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-active_model
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Martin Gamsjaeger (snusnu)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 +01:00
+date: 2010-01-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.2.9
     version: 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: "0.5"
     version: 
 description: A datamapper plugin for active_model compliance and thus rails 3 compatibility.
 email: gamsnjaga [a] gmail [d] com
@@ -62,11 +62,9 @@ files:
 - TODO
 - dm-active_model.gemspec
 - lib/dm-active_model.rb
-- lib/dm-active_model/extlib.rb
 - lib/dm-active_model/version.rb
 - spec/amo_compliance_spec.rb
 - spec/dm-active_model_spec.rb
-- spec/rails_compliance_spec.rb
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -107,5 +105,4 @@ summary: active_model compliance for datamapper
 test_files: 
 - spec/amo_compliance_spec.rb
 - spec/dm-active_model_spec.rb
-- spec/rails_compliance_spec.rb
 - spec/spec_helper.rb

data/lib/dm-active_model/extlib.rb

@@ -1,28 +0,0 @@
-require 'extlib/inflection'
-
-module ActiveSupport
-  Inflector = Extlib::Inflection
-end
-
-module ActiveModel
-
-  # This is mostly copied from active_model and adapted to use extlib under the hood.
-  # see http://github.com/rails/rails/blob/master/activemodel/lib/active_model/naming.rb
-  class Name < String
-
-    attr_reader :singular, :plural, :element, :collection, :partial_path, :human
-    alias_method :cache_key, :collection
-
-    def initialize(klass)
-      super(klass.name)
-      @singular     = Extlib::Inflection.underscore(self).tr('/', '_').freeze
-      @plural       = Extlib::Inflection.pluralize(@singular).freeze
-      @element      = Extlib::Inflection.underscore(Extlib::Inflection.demodulize(self)).freeze
-      @human        = Extlib::Inflection.humanize(@element)
-      @collection   = Extlib::Inflection.pluralize(Extlib::Inflection.underscore(self)).freeze
-      @partial_path = "#{@collection}/#{@element}".freeze
-    end
-
-  end
-
-end

data/spec/rails_compliance_spec.rb

@@ -1,50 +0,0 @@
-# TODO move these specs into rails_datamapper
-require 'active_model/naming'
-
-describe 'An active_model compliant DataMapper::Resource that is compatible with rails3' do
-
-  before :all do
-
-    module ComplianceTest
-      class ProfileInfo
-        include DataMapper::Resource
-        property :id, Serial
-      end
-    end
-
-    DataMapper.setup(:default, 'sqlite3::memory:')
-    DataMapper.auto_migrate!
-
-  end
-
-  before :each do
-    @model = ComplianceTest::ProfileInfo.create.to_model
-  end
-
-  it_should_behave_like 'an active_model compliant object'
-
-  it '#class.model_name.singular should follow active_model conventions' do
-    @model.class.model_name.singular.should == ActiveModel::Name.new(@model.class).singular
-  end
-
-  it '#class.model_name.plural should follow active_model conventions' do
-    @model.class.model_name.plural.should == ActiveModel::Name.new(@model.class).plural
-  end
-
-  it '#class.model_name.element should follow active_model conventions' do
-    @model.class.model_name.element.should == ActiveModel::Name.new(@model.class).element
-  end
-
-  it '#class.model_name.human should follow active_model conventions' do
-    @model.class.model_name.human.should == ActiveModel::Name.new(@model.class).human
-  end
-
-  it '#class.model_name.collection should follow active_model conventions' do
-    @model.class.model_name.collection.should == ActiveModel::Name.new(@model.class).collection
-  end
-
-  it '#class.model_name.partial_path should follow active_model conventions' do
-    @model.class.model_name.partial_path.should == ActiveModel::Name.new(@model.class).partial_path
-  end
-
-end