RubyGems - haml - Versions diffs - 2.2.15 → 2.2.16 - Mend

haml 2.2.15 → 2.2.16

Potentially problematic release.

This version of haml might be problematic. Click here for more details.

Files changed (23) hide show

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 2.2.15
1	+ 2.2.16

data/lib/haml/buffer.rb CHANGED

@@ -15,7 +15,7 @@ module Haml
     # The options hash passed in from {Haml::Engine}.
     #
-    # @return [Hash<String, Object>]
+    # @return [{String => Object}]
     # @see Haml::Engine#options_for_buffer
     attr_accessor :options
@@ -85,7 +85,7 @@ module Haml
     end
     # @param upper [Buffer] The parent buffer
-    # @param options [Hash<Symbol, Object>] An options hash.
+    # @param options [{Symbol => Object}] An options hash.
     #   See {Haml::Engine#options\_for\_buffer}
     def initialize(upper = nil, options = {})
       @active = true
@@ -240,9 +240,9 @@ RUBY
     #
     # Destructively modifies both `to` and `from`.
     #
-    # @param to [Hash<String, String>] The attribute hash to merge into
-    # @param from [Hash<String, String>] The attribute hash to merge from
-    # @return [Hash<String, String>] `to`, after being merged
+    # @param to [{String => String}] The attribute hash to merge into
+    # @param from [{String => String}] The attribute hash to merge from
+    # @return [{String => String}] `to`, after being merged
     def self.merge_attrs(to, from)
       if to['id'] && from['id']
         to['id'] << '_' << from.delete('id').to_s

data/lib/haml/engine.rb CHANGED

@@ -20,7 +20,7 @@ module Haml
     # The options hash.
     # See {file:HAML_REFERENCE.md#haml_options the Haml options documentation}.
     #
-    # @return [Hash<Symbol, Object>]
+    # @return [{Symbol => Object}]
     attr_accessor :options
     # The indentation used in the Haml document,
@@ -66,7 +66,7 @@ module Haml
     # Precompiles the Haml template.
     #
     # @param template [String] The Haml template
-    # @param options [Hash<Symbol, Object>] An options hash;
+    # @param options [{Symbol => Object}] An options hash;
     #   see {file:HAML_REFERENCE.md#haml_options the Haml options documentation}
     # @raise [Haml::Error] if there's a Haml syntax error in the template
     def initialize(template, options = {})
@@ -154,7 +154,7 @@ module Haml
     # they won't work.
     #
     # @param scope [Binding, Proc, Object] The context in which the template is evaluated
-    # @param locals [Hash<Symbol, Object>] Local variables that will be made available
+    # @param locals [{Symbol => Object}] Local variables that will be made available
     #   to the template
     # @param block [#to_proc] A block that can be yielded to within the template
     # @return [String] The rendered template
@@ -275,7 +275,7 @@ module Haml
     #
     # See {file:HAML_REFERENCE.md#haml_options the Haml options documentation}.
     #
