Skip to content

Commit

Permalink
Merge pull request #148 from syguer/add_rails5.1
Browse files Browse the repository at this point in the history
Add rails5.1
  • Loading branch information
syguer committed May 16, 2017
2 parents 07575fb + 92bc5f3 commit 7576771
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 3 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Expand Up @@ -24,8 +24,10 @@ matrix:
- rvm: 2.2.4
gemfile: gemfiles/rails_4.0.no-active-record.gemfile
env: SKIP_ACTIVE_RECORD=true
- rvm: 2.4.0
- rvm: 2.4.1
gemfile: gemfiles/rails_4.2.gemfile
- rvm: 2.4.0
- rvm: 2.4.1
gemfile: gemfiles/rails_5.0.gemfile
- rvm: 2.4.1
gemfile: gemfiles/rails_5.1.gemfile
script: "bundle exec rake spec"
24 changes: 24 additions & 0 deletions gemfiles/rails_5.1.gemfile
@@ -0,0 +1,24 @@
source 'http://rubygems.org/'

gem 'activerecord', '~> 5.1.0'
gem 'rspec', '~> 2.2.0'
gem 'wwtd'
gem 'rake', '~> 10.0'
gem 'json'
gem 'test-unit'

platform :jruby do
gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.6'
end

platform :ruby do
gem 'sqlite3'
end

platforms :rbx do
gem 'racc'
gem 'rubysl', '~> 2.0'
gem 'psych'
end

gemspec :path => '../'
2 changes: 1 addition & 1 deletion lib/active_hash/base.rb
Expand Up @@ -35,7 +35,7 @@ def cache_key
if Object.const_defined?(:ActiveModel)
model_name.cache_key
else
ActiveSupport::Inflector.tableize(self).downcase
ActiveSupport::Inflector.tableize(self.name).downcase
end
end

Expand Down

0 comments on commit 7576771

Please sign in to comment.