haml-edge 3.1.17 → 3.1.18

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.17
+3.1.18

data/VERSION

@@ -1 +1 @@
-3.1.17
+3.1.18

data/lib/haml/exec.rb

@@ -320,7 +320,7 @@ END
           @options[:for_engine][:cache_location] = loc
         end
         opts.on('-C', '--no-cache', "Don't cache to sassc files.") do
-          @options[:for_engine][:read_cache] = false
+          @options[:for_engine][:cache] = false
         end
       end
 

data/lib/haml/helpers/action_view_mods.rb

@@ -85,7 +85,9 @@ module ActionView
       module CaptureHelper
         def capture_with_haml(*args, &block)
           if Haml::Helpers.block_is_haml?(block)
-            capture_haml(*args, &block)
+            str = capture_haml(*args, &block)
+            return ActionView::NonConcattingString.new(str) if defined?(ActionView::NonConcattingString)
+            return str
           else
             capture_without_haml(*args, &block)
           end

data/lib/sass/script/interpolation.rb

@@ -10,12 +10,17 @@ module Sass::Script
     # @param after [Node] The SassScript after the interpolation
     # @param wb [Boolean] Whether there was whitespace between `before` and `#{`
     # @param wa [Boolean] Whether there was whitespace between `}` and `after`
-    def initialize(before, mid, after, wb, wa)
+    # @param originally_text [Boolean]
+    #   Whether the original format of the interpolation was plain text,
+    #   not an interpolation.
+    #   This is used when converting back to SassScript.
+    def initialize(before, mid, after, wb, wa, originally_text = false)
       @before = before
       @mid = mid
       @after = after
       @whitespace_before = wb
       @whitespace_after = wa
+      @originally_text = originally_text
     end
 
     # @return [String] A human-readable s-expression representation of the interpolation
@@ -28,7 +33,9 @@ module Sass::Script
       res = ""
       res << @before.to_sass(opts) if @before
       res << ' ' if @before && @whitespace_before
-      res << '#{' << @mid.to_sass(opts) << '}'
+      res << '#{' unless @originally_text
+      res << @mid.to_sass(opts)
+      res << '}' unless @originally_text
       res << ' ' if @after && @whitespace_after
       res << @after.to_sass(opts) if @after
       res

data/lib/sass/script/lexer.rb

@@ -175,6 +175,11 @@ module Sass
         @scanner.eos? && @tok.nil?
       end
 
+      # @return [Boolean] Whether or not the last token lexed was `:end_interpolation`.
+      def after_interpolation?
+        @prev && @prev.type == :end_interpolation
+      end
+
       # Raise an error to the effect that `name` was expected in the input stream
       # and wasn't found.
       #
@@ -327,10 +332,6 @@ MESSAGE
       def current_position
         @offset + 1
       end
-
-      def after_interpolation?
-        @prev && @prev.type == :end_interpolation
-      end
     end
   end
 end

data/lib/sass/script/parser.rb

@@ -150,8 +150,10 @@ module Sass
         def production(name, sub, *ops)
           class_eval <<RUBY
             def #{name}
