domle 0.1.12 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 480b3d1e557994971ceb2d5d7f5770b0566879d4
-  data.tar.gz: 580264d320d643bd8c9ebc5948fbd970234c0621
+  metadata.gz: 582f612a1a5e85324907ee10045db2855689a06b
+  data.tar.gz: ec004ade570e71c3d3c6e4253ae66be9fdd335e7
 SHA512:
-  metadata.gz: 275e085cf239e843ab6c14a5811362f8c1a5d04d7344ff9111e30ead00e9b65b38e9fdca056fdc31cc2d324b1119acb657bb1444659dad6c0dda4092d85b8a4a
-  data.tar.gz: 6b34e5ad2d58e006f0b029f4fd79bb684bd4f85e96ac628cb47856d78aa893f2f13ffd94eaa64c020dc4ef21517f2e809396b0be489ed46c0476643a60bcd577
+  metadata.gz: 67fe2b68e0e106cc35de7641c3f03fb0baad360561864b24ca84d5d78f36bcae3e29059c56e85837843617cc7d17b3fec2ca21583bf90d544263db94c2b45c24
+  data.tar.gz: 2c87e9fd02821c299b84eada7b96729ebed7fdb2f6aa4cbb244e21a84973b464cbf574c4e506453dfb66d5802cf229051631f454282f8c4a25db7be1400ba62a

data/lib/domle.rb

@@ -3,6 +3,7 @@
 # file: domle.rb
 
 require 'rexle'
+require 'csslite'
 require 'rxfhelper'
 
 
@@ -163,39 +164,8 @@ class Domle < Rexle
   
   def add_css(s, override: true)
 
-    # parse the CSS
-    
-    a = s.split(/}/)[0..-2].map do |entry|
-
-      raw_selector,raw_styles = entry.split(/{/,2)
-
-      h = raw_styles.strip.split(/;/).inject({}) do |r, x| 
-        k, v = x.split(/:/,2).map(&:strip)
-        r.merge(k.to_sym => v)
-      end
-
-      [raw_selector.split(/,\s*/).map(&:strip), h]
-    end      
-    
-    # add each CSS style attribute to the element
-    # e.g. a = [[['line'],{stroke: 'green'}]]
-
-    a.each do |x|
-
-      selectors, style = x
-
-      selectors.each do |selector|
-
-        style.each do |k,v|
-
-          self.root.css(selector).each do |element|
-
-            element.style[k] = v unless override == false and element.style.has_key? k
-          end
-        end
-
-      end
-    end
+    css = CSSLite.new s
+    css.propagate self.root    
     
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: domle
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -53,6 +53,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.7
+- !ruby/object:Gem::Dependency
+  name: csslite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement