former 1.0.0 → 1.1.0

data/former.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_dependency("nokogiri", ">= 1.6.0")
+  gem.add_dependency("csspool", ">= 3.0.0")
   gem.add_development_dependency("rake")
   gem.add_development_dependency("rdoc")
 end

data/lib/former/builder.rb

@@ -25,7 +25,7 @@ module Former
       @html.traverse_prefix do |e|
         (matches[e] || []).each do |query|
           if query[:block].nil? or query[:block].call(e)
-            @editable << Element.new(e, query[:query], @editable.length)
+            @editable << Element.new(e, query[:query], @editable.length, query[:args])
           end
         end
       end
@@ -66,15 +66,21 @@ module Former
       }
     end
 
-    def self.attr(elem, attr, &block)
+    def self.attr(elem, attr, args=nil, &block)
       @queries ||= {}
       @queries[elem] ||= []
-      @queries[elem] << { :query => attr, :block => block }
+      @queries[elem] << { :query => attr, :block => block, :args => args }
     end
     
     def self.text(*elems, &block)
       attr("text()", :text, &block) if elems.length == 0
       elems.each { |elem| attr(elem, :text, &block) }
     end
+
+    def self.style_url(property, &block)
+      attr("[@style]", :style_url, { :property => property }) { |elem|
+        elem['style'].include? property and (block_given? ? block.call(elem) : true)
+      }
+    end
   end
 end

data/lib/former/element.rb

@@ -1,31 +1,41 @@
 require 'json'
+require 'csspool'
 
 module Former
   class Element
     attr_reader :node, :query
 
-    def initialize(node, query, index)
+    def initialize(node, query, index, args=nil)
       @node = node
       @query = query
       @index = index
+      @args = args || {}
     end
 
     def to_json
       h = { 
-        :value => (@query == :text) ? @node.text : @node[@query],
+        :value => value,
         :nodename => @node.name
       }
-      h[:attr] = @query unless @query == :text
+      h[:attr] = @query unless (@query == :text or @query == :style_url)
       h.to_json
     end
 
     def value
-      @query == :text ? @node.content : @node[@query]
+      if @query == :text
+        @node.text
+      elsif @query == :style_url
+        style_url(@node['style']) { |exp| return exp.value }
+      else
+        @node[@query]
+      end
     end
 
     def value=(value)
       if @query == :text
         @node.content = value
+      elsif @query == :style_url
+        @node['style'] = style_url(@node['style']) { |exp| exp.value = value }
       else
         @node[@query] = value
       end
@@ -34,5 +44,21 @@ module Former
     def to_html
       @node.to_html
     end
+
+    private
+
+    def style_url(rules)
+      begin
+        rset = CSSPool.CSS("e { #{rules} }").rule_sets.first
+        decs = rset.declarations.select { |d| d.property == @args[:property] }
+        decs.each do |dec|
+          dec.expressions.select { |e| e.is_a? CSSPool::Terms::URI }.each { |d| yield d }
+        end
+        css = rset.to_minified_css
+        css.slice(4, css.length - 6)
+      rescue Racc::ParseError
+        rules
+      end
+    end
   end
 end

data/lib/former/version.rb

@@ -1,3 +1,3 @@
 module Former
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/test/builder_test.rb

@@ -7,6 +7,11 @@ class Parser < Former::Builder
   text "p", "a.important"
 end
 
+class StyleParser < Former::Builder
+  style_url "background-image"
+  attr "img", :src
+end
+
 class AllTextParser < Former::Builder
   attr "a.important", :href
   attr("img", :src)
@@ -25,6 +30,23 @@ class BuilderTest < Test::Unit::TestCase
     @parser = Parser.new @html_txt
   end
 
+  def test_style_url
+    p = StyleParser.new "<div style=\"background-image: url('http://blah.com/image.jpg');\">blah</div>"
+    assert_equal p.length, 1
+    p[0] = "http://another.com/image.jpg"
+    assert_equal p.to_html, "<div style='background-image: url(\"http://another.com/image.jpg\");'>blah</div>"
+
+    p = Parser.new "<div style=\"color: #ffffff;\">blah</div>"
+    assert_equal p.length, 0
+
+    p = StyleParser.new "<div style=\"background-image: url('http://blah.com/image.jpg');\"><img src=\"/pic.jpg\" /></div>"
+    assert_equal p.length, 2
+    p[0] = "http://another.com/image.jpg"
+    assert_equal p.to_html, "<div style='background-image: url(\"http://another.com/image.jpg\");'><img src=\"/pic.jpg\"></div>"
+    p[1] = "/blah.jpg"
+    assert_equal p.to_html, "<div style='background-image: url(\"http://another.com/image.jpg\");'><img src=\"/blah.jpg\"></div>"
+  end
+
   def test_ignore_blank_fields
     p = AllTextParserNotBlank.new "<p>\n</p><h1>  </h1><p> some text </p>"
     assert_equal p.length, 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: former
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: csspool
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4051511182999902248
+      hash: -3383286526901818744
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -103,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4051511182999902248
+      hash: -3383286526901818744
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25