html-to-css 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb567fab6e41c0222d3c482d3830711ab82ed62
-  data.tar.gz: 99b4ea9ceb1975d692de150a010607863fa87d9d
+  metadata.gz: 7ce023ea55a86ff16fef105a2ae4c1a7338aa76a
+  data.tar.gz: 6befdb1a8b3c493fb40b51d3e94e272e6aa82fb6
 SHA512:
-  metadata.gz: a5d9df03b2f703e504398f0729b758363eb649d8899b3a44489eb2c528aac925b03495223094ad94579132b310de229f11d274c9fb4e6cceefb15c3e62622d63
-  data.tar.gz: 5d0879fe7a4f3fe5d7ca40563e411fc83987c8bcbb1cfb1dc37576b9820840f8d169aba07a24a3f4ccbba045dd6bf596f2d0f95c31e2cab0e5fe14b463b13abe
+  metadata.gz: df21b9e5cba643f151dbc83cf54b553a3e323439cc4fae9a84c029c62a3acf2fcbd3fb57278dbdb18b7bec04a0506096bc2f6d8f178b6676781e7320d3705f41
+  data.tar.gz: 8853e230d5609db634711ccadf56e5387379eccf014bd2c433acd2a2287da283ab67c07cf6f184797a0116e8d10fc4407e7f96ef72af3aa7d18bfcff3bc59039

checksums.yaml.gz.sig

@@ -1,5 +1,3 @@
-t�l-�7!)߈��wDsҠ�[�Ю#2q�mi�Ü�m�q
-�xa�\o� ��r
-G�;!��/��S�f#'��(0�M�Az�BA��m�?Qm��@��I���ڷ�;�3F����lٷ&A?L6K��,}K�5��r�Q�Qڶ���X�IT�
-�b��=�p>��F'S�aG����<�g�|���
-.	 �ه��0�x(� ى�C#naN#٤�;W��Fu�֔��5�XQ$	`�8�3��ze1��dw
+P27�|��!���\_6���8��XN�_+��]��>�e6Z�$�����Q)���7�7ك�̺
�{v&sq 	���2.����}@�At��cCO��ûě���16%���0p��U�����S�����4�����D��.�m��|+]�Sh�	�	jz��&�#�8}\����f�q������(�^lL�q{R��$�z��"�E<�
*�����)���G���9q�i�
+ғ}��/��MP�
+��Aj��

data/lib/html-to-css.rb

@@ -13,6 +13,8 @@ end
 
 class HtmlToCss
 
+  attr_accessor :elements
+
   def initialize(filename=nil)
 
     if filename then
@@ -27,7 +29,8 @@ class HtmlToCss
     end
 
     @selectors = []
-    @nocss = ['head', 'ul li ul', 'p a', 'div div \w+']
+    @nocss = ['head']
+    @nolayoutcss = ['ul li ul', 'p a', 'div div \w+']
     @css = []
 
     @elements = {
@@ -51,17 +54,34 @@ class HtmlToCss
   end
 
   def to_css()
-    scan_to_css @doc.root
-    @css.join "\n"
+    apply_css
   end
 
   def to_layout()
-    select_layout_elements()
-    to_css()
+
+    css = apply_css(:layout) {|doc| select_layout_elements(doc) }
+    @layout_selectors = @selectors.clone
+    css
+  end
+
+  def to_style()
+    apply_css :style
   end
 
   private
 
+  def apply_css(type=:default)
+
+    @css, @selectors = [], []
+    doc = @doc.root.deep_clone
+
+    yield(doc) if block_given?
+
+    scan_to_css(type, doc.root) 
+    @layout_selectors = @selectors.clone
+    @css.join "\n"    
+  end
+
   def merge(mdoc, e, axpath=[], prev_tally=[])
 
     i = (e.parent.parent and prev_tally.last) ? 
@@ -92,7 +112,7 @@ class HtmlToCss
     tally
   end
 
-  def scan_to_css(e, indent='', parent_selector='')
+  def scan_to_css(type, e, indent='', parent_selector='', &blk)
 
     return if @nocss.include? e.name
     h = e.attributes
@@ -102,21 +122,33 @@ class HtmlToCss
     else
       selector = (parent_selector + ' ' + e.name).strip
     end
-    
-    return if @nocss.detect {|x| selector =~ /#{x}/ }
+
+    return if @nolayoutcss.detect {|x| selector =~ /#{x}/ } and type == :layout
 
     unless @selectors.include? selector then
 
       @selectors << selector
 
       if @elements.has_key?(e.name.to_sym) then
-        attributes = @elements[e.name.to_sym].strip.sub(':color','#a4f').to_h
+        attributes = @elements[e.name.to_sym].strip.sub(':color','#a5f').to_h
       else
         attributes = {}
       end
-  
-      attr = attributes.merge!(h[:style].to_h)
-            .map{|x| x.join(': ')}.join(";\n" + indent + '  ')
+
+      h_attributes = attributes.merge! h[:style].to_h
+
+      if type == :layout then
+
+        %w(font color font-family font-size background-image border line-height
+          list-style-type font-weight font-style)\
+        .each {|x| h_attributes.delete x if h_attributes.has_key? x}
+      elsif type == :style and @layout_selectors.include? selector
+
+        %w(float margin padding clear align width height display overflow)\
+        .each {|x| h_attributes.delete x if h_attributes.has_key? x}
+      end
+
+      attr =  h_attributes.map{|x| x.join(': ')}.join(";\n" + indent + '  ')
 
       @css << indent + selector + " {\n#{indent}  #{attr}\n#{indent}}"
 
@@ -126,13 +158,13 @@ class HtmlToCss
 
     indent += '  '
     e.elements.each do |x|
-      scan_to_css x, indent, parent_selector
+      scan_to_css type, x, indent, parent_selector
     end
   end
 
-  def select_layout_elements()
+  def select_layout_elements(doc)
 
-    a = @doc.root.xpath '//div'
+    a = doc.root.xpath '//div'
     a.reverse.each do |e|
 
       if not e.attributes[:id] then
@@ -152,4 +184,4 @@ end
 
 if __FILE__ == $0 then
   css = HtmlToCss.new('index.html').to_css
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html-to-css
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - James Robertson