+              interp = try_ops_after_interp(#{ops.inspect}, #{name.inspect}) and return interp
               return unless e = #{sub}
               while tok = try_tok(#{ops.map {|o| o.inspect}.join(', ')})
+                interp = try_op_before_interp(tok, e) and return interp
                 line = @lexer.line
                 e = Operation.new(e, assert_expr(#{sub.inspect}), tok.type)
                 e.line = line
@@ -164,8 +166,9 @@ RUBY
         def unary(op, sub)
           class_eval <<RUBY
             def unary_#{op}
-              return #{sub} unless try_tok(:#{op})
-              line = @lexer.line
+              return #{sub} unless tok = try_tok(:#{op})
+              interp = try_op_before_interp(tok) and return interp
+              line = @lexer.line 
               op = UnaryOperation.new(assert_expr(:unary_#{op}), :#{op})
               op.line = line
               op
@@ -182,8 +185,31 @@ RUBY
       production :expr, :interpolation, :comma
       production :equals, :interpolation, :single_eq
 
-      def interpolation
-        e = concat
+      def try_op_before_interp(op, prev = nil)
+        return unless @lexer.peek.type == :begin_interpolation
+        wb = @lexer.whitespace?(op)
+        str = Script::String.new(Lexer::OPERATORS_REVERSE[op.type])
+        str.line = @lexer.line
+        interp = Script::Interpolation.new(prev, str, nil, wb, !:wa, :originally_text)
+        interp.line = @lexer.line
+        interpolation(interp)
+      end
+
+      def try_ops_after_interp(ops, name)
+        return unless @lexer.after_interpolation?
+        return unless op = try_tok(*ops)
+        interp = try_op_before_interp(op) and return interp
+
+        wa = @lexer.whitespace?
+        str = Script::String.new(Lexer::OPERATORS_REVERSE[op.type])
+        str.line = @lexer.line
+        interp = Script::Interpolation.new(nil, str, assert_expr(name), !:wb, wa, :originally_text)
+        interp.line = @lexer.line
+        return interp
+      end
+
+      def interpolation(first = concat)
+        e = first
         while interp = try_tok(:begin_interpolation)
           wb = @lexer.whitespace?(interp)
           line = @lexer.line

data/test/linked_rails.rb

@@ -17,6 +17,13 @@ begin
 rescue LoadError
 end
 
+if defined?(Rails::Application) # Rails 3
+  class TestApp < Rails::Application
+    config.root = File.join(File.dirname(__FILE__), "../..")
+  end
+  Rails.application = TestApp
+end
+
 ActionController::Base.logger = Logger.new(nil)
 
 # Load plugins from test/plugins.

data/test/sass/plugin_test.rb

@@ -115,35 +115,6 @@ CSS
     assert_renders_correctly('more1_with_line_comments', 'more1', :prefix => 'more_')
   end
 
-  def test_merb_update
-    begin
-      require 'merb'
-    rescue LoadError
-      puts "\nmerb couldn't be loaded, skipping a test"
-      return
-    end
-    
-    require 'sass/plugin/merb'
-    if defined?(MerbHandler)
-      MerbHandler.send(:define_method, :process_without_sass) { |*args| }
-    else
-      Merb::Rack::Application.send(:define_method, :call_without_sass) { |*args| }
-    end
-
-    set_plugin_opts
-
-    File.delete(tempfile_loc('basic'))
-    assert_needs_update 'basic'
-    
-    if defined?(MerbHandler)
-      MerbHandler.new('.').process nil, nil
-    else
-      Merb::Rack::Application.new.call(::Rack::MockRequest.env_for('/'))
-    end
-
-    assert_stylesheet_updated 'basic'
-  end
-
   def test_doesnt_render_partials
     assert !File.exists?(tempfile_loc('_partial'))
   end

data/test/sass/script_conversion_test.rb

@@ -158,6 +158,49 @@ RUBY
     assert_renders "\#{$bar}"
   end
 
+  def test_interpolation_in_function
+    assert_renders 'flabnabbit(#{1 + "foo"})'
+    assert_renders 'flabnabbit($foo #{1 + "foo"}$baz)'
+    assert_renders 'flabnabbit($foo #{1 + "foo"}#{2 + "bar"} $baz)'
+  end
+
+  def test_interpolation_near_operators
+    assert_renders '#{1 + 2} , #{3 + 4}'
+    assert_renders '#{1 + 2}, #{3 + 4}'
+    assert_renders '#{1 + 2} ,#{3 + 4}'
+    assert_renders '#{1 + 2},#{3 + 4}'
+
+    assert_renders '3 / #{3 + 4}'
+    assert_renders '3 /#{3 + 4}'
+    assert_renders '3/ #{3 + 4}'
+    assert_renders '3/#{3 + 4}'
+
+    assert_renders '#{1 + 2} * 7'
+    assert_renders '#{1 + 2}* 7'
+    assert_renders '#{1 + 2} *7'
+    assert_renders '#{1 + 2}*7'
+
+    assert_renders '-#{1 + 2}'
+    assert_renders '- #{1 + 2}'
+
+    assert_renders '5 + #{1 + 2} * #{3 + 4}'
+    assert_renders '5 +#{1 + 2} * #{3 + 4}'
+    assert_renders '5+#{1 + 2} * #{3 + 4}'
+    assert_renders '#{1 + 2} * #{3 + 4} + 5'
+    assert_renders '#{1 + 2} * #{3 + 4}+ 5'
+    assert_renders '#{1 + 2} * #{3 + 4}+5'
+
+    assert_equal '5 / #{1 + 2} + #{3 + 4}', render('5 / (#{1 + 2} + #{3 + 4})')
+    assert_equal '5 / #{1 + 2} + #{3 + 4}', render('5 /(#{1 + 2} + #{3 + 4})')
+    assert_equal '5 / #{1 + 2} + #{3 + 4}', render('5 /( #{1 + 2} + #{3 + 4} )')
+    assert_equal '#{1 + 2} + #{3 + 4} / 5', render('(#{1 + 2} + #{3 + 4}) / 5')
+    assert_equal '#{1 + 2} + #{3 + 4} / 5', render('(#{1 + 2} + #{3 + 4})/ 5')
+    assert_equal '#{1 + 2} + #{3 + 4} / 5', render('( #{1 + 2} + #{3 + 4} )/ 5')
+
+    assert_renders '#{1 + 2} + 2 + 3'
+    assert_renders '#{1 + 2} +2 + 3'
+  end
+
   def test_string_interpolation
     assert_renders '"foo#{$bar}baz"'
     assert_renders '"foo #{$bar}baz"'

data/test/sass/script_test.rb

@@ -97,7 +97,63 @@ class SassScriptTest < Test::Unit::TestCase
     assert_equal Sass::Script::String.new("foo/bar"), eval("foo/bar")
   end
 
-  def test_interpolation
+  def test_basic_interpolation
+    assert_equal "foo3bar", resolve("foo\#{1 + 2}bar")
+    assert_equal "foo3 bar", resolve("foo\#{1 + 2} bar")
+    assert_equal "foo 3bar", resolve("foo \#{1 + 2}bar")
+    assert_equal "foo 3 bar", resolve("foo \#{1 + 2} bar")
+    assert_equal "foo 35 bar", resolve("foo \#{1 + 2}\#{2 + 3} bar")
+    assert_equal "foo 3 5 bar", resolve("foo \#{1 + 2} \#{2 + 3} bar")
+    assert_equal "3bar", resolve("\#{1 + 2}bar")
+    assert_equal "foo3", resolve("foo\#{1 + 2}")
+    assert_equal "3", resolve("\#{1 + 2}")
+  end
+
+  def test_interpolation_in_function
+    assert_equal 'flabnabbit(1foo)', resolve('flabnabbit(#{1 + "foo"})')
+    assert_equal 'flabnabbit(foo 1foobaz)', resolve('flabnabbit(foo #{1 + "foo"}baz)')
+    assert_equal('flabnabbit(foo 1foo2bar baz)',
+      resolve('flabnabbit(foo #{1 + "foo"}#{2 + "bar"} baz)'))
+  end
+
+  def test_interpolation_near_operators
+    assert_equal '3 , 7', resolve('#{1 + 2} , #{3 + 4}')
+    assert_equal '3, 7', resolve('#{1 + 2}, #{3 + 4}')
+    assert_equal '3 ,7', resolve('#{1 + 2} ,#{3 + 4}')
+    assert_equal '3,7', resolve('#{1 + 2},#{3 + 4}')
+
+    assert_equal '3 / 7', resolve('3 / #{3 + 4}')
+    assert_equal '3 /7', resolve('3 /#{3 + 4}')
+    assert_equal '3/ 7', resolve('3/ #{3 + 4}')
+    assert_equal '3/7', resolve('3/#{3 + 4}')
+
+    assert_equal '3 * 7', resolve('#{1 + 2} * 7')
+    assert_equal '3* 7', resolve('#{1 + 2}* 7')
+    assert_equal '3 *7', resolve('#{1 + 2} *7')
+    assert_equal '3*7', resolve('#{1 + 2}*7')
+
+    assert_equal '-3', resolve('-#{1 + 2}')
+    assert_equal '- 3', resolve('- #{1 + 2}')
+
+    assert_equal '5 + 3 * 7', resolve('5 + #{1 + 2} * #{3 + 4}')
+    assert_equal '5 +3 * 7', resolve('5 +#{1 + 2} * #{3 + 4}')
+    assert_equal '5+3 * 7', resolve('5+#{1 + 2} * #{3 + 4}')
+    assert_equal '3 * 7 + 5', resolve('#{1 + 2} * #{3 + 4} + 5')
+    assert_equal '3 * 7+ 5', resolve('#{1 + 2} * #{3 + 4}+ 5')
+    assert_equal '3 * 7+5', resolve('#{1 + 2} * #{3 + 4}+5')
+
+    assert_equal '5/3 + 7', resolve('5 / (#{1 + 2} + #{3 + 4})')
+    assert_equal '5/3 + 7', resolve('5 /(#{1 + 2} + #{3 + 4})')
+    assert_equal '5/3 + 7', resolve('5 /( #{1 + 2} + #{3 + 4} )')
+    assert_equal '3 + 7/5', resolve('(#{1 + 2} + #{3 + 4}) / 5')
+    assert_equal '3 + 7/5', resolve('(#{1 + 2} + #{3 + 4})/ 5')
+    assert_equal '3 + 7/5', resolve('( #{1 + 2} + #{3 + 4} )/ 5')
+
+    assert_equal '3 + 5', resolve('#{1 + 2} + 2 + 3')
+    assert_equal '3 +5', resolve('#{1 + 2} +2 + 3')
+  end
+
+  def test_string_interpolation
     assert_equal "foo bar, baz bang", resolve('"foo #{"bar"}, #{"baz"} bang"')
     assert_equal "foo bar baz bang", resolve('"foo #{"#{"ba" + "r"} baz"} bang"')
     assert_equal 'foo #{bar baz} bang', resolve('"foo \#{#{"ba" + "r"} baz} bang"')

data/test/sass/scss/scss_test.rb

@@ -727,54 +727,6 @@ div { -foo-\#{$a}-\#{$b}-foo: foo }
 SCSS
   end
 
-  def test_basic_prop_val_interpolation
-    assert_equal <<CSS, render(<<SCSS)
-foo {
-  bar: foo 3 baz; }
-CSS
-foo {bar: foo \#{1 + 2} baz}
-SCSS
-    assert_equal <<CSS, render(<<SCSS)
-foo {
-  bar: foo3 baz; }
-CSS
-foo {bar: foo\#{1 + 2} baz}
-SCSS
-    assert_equal <<CSS, render(<<SCSS)
-foo {
-  bar: foo 3, baz; }
-CSS
-foo {bar: foo \#{1 + 2},baz}
-SCSS
-  end
-
-  def test_prop_val_only_interpolation
-    assert_equal <<CSS, render(<<SCSS)
-foo {
-  bar: bazbang; }
-CSS
-foo {bar: \#{"baz" + "bang"}}
-SCSS
-  end
-
-  def test_prop_val_interpolation_in_string
-    assert_equal <<CSS, render(<<SCSS)
-foo {
-  bar: "bizzle bazbang bop"; }
-CSS
-foo {bar: "bizzle \#{"baz" + "bang"} bop"}
-SCSS
-  end
-
-  def test_prop_val_interpolation_in_function
-    assert_equal <<CSS, render(<<SCSS)
-foo {
-  bar: flabnabbit(1foo); }
-CSS
-foo {bar: flabnabbit(\#{1 + "foo"})}
-SCSS
-  end
-
   def test_basic_prop_name_interpolation
     assert_equal <<CSS, render(<<SCSS)
 foo {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 3.1.17
+  version: 3.1.18
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 -04:00
+date: 2010-05-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency