actionpack 4.0.0.beta1 → 4.0.0.rc1

data/lib/action_view/template/resolver.rb

@@ -47,7 +47,7 @@ module ActionView
       NAME_BLOCK    = lambda {|cache, name|    cache[name]    = SmallCache.new(&PREFIX_BLOCK)}
       KEY_BLOCK     = lambda {|cache, key|     cache[key]     = SmallCache.new(&NAME_BLOCK)}
 
-      # usually a majority of template look ups return nothing, use this canonical preallocated array to safe memory
+      # usually a majority of template look ups return nothing, use this canonical preallocated array to save memory
       NO_TEMPLATES = [].freeze
 
       def initialize
@@ -109,7 +109,7 @@ module ActionView
       @cache.clear
     end
 
-    # Normalizes the arguments and passes it on to find_template.
+    # Normalizes the arguments and passes it on to find_templates.
     def find_all(name, prefix=nil, partial=false, details={}, key=nil, locals=[])
       cached(key, [name, prefix, partial], details, locals) do
         find_templates(name, prefix, partial, details)
@@ -255,7 +255,7 @@ module ActionView
   #
   #   FileSystemResolver.new("/path/to/views", ":prefix/:action{.:locale,}{.:formats,}{.:handlers,}")
   #
-  # This one allows you to keep files with different formats in seperated subdirectories,
+  # This one allows you to keep files with different formats in separate subdirectories,
   # eg. `users/new.html` will be loaded from `users/html/new.erb` or `users/new.html.erb`,
   # `users/new.js` from `users/js/new.erb` or `users/new.js.erb`, etc.
   #

data/lib/action_view/test_case.rb

@@ -219,6 +219,7 @@ module ActionView
         :@_routes,
         :@controller,
         :@_layouts,
+        :@_files,
         :@_rendered_views,
         :@method_name,
         :@output_buffer,

data/lib/action_view/vendor/html-scanner/html/sanitizer.rb

@@ -77,7 +77,7 @@ module HTML
 
     # A regular expression of the valid characters used to separate protocols like
     # the ':' in 'http://foo.com'
-    self.protocol_separator     = /:|(&#0*58)|(&#x70)|(%|%)3A/
+    self.protocol_separator     = /:|(&#0*58)|(&#x70)|(&#x0*3a)|(%|%)3A/i
 
     # Specifies a Set of HTML attributes that can have URIs.
     self.uri_attributes         = Set.new(%w(href src cite action longdesc xlink:href lowsrc))
@@ -121,8 +121,8 @@ module HTML
       style = style.to_s.gsub(/url\s*\(\s*[^\s)]+?\s*\)\s*/, ' ')
 
       # gauntlet
-      if style !~ /^([:,;#%.\sa-zA-Z0-9!]|\w-\w|\'[\s\w]+\'|\"[\s\w]+\"|\([\d,\s]+\))*$/ ||
-          style !~ /^(\s*[-\w]+\s*:\s*[^:;]*(;|$)\s*)*$/
+      if style !~ /\A([:,;#%.\sa-zA-Z0-9!]|\w-\w|\'[\s\w]+\'|\"[\s\w]+\"|\([\d,\s]+\))*\z/ ||
+          style !~ /\A(\s*[-\w]+\s*:\s*[^:;]*(;|$)\s*)*\z/
         return ''
       end
 
@@ -133,7 +133,7 @@ module HTML
         elsif shorthand_css_properties.include?(prop.split('-')[0].downcase)
           unless val.split().any? do |keyword|
             !allowed_css_keywords.include?(keyword) &&
-              keyword !~ /^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$/
+              keyword !~ /\A(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)\z/
           end
             clean << prop + ': ' + val + ';'
           end
@@ -182,7 +182,7 @@ module HTML
 
     def contains_bad_protocols?(attr_name, value)
       uri_attributes.include?(attr_name) &&
-      (value =~ /(^[^\/:]*):|(&#0*58)|(&#x70)|(%|&#37;)3A/ && !allowed_protocols.include?(value.split(protocol_separator).first.downcase.strip))
+      (value =~ /(^[^\/:]*):|(&#0*58)|(&#x70)|(&#x0*3a)|(%|&#37;)3A/i && !allowed_protocols.include?(value.split(protocol_separator).first.downcase.strip))
     end
   end
 end

data/lib/action_view/vendor/html-scanner/html/selector.rb

@@ -537,7 +537,7 @@ module HTML
       # Get identifier, class, attribute name, pseudo or negation.
       while true
         # Element identifier.
-        next if statement.sub!(/^#(\?|[\w\-]+)/) do |match|
+        next if statement.sub!(/^#(\?|[\w\-]+)/) do
           id = $1
           if id == "?"
             id = values.shift
@@ -549,7 +549,7 @@ module HTML
         end
 
         # Class name.
-        next if statement.sub!(/^\.([\w\-]+)/) do |match|
+        next if statement.sub!(/^\.([\w\-]+)/) do
           class_name = $1
           @source << ".#{class_name}"
           class_name = Regexp.new("(^|\s)#{Regexp.escape(class_name)}($|\s)") unless class_name.is_a?(Regexp)
@@ -558,7 +558,7 @@ module HTML
         end
 
         # Attribute value.
-        next if statement.sub!(/^\[\s*([[:alpha:]][\w\-:]*)\s*((?:[~|^$*])?=)?\s*('[^']*'|"[^*]"|[^\]]*)\s*\]/) do |match|
+        next if statement.sub!(/^\[\s*([[:alpha:]][\w\-:]*)\s*((?:[~|^$*])?=)?\s*('[^']*'|"[^*]"|[^\]]*)\s*\]/) do
           name, equality, value = $1, $2, $3
           if value == "?"
             value = values.shift
@@ -575,7 +575,7 @@ module HTML
         end
 
         # Root element only.
-        next if statement.sub!(/^:root/) do |match|
+        next if statement.sub!(/^:root/) do
           pseudo << lambda do |element|
             element.parent.nil? || !element.parent.tag?
           end
@@ -611,7 +611,7 @@ module HTML
           "" # Remove
         end
         # First/last child (of type).
-        next if statement.sub!(/^:(first|last)-(child|of-type)/) do |match|
+        next if statement.sub!(/^:(first|last)-(child|of-type)/) do
           reverse = $1 == "last"
           of_type = $2 == "of-type"
           pseudo << nth_child(0, 1, of_type, reverse)
@@ -619,7 +619,7 @@ module HTML
           "" # Remove
         end
         # Only child (of type).
-        next if statement.sub!(/^:only-(child|of-type)/) do |match|
+        next if statement.sub!(/^:only-(child|of-type)/) do
           of_type = $1 == "of-type"
           pseudo << only_child(of_type)
           @source << ":only-#{$1}"
@@ -628,7 +628,7 @@ module HTML
 
         # Empty: no child elements or meaningful content (whitespaces
         # are ignored).
-        next if statement.sub!(/^:empty/) do |match|
+        next if statement.sub!(/^:empty/) do
           pseudo << lambda do |element|
             empty = true
             for child in element.children
@@ -644,7 +644,7 @@ module HTML
         end
         # Content: match the text content of the element, stripping
         # leading and trailing spaces.
-        next if statement.sub!(/^:content\(\s*(\?|'[^']*'|"[^"]*"|[^)]*)\s*\)/) do |match|
+        next if statement.sub!(/^:content\(\s*(\?|'[^']*'|"[^"]*"|[^)]*)\s*\)/) do
           content = $1
           if content == "?"
             content = values.shift

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionpack
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta1
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.33
+        version: 0.3.37
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.33
+        version: 0.3.37
 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