-    # @return [Hash<Symbol, Object>] The options hash
+    # @return [{Symbol => Object}] The options hash
     def options_for_buffer
       {
         :autoclose => @options[:autoclose],

data/lib/haml/filters.rb CHANGED

@@ -4,7 +4,7 @@ module Haml
   #
   # @see Haml::Filters::Base
   module Filters
-    # @return [Hash<String, Haml::Filters::Base>] a hash of filter names to classes
+    # @return [{String => Haml::Filters::Base}] a hash of filter names to classes
     def self.defined
       @defined ||= {}
     end

data/lib/haml/helpers.rb CHANGED

@@ -198,7 +198,7 @@ MESSAGE
     #     <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en-US' lang='en-US'>
     #
     # @param lang [String] The value of `xml:lang` and `lang`
-    # @return [Hash<#to_s, String>] The attribute hash
+    # @return [{#to_s => String}] The attribute hash
     def html_attrs(lang = 'en-US')
       {:xmlns => "http://www.w3.org/1999/xhtml", 'xml:lang' => lang, :lang => lang}
     end

data/lib/haml/template.rb CHANGED

@@ -9,7 +9,7 @@ module Haml
     # The options hash for Haml when used within Rails.
     # See {file:HAML_REFERENCE.md#haml_options the Haml options documentation}.
     #
-    # @return [Hash<Symbol, Object>]
+    # @return [{Symbol => Object}]
     attr_accessor :options
     # Enables integration with the Rails 2.2.5+ XSS protection,
@@ -46,7 +46,7 @@ end
 # Decide how we want to load Haml into Rails.
 # Patching was necessary for versions <= 2.0.1,
 # but we can make it a normal handler for higher versions.
-if defined?(ActionView::TemplateHandler)
+if defined?(ActionView::TemplateHandler) || defined?(ActionView::Template::Handler)
   require 'haml/template/plugin'
 else
   require 'haml/template/patch'

data/lib/haml/template/plugin.rb CHANGED

@@ -2,8 +2,11 @@
 # using the > 2.0.1 template handler API.
 module Haml
-  class Plugin < ActionView::TemplateHandler
-    include ActionView::TemplateHandlers::Compilable if defined?(ActionView::TemplateHandlers::Compilable)
+  class Plugin < Haml::Util.av_template_class(:Handler)
+    if defined?(ActionView::TemplateHandlers::Compilable) ||
+        defined?(ActionView::Template::Handlers::Compilable)
+      include Haml::Util.av_template_class(:Handlers)::Compilable
+    end
     def compile(template)
       options = Haml::Template.options.dup
@@ -38,7 +41,8 @@ end.register_template_handler(:haml, Haml::Plugin)
 # In Rails 2.0.2, ActionView::TemplateError took arguments
 # that we can't fill in from the Haml::Plugin context.
 # Thus, we've got to monkeypatch ActionView::Base to catch the error.
-if ActionView::TemplateError.instance_method(:initialize).arity == 5
+if defined?(ActionView::TemplateError) &&
+    ActionView::TemplateError.instance_method(:initialize).arity == 5
   class ActionView::Base
     def compile_template(handler, template, file_name, local_assigns)
       render_symbol = assign_method_name(handler, template, file_name)

data/lib/haml/util.rb CHANGED

@@ -146,6 +146,19 @@ module Haml
       return nil
     end
+    # Returns an ActionView::Template* class.
+    # In pre-3.0 versions of Rails, most of these classes
+    # were of the form `ActionView::TemplateFoo`,
+    # while afterwards they were of the form `ActionView;:Template::Foo`.
+    #
+    # @param name [#to_s] The name of the class to get.
+    #   For example, `:Error` will return `ActionView::TemplateError`
+    #   or `ActionView::Template::Error`.
+    def av_template_class(name)
+      return ActionView.const_get("Template#{name}") if ActionView.const_defined?("Template#{name}")
+      return ActionView::Template.const_get(name.to_s)
+    end
     ## Rails XSS Safety
     # Whether or not ActionView's XSS protection is available and enabled,

data/lib/haml/version.rb CHANGED

@@ -23,7 +23,7 @@ module Haml
     #       :major  => 2, :minor => 1, :teeny => 0
     #     }
     #
-    # @return [Hash<Symbol, String/Fixnum>] The version hash
+    # @return [{Symbol => String/Fixnum}] The version hash
     def version
       return @@version if defined?(@@version)

data/lib/sass/css.rb CHANGED

@@ -8,7 +8,7 @@ module Sass
       # Converts a node to Sass code that will generate it.
       #
       # @param tabs [Fixnum] The amount of tabulation to use for the Sass code
-      # @param opts [Hash<Symbol, Object>] An options hash (see {Sass::CSS#initialize})
+      # @param opts [{Symbol => Object}] An options hash (see {Sass::CSS#initialize})
       # @return [String] The Sass code corresponding to the node
       def to_sass(tabs = 0, opts = {})
         result = ''

data/lib/sass/engine.rb CHANGED

@@ -126,7 +126,7 @@ module Sass
     }.freeze
     # @param template [String] The Sass template.
-    # @param options [Hash<Symbol, Object>] An options hash;
+    # @param options [{Symbol => Object}] An options hash;
     #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
     def initialize(template, options={})
       @options = DEFAULT_OPTIONS.merge(options)

data/lib/sass/environment.rb CHANGED

@@ -30,7 +30,7 @@ module Sass
     # The options hash.
     # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
     #
-    # @return [Hash<Symbol, Object>]
+    # @return [{Symbol => Object}]
     def options
       @options || (parent && parent.options) || {}
     end

data/lib/sass/files.rb CHANGED

@@ -12,7 +12,7 @@ module Sass
     # reading it from the Sass cache if possible.
     #
     # @param filename [String] The path to the Sass file
-    # @param options [Hash<Symbol, Object>] The options hash.
+    # @param options [{Symbol => Object}] The options hash.
     #   Only the {file:SASS_REFERENCE.md#cache-option `:cache_location`} option is used
     # @raise [Sass::SyntaxError] if there's an error in the document
     def tree_for(filename, options)

data/lib/sass/plugin.rb CHANGED

@@ -30,21 +30,21 @@ module Sass
     # An options hash.
     # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
     #
-    # @return [Hash<Symbol, Object>]
+    # @return [{Symbol => Object}]
     attr_reader :options
     # Sets the options hash.
     # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
     #
-    # @param value [Hash<Symbol, Object>] The options hash
+    # @param value [{Symbol => Object}] The options hash
     def options=(value)
       @options.merge!(value)
     end
     # Non-destructively modifies \{#options} so that default values are properly set.
     #
-    # @param additional_options [Hash<Symbol, Object>] An options hash with which to merge \{#options}
-    # @return [Hash<Symbol, Object>] The modified options hash
+    # @param additional_options [{Symbol => Object}] An options hash with which to merge \{#options}
+    # @return [{Symbol => Object}] The modified options hash
     def engine_options(additional_options = {})
       opts = options.dup.merge(additional_options)
       opts[:load_paths] = load_paths(opts)

data/lib/sass/plugin/rack.rb CHANGED

@@ -38,7 +38,7 @@ module Sass
       # and updating them if necessary.
       #
       # @param env The Rack request environment
-      # @return [(#to_i, Hash<String, String>, Object)] The Rack response
+      # @return [(#to_i, {String => String}, Object)] The Rack response
       def call(env)
         Sass::Plugin.check_for_updates
         @app.call(env)

data/lib/sass/repl.rb CHANGED

@@ -7,7 +7,7 @@ module Sass
   # evaluates them,
   # and prints the result.
   class Repl
-    # @param options [Hash<Symbol, Object>] An options hash.
+    # @param options [{Symbol => Object}] An options hash.
     def initialize(options = {})
       @options = options
     end

data/lib/sass/script/color.rb CHANGED

@@ -69,7 +69,7 @@ END
     #     Color.new([126, 126, 126]).with(:red => 0, :green => 255)
     #       #=> rgb(0, 255, 126)
     #
-    # @param attrs [Hash<Symbol, Fixnum>]
+    # @param attrs [{Symbol => Fixnum}]
     #   A map of channel names (`:red`, `:green`, or `:blue`) to values
     # @return [Color] The new Color object
     def with(attrs)

data/lib/sass/script/functions.rb CHANGED

@@ -67,16 +67,18 @@ module Sass::Script
     # That means that all instance methods of {EvaluationContext}
     # are available to use in functions.
     class EvaluationContext
-      include Sass::Script::Functions
       # The options hash for the {Sass::Engine} that is processing the function call
       #
-      # @return [Hash<Symbol, Object>]
+      # @return [{Symbol => Object}]
       attr_reader :options
-      # @param options [Hash<Symbol, Object>] See \{#options}
+      # @param options [{Symbol => Object}] See \{#options}
       def initialize(options)
         @options = options
+        # We need to include this individually in each instance
+        # because of an icky Ruby restriction
+        class << self; include Sass::Script::Functions; end
       end
       # Asserts that the type of a given SassScript value

data/lib/sass/tree/node.rb CHANGED

@@ -36,7 +36,7 @@ module Sass
       # The options hash for the node.
       # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
       #
-      # @return [Hash<Symbol, Object>]
+      # @return [{Symbol => Object}]
       attr_reader :options
       def initialize
@@ -45,7 +45,7 @@ module Sass
       # Sets the options hash for the node and all its children.
       #
-      # @param options [Hash<Symbol, Object>] The options
+      # @param options [{Symbol => Object}] The options
       # @see #options
       def options=(options)
         children.each {|c| c.options = options}

data/test/haml/helper_test.rb CHANGED

@@ -73,7 +73,7 @@ class HelperTest < Test::Unit::TestCase
     begin
       ActionView::Base.new.render(:inline => "<%= flatten('Foo\\nBar') %>")
-    rescue NoMethodError, ActionView::TemplateError
+    rescue NoMethodError, Haml::Util.av_template_class(:Error)
       proper_behavior = true
     end
     assert(proper_behavior)

data/test/haml/template_test.rb CHANGED

@@ -109,7 +109,7 @@ class TemplateTest < Test::Unit::TestCase
       message = "template: #{name}\nline:     #{line}"
       assert_equal(pair.first, pair.last, message)
     end
-  rescue ActionView::TemplateError => e
+  rescue Haml::Util.av_template_class(:Error) => e
     if e.message =~ /Can't run [\w:]+ filter; required (one of|file) ((?:'\w+'(?: or )?)+)(, but none were found| not found)/
       puts "\nCouldn't require #{$2}; skipping a test."
     else

data/test/sass/functions_test.rb CHANGED

@@ -2,6 +2,16 @@ require 'test/unit'
 require File.dirname(__FILE__) + '/../../lib/sass'
 require 'sass/script'
+module UserFunctions
+  def user_defined
+    Sass::Script::String.new("I'm a user-defined string!")
+  end
+end
+module Sass::Script::Functions
+  include UserFunctions
+end
 class SassFunctionTest < Test::Unit::TestCase
   def test_hsl
     # These tests adapted from the w3c browser tests
@@ -138,6 +148,10 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_error_message("\"foo\" is not a number for `rgb'", "rgb(10, 10, \"foo\")");
   end
+  def test_user_defined_function
+    assert_equal("I'm a user-defined string!", evaluate("user_defined()"))
+  end
   private
   def assert_rgb_hsl(rgb, hsl)

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 2.2.15
+  version: 2.2.16
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-12-01 00:00:00 -08:00
+date: 2009-12-16 00:00:00 -08:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency