Add support for Rails 4.1.0

cgriego · Apr 8, 2014 · 69c1342 · 69c1342
1 parent 9118534
commit 69c1342
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,18 +4,23 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
 bundler_args: --without development
 gemfile:
   - gemfiles/rails_3_0.gemfile
   - gemfiles/rails_3_1.gemfile
   - gemfiles/rails_3_2.gemfile
+  - gemfiles/rails_4_0.gemfile
   - Gemfile
   - gemfiles/rails_head.gemfile
 matrix:
   allow_failures:
     - gemfile: gemfiles/rails_head.gemfile
   exclude:
+    - rvm: ree
+      gemfile: gemfiles/rails_4_0.gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails_4_0.gemfile
     - rvm: ree
       gemfile: Gemfile
     - rvm: 1.9.2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# ActiveAttr 0.8.3 (April 8, 2014) #
+
+* ActiveAttr now supports Rails 4.1.0
+
 # ActiveAttr 0.8.2 (June 16, 2013) #
 
 * #108 Fix grammar in HaveAttributeMatcher#description (Matt Hodan)

diff --git a/Gemfile b/Gemfile
@@ -2,9 +2,9 @@ source "https://rubygems.org"
 
 gemspec :development_group => :test
 
-gem "activemodel",   "~> 4.0.0"
-gem "activesupport", "~> 4.0.0"
-gem "actionpack",    "~> 4.0.0", :group => :test
+gem "activemodel",   "~> 4.1.0"
+gem "activesupport", "~> 4.1.0"
+gem "actionpack",    "~> 4.1.0", :group => :test
 gem "protected_attributes", :group => :test
 
 group :development do

diff --git a/active_attr.gemspec b/active_attr.gemspec
@@ -15,8 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = ActiveAttr::VERSION
 
-  gem.add_runtime_dependency "activemodel",   ">= 3.0.2", "< 4.1"
-  gem.add_runtime_dependency "activesupport", ">= 3.0.2", "< 4.1"
+  gem.add_runtime_dependency "activemodel",   ">= 3.0.2", "< 4.2"
+  gem.add_runtime_dependency "activesupport", ">= 3.0.2", "< 4.2"
 
   gem.add_development_dependency "bundler",      "~> 1.0"
   gem.add_development_dependency "factory_girl", ">= 2.2", "< 5.0"

diff --git a/gemfiles/rails_4_0.gemfile b/gemfiles/rails_4_0.gemfile
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gemspec :development_group => :test, :path => ".."
+
+gem "activemodel",   "~> 4.0.0"
+gem "activesupport", "~> 4.0.0"
+gem "actionpack",    "~> 4.0.0", :group => :test
+gem "protected_attributes", :group => :test
diff --git a/spec/unit/active_attr/typecasting/string_typecaster_spec.rb b/spec/unit/active_attr/typecasting/string_typecaster_spec.rb
@@ -1,6 +1,5 @@
 require "spec_helper"
 require "active_attr/typecasting/string_typecaster"
-require "active_support/basic_object"
 
 module ActiveAttr
   module Typecasting