simple_style_sheet 0.0.1 → 0.0.2

data/Changelog

@@ -1,2 +1,5 @@
+0.0.2 (February 26, 2012)
+  Delegated selector-related functionality to SimpleSelector gem.
+
 0.0.1 (February 21, 2012)
   Initial release.

data/README.md

@@ -86,22 +86,7 @@ The #value_for method, when called without the tag argument, returns top-level p
 Selector specificity
 --------------------
 
-In order to return a property value for a given tag, search for the matching selector of highest specificity is performed.
-
-The specificity of each selector is calculated according to rules similar to the standard CSS rules.
-
-The specificity is four numbers: **a,b,c,d**.
-
-**The rules respected by this gem are**:
-
-* **a** is always 0;
-* **b** is the number of ID attributes in the selector;
-* **c** is the number of class names in the selector;
-* **d** is the number of tag names in the selector.
-
-For example, a selector `tag#id1.class1 #id2.class2.class3` has specificity equal to `0,2,3,1`.
-
-Two selector specificities are compared by succesively comparing their corresponding numbers, from left to right.
+Selector specificity information can be found in the description of [SimpleSelector](http://github.com/jacekmikrut/simple_selector) Ruby gem.
 
 Property name translator
 ------------------------

data/lib/simple_style_sheet/handler.rb

@@ -42,7 +42,7 @@ module SimpleStyleSheet
     end
 
     def new_selector
-      Selector.new
+      SimpleSelector.new
     end
 
     def final_property_name(property_name)

data/lib/simple_style_sheet/version.rb

@@ -1,3 +1,3 @@
 module SimpleStyleSheet
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/simple_style_sheet.rb

@@ -1,8 +1,7 @@
 require "simple_style_sheet/version"
 
-require "simple_style_sheet/selector_specificity"
-require "simple_style_sheet/selector_segment"
-require "simple_style_sheet/selector"
+require "simple_selector"
+
 require "simple_style_sheet/handler"
 
 module SimpleStyleSheet

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_style_sheet
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000Z
+date: 2012-02-26 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: simple_selector
+  requirement: &83580310 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *83580310
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &74598880 !ruby/object:Gem::Requirement
+  requirement: &83580040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +32,7 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *74598880
+  version_requirements: *83580040
 description: Parses a CSS-like Hash style sheet and allows searching for property
   values of HTML-like tags. Tag and property names, as well as their meaning, are
   up to the gem user.
@@ -33,9 +44,6 @@ files:
 - lib/simple_style_sheet.rb
 - lib/simple_style_sheet/handler.rb
 - lib/simple_style_sheet/version.rb
-- lib/simple_style_sheet/selector.rb
-- lib/simple_style_sheet/selector_segment.rb
-- lib/simple_style_sheet/selector_specificity.rb
 - README.md
 - LICENSE
 - Changelog

data/lib/simple_style_sheet/selector.rb

@@ -1,63 +0,0 @@
-module SimpleStyleSheet
-  class Selector
-
-    def initialize(string=nil)
-      @segments = []
-      @specificity = SelectorSpecificity.new
-      concat(string) unless string.nil?
-    end
-
-    attr_reader :specificity
-
-    def concat(string)
-      string.scan(/[\w.#]+/).map { |s| SelectorSegment.new(s) }.each do |segment|
-        @segments << segment
-        @specificity += segment.specificity
-      end
-      self
-    end
-
-    def +(string)
-      duplicate.concat(string)
-    end
-
-    def match?(tag)
-      return true  if @segments.none?
-      return false unless @segments.last.match?(tag)
-
-      index = @segments.size - 2
-      current_tag = tag
-
-      while index >= 0 && current_tag = current_tag.parent
-        if @segments[index].match?(current_tag)
-          index -= 1
-          next
-        end
-      end
-      index == -1
-    end
-
-    def empty?
-      @segments.none?
-    end
-
-    def to_s
-      @segments.map { |segment| segment.to_s }.join(" ")
-    end
-
-    def inspect
-      "#<#{self.class} #{to_s.inspect}>"
-    end
-
-    def ==(other)
-      to_s == other.to_s
-    end
-
-    def duplicate
-      d = dup
-      d.instance_variable_set(   "@segments",    @segments.dup)
-      d.instance_variable_set("@specificity", @specificity.dup)
-      d
-    end
-  end
-end

data/lib/simple_style_sheet/selector_segment.rb

@@ -1,38 +0,0 @@
-module SimpleStyleSheet
-  class SelectorSegment
-
-    def initialize(string)
-      @tag_name    = string.lstrip.slice(/^\w+/)
-      @id          = string.slice(/(?<=\#)\w+/)
-      @class_names = string.scan(/(?<=\.)\w+/)
-    end
-
-    attr_reader :tag_name, :id, :class_names
-
-    def specificity
-      @specificity ||= SelectorSpecificity.new(
-        0,
-        id ? 1 : 0,
-        class_names.count,
-        tag_name ? 1 : 0
-      )
-    end
-
-    def match?(tag)
-      return false if tag_name && tag_name != tag.name
-      return false if id       && id       != tag.id
-      return false if (class_names - tag.class_names).any?
-      true
-    end
-
-    def to_s
-      "#{tag_name}" +
-      (id ? "##{id}" : "") +
-      class_names.map { |class_name| ".#{class_name}" }.join
-    end
-
-    def inspect
-      "#<#{self.class} #{to_s.inspect}>"
-    end
-  end
-end

data/lib/simple_style_sheet/selector_specificity.rb

@@ -1,32 +0,0 @@
-module SimpleStyleSheet
-  class SelectorSpecificity
-
-    include Comparable
-
-    def initialize(a=0, b=0, c=0, d=0)
-      @a, @b, @c, @d = a, b, c, d
-    end
-
-    attr_accessor :a, :b, :c, :d
-
-    def <=>(other)
-      [:a, :b, :c, :d].each do |name|
-        result = send(name) <=> other.send(name)
-        return result unless result == 0
-      end
-      0
-    end
-
-    def +(other)
-      self.class.new(a + other.a, b + other.b, c + other.c, d + other.d)
-    end
-
-    def to_s
-      "#{a},#{b},#{c},#{d}"
-    end
-
-    def inspect
-      "#<#{self.class} #{to_s.inspect}>"
-    end
-  end
-end