former 0.0.1 → 0.0.2

data/README.rdoc

@@ -1,4 +1,6 @@
 = Former
+{<img src="https://secure.travis-ci.org/opbandit/former.png?branch=master" alt="Build Status" />}[https://travis-ci.org/opbandit/former]
+{<img src="https://gemnasium.com/opbandit/former.png" alt="Dependency Status" />}[https://gemnasium.com/opbandit/former]
 
 Former turns an html string into a set of editable fields.  For instance, if you want to give users the ability to edit certain parts of pregenerated HTML (like the href's of a's), this gem makes it easy to create the form and handle user input.
 
@@ -25,7 +27,7 @@ First, create a new parser that extends Builder class.
     text "p", "a.important"
   end
 
-In this example, we want to be able to edit the location of all links that have a class of "important", the location of all images, and the text in any paragraphs or important links.
+In this example, we want to be able to edit the location of all links that have a class of "important", the location of all images, and the text in any paragraphs or important links.  Note that the text method takes any number of parameters which each will be evaluated for text children (or, if you give no parameters, all text nodes will be included).
 
 To produce the input fields from some example input HTML, first create an instance of your parser.
 
@@ -40,6 +42,10 @@ This will output:
   <input name="former_3" type="text" value="/an/image/path" />
   <input name="former_4" type="text" value="last text" />
 
+You can also convert the original html to json:
+
+  puts parsed.to_json
+
 You can then set fields individually or as a group (with, say, the params from a POST/GET):
 
   parsed[0] = "A New Description"
@@ -65,4 +71,4 @@ By default, the fields created are input's.  If you pass a block to the attr/tex
       "<textarea name='#{name}'></textarea>"
     }
     text "p", "a.important"
-  end
+  end

data/Rakefile

@@ -15,5 +15,4 @@ desc "Run all unit tests"
 Rake::TestTask.new("test") { |t|
   t.libs << "lib"
   t.test_files = FileList['test/*.rb']
-  t.verbose = true
 }

data/former.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_dependency("actionpack", ">= 3.2.0")
-  gem.add_dependency("nokogiri", ">= 1.5.6")
+  gem.add_dependency("actionpack", ">= 4.0.3")
+  gem.add_dependency("nokogiri", ">= 1.6.0")
   gem.add_development_dependency("rake")
   gem.add_development_dependency("rdoc")
 end

data/lib/former/builder.rb

@@ -2,13 +2,14 @@ require 'nokogiri'
 
 module Former
   class Builder
+    class << self; attr_accessor :queries end
     attr_reader :editable
 
     def initialize(html)
       @html = Nokogiri::HTML.parse(html)
 
       matches = {}
-      @@queries.each { |path, qs|
+      self.class.queries.each { |path, qs|
         @html.search(path).each { |node| 
           # if all we need is the text, only include text kids
           if qs.length == 1 and qs.first[:query] == :text
@@ -33,12 +34,16 @@ module Former
     end
 
     def to_form_html
-      @editable.map { |e| e.to_form_html }.join("\n")
+      @editable.map(&:to_form_html).join("\n")
+    end
+
+    def to_json
+      "[" + @editable.map(&:to_json).join(",") + "]"
     end
 
     def to_html
       # nokogiri pads w/ xhtml/body elements
-      @html.search("//body").first.children.first.to_html
+      @html.search("//body").first.children.map(&:to_html).join
     end
 
     def []=(index, value)
@@ -53,12 +58,13 @@ module Former
     end
 
     def self.attr(elem, attr, &block)
-      @@queries ||= {}
-      @@queries[elem] ||= []
-      @@queries[elem] << { :query => attr, :block => block }
+      @queries ||= {}
+      @queries[elem] ||= []
+      @queries[elem] << { :query => attr, :block => block }
     end
     
     def self.text(*elems, &block)
+      attr("text()", :text, &block) if elems.length == 0
       elems.each { |elem| attr(elem, :text, &block) }
     end
   end

data/lib/former/element.rb

@@ -1,4 +1,5 @@
 require 'action_view'
+require 'json'
 
 module Former
   class Element
@@ -12,6 +13,15 @@ module Former
       @index = index
     end
 
+    def to_json
+      h = { 
+        :value => (@query == :text) ? @node.text : @node[@query],
+        :nodename => @node.name
+      }
+      h[:attr] = @query unless @query == :text
+      h.to_json
+    end
+
     def to_form_html
       name = "former_#{@index}"
       return @block.call(@node, name) unless @block.nil?

data/lib/former/version.rb

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

data/test/builder_test.rb

@@ -7,15 +7,31 @@ class Parser < Former::Builder
   text "p", "a.important"
 end
 
+class AllTextParser < Former::Builder
+  attr "a.important", :href
+  attr("img", :src)
+  text
+end
+
 class BuilderTest < Test::Unit::TestCase
   def setup
     @html_txt = '<p>some text<a class="important" href="http://alink.com">some link text<img src="/an/image/path"></a>last text</p>'
     @parser = Parser.new @html_txt
-    puts @parser.to_form_html
   end
 
   def test_parsing
     assert_equal @parser.editable.length, 5
+
+    html = '<img src="http://blah.com/example.jpg" /><p>This is some text</p>This is some more text'
+    json = [
+            { "value" => "http://blah.com/example.jpg", "nodename" => "img", "attr" => "src"},
+            { "value" => "This is some text", "nodename" => "text"}
+           ]
+    assert_equal JSON.parse(Parser.new(html).to_json), json
+
+    # now, test with parsing all text (which will include the last bit now)
+    json << { "value" => "This is some more text", "nodename" => "text" }
+    assert_equal JSON.parse(AllTextParser.new(html).to_json), json
   end
 
   def test_building

metadata

@@ -1,71 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: former
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Brian Muller
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-02-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.2.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.3
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Converts HTML to form fields for editing values in the HTML
-email: 
+email:
 - bamuller@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -80,36 +96,33 @@ files:
 - test/builder_test.rb
 homepage: http://github.com/opbandit/former
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2404963171909705179
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4374242057553143574
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2404963171909705179
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 4374242057553143574
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Converts HTML to form fields for editing values in the HTML
-test_files: 
+test_files:
 - test/builder_test.rb