wagon 0.9.5 → 0.10.0

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.10.0

data/bin/wagon

@@ -128,7 +128,7 @@ class WagonApp
     
     directory = user.ward.to_pdf( @options.marshal_dump )
     directory.render_file(@options.output_file)
-    
+        
     puts "\nFinished. Enjoy.\n"
     
   rescue Wagon::AuthenticationFailure

data/lib/wagon/address.rb

@@ -2,7 +2,7 @@ module Wagon
   class Address
     CITY_STATE_ZIP = %r/^(\D+), (\D+)?\s*(\d+(-\d+)?)?$/
     
-    attr_reader :street, :city, :state, :zip, :country
+    attr_reader :city, :state, :zip, :country
     
     def self.extract_from_string(string)
       parts   = string.split("\n").collect(&:strip).delete_if(&:empty?)
@@ -20,6 +20,11 @@ module Wagon
       @street, @city, @state, @zip, @country = street, city, state, zip, country
     end
     
+    def street
+      #601 N. Monterey Drive Apartment K
+      @street.to_s.gsub(/apartment/i, 'Apt.').gsub(/drive/i, 'Dr.')
+    end
+    
     def to_s
       [street, [[city, state].compact.join(", "), zip, country.to_s.empty? ? nil : "(#{country})"].compact.join(" ")].compact.join("\n")
     end

data/lib/wagon/connection.rb

@@ -1,20 +1,48 @@
 require 'net/http'
 require 'net/https'
+require 'curb'
 require 'uri'
 require 'digest/sha1'
 require 'wagon/ward'
 
 module Wagon
-  
   class AuthenticationFailure < StandardError; end
   
   class Connection
     HOST        = 'secure.lds.org'
     LOGIN_PATH  = '/units/a/login/1,21568,779-1,00.html?URL='
-    CACHE_PATH  = File.join(File.expand_path('~'), '.wagon_cache')
+    
+    # For asynchronous procedures
+    @@trigger = ConditionVariable.new
+    @@lock    = Mutex.new
+    @@queue   = []
+    
+    (1..30).collect do
+      Thread.new do
+        http              = Net::HTTP.new(HOST, 443)
+        http.use_ssl      = true
+        http.verify_mode  = OpenSSL::SSL::VERIFY_NONE
+        http
+        
+        while true
+          connection, path, callback = nil, nil, nil
+          @@lock.synchronize do
+            connection, path, callback = *@@queue.shift
+          end
+          
+          if connection
+            callback.call(http.request(Net::HTTP::Get.new(path, {'Cookie' => connection.cookies || ''})))
+          else
+            sleep(0.5)
+          end
+        end
+      end
+    end
+    
+    attr_reader :cookies
     
     def initialize(username, password)
-      response    = post(LOGIN_PATH, 'username' => username, 'password' => password)
+      response    = _post(LOGIN_PATH, 'username' => username, 'password' => password)
       @cookies    = response['set-cookie']
       @home_path  = URI.parse(response['location']).path
 
@@ -30,33 +58,17 @@ module Wagon
     end
     
     def get(path)
-      Connection.perform_caching? ? get_with_caching(path) : get_without_caching(path)
-    end
-    
-    def get_without_caching(path)
-      _http.request(Net::HTTP::Get.new(path, {'Cookie' => @cookies || ''})).body
+      _get(path).body
     end
     
-    def get_with_caching(path)
-      FileUtils::mkdir(CACHE_PATH) unless File.directory?(CACHE_PATH)
-      cache_path = File.join(CACHE_PATH, Digest::SHA1.hexdigest(path) + ".cache")
-      return open(cache_path).read if File.exists?(cache_path)
-      open(cache_path, "w").write(data = get_without_caching(path))
-      data
+    def get_async(path, &block)
+      @@lock.synchronize do
+        @@queue.push([self, path, block])
+      end
     end
     
-    def self.perform_caching?
-      @@perform_caching ||= true
-    end
-    
-    def self.perform_caching(true_or_false)
-      @@perform_caching = true_or_false
-    end
-
-    def post(path, data)
-      request = Net::HTTP::Post.new(path, {'Cookie' => @cookies || ''})
-      request.set_form_data(data)
-      _http.request(request)
+    def expired?
+      _head(ward.directory_path).class != Net::HTTPOK
     end
     
     def _dump(depth)
@@ -79,5 +91,25 @@ module Wagon
       @http.verify_mode  = OpenSSL::SSL::VERIFY_NONE
       @http
     end
