Skip to content

fixed deprecated warning #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wafcio wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fixed deprecated warning #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e739cba
fixed depreciation warning for factory_girl 3.0
wafcio Apr 4, 2012
5e53574
fix gemfile and gemspec for 1.3.0.beta
wafcio Apr 16, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,23 @@ group :test do
gem 'mocha', :require => false
end

DM_VERSION = '~> 1.2.0'
DATAMAPPER = 'git://github.com/datamapper'
DM_VERSION = '~> 1.2'
DM_UVERSION = '< 1.3'

group :development do
gem 'rails', '~> 3.1.0'
gem 'dm-sqlite-adapter', DM_VERSION
gem 'rails', '~> 3.2'
gem 'dm-sqlite-adapter', DM_VERSION, DM_UVERSION, :git => "#{DATAMAPPER}/dm-sqlite-adapter.git"
gem 'dm-do-adapter', DM_VERSION, DM_UVERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"

gem 'dm-core', DM_VERSION
gem 'dm-migrations', DM_VERSION
gem 'dm-serializer', DM_VERSION
gem 'dm-timestamps', DM_VERSION
gem 'dm-rails', DM_VERSION
gem 'dm-core', DM_VERSION, DM_UVERSION, :git => "#{DATAMAPPER}/dm-core.git"
gem 'dm-migrations', DM_VERSION, DM_UVERSION, :git => "#{DATAMAPPER}/dm-migrations.git"
gem 'dm-serializer', DM_VERSION, DM_UVERSION, :git => "#{DATAMAPPER}/dm-serializer.git"
gem 'dm-timestamps', DM_VERSION, DM_UVERSION, :git => "#{DATAMAPPER}/dm-timestamps.git"
gem 'dm-rails', DM_VERSION, DM_UVERSION, :git => "#{DATAMAPPER}/dm-rails.git"
gem "dm-active_model", DM_VERSION, DM_UVERSION, :git => "#{DATAMAPPER}/dm-active_model.git"
end

group :'dm-validations' do
gem 'dm-validations', DM_VERSION
gem 'dm-validations', DM_VERSION, DM_UVERSION, :git => "#{DATAMAPPER}/dm-validations.git"
end
12 changes: 6 additions & 6 deletions dm-devise.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]

s.add_dependency('dm-core', '>= 1.0.2', '< 2.0')
s.add_dependency('dm-migrations', '>= 1.0.2', '< 2.0')
s.add_dependency('dm-serializer', '>= 1.0.2', '< 2.0')
s.add_dependency('dm-timestamps', '>= 1.0.2', '< 2.0')
s.add_dependency('dm-rails', '>= 1.0.2', '< 2.0')
s.add_dependency('devise', '>= 1.3')
s.add_dependency('dm-core', ['< 1.3', '~> 1.2'])
s.add_dependency('dm-migrations', ['< 1.3', '~> 1.2'])
s.add_dependency('dm-serializer', ['< 1.3', '~> 1.2'])
s.add_dependency('dm-timestamps', ['< 1.3', '~> 1.2'])
s.add_dependency('dm-rails', ['< 1.3', '~> 1.2'])
s.add_dependency('devise', ['>= 1.3'])
end
2 changes: 1 addition & 1 deletion lib/devise/orm/data_mapper/validations/dm-validations.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def add(field_name, message = nil)
if message.kind_of?(Symbol)
message = self.class.default_error_message(message, field_name)
end
original_add(field_name, message) unless errors[field_name].include?(message)
original_add(field_name, message) unless violations[field_name].include?(message)
end

# Some devise controller actions expect resource#errors to respond to
Expand Down