css_compare 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7870883a1448bb39dcff1dcbb3eb4c6736999d07
-  data.tar.gz: 1adfcdbfbf8ff6c45d5e6e682502f1b5377b06d2
+  metadata.gz: fca000673eaa0c61fd27e1183311064be28dedc7
+  data.tar.gz: 78a349c577139e8e94f866f46bb2f5bcbacde6d8
 SHA512:
-  metadata.gz: 4ec908933d4cbc9fa6c51627cf940c7c15824f8768030b70c3580e4afae3b888c1e10c9a8466c9a87821dd3ad566fe7866f4973d045276dc43b56881d567fbb3
-  data.tar.gz: be25bdc14bce1a42302c2b440422713727a84a036162133f22f81a50df0db44202ffe3993092fcc1d9cce2e968f39cda829bccde4dba26af92657ace679583e4
+  metadata.gz: 8943b8ac544e8e76b302f9c3cd03671d02f74676ae6fca0886d86c7772d9f3ef64695f2641d5f7e0de0ee8796c7725c8174ba714497794d13a320ae151de722d
+  data.tar.gz: 3b451d7188514141afd63dc1fedc135bf306a94c47cbfba45efb96eedc4d39627cb199eeb77cda4403712e10f0dd4dc69176923979ca972073a00d50f23c8b79

data/lib/css_compare/constants.rb

@@ -1,5 +1,5 @@
 module CssCompare
   # The root directory of the Less2Sass source tree.
   ROOT_DIR = File.expand_path(File.join(__FILE__, '../../..'))
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/css_compare/css.rb

@@ -1,3 +1,4 @@
+require 'css_compare/css/value_factory'
 require 'css_compare/css/component'
 require 'css_compare/css/parser'
 require 'css_compare/css/engine'

data/lib/css_compare/css/component/base.rb

@@ -11,10 +11,21 @@ module CssCompare
         # @param [Hash] that second hash to compare
         # @return [Boolean]
         def ==(this, that)
-          keys = this.keys + that.keys
-          keys.uniq!
+          keys = merge_keys(this, that)
           keys.all? { |key| this[key] && that[key] && this[key] == that[key] }
         end
+
+        def equals?(this, that)
+          keys = merge_keys(this, that)
+          keys.all? { |key| this[key] && that[key] && this[key].equals?(that[key]) }
+        end
+
+        private
+
+        def merge_keys(this, that)
+          keys = this.keys + that.keys
+          keys.uniq
+        end
       end
     end
   end

data/lib/css_compare/css/component/property.rb

@@ -28,7 +28,7 @@ module CssCompare
         def initialize(node, conditions)
           @name = node.resolved_name
           @values = {}
-          value = Value.new(node.resolved_value)
+          value = Value.new(node)
           conditions.each { |c| set_value(value.clone, c) }
         end
 
@@ -42,7 +42,8 @@ module CssCompare
         #   with.
         # @return [Boolean]
         def ==(other)
-          super(@values, other.values)
+          return super(@values, other.values) unless font?
+          equals?(@values, other.values)
         end
 
         # Merges the property with another one.
@@ -141,6 +142,10 @@ module CssCompare
           val.to_s.include?('!important')
         end
 
+        def font?
+          @name['font']
+        end
+
         # Breaks down complex properties like `border` into
         # smaller chunks (`border-width`, `border-style`, `border-color`)
         #

data/lib/css_compare/css/component/value.rb

@@ -4,10 +4,10 @@ module CssCompare
       # Represents the value of a CSS property under
       # certain conditions declared by @media queries.
       class Value < Base
-        # @return [#to_s]
+        # @return [CssCompare::CSS::Value::Base]
         attr_accessor :value
 
-        # @param [#to_s] val the value of the property
+        # @param [Sass::Tree::PropNode] val the value of the property
         def initialize(val)
           self.value = val
         end
@@ -16,23 +16,25 @@ module CssCompare
         # Equal values mean, that the actual value and
         # the importance, as well, are set equally.
         #
-        # @param [Value] other the value to compare this with
+        # @param [CssCompare::CSS::Value::Base] other the value to compare this with
         # @return [Boolean]
         def ==(other)
-          @value.to_s == other.value.to_s
+          @value == other.value
+        end
+
+        def equals?(other)
+          @value.equals?(other.value)
         end
 
-        # Sets the value and the importance of
-        # the {Value} node.
-        #
         # @private
-        def value=(value)
-          original_value = value = value.is_a?(Value) ? value.value : value
-          # Can't do gsub! because the String gets frozen and can't be further modified by strip
-          value = value.gsub(/\s*!important\s*/, '')
-          @is_important = value != original_value
-          value = sanitize_value(value) if value =~ CONTAIN_STRING
-          @value = value
+        def value=(val)
+          if val.is_a?(self.class)
+            @is_important = val.important?
+            @value = val.value
+          else
+            @value = ValueFactory.create(val.value)
+            @is_important = @value.important?
+          end
         end
 
         # Tells, whether or not the value is marked as !important
@@ -44,34 +46,9 @@ module CssCompare
 
         # @return [String] the String representation of this node
         def to_s
-          @value.to_s + (@is_important ? ' !important' : '')
-        end
-
-        private
-
-        CONTAIN_STRING = /['"](.*)['"]/
-
-        # Normalizes string values.
-        #
-        # We can assume, that a value describes a path
-        # if following the removal of leading and trailing
-        # quotes it begins with a `./`. It can be safely
-        # removed without affecting the real value of
-        # the CSS property.
-        #
-        # Examples:
-        #   "'path/to/file.css'" #=> "path/to/file.css"
-        #   ""\"path/to/file.css\""" #=> ""path/to/file.css""
-        #   "./path/to/file.css" #=> "path/to/file.css"
-        #
-        # @param [String] value the string to sanitize
-        # @return [String] sanitized string
-        def sanitize_value(value)
-          value = value.sub(/\A['"](.*)['"]\Z/, '\1').gsub(/\\"|"|'/, '"') # Solves first two examples
-          value = value.sub('./', '') if value.start_with?('url(') # Solves third if it's a url value
-          value
+          @value.to_s
         end
       end
     end
   end
-end
+end

data/lib/css_compare/css/engine.rb

@@ -54,6 +54,9 @@ module CssCompare
       attr_accessor :selectors, :keyframes, :namespaces,
                     :pages, :supports, :charset
 
+      # @note UTF-8 is assumed as default charset
+      # @see https://www.w3.org/TR/CSS2/syndata.html#x52
+      #
       # @param [String, Sass::Tree::Node] input the source file of
       #   the CSS project, or its AST
       def initialize(input)
@@ -76,7 +79,7 @@ module CssCompare
         @pages = {}
         @supports = {}
         @unsupported = []
-        @charset
+        @charset = 'UTF-8'
       end
 
       # Checks, whether two engines are equal.
@@ -278,7 +281,7 @@ module CssCompare
       #   a small change in the the selector's name.
       #
       # @param [Sass::Tree:RuleNode] node the Rule node
-      # @param [Array<String>] parent_query_list processed parent_query_list of the
+      # @param [Array<String>] conditions processed parent_query_list of the
       #   parent media node. If the rule is global, it will be assigned
       #   to the media query equal to `@media all {}`.
       # @return [Void]

data/lib/css_compare/css/value/base.rb

@@ -0,0 +1,84 @@
+require 'color'
+
+module CssCompare
+  module CSS
+    module Value
+      # The base class for wrapping the CSS property values
+      class Base
+        # @return [Sass::Script::Tree::Node]
+        attr_accessor :value
+
+        # @param [Sass::Script::Tree::Node] value the SassScript value to be wrapped
+        def initialize(value)
+          @value = value
+        end
+
+        # Checks, whether the CSS values are equal
+        #
+        # @return [Boolean]
+        def ==(other)
+          self.class == other.class
+        end
+
+        def equals?(other)
+          self == other
+        end
+
+        # Checks, whether the CSS values are flagged as !important.
+        #
+        # @return [Boolean]
+        def important?
+          @value.to_sass.include?('!important')
+        end
+
+        # Checks, whether the CSS value is a color. Subclasses may
+        # override this method.
+        #
+        # @return [Boolean]
+        def color?
+          false
+        end
+
+        # @return [String]
+        def to_s
+          @value.to_sass
+        end
+
+        protected
+
+        # Normalizes the quoted string values.
+        #
+        # @param [String] value the string to sanitize
+        # @return [String] sanitized string
+        def sanitize_string(value)
+          value.sub(/\A['"](.*)['"]\Z/, '\1').gsub(/\\"|"|'/, '"')
+        end
+
+        def sanitize_font(value)
+          value.gsub(/\\"|"|'/, '')
+        end
+
+        # Normalizes the url paths.
+        #
+        # We can assume, that a value describes a path
+        # if following the removal of leading and trailing
+        # quotes it begins with a `./`. It can be safely
+        # removed without affecting the real value of
+        # the CSS property.
+        #
+        # Examples:
+        #   "'path/to/file.css'" #=> "path/to/file.css"
+        #   ""\"path/to/file.css\""" #=> ""path/to/file.css""
+        #   "./path/to/file.css" #=> "path/to/file.css"
+        #
+        # @param [String] value the url path to normalize
+        # @return [String] the normalized path
+        def sanitize_url(value)
+          value = sanitize_string(value)
+          value = value.sub('./', '') if value.start_with?('./')
+          value
+        end
+      end
+    end
+  end
+end

data/lib/css_compare/css/value/function.rb

@@ -0,0 +1,65 @@
+module CssCompare
+  module CSS
+    module Value
+      # Wraps the SassScript Funcall object
+      class Function < Base
+
+        # Checks, whether two function expressions are equal.
+        #
+        # @param [Function] other the other function expression
+        # @return [Boolean]
+        def ==(other)
+          if color?
+            return false unless other.color?
+            ::Color.equivalent?(color, other.color)
+          else
+            return false unless super
+            arg1 = @value.args.length
+            arg2 = other.value.args.length
+            return false unless arg1 == arg2
+            args1 = @value.args.collect { |x| ValueFactory.create(x) }
+            args2 = other.value.args.collect { |x| ValueFactory.create(x) }
+            args1.each_index { |i| args1[i] == args2[i] }
+          end
+        end
+
+        # @see Base#color?
+        def color?
+          rgb? || hsl?
+        end
+
+        def color
+          raise StandardError, 'Function not a color' unless color?
+          args = @value.args.collect { |x| x.value.value }
+          if rgb?
+            ::Color::RGB.new(args[0], args[1], args[2])
+          elsif hsl?
+            ::Color::HSL.new(args[0], args[1], args[2])
+          end
+        end
+
+        def alpha?
+          @value.args.length == 4
+        end
+
+        def alpha
+          return @value.args[3] if alpha?
+          false
+        end
+
+        private
+
+        RGB_COLOR_FUNCTIONS = %w(rgb rgba)
+        HSL_COLOR_FUNCTIONS = %w(hsl hsla)
+
+        def rgb?
+          RGB_COLOR_FUNCTIONS.include?(@value.name)
+        end
+
+        def hsl?
+          HSL_COLOR_FUNCTIONS.include?(@value.name)
+        end
+      end
+    end
+  end
+end

data/lib/css_compare/css/value/list_literal.rb

@@ -0,0 +1,26 @@
+module CssCompare
+  module CSS
+    module Value
+      # Wraps the SassScript ListLiteral object.
+      class ListLiteral < Base
+
+        # Checks, whether two list literals are equal.
+        #
+        # @param [ListLiteral] other the other list literal
+        # @return [Boolean]
+        def ==(other)
+          return false unless super
+          elements1 = @value.elements.length
+          elements2 = other.value.elements.length
+          return false unless elements1 == elements2
+          @value.elements.each_index do |i|
+            value1 = sanitize_string(@value.elements[i].to_sass)
+            value2 = sanitize_string(other.value.elements[i].to_sass)
+            return false unless value1 == value2
+          end
+          true
+        end
+      end
+    end
+  end
+end

data/lib/css_compare/css/value/literal.rb

@@ -0,0 +1,58 @@
+module CssCompare
+  module CSS
+    module Value
+      # Wraps the SassScript Literal object.
+      class Literal < Base
+
+        # Checks, whether two literals are equal.
+        #
+        # @param [Literal] other the other literal
+        # @return [Boolean]
+        def ==(other)
+          if color?
+            return false unless other.color?
+            ::Color.equivalent?(color, other.color)
+          else
+            return false unless super
+            value1 = sanitize_string(@value.to_sass)
+            value2 = sanitize_string(other.value.to_sass)
+            value1 == value2
+          end
+        end
+
+        def equals?(other)
+          value1 = sanitize_font(@value.to_sass)
+          value2 = sanitize_font(other.value.to_sass)
+          value1 == value2
+        end
+
+        def color?
+          named_color? || hex_color?
+        end
+
+        def color
+          return nil unless color?
+          hex_color? ? hex_color : named_color
+        end
+
+        private
+
+        HEX_COLOR_LITERAL = /^#(?:[a-f0-9]{3}){1,2}$/i
+
+        def named_color?
+          ::Color::CSS[@value.to_sass]
+        end
+
+        alias_method :named_color, :named_color?
+
+        def hex_color?
+          @value.to_sass =~ HEX_COLOR_LITERAL
+        end
+
+        def hex_color
+          ::Color::RGB.by_hex(@value.to_sass)
+        end
+      end
+    end
+  end
+end

data/lib/css_compare/css/value/url.rb

@@ -0,0 +1,20 @@
+module CssCompare
+  module CSS
+    module Value
+      # Wraps the SassScript `url` Funcall.
+      class Url < Base
+
+        # Checks, whether two url calls are equal.
+        #
+        # @param [Url] other the other url call
+        # @return [Boolean]
+        def ==(other)
+          return false unless super
+          value1 = sanitize_url(@value.args[0].value.value)
+          value2 = sanitize_url(other.value.args[0].value.value)
+          value1 == value2
+        end
+      end
+    end
+  end
+end

data/lib/css_compare/css/value_factory.rb

@@ -0,0 +1,29 @@
+require 'css_compare/css/value/base'
+require 'css_compare/css/value/literal'
+require 'css_compare/css/value/list_literal'
+require 'css_compare/css/value/function'
+require 'css_compare/css/value/url'
+
+module CssCompare
+  module CSS
+    module ValueFactory
+
+      # Creates the value object by applying the appropriate wrapper class.
+      #
+      # @param [Sass::Script::Tree::Node] value the CSS property's value
+      # @return [CssCompare::CSS::Value::Base] the wrapped property value
+      def self.create(value)
+        if value.is_a?(Sass::Script::Tree::Literal)
+          Value::Literal.new(value)
+        elsif value.is_a?(Sass::Script::Tree::ListLiteral)
+          Value::ListLiteral.new(value)
+        elsif value.is_a?(Sass::Script::Tree::Funcall)
+          return Value::Function.new(value) unless value.name == 'url'
+          Value::Url.new(value)
+        else
+          raise StandardError, 'Unsupported type of CSS value'
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: css_compare
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Attila Večerek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: color
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +96,12 @@ files:
 - lib/css_compare/css/component/value.rb
 - lib/css_compare/css/engine.rb
 - lib/css_compare/css/parser.rb
+- lib/css_compare/css/value/base.rb
+- lib/css_compare/css/value/function.rb
+- lib/css_compare/css/value/list_literal.rb
+- lib/css_compare/css/value/literal.rb
+- lib/css_compare/css/value/url.rb
+- lib/css_compare/css/value_factory.rb
 - lib/css_compare/engine.rb
 - lib/css_compare/exec.rb
 - lib/css_compare/util.rb