+    
+    def _curl
+      @curl ||= Curl::Easy.new do |curl|
+        curl.headers = {'Cookie' => @cookies || ''}
+      end
+    end
+    
+    def _get(path)
+      _http.request(Net::HTTP::Get.new(path, {'Cookie' => @cookies || ''}))
+    end
+    
+    def _head(path)
+      _http.request(Net::HTTP::Head.new(path, {'Cookie' => @cookies || ''}))
+    end
+    
+    def _post(path, data)
+      request = Net::HTTP::Post.new(path, {'Cookie' => @cookies || ''})
+      request.set_form_data(data)
+      _http.request(request)
+    end
   end
 end

data/lib/wagon/directory.rb

@@ -8,23 +8,10 @@ module Wagon
       @parent
     end
     
-    def photo_directory_path
-      return @photo_directory_path unless @photo_directory_path.nil?
-      
-      self.at('a.linknoline[href^="javascript:confirm_photo"]')['href'].match(/^javascript:confirm_photo\('(.*)'\);$/)
-      @photo_directory_path = $1
-    end
-    
-    def photo_directory
-      @photo_directory ||= PhotoDirectory.new(connection, photo_directory_path)
-    end
-    
     def households
-      @households ||= photo_directory.households.sort
-    end
-    
-    def members
-      households.collect(&:members).flatten()
+      @households ||= self.search('body > table > tr > td.eventsource[@width="25%"]').collect do |household_td|
+        household = Household.create_from_td(connection, household_td)
+      end.sort
     end
     
     def to_pdf(options = {})
@@ -62,8 +49,9 @@ module Wagon
             y = pdf.bounds.top - row*grid_height - header_height
             (0...columns).each do |column|
               break if (index = page*rows*columns+row*columns+column) >= households.size
-              household = households[index]
               x         = pdf.bounds.left + column*grid_width
+              household = households[index]
+              
               pdf.bounding_box([x, y], :width => grid_width, :height => grid_height) do
                 pdf.bounding_box([pdf.bounds.left + padding, pdf.bounds.top - padding], :width => box_width, :height => box_height) do
                   info = []

data/lib/wagon/household.rb

@@ -6,13 +6,16 @@ require 'base64'
 
 module Wagon
   class Household
-    attr_reader :connection
-    attr_writer :name
-    attr_accessor :address, :phone_number, :image_path, :members
+    attr_reader :connection, :address, :phone_number, :image_path, :members
     
-    def initialize(connection)
-      @members = []
-      @connection = connection
+    def initialize(connection, name, address, phone_number, image_path, members)
+      @connection, @name, @address, @phone_number, @image_path, @members = connection, name, address, phone_number, image_path, members
+      
+      if has_image?
+        @connection.get_async(image_path) do |response|
+          @image_data = response.body
+        end
+      end
     end
     
     def name
@@ -32,7 +35,11 @@ module Wagon
     end
     
     def image_data
-      @image_data ||= image_path.to_s.empty? ? "" : connection.get(image_path)
+      return nil unless has_image?
+      
+      sleep(0.5) while @image_data.nil?
+      
+      @image_data
     end
     
     def <=>(other)
@@ -43,21 +50,26 @@ module Wagon
       end
     end
     
-    def self.create_from_td(connection, td)
-      Household.new(connection).instance_eval do
-        name_element, phone_element, *member_elements = *td.search('table > tr > td.eventsource[width="45%"] > table > tr > td.eventsource')
-        @address = Address.extract_from_string(td.search('table > tr > td.eventsource[width="25%"]').inner_text)
-        @image_path = td.at('table > tr > td.eventsource[width="30%"] > img')['src'] rescue nil
-        @name = name_element.inner_text
-        @phone_number = PhoneNumber.extract_from_string(phone_element.inner_text)
-        
-        member_elements.each_slice(2) do |name_and_email|
-          name, email = *name_and_email.collect { |element| element.inner_text.gsub(/\302\240/, '').strip() }
-          @members << Member.new(self, name, email)
-        end
+    private
+    def spawn_download_thread
+      @thread ||= Thread.new(image_path) do |path|
+        @image_data = connection.get_async(path)
+      end
+    end
     
-        self
+    def self.create_from_td(connection, td)
+      name_element, phone_element, *member_elements = *td.search('table > tr > td.eventsource[width="45%"] > table > tr > td.eventsource')
+      address       = Address.extract_from_string(td.search('table > tr > td.eventsource[width="25%"]').inner_text)
+      image_path    = td.at('table > tr > td.eventsource[width="30%"] > img')['src'] rescue nil
+      phone_number  = PhoneNumber.extract_from_string(phone_element.inner_text)
+      members       = []
+      
+      member_elements.each_slice(2) do |name_and_email|
+        name, email = *name_and_email.collect { |element| element.inner_text.gsub(/\302\240/, '').strip() }
+        members << Member.new(self, name, email)
       end
