ardm-active_model 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 914b0870e37e4d5287c192bdea00965b86f83ac8
-  data.tar.gz: 23b3a36468ab60b8a468a88f701a8e8731bbcf48
+  metadata.gz: e6f6c4708c51eff3663adead13142aedd6002044
+  data.tar.gz: b13e5c582565bc89febb650846d3141d960df832
 SHA512:
-  metadata.gz: d9e90d018c2691c64e3a3b9d03cd36c2a7a9341230df8d8acf3f67f2741d243ae5716af0169819a11738221af170a037066d555cfedfb80958386a42e5342c4c
-  data.tar.gz: 13bc8f8ebe38ce8e87ecbfc25441138a83f3b793cd6141b163ab58454888832665df9f44572a5343415b9e15f37cc31068f5f4f02512aabce8a951ca874fec9d
+  metadata.gz: ee28484dc877534d9255f7a071414ccca6f133a77bca7f822b18e0ee9ac966ba739bedc27cc89670e6f215db069ce8a4e42fd785887b897b294fc0a3f6501437
+  data.tar.gz: 5ffc7d460670092e8794e5fa932c801913fc50f8cc6a457693a4017fb3faf1df4d75499925b1bc4a944bd0edde3bbedb5425955ac3ab39588b6b204a9823c83e

data/Gemfile

@@ -7,12 +7,11 @@ gemspec
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'https://github.com/ar-dm'
-DM_VERSION     = '~> 1.2.0'
+DM_VERSION     = '~> 1.2'
 CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
-RAILS_VERSION  = '~> 3.1.0'
+RAILS_VERSION  = [ '>= 3.0', '< 5.0' ]
 
 gem 'ardm-core',     DM_VERSION, SOURCE  => "#{DATAMAPPER}/ardm-core#{REPO_POSTFIX}", :branch => CURRENT_BRANCH
-
 gem 'activemodel', RAILS_VERSION, :require => nil
 
 group :development do

data/lib/dm-active_model.rb

@@ -1,10 +1,15 @@
 require 'dm-core'
+require 'active_support/core_ext/module/delegation'  # needed by active_model/naming
+require 'active_support/core_ext/module/remove_method' # needed for Module.remove_possible_method in active_model/naming.rb (active_model ~> 4.1)
+require 'active_support/concern'                     # needed by active_model/conversion
 require 'active_model/naming'
+require 'active_model/conversion'
 
 module DataMapper
   module ActiveModel
 
     module InstanceMethods
+      include ::ActiveModel::Conversion
 
       def to_model
         self
@@ -50,6 +55,7 @@ module DataMapper
   end
 
   Model.append_extensions(::ActiveModel::Naming)
+  Model.append_extensions(::ActiveModel::Conversion::ClassMethods)
   Model.append_inclusions(ActiveModel::InstanceMethods)
 
 end

data/lib/dm-active_model/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module ActiveModel
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
   end
 end

data/spec/amo_interface_compliance_spec.rb

@@ -1,4 +1,5 @@
 require 'spec/test/unit'
+require 'active_support/core_ext/object/blank'  # needed by active_model/lint
 require 'active_model/lint'
 
 # This must be kept in sync with active_model/lint tests
@@ -12,29 +13,9 @@ share_examples_for 'an active_model compliant object' do
 
   include ActiveModel::Lint::Tests
 
-  it 'must implement the #to_key interface' do
-    test_to_key
+  instance_methods.grep(/^test_/).each do |meth|
+    it meth.to_s do
+      send(meth)
+    end
   end
-
-  it 'must implement the #to_param interface' do
-    test_to_param
-  end
-
-  it 'must implement the #valid? interface' do
-    test_valid?
-  end
-
-  it 'must implement the #persisted? interface' do
-    test_persisted?
-  end
-
-  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/amo_validation_compliance_spec.rb

@@ -10,5 +10,4 @@ share_examples_for 'an active_model/validations compliant object' do
       send("test_#{validation_method}")
     end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ardm-active_model
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Martin Emde