cloudhead-less 1.0.9 → 1.0.10

data/VERSION

@@ -1 +1 @@
-1.0.10
+1.0.11

data/less.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "1.0.9"
+  s.version = "1.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]

data/lib/less/engine/nodes/literal.rb

@@ -15,13 +15,15 @@ module Less
       include Literal
       attr_reader :r, :g, :b, :a
 
-      def initialize(r, g, b, a = 1.0)
-        r, g, b = [r, g, b].map {|c| c.is_a?(::String) ? c.to_i(16) : c }
-        @r, @g, @b, @a = normalize(r), normalize(g), normalize(b), normalize(a, 1.0)
+      def initialize r, g, b, a = 1.0
+        @r, @g, @b = [r, g, b].map do |c|
+          normalize(c.is_a?(::String) ? c.to_i(16) : c)
+        end
+        @a = normalize(a, 1.0)
       end
       
-      def alpha(v)
-        self.class.new(r,g,b,v)
+      def alpha v
+        self.class.new r, g, b, v
       end
       
       def rgb
@@ -29,28 +31,18 @@ module Less
       end
       
       def operate op, other
-        if other.is_a? Numeric
-          self.class.new *self.rgb.map {|c| c.send(op, other) }, @a
+        color = if other.is_a? Numeric
+          rgb.map {|c| c.send(op, other) }
         else
-          self.class.new *self.rgb.zip(other.rgb).map {|a, b| a.send(op, b) }, @a
+          rgb.zip(other.rgb).map {|a, b| a.send(op, b) }
         end
+        self.class.new *[color, @a].flatten # Ruby 1.8 hack
       end
       
-      def + other
-        operate :+, other
-      end
-
-      def - other
-        operate :-, other
-      end
-      
-      def * other
-        operate :*, other
-      end
-      
-      def / other
-        operate :/, other
-      end
+      def + other; operate :+, other end
+      def - other; operate :-, other end
+      def * other; operate :*, other end
+      def / other; operate :/, other end
       
       def coerce other
         return self, other
@@ -60,7 +52,7 @@ module Less
         if a < 1.0
           "rgba(#{r.to_i}, #{g.to_i}, #{b.to_i}, #{a})"
         else
-          "#%02x%02x%02x" % [r,g,b]
+          "#%02x%02x%02x" % [r, g, b]
         end
       end
 
@@ -77,7 +69,7 @@ module Less
       end
       
       def to_ruby
-        "Color.new(#{r},#{g},#{b},#{a})"
+        "#{self.class}.new(#{r},#{g},#{b},#{a})"
       end
       
     protected

data/lib/less/engine/nodes/property.rb

@@ -98,7 +98,7 @@ module Less
               if result.is_a? Entity
                 result
               else
-                entity.class.new(*result, *(unit if entity.class == Node::Number))
+                entity.class.new(result, *(unit if entity.class == Node::Number))
               end
             else
               first

data/lib/less.rb

@@ -13,12 +13,12 @@ require 'less/command'
 require 'less/engine'
 
 module Less  
-  MixedUnitsError   = Class.new(Exception)
-  PathError         = Class.new(Exception)
+  MixedUnitsError   = Class.new(RuntimeError)
+  PathError         = Class.new(RuntimeError)
   VariableNameError = Class.new(NameError)
   MixinNameError    = Class.new(NameError)
   SyntaxError       = Class.new(RuntimeError)
-  ImportError       = Class.new(Exception)
+  ImportError       = Class.new(RuntimeError)
   
   $verbose = false
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudhead-less
 version: !ruby/object:Gem::Version 
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors: 
 - cloudhead