wagon 0.10.5 → 1.0.0

data/lib/wagon/connection.rb

@@ -1,108 +1,74 @@
-require 'net/http'
-require 'net/https'
-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='
-    
-    # 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)
-      @cookies    = response['set-cookie']
-      @home_path  = URI.parse(response['location']).path
-
-      raise AuthenticationFailure.new("Invalid username and/or password") unless @cookies
-    end
-    
-    def home_path
-      @home_path
-    end
-    
-    def ward
-      @ward ||= Ward.new(self, home_path)
-    end
-    
-    def get(path)
-      _get(path).body
-    end
-    
-    def get_async(path, &block)
-      @@lock.synchronize do
-        @@queue.push([self, path, block])
-      end
-    end
-    
-    def expired?
-      _head(ward.directory_path).class != Net::HTTPOK
-    end
-    
-    def _dump(depth)
-      Marshal.dump([@cookies, @home_path])
-    end
-    
-    def self._load(string)
-      attributes = Marshal.restore(string)
-      connection = Connection.allocate()
-      connection.instance_variable_set(:@cookies, attributes.shift)
-      connection.instance_variable_set(:@home_path, attributes.shift)
-      connection
-    end
-    
-    private
-    def _http
-      return @http unless @http.nil?
-      @http              = Net::HTTP.new(HOST, 443)
-      @http.use_ssl      = true
-      @http.verify_mode  = OpenSSL::SSL::VERIFY_NONE
-      @http
-    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
+require 'net/http'
+require 'net/https'
+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='
+    
+    attr_reader :cookies
+    
+    def initialize(username, password)
+      response    = _post(LOGIN_PATH, 'username' => username, 'password' => password)
+      @cookies    = response['set-cookie']
+      @home_path  = URI.parse(response['location']).path
+
+      raise AuthenticationFailure.new("Invalid username and/or password") unless @cookies
+    end
+    
+    def home_path
+      @home_path
+    end
+    
+    def ward
+      @ward ||= Ward.new(self, home_path)
+    end
+    
+    def get(path)
+      _get(path).body
+    end
+    
+    def expired?
+      _head(ward.directory_path).class != Net::HTTPOK
+    end
+    
+    def _dump(depth)
+      Marshal.dump([@cookies, @home_path])
+    end
+    
+    def self._load(string)
+      attributes = Marshal.restore(string)
+      connection = Connection.allocate()
+      connection.instance_variable_set(:@cookies, attributes.shift)
+      connection.instance_variable_set(:@home_path, attributes.shift)
+      connection
+    end
+    
+    private
+    def _http
+      http              = Net::HTTP.new(HOST, 443)
+      http.use_ssl      = true
+      http.verify_mode  = OpenSSL::SSL::VERIFY_NONE
+      http
+    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

