gfrom 0.1.2 → 0.1.5

data/gfrom.gemspec

@@ -5,14 +5,13 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |spec|
   spec.platform      = Gem::Platform::RUBY
   spec.name          = "gfrom"
-  spec.version       = "0.1.2"
+  spec.version       = "0.1.5"
   spec.authors       = ["Marvin Marcelo"]
   spec.email         = ["mrclmrvn@gmail.com"]
   spec.description   = %q{Render unathenticated Google Form in your website. Useful for collecting data from your users without a database. Just create a google form from your google account. If you are using Google Apps, please read form options}
   spec.summary       = %q{From Google Form}
   spec.homepage      = "https://bitbucket.org/mrclmrvn/gfrom/"
   spec.license       = "MIT"
-  spec.date         = '2013-05-01'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/lib/gfrom.rb

@@ -8,14 +8,14 @@ class Gfrom
 
   attr_accessor :form, :fields
 
-  MATCHERS = '//input[@type="text"] | //input[@type="hidden"] | //textarea | //form'
+  MATCHERS = '//input[@type="text"] | //input[@type="radio"] |//input[@type="checkbox"] | //input[@type="hidden"] | //textarea | //form'
 
-  def initialize(url, reset = false)
+  def initialize(url, regenerate_cache = false)
     @form = Hash.new
     @fields = []
 
     cache = "#{Dir.tmpdir}/#{Digest::SHA1.hexdigest(url)}"
-    File.delete cache if reset
+    File.delete cache if regenerate_cache
 
     unless File.exists?(cache)
       req = Curl.get(url)
@@ -31,13 +31,14 @@ class Gfrom
       case node.name
       when "form"
         @form[:action] = node.attributes["action"].value unless @form.has_key?(:action)
+        @form[:title] = doc.search('//title').first.text.strip unless @form.has_key?(:title)
       else
         n = hash_it(node)
         @fields << n
         keys << n[:name]
       end
     end
-    @form[:keys] = keys.uniq
+    @form[:keys] = keys
 
   end
 
@@ -46,7 +47,8 @@ class Gfrom
     doc = Nokogiri::XML.parse(response.body_str)
     errorheader = doc.search('//div[@class="errorheader"]')
     success = errorheader.empty?
-    out = { :success => success, :message => doc.search('//title').first.text.strip }
+    success_response = doc.search('//div[@class="ss-custom-resp"]').first.text.strip
+    out = { :success => success, :message => success_response || doc.search('//title').first.text.strip }
     unless success
       out[:message] = errorheader.children.first.text.strip
     end
@@ -56,14 +58,25 @@ class Gfrom
   private
 
   def hash_it(node)
+    group = ["checkbox", "radio"]
     object = Hash.new
     object[:element] = node.name
     node.attributes.each do |k,v|
-      object[k.to_sym] = v.value
+      if (k == "name" and v.value == "checkbox" and node.search("//input[@name=\"#{v.value}\"]").length > 1)
+        # checkbox needs name to be array'ed
+        object[k.to_sym] = "#{v.value}[]"
+      else
+        object[k.to_sym] = v.value
+      end
       if k == "id"
         label = node.search("//label[@for=\"#{v.value}\"]").first
-        object[:label] = label.children.first.text.strip if label
-        object[:required] = true unless label.search("//label[@for=\"#{v.value}\"]/span[contains(@class, \"required\")]").empty?
+        if label
+          object[:label] = label.children.first.text.strip
+          object[:required] = true unless label.search("//label[@for=\"#{v.value}\"]/span[contains(@class, \"required\")]").empty?
+        end
+      end
+      if object[:label].nil? and group.include?(object[:type])
+        object[:label] = node.attributes["value"].value
       end
     end
     object

data/readme.md

@@ -28,7 +28,8 @@ GOOGLE_FORM_URL = "https://docs.google.com/a/myorganization.com/spreadsheet/embe
 #   {:element=>"input", :type=>"text", :name=>"entry.0.single", :value=>"", :class=>"ss-q-short", :id=>"entry_0", :label=>"Name", :required=>true},
 #   {:element=>"input", :type=>"text", :name=>"entry.2.single", :value=>"", :class=>"ss-q-short", :id=>"entry_2", :label=>"Email", :required=>true},
 #   {:element=>"textarea", :name=>"entry.1.single", :rows=>"8", :cols=>"75", :class=>"ss-q-long", :id=>"entry_1", :label=>"Message"},
-#   {:element=>"input", :type=>"hidden", :name=>"pageNumber", :value=>"0"}, {:element=>"input", :type=>"hidden", :name=>"backupCache", :value=>""}
+#   {:element=>"input", :type=>"hidden", :name=>"pageNumber", :value=>"0"},
+#   {:element=>"input", :type=>"hidden", :name=>"backupCache", :value=>""}
 # ]
 puts @myform.fields
 # submit the form data to Google will return a hash
@@ -40,7 +41,8 @@ result = @myform.submit(params)
 ## TODO
 
 * Support for Authenticated forms (requires login to organization/google apps)
-* Radio buttons and checkboxes (not sure if this will work on current version - 0.1.0)
+* <del>Ensure radio buttons and checkboxes are grouped (not sure if this works in current version - 0.1.2)</del>
+* Label for grouped form tags - checkbox and radio
 * Supply an RDOC
 * Tests
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gfrom
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb