Navigation Menu

Skip to content

Commit

Permalink
fix dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Sven Fuchs committed Oct 16, 2010
1 parent 68b41c2 commit f88e9d5
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
3 changes: 2 additions & 1 deletion globalize3.gemspec
Expand Up @@ -17,12 +17,13 @@ Gem::Specification.new do |s|
s.rubyforge_project = '[none]'

s.add_dependency 'activerecord', '>= 3.0.0'
s.add_dependency 'activemodel', '>= 3.0.0'

s.add_development_dependency 'database_cleaner'
s.add_development_dependency 'mocha'
s.add_development_dependency 'pathname_local'
s.add_development_dependency 'test_declarative'
# s.add_development_dependency 'vestal_versions'
s.add_development_dependency 'vestal_versions'
s.add_development_dependency 'ruby-debug'
s.add_development_dependency 'sqlite3-ruby'
end
7 changes: 4 additions & 3 deletions lib/globalize.rb
@@ -1,3 +1,4 @@
require 'active_record'
require 'patches/active_record/xml_attribute_serializer'
require 'patches/active_record/query_method'

Expand Down Expand Up @@ -29,13 +30,13 @@ def fallbacks?
def fallbacks(locale = self.locale)
fallbacks? ? I18n.fallbacks[locale] : [locale.to_sym]
end

protected

def read_locale
Thread.current[:globalize_locale]
end

def set_locale(locale)
Thread.current[:globalize_locale] = locale
end
Expand Down
2 changes: 1 addition & 1 deletion lib/patches/active_record/xml_attribute_serializer.rb
Expand Up @@ -9,4 +9,4 @@ def compute_type_with_translations
end
end
alias_method_chain :compute_type, :translations
end
end
2 changes: 2 additions & 0 deletions test/test_helper.rb
Expand Up @@ -5,6 +5,8 @@
require 'logger'

Bundler.require(:default, :test)
require 'database_cleaner'
require 'test_declarative'

log = '/tmp/globalize3_test.log'
FileUtils.touch(log) unless File.exists?(log)
Expand Down

0 comments on commit f88e9d5

Please sign in to comment.