basic_model 0.3.2 → 0.4.0

data/.travis.yml

@@ -1,7 +1,10 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1
 gemfile:
   - gemfiles/Gemfile.activemodel-3.0.x
   - gemfiles/Gemfile.activemodel-3.1.x
-  
+  - gemfiles/Gemfile.activemodel-3.2.x
+  - gemfiles/Gemfile.activemodel-4.0.x
+  

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/basic_model.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   
   s.rubyforge_project = 'basic_model'
   
-  s.add_dependency 'activemodel',   '~> 3.0'
-  s.add_dependency 'activesupport', '~> 3.0'
+  s.add_dependency 'activemodel',   '>= 3.0', '< 5'
+  s.add_dependency 'activesupport', '>= 3.0', '< 5'
   s.add_development_dependency 'rake'
 
   s.files         = `git ls-files`.split("\n")

data/gemfiles/Gemfile.activemodel-3.0.x

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'basic_model', :path => File.expand_path('../..', __FILE__)
 

data/gemfiles/Gemfile.activemodel-3.1.x

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'basic_model', :path => File.expand_path('../..', __FILE__)
 

data/gemfiles/Gemfile.activemodel-3.2.x

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'basic_model', :path => File.expand_path('../..', __FILE__)
+
+gem 'activemodel',   '~> 3.2.0'
+gem 'activesupport', '~> 3.2.0'
+
+gem 'rake', :group => :development

data/gemfiles/Gemfile.activemodel-4.0.x

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'basic_model', :path => File.expand_path('../..', __FILE__)
+
+gem 'activemodel',   '~> 4.0.0'
+gem 'activesupport', '~> 4.0.0'
+
+gem 'rake', :group => :development

data/lib/basic_model.rb

@@ -6,7 +6,7 @@ module BasicModel
   extend ActiveSupport::Concern
   include ActiveModel::Conversion
   include ActiveModel::Validations
-  
+
   # Creates and optionally sets the attributes of the model with keys
   # matching the attribute names. If ActiveModel::MassSecurityAssignment
   # is included, attributes will be sanitized with the role given in the :as option.
@@ -15,23 +15,23 @@ module BasicModel
     unless attributes.nil?
       # Sanitize the attributes if we're using ActiveModel::MassSecurityAssignment
       # Also account for the different APIs between 3.0 and 3.1
-      if respond_to? :sanitize_for_mass_assignment
+      if protected_methods.include? :sanitize_for_mass_assignment
         if method(:sanitize_for_mass_assignment).arity == 2
           attributes = sanitize_for_mass_assignment attributes, options[:as]
         else
           attributes = sanitize_for_mass_assignment attributes
         end
       end
-      
+
       # Now set the attributes, ignoring any private methods
       attributes.each do |name, value|
         send "#{name}=", value if respond_to? "#{name}="
       end
     end
-    
+
     yield self if block_given?
   end
-  
+
   # By default, BasicModels are not persisted in any way.
   def persisted?
     false

data/lib/basic_model/version.rb

@@ -1,3 +1,3 @@
 module BasicModel
-  VERSION = "0.3.2"
+  VERSION = '0.4.0'
 end

data/test/basic_model_test.rb

@@ -6,9 +6,9 @@ require 'test/unit'
 class Post
   include BasicModel
   attr_accessor :title, :body
-  
+
   private
-  
+
   def not_allowed=(value)
     raise 'Not Allowed!'
   end
@@ -16,36 +16,40 @@ end
 
 class Comment
   include BasicModel
-  include ActiveModel::MassAssignmentSecurity
   attr_accessor :name, :comment, :spam
-  
-  attr_accessible :name, :comment
+
+  if defined? ActiveModel::MassAssignmentSecurity
+    include ActiveModel::MassAssignmentSecurity
+    attr_accessible :name, :comment
+  end
 end
 
 class BasicModelTest < ActiveSupport::TestCase
   include ActiveModel::Lint::Tests
-  
+
   def setup
     @model = Post.new
   end
-  
+
   def test_initialize_with_attributes
     @model = Post.new(:title => 'Title', :body => 'Body')
     assert_equal 'Title', @model.title
     assert_equal 'Body', @model.body
   end
-  
+
   def test_do_not_call_private_methods
     assert_nothing_raised do
       Post.new(:not_allowed => 'Oops')
     end
   end
-  
-  def test_mass_security_assignment
-    @model = Comment.new(:name => 'Bob', :comment => 'Great post!', :spam => false)
-    assert_nil @model.spam
+
+  if defined? ActiveModel::MassAssignmentSecurity
+    def test_mass_security_assignment
+      @model = Comment.new(:name => 'Bob', :comment => 'Great post!', :spam => false)
+      assert_nil @model.spam
+    end
   end
-  
+
   def test_initialize_with_yield
     @model = Post.new do |post|
       post.title = 'Title'

metadata

@@ -1,76 +1,64 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: basic_model
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 2
-  version: 0.3.2
 platform: ruby
-authors: 
+authors:
 - Pete Browne
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-03-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activemodel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70238234788220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70238234788220
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70238234816100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70238234816100
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70238234813680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: BasicModel is intended to be used in a tableless model in Rails >= 3.0. It complies with the ActiveModel API and includes valdiations, so it can be used in form helpers without a problem.
-email: 
+  prerelease: false
+  version_requirements: *70238234813680
+description: BasicModel is intended to be used in a tableless model in Rails >= 3.0.
+  It complies with the ActiveModel API and includes valdiations, so it can be used
+  in form helpers without a problem.
+email:
 - me@petebrowne.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -80,41 +68,40 @@ files:
 - basic_model.gemspec
 - gemfiles/Gemfile.activemodel-3.0.x
 - gemfiles/Gemfile.activemodel-3.1.x
+- gemfiles/Gemfile.activemodel-3.2.x
+- gemfiles/Gemfile.activemodel-4.0.x
 - lib/basic_model.rb
 - lib/basic_model/version.rb
 - test/basic_model_test.rb
 homepage: http://github.com/petebrowne/basic_model
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3744792226769240364
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 3744792226769240364
 requirements: []
-
 rubyforge_project: basic_model
-rubygems_version: 1.8.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: BasicModel is a tiny Module that complies with the ActiveModel API
-test_files: 
+test_files:
 - test/basic_model_test.rb