actionpack 3.2.18 → 3.2.19

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Rails 3.2.19 (Jul 2, 2014) ##
+
+*   Fix regression when using `ActionView::Helpers::TranslationHelper#translate` with
+    `options[:raise]`.
+
+    This regression was introduced at ec16ba75a5493b9da972eea08bae630eba35b62f.
+
+    *Shota Fukumori (sora_h)*
+
+
 ## Rails 3.2.18 (May 6, 2014) ##
 
 *   Only accept actions without File::SEPARATOR in the name.

data/lib/action_controller/metal/force_ssl.rb

@@ -22,7 +22,7 @@ module ActionController
       #
       # ==== Options
       # * <tt>only</tt>   - The callback should be run only for this action
-      # * <tt>except<tt>  - The callback should be run for all actions except this action
+      # * <tt>except</tt>  - The callback should be run for all actions except this action
       def force_ssl(options = {})
         host = options.delete(:host)
         before_filter(options) do

data/lib/action_pack/version.rb

@@ -2,7 +2,7 @@ module ActionPack
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 18
+    TINY  = 19
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/action_view/helpers/number_helper.rb

@@ -129,10 +129,10 @@ module ActionView
       #
       #  number_to_currency(-1234567890.50, :negative_format => "(%u%n)")
       #  # => ($1,234,567,890.50)
-      #  number_to_currency(1234567890.50, :unit => "£", :separator => ",", :delimiter => "")
-      #  # => £1234567890,50
-      #  number_to_currency(1234567890.50, :unit => "£", :separator => ",", :delimiter => "", :format => "%n %u")
-      #  # => 1234567890,50 £
+      #  number_to_currency(1234567890.50, :unit => "R$", :separator => ",", :delimiter => "")
+      #  # => R$1234567890,50
+      #  number_to_currency(1234567890.50, :unit => "R$", :separator => ",", :delimiter => "", :format => "%n %u")
+      #  # => 1234567890,50 R$
       def number_to_currency(number, options = {})
         return unless number
 

data/lib/action_view/helpers/translation_helper.rb

@@ -36,7 +36,13 @@ module ActionView
       def translate(key, options = {})
         # If the user has specified rescue_format then pass it all through, otherwise use
         # raise and do the work ourselves
-        options[:raise] = true unless options.key?(:raise) || options.key?(:rescue_format)
+        if options.key?(:raise) || options.key?(:rescue_format)
+          raise_error = options[:raise] || options[:rescue_format]
+        else
+          raise_error = false
+          options[:raise] = true
+        end
+
         if html_safe_translation_key?(key)
           html_safe_options = options.dup
           options.except(*I18n::RESERVED_KEYS).each do |name, value|
@@ -51,6 +57,8 @@ module ActionView
           I18n.translate(scope_key_by_partial(key), options)
         end
       rescue I18n::MissingTranslationData => e
+        raise e if raise_error
+
         keys = I18n.normalize_keys(e.locale, e.key, e.options[:scope])
         content_tag('span', keys.last.to_s.titleize, :class => 'translation_missing', :title => "translation missing: #{keys.join('.')}")
       end

data/lib/action_view/template/resolver.rb

@@ -120,13 +120,7 @@ module ActionView
     def query(path, details, formats)
       query = build_query(path, details)
 
-      # deals with case-insensitive file systems.
-      sanitizer = Hash.new { |h,dir| h[dir] = Dir["#{dir}/*"] }
-
-      template_paths = Dir[query].reject { |filename|
-        File.directory?(filename) ||
-          !sanitizer[File.dirname(filename)].include?(filename)
-      }
+      template_paths = find_template_paths query
 
       template_paths.map { |template|
         handler, format = extract_handler_and_format(template, formats)
@@ -139,6 +133,26 @@ module ActionView
       }
     end
 
+    if RUBY_VERSION >= '2.2.0'
+      def find_template_paths(query)
+        Dir[query].reject { |filename|
+          File.directory?(filename) ||
+            # deals with case-insensitive file systems.
+            !File.fnmatch(query, filename, File::FNM_EXTGLOB)
+        }
+      end
+    else
+      def find_template_paths(query)
+        # deals with case-insensitive file systems.
+        sanitizer = Hash.new { |h,dir| h[dir] = Dir["#{dir}/*"] }
+
+        Dir[query].reject { |filename|
+          File.directory?(filename) ||
+            !sanitizer[File.dirname(filename)].include?(filename)
+        }
+      end
+    end
+
     # Helper for building query glob string based on resolver's pattern.
     def build_query(path, details)
       query = @pattern.dup

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 3
   - 2
-  - 18
-  version: 3.2.18
+  - 19
+  version: 3.2.19
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,44 +15,43 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-05-06 00:00:00 Z
+date: 2014-07-02 00:00:00 -03:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: activesupport
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 41
         segments: 
         - 3
         - 2
-        - 18
-        version: 3.2.18
+        - 19
+        version: 3.2.19
+  type: :runtime
+  version_requirements: *id001
   prerelease: false
-  requirement: *id001
+  name: activesupport
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: activemodel
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 41
         segments: 
         - 3
         - 2
-        - 18
-        version: 3.2.18
+        - 19
+        version: 3.2.19
+  type: :runtime
+  version_requirements: *id002
   prerelease: false
-  requirement: *id002
+  name: activemodel
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: rack-cache
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,12 +61,12 @@ dependencies:
         - 1
         - 2
         version: "1.2"
+  type: :runtime
+  version_requirements: *id003
   prerelease: false
-  requirement: *id003
+  name: rack-cache
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: builder
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,12 +77,12 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
+  type: :runtime
+  version_requirements: *id004
   prerelease: false
-  requirement: *id004
+  name: builder
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: rack
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,12 +93,12 @@ dependencies:
         - 4
         - 5
         version: 1.4.5
+  type: :runtime
+  version_requirements: *id005
   prerelease: false
-  requirement: *id005
+  name: rack
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: rack-test
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -110,12 +109,12 @@ dependencies:
         - 6
         - 1
         version: 0.6.1
+  type: :runtime
+  version_requirements: *id006
   prerelease: false
-  requirement: *id006
+  name: rack-test
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: journey
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -126,12 +125,12 @@ dependencies:
         - 0
         - 4
         version: 1.0.4
+  type: :runtime
+  version_requirements: *id007
   prerelease: false
-  requirement: *id007
+  name: journey
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: sprockets
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -142,12 +141,12 @@ dependencies:
         - 2
         - 1
         version: 2.2.1
+  type: :runtime
+  version_requirements: *id008
   prerelease: false
-  requirement: *id008
+  name: sprockets
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: erubis
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -158,12 +157,12 @@ dependencies:
         - 7
         - 0
         version: 2.7.0
+  type: :runtime
+  version_requirements: *id009
   prerelease: false
-  requirement: *id009
+  name: erubis
 - !ruby/object:Gem::Dependency 
-  type: :development
-  name: tzinfo
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -174,8 +173,10 @@ dependencies:
         - 3
         - 29
         version: 0.3.29
+  type: :development
+  version_requirements: *id010
   prerelease: false
-  requirement: *id010
+  name: tzinfo
 description: Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.
 email: david@loudthinking.com
 executables: []
@@ -376,6 +377,7 @@ files:
 - lib/sprockets/helpers.rb
 - lib/sprockets/railtie.rb
 - lib/sprockets/static_compiler.rb
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: 
 - MIT
@@ -407,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).