+      
+      self.new(connection, name_element.inner_text, address, phone_number, image_path, members)
     end
   end
 end

data/lib/wagon/phone_number.rb

@@ -4,7 +4,7 @@ module Wagon
     
     def self.extract_from_string(string)
       string.strip =~ /([\)\(\+\s\-\d]+)(\((.*)\))?$/
-      self.new($3 || 'Home', $1.strip)
+      self.new($3 || 'Home', $1.to_s.strip)
     end
     
     def initialize(type, value)

data/lib/wagon/ward.rb

@@ -7,7 +7,7 @@ module Wagon
     end
     
     def directory_path
-      @directory_path ||= self.at('a.directory[href^="/units/a/directory"]')['href']
+      @directory_path ||= '/units/a/directory/photoprint/1,10357,605-1-7-197742,00.html'
     end
     
     def directory

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ require 'highline/import'
 $user = nil
 
 def establish_connection
+  puts "Create a connection for testing: "
   username = ask("What is your lds.org username? ")
   password = ask("What is your lds.org password? ") { |prompt| prompt.echo = "*" }
   
@@ -26,6 +27,11 @@ end
 
 if File.exists?(USER_FILE)
   restore_connection()
+  
+  if $user.expired?
+    puts "Previous connection timed out."
+    establish_connection()
+  end
 else
   establish_connection()
 end

data/spec/wagon/directory_spec.rb

@@ -3,16 +3,20 @@ require File.expand_path(File.dirname(__FILE__) + '../../spec_helper')
 describe "Wagon::Directory" do
   
   before(:each) do
-    @page = Wagon::Directory.new($user, $user.ward.directory_path, $user.ward)
+    @directory = Wagon::Directory.new($user, $user.ward.directory_path, $user.ward)
   end
   
   it "should find the photo directory link" do
-    @page.photo_directory_path.should_not be_nil
-    @page.photo_directory_path.should match(%r{^/units/a/directory/photoprint})
+    @directory.instance_variable_get(:@url).should_not be_nil
+    @directory.instance_variable_get(:@url).should match(%r{^/units/a/directory/photoprint})
   end
   
   it "should be able to generate a pdf" do
-    @page.to_pdf.render_file("./photo_directory.pdf")
+    lambda { @directory.to_pdf.render_file("./photo_directory.pdf") }.should_not raise_error
+  end
+  
+  it "should parse out the households correctly" do
+    @directory.households.should have_at_least(10).items
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wagon
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.10.0
 platform: ruby
 authors: 
 - Devin Christensen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-08 00:00:00 -07:00
+date: 2009-11-13 00:00:00 -07:00
 default_executable: wagon
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,12 +88,10 @@ files:
 - lib/wagon/member.rb
 - lib/wagon/page.rb
 - lib/wagon/phone_number.rb
-- lib/wagon/photo_directory.rb
 - lib/wagon/ward.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/wagon/directory_spec.rb
-- spec/wagon/photo_directory_spec.rb
 - spec/wagon/ward_spec.rb
 - spec/wagon_spec.rb
 has_rdoc: true
@@ -127,6 +125,5 @@ summary: Create a PDF from the lds.org ward Photo Directory.
 test_files: 
 - spec/spec_helper.rb
 - spec/wagon/directory_spec.rb
-- spec/wagon/photo_directory_spec.rb
 - spec/wagon/ward_spec.rb
 - spec/wagon_spec.rb

data/lib/wagon/photo_directory.rb

@@ -1,28 +0,0 @@
-require 'wagon/household'
-
-module Wagon
-  class PhotoDirectory < Page
-    def households
-      @households ||= _parse_households
-    end
-    
-    def members
-      households.collect(&:members).flatten()
-    end
-    
-    def to_pdf(options)
-      Prawn::Document.new() do |pdf|
-        households.each do |household|
-          pdf.text household.name
-        end
-      end
-    end
-    
-    private
-    def _parse_households
-      self.search('body > table > tr > td.eventsource[@width="25%"]').collect do |household_td|
-        household = Household.create_from_td(connection, household_td)
-      end
-    end
-  end
-end

data/spec/wagon/photo_directory_spec.rb

@@ -1,13 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '../../spec_helper')
-
-describe "Wagon::PhotoDirectory" do
-  
-  before(:each) do
-    @page = Wagon::PhotoDirectory.new($user, $user.ward.directory.photo_directory_path)
-  end
-  
-  it "should parse out the households correctly" do
-    @page.households.should have_at_least(10).items
-  end
-  
-end