@@ -1,78 +1,78 @@
-require 'wagon/household'
-require 'prawn'
-require 'stringio'
-
-module Wagon
-  class Directory < Page
-    def ward
-      @parent
-    end
-    
-    def households
-      @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 = {})
-      options = {
-        :columns      => 7,
-        :rows         => 6,
-        :padding      => 2,
-        :font_size    => 8,
-        :address      => true,
-        :phone_number => true,
-        :email        => true,
-        :title        => "#{ward.name}"
-      }.merge(options.delete_if {|k,v| v.nil? })
-      
-      Prawn::Document.new(:left_margin => 10, :right_margin => 10, :top_margin => 10, :bottom_margin => 10) do |pdf|
-        header_height = 10
-        footer_height = 10
-        columns       = options[:columns].to_f
-        rows          = options[:rows].to_f
-        padding       = options[:padding].to_f
-        grid_width    = pdf.bounds.width / columns
-        grid_height   = (pdf.bounds.height - header_height - footer_height) / rows
-        box_width     = grid_width - (padding * 2)
-        box_height    = grid_height - (padding * 2)
-        pages         = (households.size.to_f / (columns * rows)).ceil()
-        pdf.font_size = options[:font_size].to_i
-        info_count    = 1 + [:address, :phone_number, :email].inject(0) { |sum, item| sum += options[item] ? 1 : 0 }
-        info_height   = pdf.font.height*info_count
-        
-        (0...pages).each do |page|
-          pdf.start_new_page unless page == 0
-          pdf.text(options[:title], :at => [pdf.bounds.right/2 - pdf.width_of(options[:title], :size => 12)/2, pdf.bounds.top - header_height + padding], :size => 12)
-          pdf.text("For Church Use Only", :at => [pdf.bounds.right/2 - pdf.width_of("For Church Use Only")/2, pdf.bounds.bottom])
-          (0...rows).each do |row|
-            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
-              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 = []
-                  info.push(household.name)
-                  info.push(*household.address.street) if options[:address]
-                  info.push(household.phone_number.value) if options[:phone_number]
-                  info.push(household.members.first.email) if options[:email]
-                  
-                  pdf.image(household.has_image? ? StringIO.new(household.image_data) : File.join(Wagon::BASE_PATH, 'extra', 'placeholder.jpg'), :position => :center, :fit => [box_width, box_height - (padding*2 + info_height)] )
-                  
-                  pdf.bounding_box([pdf.bounds.left, pdf.bounds.bottom + info_height], :height => info_height+1, :width => pdf.bounds.width) do
-                    info.compact.each do |line|
-                      pdf.text(line, :align => :center, :size => pdf.font_size.downto(1).detect() { |size| pdf.width_of(line.to_s, :size => size) <= box_width })
-                    end
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+require 'wagon/household'
+require 'prawn'
+require 'stringio'
+
+module Wagon
+  class Directory < Page
+    def ward
+      @parent
+    end
+    
+    def households
+      @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 = {})
+      options = {
+        :columns      => 7,
+        :rows         => 6,
+        :padding      => 2,
+        :font_size    => 8,
+        :address      => true,
+        :phone_number => true,
+        :email        => true,
+        :title        => "#{ward.name}"
+      }.merge(options.delete_if {|k,v| v.nil? })
+      
+      Prawn::Document.new(:left_margin => 10, :right_margin => 10, :top_margin => 10, :bottom_margin => 10) do |pdf|
+        header_height = 10
+        footer_height = 10
+        columns       = options[:columns].to_f
+        rows          = options[:rows].to_f
+        padding       = options[:padding].to_f
+        grid_width    = pdf.bounds.width / columns
+        grid_height   = (pdf.bounds.height - header_height - footer_height) / rows
+        box_width     = grid_width - (padding * 2)
+        box_height    = grid_height - (padding * 2)
+        pages         = (households.size.to_f / (columns * rows)).ceil()
+        pdf.font_size = options[:font_size].to_i
+        info_count    = 1 + [:address, :phone_number, :email].inject(0) { |sum, item| sum += options[item] ? 1 : 0 }
+        info_height   = pdf.font.height*info_count
+        
+        (0...pages).each do |page|
+          pdf.start_new_page unless page == 0
+          pdf.text(options[:title], :at => [pdf.bounds.right/2 - pdf.width_of(options[:title], :size => 12)/2, pdf.bounds.top - header_height + padding], :size => 12)
+          pdf.text("For Church Use Only", :at => [pdf.bounds.right/2 - pdf.width_of("For Church Use Only")/2, pdf.bounds.bottom])
+          (0...rows).each do |row|
+            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
+              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 = []
+                  info.push(household.name)
+                  info.push(*household.address.street) if options[:address]
+                  info.push(household.phone_number.value) if options[:phone_number]
+                  info.push(household.members.first.email) if options[:email]
+                  
+                  pdf.image(household.has_image? ? StringIO.new(household.image_data) : File.join(Wagon::BASE_PATH, 'extra', 'placeholder.jpg'), :position => :center, :fit => [box_width, box_height - (padding*2 + info_height)] )
+                  
+                  pdf.bounding_box([pdf.bounds.left, pdf.bounds.bottom + info_height], :height => info_height+1, :width => pdf.bounds.width) do
+                    info.compact.each do |line|
+                      pdf.text(line, :align => :center, :size => pdf.font_size.downto(1).detect() { |size| pdf.width_of(line.to_s, :size => size) <= box_width })
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/wagon/household.rb

@@ -1,75 +1,60 @@
-require 'wagon/address'
-require 'wagon/phone_number'
-require 'wagon/member'
-
-require 'base64'
-
-module Wagon
-  class Household
-    attr_reader :connection, :address, :phone_number, :image_path, :members
-    
-    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
-      self.individual? ? "#{members.first.name} #{@name}" : "#{@name} Household"
-    end
-    
-    def reversed_name
-      self.individual? ? "#{@name}, #{members.first.name}" : name
-    end
-    
-    def individual?
-      members.count == 1
-    end
-    
-    def has_image?
-      !image_path.to_s.empty?
-    end
-    
-    def image_data
-      return nil unless has_image?
-      
-      sleep(0.5) while @image_data.nil?
-      
-      @image_data
-    end
-    
-    def <=>(other)
-      if has_image? == other.has_image?
-        reversed_name <=> other.reversed_name
-      else
-        has_image? ? -1 : 1
-      end
-    end
-    
-    private
-    def spawn_download_thread
-      @thread ||= Thread.new(image_path) do |path|
-        @image_data = connection.get_async(path)
-      end
-    end
-    
-    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
+require 'wagon/address'
+require 'wagon/phone_number'
+require 'wagon/member'
+
+require 'base64'
+
+module Wagon
+  class Household
+    attr_reader :connection, :address, :phone_number, :image_path, :image_data, :members
+    
+    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?
+        @image_data = Future(image_path) do |image_path|
+          @connection.get(image_path)
+        end
+      end
+    end
+    
+    def name
+      self.individual? ? "#{members.first.name} #{@name}" : "#{@name} Household"
+    end
+    
+    def reversed_name
+      self.individual? ? "#{@name}, #{members.first.name}" : name
+    end
+    
+    def individual?
+      members.count == 1
+    end
+    
+    def has_image?
+      !image_path.to_s.empty?
+    end
+    
+    def <=>(other)
+      if has_image? == other.has_image?
+        reversed_name <=> other.reversed_name
+      else
+        has_image? ? -1 : 1
+      end
+    end
+    
+    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