css 0.0.3 → 0.0.4

data/lib/css.rb

@@ -1,12 +1,12 @@
 require "numbers"
+require "monkey_patches"
 require "css/colors"
 require "css/errors"
-require "css/normalize"
 require "css/parser"
 require "css/property"
 require "css/rule"
 require "css/rule_set"
 
 module CSS
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/css/helpers/normalize.rb

@@ -0,0 +1,16 @@
+module CSS
+  module Normalize
+    def normalize_property_name(name)
+      name = name.to_s.strip
+      if name =~ /[A-Z]/
+        name.gsub(/([A-Z])/) do |match|
+          "-#{match.downcase}"
+        end
+      elsif name =~ /_/
+        name.gsub(/_/, '-')
+      else
+        name
+      end
+    end
+  end
+end

data/lib/css/helpers/orientation.rb

@@ -0,0 +1,19 @@
+module CSS
+  module Orientation
+    NESW = %w(top right bottom left)
+
+    def compact_orientation(top, right, bottom, left)
+      if top && right && bottom && left
+        if [top, right, bottom, left] == Array.new(4) { top }
+          top.value
+        elsif [top, bottom] == Array.new(2) { top } && [left, right] == Array.new(2) { left }
+          [top, left].map { |s| s.value }.join(' ')
+        elsif [top, bottom] != Array.new(2) { top } && [left, right] == Array.new(2) { left }
+          [top, left, bottom].map { |s| s.value }.join(' ')
+        else
+          [top, right, bottom, left].map { |s| s.value }.join(' ')
+        end
+      end
+    end
+  end
+end

data/lib/css/properties/background_property.rb

@@ -4,19 +4,17 @@ module CSS
       'background'
     end
 
-    def to_s
-      %w(color image repeat position attachment).map { |prop| @properties[prop] && @properties[prop] != default_properties[prop] ? @properties[prop].value : nil }.compact.join(' ')
-    end
-
     def to_style
-      [name, to_s].join(':')
+      values = %w(color image repeat position attachment).map { |prop| @properties[prop] && @properties[prop] != default_properties[prop] ? @properties[prop].value : nil }.compact.join(' ')
+      [name, values].join(':')
     end
 
     private
-      def init(name, value)
+      def init(parent, name, value)
+        @parent = parent
         if name =~ /-/
           property_name = name.sub(/[^-]+-(.*)/, '\1')
-          @properties[property_name] = Property.new(:p, property_name, value)
+          @properties[property_name] = Property.new(self, property_name, value)
         else
           expand_property value if value
         end
@@ -24,11 +22,11 @@ module CSS
 
       def default_properties
         @@default_properties ||= {
-          'color' => Property.create('color', 'transparent'),
-          'image' => Property.create('image', 'none'),
-          'repeat' => Property.create('repeat', 'repeat'),
-          'position' => Property.create('position', 'top left'),
-          'attachment' => Property.create('attachment', 'scroll')
+          'color' => Property.new(self, 'color', 'transparent'),
+          'image' => Property.new(self, 'image', 'none'),
+          'repeat' => Property.new(self, 'repeat', 'repeat'),
+          'position' => Property.new(self, 'position', 'top left'),
+          'attachment' => Property.new(self, 'attachment', 'scroll')
         }
       end
 
@@ -37,22 +35,22 @@ module CSS
         while values.size > 0
           val = values.shift
           if val =~ /^(#|rgb)/ || val == 'transparent' || Colors::NAMES.keys.include?(val.to_s.upcase)
-            @properties['color'] = Property.create('color', val)
+            @properties['color'] = Property.new(self, 'color', val)
           elsif val =~ /^url/
-            @properties['image'] = Property.create('image', val)
+            @properties['image'] = Property.new(self, 'image', val)
           elsif val =~ /repeat/
-            @properties['repeat'] = Property.create('repeat', val)
+            @properties['repeat'] = Property.new(self, 'repeat', val)
           elsif val =~ /^(\d|top|bottom|center)/
             val2 = values.shift
-            @properties['position'] = Property.create('position', [val, val2].join(' '))
+            @properties['position'] = Property.new(self, 'position', [val, val2].join(' '))
           elsif val =~ /inherit/
             if values.size == 0
-              @properties['attachment'] = Property.create('attachment', val)
+              @properties['attachment'] = Property.new(self, 'attachment', val)
             else
-              @properties['repeat'] = Property.create('repeat', val)
+              @properties['repeat'] = Property.new(self, 'repeat', val)
             end
           elsif values.size == 0
-            @properties['attachment'] = Property.create('attachment', val)
+            @properties['attachment'] = Property.new(self, 'attachment', val)
           end
         end
       end

data/lib/css/properties/border_orientation_property.rb

@@ -0,0 +1,53 @@
+module CSS
+  class BorderOrientationProperty < Property
+    def to_style
+      value = %w(size style color).map { |prop| @properties[prop] && @properties[prop] != default_properties[prop] ? @properties[prop].value : nil }.compact.join(' ')
+      if @properties['color'].nil? && @properties['style'].nil?
+        "border-size:#{@properties['size']}"
+      else
+        [name, value].join(':')
+      end
+    end
+
+    private
+      def init(parent, name, value)
+        @parent = parent
+        @name = name
+        if name =~ /-/
+          property_name = name.sub(/[^-]+-(.*)/, '\1')
+          @properties[property_name] = Property.new(self, property_name, value)
+        else
+          expand_property value if value
+        end
+      end
+
+      def default_properties
+        @@default_properties ||= {
+          'size' => Property.new(self, 'size', '3px'),
+          'style' => nil,
+          'color' => Property.new(self, 'color', 'black')
+        }
+      end
+
+      def expand_property(value)
+        values = value.delete(';').split(/\s+/)
+
+        val = values.pop
+        if val =~ /^(#|rgb)/ || Colors::NAMES.include?(val.upcase)
+          @properties["color"] = Property.new(self, 'color', val)
+        else
+          values << val
+        end
+
+        val = values.pop
+        if val =~ /^\d/
+          values << val
+        else
+          @properties["style"] = Property.new(self, 'style', val) if val
+        end
+
+        val = values.pop
+        @properties["size"] = Property.new(self, 'size', val) if val
+      end
+  end
+end

data/lib/css/properties/border_property.rb

@@ -1,32 +1,89 @@
+require 'css/helpers/orientation'
+
 module CSS
   class BorderProperty < Property
+    include Orientation
+
     def name
       'border'
     end
 
-    def to_s
-      value = %w(size style color).map { |prop| @properties[prop] && @properties[prop] != default_properties[prop] ? @properties[prop].value : nil }.compact.join(' ')
-      if value == @properties['size'].value
-        "#{@properties['size']}"
+    def to_style
+      sides = NESW.map { |o| @properties[o] }
+      value = nil
+      if %w(size style color).all? { |p| sides.all? { |side| @properties['top'].try(p) == side.try(p) && !side.try(p).nil? } }
+        value = %w(size style color).map { |p| top.send(p).value }.join(' ')
+      elsif %w(style color).all? { |p| sides.all? { |side| @properties['top'].try(p) == side.try(p) && !side.try(p).nil? } }
+        value = %w(style color).map { |p| top.send(p).value }.join(' ')
+      elsif %w(size style).all? { |p| sides.all? { |side| @properties['top'].try(p) == side.try(p) && !side.try(p).nil? } }
+        value = %w(size style).map { |p| top.send(p).value }.join(' ')
+      end
+      if value
+        [name, value].join(':')
       else
-        value
+        if %w(style color).all? { |p| sides.all? { |side| side.try(p).nil? } } && sides.all? { |side| @properties['top'].try('size') == side.try('size') && !side.try('size').nil? }
+          "border-size:#{top.size.value}"
+        else
+          sides.map { |side| side.empty? ? nil : side.to_style }.compact.join(';')
+        end
       end
     end
 
-    def to_style
-      value = %w(size style color).map { |prop| @properties[prop] && @properties[prop] != default_properties[prop] ? @properties[prop].value : nil }.compact.join(' ')
-      if value == @properties['size'].value
-        "border-size:#{@properties['size']}"
+    def size
+      method_missing(:size)
+    end
+
+    def method_missing(method_name, *args)
+      if method_name.to_s[-1..-1] == '='
+        property_name = normalize_property_name(method_name.to_s.chop)
+        if %w(size style color).include?(property_name)
+          NESW.each do |o|
+            @properties[o].send(method_name, *args)
+          end
+        else
+          super
+        end
       else
-        [name, value].join(':')
+        if %w(color size style).include?(method_name.to_s)
+          property = BorderUnitProperty.new(self, method_name.to_s)
+          is_nil = true
+          NESW.each do |o|
+            prop = @properties[o].send(method_name).try(:value)
+            if prop
+              property.send("#{o}=", prop)
+              is_nil = false
+            end
+          end
+          is_nil ? nil :property
+        else
+          super
+        end
       end
     end
 
+    def respond_to?(method_name, include_private = false)
+      property_name = normalize_property_name(method_name.to_s[-1..-1] == '=' ? method_name.to_s.chop : method_name)
+      %w(size style color).include?(property_name) || super
+    end
+
     private
-      def init(name, value)
+      def init(parent, name, value)
+        @parent = parent
+
+        #Allocate new orientation properties
+        NESW.each do |o|
+          @properties[o] = BorderOrientationProperty.new(self, o)
+        end
+
         if name =~ /-/
           property_name = name.sub(/[^-]+-(.*)/, '\1')
-          @properties[property_name] = Property.new(:p, property_name, value)
+          if NESW.include?(property_name)
+            @properties[property_name] = BorderOrientationProperty.new(self, property_name, value)
+          else
+            NESW.each do |orientation|
+              @properties[orientation].send("#{property_name}=", value)
+            end
+          end
         else
           expand_property value if value
         end
@@ -34,9 +91,10 @@ module CSS
 
       def default_properties
         @@default_properties ||= {
-          'size' => Property.create('size', '3px'),
-          'style' => nil,
-          'color' => Property.create('color', 'black')
+          'top' => BorderOrientationProperty.new(self, 'top'),
+          'right' => BorderOrientationProperty.new(self, 'right'),
+          'bottom' => BorderOrientationProperty.new(self, 'bottom'),
+          'left' => BorderOrientationProperty.new(self, 'left')
         }
       end
 
@@ -45,7 +103,9 @@ module CSS
 
         val = values.pop
         if val =~ /^(#|rgb)/ || Colors::NAMES.include?(val.upcase)
-          @properties["color"] = Property.create('color', val)
+          NESW.each do |o|
+            @properties[o].send('color=', val)
+          end
         else
           values << val
         end
@@ -54,11 +114,19 @@ module CSS
         if val =~ /^\d/
           values << val
         else
-          @properties["style"] = Property.create('style', val) if val
+          if val
+            NESW.each do |o|
+              @properties[o].send('style=', val)
+            end
+          end
         end
 
         val = values.pop
-        @properties["size"] = Property.create('size', val) if val
+        if val
+          NESW.each do |o|
+            @properties[o].send('size=', val)
+          end
+        end
       end
   end
 end

data/lib/css/properties/border_unit_property.rb

@@ -0,0 +1,16 @@
+module CSS
+  class BorderUnitProperty < MarginProperty
+    def init(parent, name, value)
+      @name = name
+      super
+    end
+
+    def name
+      @name
+    end
+
+    def to_style
+      [@parent.try(:name), super].compact.join('-')
+    end
+  end
+end

data/lib/css/properties/font_property.rb

@@ -4,30 +4,14 @@ module CSS
       'font'
     end
 
-    def to_s
-      if size && family
-        %w(style variant weight size family).map do |prop|
-          if @properties[prop] != default_properties[prop]
-            if prop == 'size' && get('size') != nil && @properties['line-height']
-              [@properties[prop], @properties['line-height']].join('/')
-            else
-              @properties[prop]
-            end
-          else
-            nil
-          end
-        end.compact.join(' ')
-      end
-    end
-
     def to_style
       if size && family
         values = %w(style variant weight size family).map do |prop|
           if @properties[prop] != default_properties[prop]
             if prop == 'size' && get('size') != nil && @properties['line-height']
-              [@properties[prop], @properties['line-height']].join('/')
+              [@properties[prop].value, @properties['line-height'].value].join('/')
             else
-              @properties[prop]
+              @properties[prop].try(:value)
             end
           else
             nil
@@ -35,17 +19,18 @@ module CSS
         end.compact.join(' ')
         [name, values].join(':')
       else
-        @properties.map { |prop, val| "#{prop == 'line-height' ? '' : 'font-'}#{prop}:#{val}" }.join(';')
+        @properties.map { |property_name, property| "#{property_name == 'line-height' ? '' : 'font-'}#{property_name}:#{property.value}" }.join(';')
       end
     end
 
     private
-      def init(name, value)
+      def init(parent, name, value)
+        @parent = parent
         if name == 'line-height'
           @properties['line-height'] = Property.new(:p, 'line-height', value)
         elsif name =~ /-/
           property_name = name.sub(/[^-]+-(.*)/, '\1')
-          @properties[property_name] = Property.new(:p, property_name, value)
+          @properties[property_name] = Property.new(self, property_name, value)
         else
           expand_property value if value
         end
@@ -53,11 +38,11 @@ module CSS
 
       def default_properties
         @@default_properties ||= {
-          'style' => Property.new(:p, 'style', 'normal'),
-          'variant' => Property.new(:p, 'variant', 'normal'),
-          'weight' => Property.new(:p, 'weight', 'normal'),
-          'size' => Property.new(:p, 'size', 'inherit'),
-          'family' => Property.new(:p, 'family', 'inherit'),
+          'style' => Property.new(self, 'style', 'normal'),
+          'variant' => Property.new(self, 'variant', 'normal'),
+          'weight' => Property.new(self, 'weight', 'normal'),
+          'size' => Property.new(self, 'size', 'inherit'),
+          'family' => Property.new(self, 'family', 'inherit'),
           'line-height' => nil
         }
       end
@@ -70,29 +55,29 @@ module CSS
         if font_families[0] =~ /"\s*$/
           font_families[0] = [values.pop, font_families[0]].join(' ')
         end
-        @properties['family'] = Property.new(:p, 'family', font_families.join(','))
+        @properties['family'] = Property.new(self, 'family', font_families.join(','))
 
         val = values.pop
         font_size, line_height = val.split(/\//)
-        @properties['size'] = Property.new(:p, 'size', font_size)
+        @properties['size'] = Property.new(self, 'size', font_size)
         @properties['line-height'] = Property.new(:p, 'line-height', line_height) if line_height
 
         val = values.shift
         if val =~ /(inherit|italic|oblique)/
-          @properties['style'] = Property.new(:p, 'style', val)
+          @properties['style'] = Property.new(self, 'style', val)
         else
           values << val
         end
 
         val = values.shift
         if val =~ /(inherit|small-caps)/
-          @properties['variant'] = Property.new(:p, 'variant', val)
+          @properties['variant'] = Property.new(self, 'variant', val)
         else
           values << val
         end
 
         val = values.shift
-        @properties['weight'] = Property.new(:p, 'weight', val) if val
+        @properties['weight'] = Property.new(self, 'weight', val) if val
       end
   end
 end

data/lib/css/properties/list_style_property.rb

@@ -5,16 +5,17 @@ module CSS
       super
     end
 
-    def name
-      'list-style'
+    def get(property_name)
+      @properties[property_name]
     end
 
-    def to_s
-      %w(type position image).map { |prop| @properties[prop] }.join(' ')
+    def name
+      'list-style'
     end
 
     def to_style
-      [name, to_s].join(':')
+      value = %w(type position image).map { |prop| @properties[prop].try(:value) }.join(' ')
+      [name, value].join(':')
     end
 
     def type
@@ -22,19 +23,21 @@ module CSS
     end
 
     def type=(val)
-      @properties['type'] = val
+      @properties['type'] = Property.new(self, 'type', val)
     end
 
     private
-      def init(name, value)
+      def init(parent, name, value)
+        @parent = parent
+        @properties['image'] = Property.new(self, 'image', 'none')
         expand_property value if value
       end
 
       def default_properties
         @@default_properties ||= {
-          'type' => Property.new(:p, 'type', 'disc'),
-          'position' => Property.new(:p, 'position', 'outside'),
-          'image' => Property.new(:p, 'image', 'none')
+          'type' => Property.new(self, 'type', 'disc'),
+          'position' => Property.new(self, 'position', 'outside'),
+          'image' => Property.new(self, 'image', 'none')
         }
       end
 
@@ -43,11 +46,11 @@ module CSS
         while values.size > 0
           val = values.shift
           if val =~ /^url/
-            @properties['image'] = Property.new(:p, 'image', val)
+            @properties['image'] = Property.new(self, 'image', val)
           elsif val =~ /^(inside|outside)/
-            @properties['position'] = Property.new(:p, 'position', val)
+            @properties['position'] = Property.new(self, 'position', val)
           else
-            @properties['type'] = Property.new(:p, 'type', val)
+            @properties['type'] = Property.new(self, 'type', val)
           end
         end
       end

data/lib/css/properties/margin_property.rb

@@ -1,25 +1,28 @@
+require 'css/helpers/orientation'
+
 module CSS
   class MarginProperty < Property
+    include Orientation
+
     def name
       'margin'
     end
 
-    def to_s
+    def ==(val)
+      if val.is_a?(Property)
+        super
+      else
+        value == val
+      end
+    end
+
+    def value
       top = @properties['top']
       right = @properties['right']
       bottom = @properties['bottom']
       left = @properties['left']
-
       if top && right && bottom && left
-        if [top, right, bottom, left] == Array.new(4) { top }
-          top
-        elsif [top, bottom] == Array.new(2) { top } && [left, right] == Array.new(2) { left }
-          [top, left].join(' ')
-        elsif [top, bottom] != Array.new(2) { top } && [left, right] == Array.new(2) { left }
-          [top, left, bottom].join(' ')
-        else
-          [top, right, bottom, left].join(' ')
-        end
+        compact_orientation(top, right, bottom, left)
       end
     end
 
@@ -30,26 +33,19 @@ module CSS
       left = @properties['left']
 
       if top && right && bottom && left
-        value = if [top, right, bottom, left] == Array.new(4) { top }
-          top
-        elsif [top, bottom] == Array.new(2) { top } && [left, right] == Array.new(2) { left }
-          [top, left].join(' ')
-        elsif [top, bottom] != Array.new(2) { top } && [left, right] == Array.new(2) { left }
-          [top, left, bottom].join(' ')
-        else
-          [top, right, bottom, left].join(' ')
-        end
+        value = compact_orientation(top, right, bottom, left)
         [name, value].join(':')
       else
-        default_properties.keys.map { |prop| @properties[prop] ? ["#{name}-#{prop}", @properties[prop]].join(':') : nil }.compact.join(';')
+        default_properties.keys.map { |prop| @properties[prop] ? ["#{name}-#{prop}", @properties[prop].value].join(':') : nil }.compact.join(';')
       end
     end
 
     private
-      def init(name, value)
+      def init(parent, name, value)
+        @parent = parent
         if name =~ /-/
           property_name = name.sub(/[^-]+-(.*)/, '\1')
-          @properties[property_name] = Property.new(:p, property_name, value)
+          @properties[property_name] = Property.new(self, property_name, value)
         else
           expand_property value if value
         end
@@ -90,10 +86,10 @@ module CSS
           left = values[3]
         end
 
-        @properties['top'] = Property.new(:p, 'top', top)
-        @properties['right'] = Property.new(:p, 'right', right)
-        @properties['bottom'] = Property.new(:p, 'bottom', bottom)
-        @properties['left'] = Property.new(:p, 'left', left)
+        @properties['top'] = Property.new(self, 'top', top)
+        @properties['right'] = Property.new(self, 'right', right)
+        @properties['bottom'] = Property.new(self, 'bottom', bottom)
+        @properties['left'] = Property.new(self, 'left', left)
       end
   end
 end

data/lib/css/property.rb

@@ -1,17 +1,21 @@
+require 'css/helpers/normalize'
+
 module CSS
   class Property
     include Normalize
 
-    attr_reader :name
+    attr_reader :value
 
     def initialize(*args)
-      raise "Please use Property.create instead of Property.new" unless args[0] == :p
-      @properties ||= {}
-      init(args[1], args[2])
+      raise "Please use Property.create instead of Property.new" unless args[0] == :p || args[0].is_a?(Property)
+      @properties = {}
+      name = args[1]
+      value = clean_value(args[2])
+      init(args[0].is_a?(Property) ? args[0] : nil, name, value)
     end
 
     def self.create(name, value = nil)
-      klass = case name
+      klass = case name.to_s
       when /^background/
         BackgroundProperty
       when /^(font|line-height)/
@@ -37,30 +41,46 @@ module CSS
       @properties.keys.include?(normalize_property_name(property_name))
     end
 
-    def to_s
-      @value
+    def name
+      [@parent.try(:name), @name].compact.join('-')
+    end
+
+    def value=(val)
+      if @properties.size > 0
+        expand_property val
+      else
+        @value = val
+      end
     end
 
-    def value
-      to_s
+    def to_s
+      @value || to_style
     end
 
     def inspect
-      to_s
+      "#<Property #{to_style}>"
     end
 
     def to_style
-      [@name, @value].join(':')
+      [name, @value].join(':')
     end
 
     def ==(val)
       if val.is_a?(Property)
-        @value == val.value
+        @value == val.instance_variable_get(:@value) && @properties == val.instance_variable_get(:@properties)
       else
         @value == val
       end
     end
 
+    def eql?(property)
+      property.is_a?(Property) && self == property
+    end
+
+    def hash
+      to_style.hash
+    end
+
     def <<(val)
       @value = val
     end
@@ -97,8 +117,18 @@ module CSS
       end
     end
 
+    def respond_to?(method_name, include_private = false)
+      property_name = normalize_property_name(method_name.to_s[-1..-1] == '=' ? method_name.to_s.chop : method_name)
+      default_properties.keys.include?(property_name) || super
+    end
+
+    def empty?
+      @value.nil? && @properties.all? { |p| p.empty? }
+    end
+
     private
-      def init(name, value)
+      def init(parent, name, value)
+        @parent = parent
         @name = name
         @value = value
       end
@@ -106,13 +136,24 @@ module CSS
       def default_properties
         {}
       end
+
+      def clean_value(value)
+        return if value.nil?
+
+        value = value.
+                  to_s.
+                  strip.
+                  gsub(/rgba?\([^)]+\)/) { |match| match.delete(' ') }
+      end
   end
 end
 
+require "css/properties/margin_property.rb"
 require "css/properties/background_property.rb"
 require "css/properties/font_property.rb"
 require "css/properties/border_property.rb"
+require "css/properties/border_orientation_property.rb"
+require "css/properties/border_unit_property.rb"
 require "css/properties/outline_property.rb"
-require "css/properties/margin_property.rb"
 require "css/properties/padding_property.rb"
 require "css/properties/list_style_property.rb"

data/lib/css/rule.rb

@@ -1,5 +1,6 @@
 # Shorthand conversions based on guide by Dustin Diaz - http://www.dustindiaz.com/css-shorthand/
 require 'set'
+require 'css/helpers/normalize'
 
 module CSS
   class Rule
@@ -28,13 +29,49 @@ module CSS
     end
 
     def get(property_name)
-      @rules[normalize_property_name(property_name)]
+      property_name = normalize_property_name(property_name)
+      if property_name =~ /-/
+        property_name_parts = property_name.split('-')
+        pname = property_name_parts.shift
+        property = nil
+        while property_name_parts.size > 0
+          property = @rules[normalize_property_name(pname)]
+          break unless property.nil?
+          pname = [pname, property_name_parts.shift].join('-')
+        end
+        property = @rules[normalize_property_name(pname)] unless property
+        if property && property_name_parts.size == 0
+          property
+        else
+          while property_name_parts.size > 0
+            next_property_name = property_name_parts.shift
+            property = property[next_property_name] if property
+          end
+          property
+        end
+      else
+        @rules[normalize_property_name(property_name)]
+      end
     end
 
     def [](property_name)
       get property_name
     end
 
+    def []=(property_name, value)
+      property = get(property_name)
+      unless property
+        property = Property.create(property_name, value)
+        if @rules[property.name]
+          @rules[property.name] << property
+        else
+          @properties << property.name
+          @rules[property.name] = property
+        end
+      end
+      property.value = value
+    end
+
     def to_s
       properties.map { |prop| get(prop).to_style }.join ';'
     end
@@ -48,43 +85,22 @@ module CSS
     end
 
     def has_property?(property_name)
-      property_name = normalize_property_name(property_name)
-      if property_name =~ /-/
-        property_name_parts = property_name.split('-')
-        pname = property_name_parts.shift
-        property = nil
-        while property_name_parts.size > 0
-          property = get(pname)
-          break unless property.nil?
-          pname = [pname, property_name_parts.shift].join('-')
-        end
-        property.has_property?(property_name_parts.shift)
-      else
-        properties.include?(property_name)
-      end
+      !get(property_name).empty?
     end
 
     def method_missing(method_name, *args)
-      property_name = normalize_property_name(method_name)
-      if property_name =~ /-/
-        property_name_parts = property_name.split('-')
-        pname = property_name_parts.shift
-        property = nil
-        while property_name_parts.size > 0
-          property = get(pname)
-          break unless property.nil?
-          pname = [pname, property_name_parts.shift].join('-')
-        end
-        property[property_name_parts.shift]
+      if method_name.to_s[-1..-1] == '='
+        property_name = method_name.to_s.chop
+        self[property_name] = args[0]
       else
-        get(property_name) || super
+        get(method_name) || super
       end
     end
 
     private
       def parse_rules(properties, rules, rule_text)
         rule_text.split(/;/).inject([properties, rules]) do |properties, rule|
-          property = rule.split(/:/).map { |el| el.strip }
+          property = rule.split(/:/)
           name = normalize_property_name(property[0])
           value = property[1]
 

data/lib/css/rule_set.rb

@@ -1,9 +1,7 @@
-require 'set'
-
 module CSS
   class RuleSet
     def initialize
-      @selectors = Set.new
+      @selectors = []
       @rules = {}
     end
 
@@ -25,15 +23,11 @@ module CSS
     end
 
     def rules
-      selectors.map { |selector| @rules[selector] }
+      selectors.map { |s| @rules[s] }
     end
 
     def to_style
-      rules = []
-      selectors.each do |selector|
-        rules << @rules[selector].to_style
-      end
-      rules.join("\n")
+      rules.map { |rule| rule.to_style }.join("\n")
     end
   end
 end

data/lib/monkey_patches.rb

@@ -0,0 +1,15 @@
+unless Object.methods.include?('try')
+  class Object
+    def try(method_name, *args)
+      send(method_name, *args) if respond_to?(method_name, true)
+    end
+  end
+end
+
+unless NilClass.methods.include?('empty?')
+  class NilClass
+    def empty?
+      true
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: css
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Andrew Timberlake
@@ -46,10 +46,13 @@ files:
 - LICENSE
 - lib/css/colors.rb
 - lib/css/errors.rb
-- lib/css/normalize.rb
+- lib/css/helpers/normalize.rb
+- lib/css/helpers/orientation.rb
 - lib/css/parser.rb
 - lib/css/properties/background_property.rb
+- lib/css/properties/border_orientation_property.rb
 - lib/css/properties/border_property.rb
+- lib/css/properties/border_unit_property.rb
 - lib/css/properties/font_property.rb
 - lib/css/properties/list_style_property.rb
 - lib/css/properties/margin_property.rb
@@ -59,6 +62,7 @@ files:
 - lib/css/rule.rb
 - lib/css/rule_set.rb
 - lib/css.rb
+- lib/monkey_patches.rb
 - lib/numbers.rb
 - README.rdoc
 has_rdoc: true

data/lib/css/normalize.rb

@@ -1,15 +0,0 @@
-module CSS
-  module Normalize
-    def normalize_property_name(name)
-      if name.to_s =~ /[A-Z]/
-        name.to_s.gsub(/([A-Z])/) do |match|
-          "-#{match.downcase}"
-        end
-      elsif name.to_s =~ /_/
-        name.to_s.gsub(/_/, '-')
-      else
-        name.to_s
-      end
-    end
-  end
-end