Permalink
Browse files

remove ActiveSupport::Concern 3.2 deprecations

  • Loading branch information...
1 parent 18928ce commit 1a2ed3f00543e21f38680c3fa4ba6b47dc6f36ae @Mik-die committed Jan 23, 2012
Showing with 14 additions and 14 deletions.
  1. +2 −3 .travis.yml
  2. +1 −1 Gemfile
  3. +6 −6 Gemfile.lock
  4. +4 −3 lib/mongoid_globalize.rb
  5. +1 −1 lib/mongoid_globalize/{instance_methods.rb → methods.rb}
View
@@ -4,6 +4,5 @@ rvm:
- 1.9.3
- ruby-head
- jruby
- - rbx
- - rbx-2.0
- - ree
+ - rbx-18mode
+ - ree
View
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'mongoid', '~> 2.4', :git => 'git://github.com/mongoid/mongoid.git', :tag => 'v2.4.1'
+gem 'mongoid', '~> 2.4', :git => 'git://github.com/mongoid/mongoid.git', :tag => 'v2.4.2'
gem 'bson_ext', '~> 1.5'
group :development, :test do
View
@@ -1,21 +1,21 @@
GIT
remote: git://github.com/mongoid/mongoid.git
- revision: 0abef29ade4fe81c4e83be773cd6cfd6c02364f9
- tag: v2.4.1
+ revision: f740a5dc41cb4f554a849f81a5625ff11cb0d350
+ tag: v2.4.2
specs:
- mongoid (2.4.1)
+ mongoid (2.4.2)
activemodel (~> 3.1)
mongo (~> 1.3)
tzinfo (~> 0.3.22)
GEM
remote: http://rubygems.org/
specs:
- activemodel (3.1.3)
- activesupport (= 3.1.3)
+ activemodel (3.2.0)
+ activesupport (= 3.2.0)
builder (~> 3.0.0)
+ activesupport (3.2.0)
i18n (~> 0.6)
- activesupport (3.1.3)
multi_json (~> 1.0)
archive-tar-minitar (0.5.2)
bson (1.5.2)
View
@@ -4,14 +4,15 @@
require 'mongoid_globalize/class_methods'
require 'mongoid_globalize/document_translation'
require 'mongoid_globalize/fields_builder'
-require 'mongoid_globalize/instance_methods'
+require 'mongoid_globalize/methods'
module Mongoid::Globalize
+ include Mongoid::Globalize::Methods
+
# When Mongoid::Globalize included into Mongoid document class, for this class
# code inside +included+ block will be executed, methods from
- # Mongoid::Globalize::ClassMethods module become class methods, and methods
- # from Mongoid::Globalize::InstanceMethods become instance methods, due to
+ # Mongoid::Globalize::ClassMethods module become class methods due to
# ActiveSupport::Concern mechanism.
extend ActiveSupport::Concern
@@ -1,5 +1,5 @@
module Mongoid::Globalize
- module InstanceMethods
+ module Methods
delegate :translated_locales, :to => :translations
# Reader for adapter, where translations stashing during lifecicle. At first

0 comments on commit 1a2ed3f

Please sign in to comment.