googletastic 0.0.4 → 0.0.5

data/Rakefile

@@ -31,7 +31,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "googletastic"
   s.platform          = Gem::Platform::RUBY
   s.files             = %w(README.textile Rakefile) + 
-                          Dir["{googletastic,lib,spec}/**/*"] - 
+                          Dir["{googletastic,lib,spec,rails}/**/*"] - 
                           Dir["spec/tmp"]
   s.extra_rdoc_files  = %w(README.textile)
   s.require_path      = "lib"
@@ -68,7 +68,12 @@ end
 
 desc "Install the gem locally"
 task :install => [:package] do
-  sh %{sudo gem install pkg/googletastic-#{Googletastic::VERSION} --no-ri --no-rdoc}
+  sh %{sudo gem install pkg/#{spec.name}-#{spec.version} --no-ri --no-rdoc}
+end
+
+desc "Publish gem to rubygems"
+task :publish => [:package] do
+  %x[gem push pkg/#{spec.name}-#{spec.version}.gem]
 end
 
 desc "Run all specs"

data/lib/googletastic.rb

@@ -59,7 +59,7 @@ end
 
 module Googletastic
   # :stopdoc:
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
   # :startdoc
   class << self; attr_accessor :keys, :clients, :options; end
 

data/lib/googletastic/form.rb

@@ -3,11 +3,17 @@ class Googletastic::Form < Googletastic::Base
   
   FORM_KEY_EXPRESSION = /formkey["|']\s*:["|']\s*([^"|']+)"/ unless defined?(FORM_KEY_EXPRESSION)
   
-  attr_accessor :title, :body, :redirect_to, :form_key, :form_only, :authenticity_token, :spreadsheet
+  attr_accessor :title, :body, :form_key, :description, :fields, :properties
+  attr_accessor :authenticity_token, :spreadsheet, :form_only
   
-  def body(options = {}, &block)
-    @body ||= get(options, &block)
-    @body
+  # uses mechanize to hackily find form key
+  def form_key
+    unless @form_key
+      puts "Getting form key for '#{self.title}'"
+      @form_key = self.class.find_form_key(self.id)
+    end
+    
+    @form_key
   end
   
   def submit_url
@@ -18,18 +24,25 @@ class Googletastic::Form < Googletastic::Base
     self.class.show_url(self.form_key)
   end
   
-  def form_key
-    @form_key ||= get_form_key
+  def from_google_tag(key)
+    self.class.from_google_tag(key)
   end
   
-  def properties
-    body
-    @properties
+  def to_google_tag(key)
+    self.class.to_google_tag(key)
   end
   
   # this you want to call JUST BEFORE you render in the view
   # body still gives you the nokogiri element
   def render
+    add_redirect(body, options, &block)
+    
+    body.xpath("//textarea").each do |node|
+      node.add_child Nokogiri::XML::Text.new("\n", body)
+      node.remove_attribute("rows")
+      node.remove_attribute("cols")
+    end
+    
     if self.form_only
       result = body.xpath("//form").first.unlink
     else
@@ -101,6 +114,25 @@ class Googletastic::Form < Googletastic::Base
       "http://spreadsheets.google.com/viewform?formkey=#{id}"
     end
     
+    def tag_map
+      @tag_map ||= {
+        "text" => "text",
+        "paragraph-text" => "textarea",
+        "grid" => "grid",
+        "scale" => "range",
+        "radio" => "radio",
+        "checkbox" => "checkbox"
+      }
+    end
+
+    def from_google_tag(key)
+      tag_map[key]
+    end
+    
+    def to_google_tag(key)
+      tag_map[tag_map.values.detect {|i| i == key.to_s}]
+    end
+    
     def unmarshall(xml)
       records = xml.xpath("//atom:entry", ns_tag("atom")).collect do |record|
         #id          = record.xpath("atom:id", ns_tag("atom")).first.text.gsub("http://spreadsheets.google.com/feeds/spreadsheets/", "")
@@ -111,131 +143,195 @@ class Googletastic::Form < Googletastic::Base
         title       = record.xpath("atom:title", ns_tag("atom")).first.text
         created_at  = record.xpath("atom:published", ns_tag("atom")).text
         updated_at  = record.xpath("atom:updated", ns_tag("atom")).text
-        
+                
         # same as spreadsheet
         Googletastic::Form.new(
-          :id => id,
-          :title => title,
+          :id         => id,
+          :title      => title,
           :updated_at => DateTime.parse(updated_at)
         )
       end
       records
     end
+        
+    def agent(force = false)
+      if force || !@agent
+        @agent = defined?(Mechanize) ? Mechanize.new : WWW::Mechanize.new
+        # google wants recent browsers!
+        # http://docs.google.com/support/bin/answer.py?answer=37560&hl=en
+        @agent.user_agent = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_2; ru-ru) AppleWebKit/533.2+ (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10"
+        login_form = @agent.get(mechanize_url(id)).forms.first
+        login_form.Email = Googletastic.credentials[:username].split("@").first # don't want emails
+        login_form.Passwd = Googletastic.credentials[:password]
+        @agent.submit(login_form)
+      end
+      
+      @agent
+    end
     
-  end
-  
-  def get_form_key
-    begin
-      agent = defined?(Mechanize) ? Mechanize.new : WWW::Mechanize.new
-      # google wants recent browsers!
-      # http://docs.google.com/support/bin/answer.py?answer=37560&hl=en
-      agent.user_agent = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_2; ru-ru) AppleWebKit/533.2+ (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10"
+    def mechanize_url(id)
       url = "http://spreadsheets.google.com/"
       # for spreadsheet, we need the domain!
       if Googletastic.credentials[:domain]
         url << "a/#{Googletastic.credentials[:domain]}/"
       end
-      url << "ccc?key=#{self.id}&hl=en&pli=1"
-      login_form = agent.get(url).forms.first
-      login_form.Email = Googletastic.credentials[:username].split("@").first # don't want emails
-      login_form.Passwd = Googletastic.credentials[:password]
-      page = agent.submit(login_form)
-      match = page.body.match(FORM_KEY_EXPRESSION)
-      if page.meta.first and (page.title == "Redirecting" || match.nil?)
-      	page = page.meta.first.click
+      url << "ccc?key=#{id}&hl=en&pli=1"
+      url
+    end
+
+    # optimize this to login only once
+    def find_form_key(id, force = false)
+      result = nil
+      begin
+        page = agent(force).get(mechanize_url(id))
         match = page.body.match(FORM_KEY_EXPRESSION)
+        if page.meta.first and (page.title == "Redirecting" || match.nil?)
+        	page = page.meta.first.click
+          match = page.body.match(FORM_KEY_EXPRESSION)
+        end
+        result = match.captures.first if match
+      rescue Exception => e #
+        puts "ERROR: #{e.to_s}"
+        result = find_form_key(id, true) unless force # try again, unless we have already tried again
+      end
+      result
+    end
+    
+    # returns {:fields => fields, :body => body, :properties => properties, :description => description}
+    def parse(html, options, &block)
+      title = html.xpath("//h1[@class='ss-form-title']").first.text
+      description = html.css(".ss-form-desc").first
+      description = description ? description.children.to_html : ""
+      
+      properties = {}
+      fields = []
+
+      html.css("div.ss-item").each do |item|
+        tag       = ""
+        required  = false
+        classes   = item["class"].split(/\s+/)
+        classes.each do |clazz|
+          if clazz =~ /ss-(text|paragraph-text|grid|scale|radio|checkbox)/
+            tag = from_google_tag($1)
+          elsif clazz =~ /ss-item-required/
+            required = true
+          end
+        end
+        entry     = item.xpath("div[@class='ss-form-entry']").first
+        label     = entry.xpath("label[@class='ss-q-title']").first
+        next unless label
+        title     = label.text.gsub(/:[^:]+$/, "").gsub(/\n+.*/, "") # remove trailing :, then trailing newline stuff
+        help      = entry.xpath("label[@class='ss-q-help']").first.text
+        single    = (item["class"].to_s =~ /ss-(grid|scale)/).nil?
+        type      = single ? "single" : "group"
+        column    = label.text.downcase.gsub(/[^a-z0-9\-]/, "")
+        input_name = label["for"].gsub("_", ".").squeeze("\.") + "." + type
+        
+        value     = []
+        if tag =~ /(radio|checkbox|range|text)/
+          item.css("* input[type=#{$1}]").each do |input|
+            value << input["value"]
+          end
+        elsif tag =~ /(select)/
+          item.css("* #{$1} option").each do |option|
+            value << option["value"]
+          end
+        end
+        # still need to handle defaults
+        keys = {
+          :id       => input_name.gsub(/[^\d]/, ""),
+          :key      => column,
+          :tag      => tag,
+          :title    => title,
+          :help     => help,
+          :required => required,
+          :value    => value # need defaults somehow
+        }
+        if tag == "range"
+          keys[:left_label]   = item.css("* td.ss-leftlabel").text
+          keys[:right_label]  = item.css("* td.ss-rightlabel").text
+        end
+        fields << keys
+        properties[column] = input_name
       end
-      formkey = match.captures.first if match
-    rescue Exception => e
-      puts "ERROR: #{e.to_s}"
-      nil
+
+      {:fields => fields, :body => html, :properties => properties, :description => description}
     end
+
+    def add_redirect(doc, options, &block)
+      action = doc.xpath("//form").first
+      return if action.nil?
+      action = action["action"].to_s
+      submit_key = action.gsub(self.submit_url, "")
+
+      form = doc.xpath("//form").first
+
+      form["enctype"] = "multipart/form-data"      
+
+      # don't have time to build this correctly
+      redirect = options[:redirect]
+      if redirect
+        form["action"] = redirect[:url]
+        if redirect.has_key?(:params)
+          redirect[:params].each do |k,v|
+            hidden_node = doc.create_element('input')
+            hidden_node["name"] = k.to_s
+            hidden_node["type"] = "hidden"
+            hidden_node["value"] = v.to_s
+            form.children.first.add_previous_sibling(hidden_node)
+          end
+        end
+      end
+
+      hidden_node = doc.create_element('input')
+      hidden_node["name"] = "submit_key"
+      hidden_node["type"] = "hidden"
+      hidden_node["value"] = submit_key
+      form.children.first.add_previous_sibling(hidden_node)
+
+      put_node = doc.create_element('input')
+      put_node["name"] = "_method"
+      put_node["type"] = "hidden"
+      put_node["value"] = "put"
+      form.children.first.add_previous_sibling(put_node)
+
+      form
+    end
+    
   end
-  
-  def submit(form_key, params, options)
-    uri = URI.parse(submit_url)
-    req = Net::HTTP::Post.new("#{uri.path}?#{uri.query}")
-    req.form_data = params
-    response = Net::HTTP.new(uri.host).start {|h| h.request(req)}
-    if response.is_a?(Net::HTTPSuccess) || response.is_a?(GData::HTTP::Response)
-      unmarshall(Nokogiri::HTML(response.body), options).to_html
-    else
-      response.body
+
+  # construct(:redirect => {:url => "/our-forms", :params => {:one => "hello"}})
+  def construct(options = {}, &block)
+    return if body
+    raise "I NEED A FORM KEY (#{self.title.to_s})!" unless self.form_key
+    parts = fetch(options, &block)
+    parts.each do |k, v|
+      self.send("#{k}=", v)
     end
+    parts.delete(:body)
+    parts[:form_key] = form_key
+    self.attributes.merge!(parts)
+    body
   end
   
-  # get(:redirect => {:url => "/our-forms", :params => {:one => "hello"}})
-  def get(options = {}, &block)
-    raise "I NEED A FORM KEY!" unless self.form_key
+  def fetch(options = {}, &block)
     response = client.get(show_url)
     if response.is_a?(Net::HTTPSuccess) || response.is_a?(GData::HTTP::Response)
-      unmarshall(Nokogiri::HTML(response.body), options, &block)
+      self.class.parse(Nokogiri::HTML(response.body), options, &block)
     else
       response
     end
   end
   
-  # not class unmarshall, instance unmarshall
-  def unmarshall(html, options, &block)
-#    title = html.xpath("//h1[@class='ss-form-title']").first.text
-    add_redirect(html, options, &block)
-    
-    html.xpath("//textarea").each do |node|
-      node.add_child Nokogiri::XML::Text.new("\n", html)
-    end
-    
-    @properties = {}
-    html.css("div.ss-item").each do |item|
-      entry     = item.xpath("div[@class='ss-form-entry']").first
-      label     = entry.xpath("label[@class='ss-q-title']").first
-      next unless label
-      single    = (item["class"].to_s =~ /ss-(grid|scale)/).nil?
-      type      = single ? "single" : "group"
-      column    = label.text.downcase.gsub(/[^a-z0-9\-]/, "")
-      input_name = label["for"].gsub("_", ".").squeeze("\.") + "." + type
-      @properties[column] = input_name
-    end
-    
-    html
-  end
-  
-  def add_redirect(doc, options, &block)
-    action = doc.xpath("//form").first
-    return if action.nil?
-    action = action["action"].to_s
-    submit_key = action.gsub(self.submit_url, "")
-    
-    form = doc.xpath("//form").first
-    
-    form["enctype"] = "multipart/form-data"      
-    
-    # don't have time to build this correctly
-    redirect = options[:redirect] || self.redirect_to
-    if redirect
-      form["action"] = redirect[:url]
-      if redirect.has_key?(:params)
-        redirect[:params].each do |k,v|
-          hidden_node = doc.create_element('input')
-          hidden_node["name"] = k.to_s
-          hidden_node["type"] = "hidden"
-          hidden_node["value"] = v.to_s
-          form.children.first.add_previous_sibling(hidden_node)
-        end
-      end
+  def submit(form_key, params, options)
+    uri = URI.parse(submit_url)
+    req = Net::HTTP::Post.new("#{uri.path}?#{uri.query}")
+    req.form_data = params
+    response = Net::HTTP.new(uri.host).start {|h| h.request(req)}
+    if response.is_a?(Net::HTTPSuccess) || response.is_a?(GData::HTTP::Response)
+      self.class.parse(Nokogiri::HTML(response.body), options).to_html
+    else
+      response.body
     end
-    
-    hidden_node = doc.create_element('input')
-    hidden_node["name"] = "submit_key"
-    hidden_node["type"] = "hidden"
-    hidden_node["value"] = submit_key
-    form.children.first.add_previous_sibling(hidden_node)
-    
-    put_node = doc.create_element('input')
-    put_node["name"] = "_method"
-    put_node["type"] = "hidden"
-    put_node["value"] = "put"
-    form.children.first.add_previous_sibling(put_node)
-
-    form
   end
 end

data/rails/init.rb

@@ -0,0 +1 @@
+require "googletastic"

data/spec/googletastic/form_spec.rb

@@ -21,25 +21,32 @@ describe Googletastic::Form do
 
     it "should respond_to?(:find_with_google_form) dynamic class methods" do
       Form.respond_to?(:find_with_google_form).should == true
-      pending
     end
   end
   
   describe "mechanize" do
     it "it should get the formkey via mechanize" do
       form = Googletastic::Form.first
-      formkey = form.get_form_key
-      puts "FORMKEY: #{formkey}"
+      formkey = form.form_key
+      puts "Form Key: #{formkey.to_s}"
       formkey.should_not be_nil
     end
     
     it "should remove unnecessary html from form" do
       form = Googletastic::Form.first
-      form.form_key = form.get_form_key
+      form.construct
       body = form.body
-      puts "BODY!: #{body.to_s}"
       body.should_not == nil
     end
+    
+    it "should get 'properties', 'fields', and 'description'" do
+      form = Googletastic::Form.first
+      form.construct
+      form.properties.should_not == nil
+      form.fields.should_not == nil
+      form.description.should_not == nil
+      puts form.inspect
+    end
   end
   
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Lance Pollard
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -07:00
+date: 2010-03-22 20:12:47 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -158,6 +158,7 @@ files:
 - spec/googletastic/youtube_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- rails/init.rb
 has_rdoc: true
 homepage: http://github.com/viatropos/googletastic
 licenses: []