haml-edge 2.3.98 → 2.3.99

Sign up to get free protection for your applications and to get access to all the features.
data/EDGE_GEM_VERSION CHANGED
@@ -1 +1 @@
1
- 2.3.98
1
+ 2.3.99
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.3.98
1
+ 2.3.99
data/lib/haml/buffer.rb CHANGED
@@ -15,7 +15,7 @@ module Haml
15
15
 
16
16
  # The options hash passed in from {Haml::Engine}.
17
17
  #
18
- # @return [Hash<String, Object>]
18
+ # @return [{String => Object}]
19
19
  # @see Haml::Engine#options_for_buffer
20
20
  attr_accessor :options
21
21
 
@@ -85,7 +85,7 @@ module Haml
85
85
  end
86
86
 
87
87
  # @param upper [Buffer] The parent buffer
88
- # @param options [Hash<Symbol, Object>] An options hash.
88
+ # @param options [{Symbol => Object}] An options hash.
89
89
  # See {Haml::Engine#options\_for\_buffer}
90
90
  def initialize(upper = nil, options = {})
91
91
  @active = true
@@ -240,9 +240,9 @@ RUBY
240
240
  #
241
241
  # Destructively modifies both `to` and `from`.
242
242
  #
243
- # @param to [Hash<String, String>] The attribute hash to merge into
244
- # @param from [Hash<String, String>] The attribute hash to merge from
245
- # @return [Hash<String, String>] `to`, after being merged
243
+ # @param to [{String => String}] The attribute hash to merge into
244
+ # @param from [{String => String}] The attribute hash to merge from
245
+ # @return [{String => String}] `to`, after being merged
246
246
  def self.merge_attrs(to, from)
247
247
  if to['id'] && from['id']
248
248
  to['id'] << '_' << from.delete('id').to_s
data/lib/haml/engine.rb CHANGED
@@ -20,7 +20,7 @@ module Haml
20
20
  # The options hash.
21
21
  # See {file:HAML_REFERENCE.md#haml_options the Haml options documentation}.
22
22
  #
23
- # @return [Hash<Symbol, Object>]
23
+ # @return [{Symbol => Object}]
24
24
  attr_accessor :options
25
25
 
26
26
  # The indentation used in the Haml document,
@@ -66,7 +66,7 @@ module Haml
66
66
  # Precompiles the Haml template.
67
67
  #
68
68
  # @param template [String] The Haml template
69
- # @param options [Hash<Symbol, Object>] An options hash;
69
+ # @param options [{Symbol => Object}] An options hash;
70
70
  # see {file:HAML_REFERENCE.md#haml_options the Haml options documentation}
71
71
  # @raise [Haml::Error] if there's a Haml syntax error in the template
72
72
  def initialize(template, options = {})
@@ -158,7 +158,7 @@ module Haml
158
158
  # they won't work.
159
159
  #
160
160
  # @param scope [Binding, Proc, Object] The context in which the template is evaluated
161
- # @param locals [Hash<Symbol, Object>] Local variables that will be made available
161
+ # @param locals [{Symbol => Object}] Local variables that will be made available
162
162
  # to the template
163
163
  # @param block [#to_proc] A block that can be yielded to within the template
164
164
  # @return [String] The rendered template
@@ -279,7 +279,7 @@ module Haml
279
279
  #
280
280
  # See {file:HAML_REFERENCE.md#haml_options the Haml options documentation}.
281
281
  #
282
- # @return [Hash<Symbol, Object>] The options hash
282
+ # @return [{Symbol => Object}] The options hash
283
283
  def options_for_buffer
284
284
  {
285
285
  :autoclose => @options[:autoclose],
data/lib/haml/filters.rb CHANGED
@@ -4,7 +4,7 @@ module Haml
4
4
  #
5
5
  # @see Haml::Filters::Base
6
6
  module Filters
7
- # @return [Hash<String, Haml::Filters::Base>] a hash of filter names to classes
7
+ # @return [{String => Haml::Filters::Base}] a hash of filter names to classes
8
8
  def self.defined
9
9
  @defined ||= {}
10
10
  end
data/lib/haml/helpers.rb CHANGED
@@ -198,7 +198,7 @@ MESSAGE
198
198
  # <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en-US' lang='en-US'>
199
199
  #
200
200
  # @param lang [String] The value of `xml:lang` and `lang`
201
- # @return [Hash<#to_s, String>] The attribute hash
201
+ # @return [{#to_s => String}] The attribute hash
202
202
  def html_attrs(lang = 'en-US')
203
203
  {:xmlns => "http://www.w3.org/1999/xhtml", 'xml:lang' => lang, :lang => lang}
204
204
  end
data/lib/haml/template.rb CHANGED
@@ -9,7 +9,7 @@ module Haml
9
9
  # The options hash for Haml when used within Rails.
10
10
  # See {file:HAML_REFERENCE.md#haml_options the Haml options documentation}.
11
11
  #
12
- # @return [Hash<Symbol, Object>]
12
+ # @return [{Symbol => Object}]
13
13
  attr_accessor :options
14
14
 
15
15
  # Enables integration with the Rails 2.2.5+ XSS protection,
data/lib/haml/version.rb CHANGED
@@ -23,7 +23,7 @@ module Haml
23
23
  # :major => 2, :minor => 1, :teeny => 0
24
24
  # }
25
25
  #
26
- # @return [Hash<Symbol, String/Fixnum>] The version hash
26
+ # @return [{Symbol => String/Fixnum}] The version hash
27
27
  def version
28
28
  return @@version if defined?(@@version)
29
29
 
data/lib/sass/css.rb CHANGED
@@ -8,7 +8,7 @@ module Sass
8
8
  # Converts a node to Sass code that will generate it.
9
9
  #
10
10
  # @param tabs [Fixnum] The amount of tabulation to use for the Sass code
11
- # @param opts [Hash<Symbol, Object>] An options hash (see {Sass::CSS#initialize})
11
+ # @param opts [{Symbol => Object}] An options hash (see {Sass::CSS#initialize})
12
12
  # @return [String] The Sass code corresponding to the node
13
13
  def to_sass(tabs = 0, opts = {})
14
14
  result = ''
data/lib/sass/engine.rb CHANGED
@@ -127,7 +127,7 @@ module Sass
127
127
  }.freeze
128
128
 
129
129
  # @param template [String] The Sass template.
130
- # @param options [Hash<Symbol, Object>] An options hash;
130
+ # @param options [{Symbol => Object}] An options hash;
131
131
  # see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
132
132
  def initialize(template, options={})
133
133
  @options = DEFAULT_OPTIONS.merge(options)
@@ -30,7 +30,7 @@ module Sass
30
30
  # The options hash.
31
31
  # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
32
32
  #
33
- # @return [Hash<Symbol, Object>]
33
+ # @return [{Symbol => Object}]
34
34
  def options
35
35
  @options || (parent && parent.options) || {}
36
36
  end
data/lib/sass/error.rb CHANGED
@@ -41,7 +41,7 @@ module Sass
41
41
  # This information is also included in standard backtrace format
42
42
  # in the output of \{#backtrace}.
43
43
  #
44
- # @return [Aray<Hash<Symbol, Object>>]
44
+ # @return [Aray<{Symbol => Object>}]
45
45
  attr_accessor :sass_backtrace
46
46
 
47
47
  # The text of the template where this error was raised.
@@ -50,7 +50,7 @@ module Sass
50
50
  attr_accessor :sass_template
51
51
 
52
52
  # @param msg [String] The error message
53
- # @param attrs [Hash<Symbol, Object>] The information in the backtrace entry.
53
+ # @param attrs [{Symbol => Object}] The information in the backtrace entry.
54
54
  # See \{#sass\_backtrace}
55
55
  def initialize(msg, attrs = {})
56
56
  @message = msg
@@ -83,7 +83,7 @@ module Sass
83
83
 
84
84
  # Adds an entry to the exception's Sass backtrace.
85
85
  #
86
- # @param attrs [Hash<Symbol, Object>] The information in the backtrace entry.
86
+ # @param attrs [{Symbol => Object}] The information in the backtrace entry.
87
87
  # See \{#sass\_backtrace}
88
88
  def add_backtrace(attrs)
89
89
  sass_backtrace << attrs.reject {|k, v| v.nil?}
@@ -101,7 +101,7 @@ module Sass
101
101
  # and is not used for less deeply-nested entries
102
102
  # (even if they don't have that attribute set).
103
103
  #
104
- # @param attrs [Hash<Symbol, Object>] The information to add to the backtrace entry.
104
+ # @param attrs [{Symbol => Object}] The information to add to the backtrace entry.
105
105
  # See \{#sass\_backtrace}
106
106
  def modify_backtrace(attrs)
107
107
  attrs = attrs.reject {|k, v| v.nil?}
data/lib/sass/files.rb CHANGED
@@ -12,7 +12,7 @@ module Sass
12
12
  # reading it from the Sass cache if possible.
13
13
  #
14
14
  # @param filename [String] The path to the Sass file
15
- # @param options [Hash<Symbol, Object>] The options hash.
15
+ # @param options [{Symbol => Object}] The options hash.
16
16
  # Only the {file:SASS_REFERENCE.md#cache-option `:cache_location`} option is used
17
17
  # @raise [Sass::SyntaxError] if there's an error in the document.
18
18
  # The caller has responsibility for setting backtrace information, if necessary
data/lib/sass/plugin.rb CHANGED
@@ -31,21 +31,21 @@ module Sass
31
31
  # An options hash.
32
32
  # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
33
33
  #
34
- # @return [Hash<Symbol, Object>]
34
+ # @return [{Symbol => Object}]
35
35
  attr_reader :options
36
36
 
37
37
  # Sets the options hash.
38
38
  # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
39
39
  #
40
- # @param value [Hash<Symbol, Object>] The options hash
40
+ # @param value [{Symbol => Object}] The options hash
41
41
  def options=(value)
42
42
  @options.merge!(value)
43
43
  end
44
44
 
45
45
  # Non-destructively modifies \{#options} so that default values are properly set.
46
46
  #
47
- # @param additional_options [Hash<Symbol, Object>] An options hash with which to merge \{#options}
48
- # @return [Hash<Symbol, Object>] The modified options hash
47
+ # @param additional_options [{Symbol => Object}] An options hash with which to merge \{#options}
48
+ # @return [{Symbol => Object}] The modified options hash
49
49
  def engine_options(additional_options = {})
50
50
  opts = options.dup.merge(additional_options)
51
51
  opts[:load_paths] = load_paths(opts)
@@ -38,7 +38,7 @@ module Sass
38
38
  # and updating them if necessary.
39
39
  #
40
40
  # @param env The Rack request environment
41
- # @return [(#to_i, Hash<String, String>, Object)] The Rack response
41
+ # @return [(#to_i, {String => String}, Object)] The Rack response
42
42
  def call(env)
43
43
  Sass::Plugin.check_for_updates
44
44
  @app.call(env)
data/lib/sass/repl.rb CHANGED
@@ -7,7 +7,7 @@ module Sass
7
7
  # evaluates them,
8
8
  # and prints the result.
9
9
  class Repl
10
- # @param options [Hash<Symbol, Object>] An options hash.
10
+ # @param options [{Symbol => Object}] An options hash.
11
11
  def initialize(options = {})
12
12
  @options = options
13
13
  end
data/lib/sass/script.rb CHANGED
@@ -21,19 +21,6 @@ module Sass
21
21
  # The regular expression used to validate variables without matching.
22
22
  VALIDATE = /^![a-zA-Z_]\w*$/
23
23
 
24
- # Parses and evaluates a string of SassScript.
25
- #
26
- # @param value [String] The SassScript
27
- # @param line [Fixnum] The number of the line on which the SassScript appeared.
28
- # Used for error reporting
29
- # @param offset [Fixnum] The number of characters in on `line` that the SassScript started.
30
- # Used for error reporting
31
- # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
32
- # @return [String] The string result of evaluating the SassScript
33
- def self.resolve(value, line, offset, environment)
34
- parse(value, line, offset).perform(environment).to_s
35
- end
36
-
37
24
  # Parses a string of SassScript
38
25
  #
39
26
  # @param value [String] The SassScript
@@ -122,7 +122,7 @@ END
122
122
  # Color.new([1, 2, 3]).with(:alpha => 0.4)
123
123
  # #=> rgba(1, 2, 3, 0.4)
124
124
  #
125
- # @param attrs [Hash<Symbol, Numeric>]
125
+ # @param attrs [{Symbol => Numeric}]
126
126
  # A map of channel names (`:red`, `:green`, `:blue`, or `:alpha`) to values
127
127
  # @return [Color] The new Color object
128
128
  def with(attrs)
@@ -96,10 +96,10 @@ module Sass::Script
96
96
 
97
97
  # The options hash for the {Sass::Engine} that is processing the function call
98
98
  #
99
- # @return [Hash<Symbol, Object>]
99
+ # @return [{Symbol => Object}]
100
100
  attr_reader :options
101
101
 
102
- # @param options [Hash<Symbol, Object>] See \{#options}
102
+ # @param options [{Symbol => Object}] See \{#options}
103
103
  def initialize(options)
104
104
  @options = options
105
105
  end
@@ -44,7 +44,7 @@ module Sass
44
44
  # The options hash for the node.
45
45
  # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
46
46
  #
47
- # @return [Hash<Symbol, Object>]
47
+ # @return [{Symbol => Object}]
48
48
  attr_reader :options
49
49
 
50
50
  def initialize
@@ -53,7 +53,7 @@ module Sass
53
53
 
54
54
  # Sets the options hash for the node and all its children.
55
55
  #
56
- # @param options [Hash<Symbol, Object>] The options
56
+ # @param options [{Symbol => Object}] The options
57
57
  # @see #options
58
58
  def options=(options)
59
59
  children.each {|c| c.options = options}
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: haml-edge
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.98
4
+ version: 2.3.99
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nathan Weizenbaum
@@ -44,11 +44,11 @@ extensions: []
44
44
 
45
45
  extra_rdoc_files:
46
46
  - README.md
47
- - REVISION
48
47
  - VERSION
49
- - VERSION_NAME
48
+ - REVISION
50
49
  - CONTRIBUTING
51
50
  - MIT-LICENSE
51
+ - VERSION_NAME
52
52
  - EDGE_GEM_VERSION
53
53
  files:
54
54
  - rails/init.rb
@@ -243,11 +243,11 @@ files:
243
243
  - init.rb
244
244
  - .yardopts
245
245
  - README.md
246
- - REVISION
247
246
  - VERSION
248
- - VERSION_NAME
247
+ - REVISION
249
248
  - CONTRIBUTING
250
249
  - MIT-LICENSE
250
+ - VERSION_NAME
251
251
  - EDGE_GEM_VERSION
252
252
  has_rdoc: true
253
253
  homepage: http://haml-lang.com/