diff options
author | elijah <elijah@riseup.net> | 2012-12-07 11:45:36 -0800 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2012-12-07 11:45:36 -0800 |
commit | caadadd3b7f2735d95bb02f935346f6044e05049 (patch) | |
tree | a8f1e0840c3aaab81e38006a65657bbe49fa5068 | |
parent | efc52e7266d72fa043b0f2cdcd59657810789171 (diff) |
ruby 1.9 compatibility
-rw-r--r-- | config/environments/development.rb | 2 | ||||
-rw-r--r-- | config/initializers/languages.rb | 2 | ||||
-rw-r--r-- | config/initializers/libraries.rb | 9 | ||||
-rw-r--r-- | lib/core_extensions.rb | 14 | ||||
-rw-r--r-- | lib/static_page.rb | 3 |
5 files changed, 24 insertions, 6 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index c796a73..c4c4c95 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -31,7 +31,7 @@ LeapPublicSite::Application.configure do ## # Print deprecation notices to the Rails logger - #config.active_support.deprecation = :log + config.active_support.deprecation = :log # Raise exception on mass assignment protection for Active Record models #config.active_record.mass_assignment_sanitizer = :strict diff --git a/config/initializers/languages.rb b/config/initializers/languages.rb index 1861f3a..36f1a34 100644 --- a/config/initializers/languages.rb +++ b/config/initializers/languages.rb @@ -1,3 +1,5 @@ +# encoding: utf-8 + LANGUAGES = { 'es' => ['EspaƱol', 'es', 3, false], 'en' => ['English', 'en', 4, false], diff --git a/config/initializers/libraries.rb b/config/initializers/libraries.rb index a2ae6ec..f018ff9 100644 --- a/config/initializers/libraries.rb +++ b/config/initializers/libraries.rb @@ -1,4 +1,5 @@ -require 'lib/config' -require 'lib/static_page' -require 'lib/menu' -require 'lib/http_accept_language'
\ No newline at end of file +require 'config' +require 'static_page' +require 'menu' +require 'http_accept_language' +require 'core_extensions'
\ No newline at end of file diff --git a/lib/core_extensions.rb b/lib/core_extensions.rb new file mode 100644 index 0000000..07af8e5 --- /dev/null +++ b/lib/core_extensions.rb @@ -0,0 +1,14 @@ +# +# make ruby 1.9 act more like ruby 1.8 +# +unless String.method_defined?(:to_a) + class String + def to_a; [self]; end + end +end + +unless String.method_defined?(:any?) + class String + def any?; self.chars.any?; end + end +end diff --git a/lib/static_page.rb b/lib/static_page.rb index 65e9c72..679e799 100644 --- a/lib/static_page.rb +++ b/lib/static_page.rb @@ -1,4 +1,4 @@ -require 'lib/property_set' +require 'property_set' require 'i18n' require 'pathname' @@ -30,6 +30,7 @@ class StaticPage array.delete_if do |page| page.props.locale(locale).send(attr).nil? end + return PageArray.new.replace array end end |