haml-edge 3.1.47 → 3.1.48

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.47
+3.1.48

data/VERSION

@@ -1 +1 @@
-3.1.47
+3.1.48

data/lib/haml/util.rb

@@ -441,6 +441,7 @@ MSG
     # @raise [ArgumentError] if the document declares an unknown encoding
     def check_haml_encoding(str, &block)
       return check_encoding(str, &block) if ruby1_8?
+      str = str.dup if str.frozen?
 
       bom, encoding = parse_haml_magic_comment(str)
       if encoding; str.force_encoding(encoding)

data/lib/sass/plugin/configuration.rb

@@ -117,12 +117,7 @@ module Sass
     #   The location of the CSS file that was deleted.
     define_callback :deleting_css
 
-    @options = {
-      :css_location       => './public/stylesheets',
-      :always_update      => false,
-      :always_check       => true,
-      :full_exception     => true
-    }
+    @options = {:full_exception => true}
 
     # An options hash.
     # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
@@ -215,7 +210,9 @@ module Sass
       return if options[:template_location].is_a?(Array)
       options[:template_location] =
         case options[:template_location]
-        when nil; [[File.join(options[:css_location], 'sass'), options[:css_location]]]
+        when nil
+          css_location = options[:css_location] || './public/stylesheets'
+          [[File.join(css_location, 'sass'), css_location]]
         when String; [[options[:template_location], options[:css_location]]]
         else; options[:template_location].to_a
         end

data/lib/sass/plugin/generic.rb

@@ -0,0 +1,15 @@
+# The reason some options are declared here rather than in sass/plugin/configuration.rb
+# is that otherwise they'd clobber the Rails-specific options.
+# Since Rails' options are lazy-loaded in Rails 3,
+# they're reverse-merged with the default options
+# so that user configuration is preserved.
+# This means that defaults that differ from Rails'
+# must be declared here.
+
+unless defined?(Sass::GENERIC_LOADED)
+  Sass::GENERIC_LOADED = true
+
+  Sass::Plugin.options.merge!(:css_location   => './public/stylesheets',
+                              :always_update  => false,
+                              :always_check   => true)
+end

data/lib/sass/plugin.rb

@@ -265,5 +265,10 @@ module Sass
   end
 end
 
-require 'sass/plugin/rails' if defined?(ActionController)
-require 'sass/plugin/merb'  if defined?(Merb::Plugins)
+if defined?(ActionController)
+  require 'sass/plugin/rails'
+elsif defined?(Merb::Plugins)
+  require 'sass/plugin/merb'
+else
+  require 'sass/plugin/generic'
+end

data/lib/sass/script/lexer.rb

@@ -92,7 +92,7 @@ module Sass
         :number => /(-)?(?:(\d*\.\d+)|(\d+))([a-zA-Z%]+)?/,
         :color => HEXCOLOR,
         :bool => /(true|false)\b/,
-        :ident_op => %r{(#{Regexp.union(*IDENT_OP_NAMES.map{|s| Regexp.new(Regexp.escape(s) + '(?:\b|$)')})})},
+        :ident_op => %r{(#{Regexp.union(*IDENT_OP_NAMES.map{|s| Regexp.new(Regexp.escape(s) + "(?!#{NMCHAR}|$)")})})},
         :op => %r{(#{Regexp.union(*OP_NAMES)})},
       }
 

data/test/sass/script_test.rb

@@ -390,6 +390,18 @@ SASS
       'Invalid CSS after "foo(bar, ": expected function argument, was ")"') {eval('foo(bar, )')}
   end
 
+  def test_color_prefixed_identifier
+    assert_equal "tealbang", resolve("tealbang")
+    assert_equal "teal-bang", resolve("teal-bang")
+  end
+
+  def test_op_prefixed_identifier
+    assert_equal "notbang", resolve("notbang")
+    assert_equal "not-bang", resolve("not-bang")
+    assert_equal "or-bang", resolve("or-bang")
+    assert_equal "and-bang", resolve("and-bang")
+  end
+
   private
 
   def resolve(str, opts = {}, environment = env)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 3.1.47
+  version: 3.1.48
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 -04:00
+date: 2010-06-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,6 +91,7 @@ files:
 - lib/sass/plugin/rack.rb
 - lib/sass/plugin/rails.rb
 - lib/sass/plugin/staleness_checker.rb
+- lib/sass/plugin/generic.rb
 - lib/sass/repl.rb
 - lib/sass/script.rb
 - lib/sass/script/bool.rb