turingstudio-freshbooks-rb 3.0.1 → 3.0.2

data/README.rdoc

@@ -10,7 +10,7 @@ A Ruby interface to the FreshBooks API. It exposes easy-to-use classes and metho
 
 Initialization:
 
-  FreshBooks::Base.setup('sample.freshbooks.com', 'mytoken')
+  FreshBooks::Base.establish_connection!('sample.freshbooks.com', 'mytoken')
 
 Updating a client name:
 

data/lib/freshbooks.rb

@@ -24,6 +24,7 @@ require 'rexml/document'
 require 'activesupport'
 
 require 'freshbooks/version'
+require 'freshbooks/connection'
 require 'freshbooks/response'
 require 'freshbooks/base'
 require 'freshbooks/category'
@@ -33,9 +34,12 @@ require 'freshbooks/expense'
 require 'freshbooks/invoice'
 require 'freshbooks/item'
 require 'freshbooks/line'
+require 'freshbooks/links'
+require 'freshbooks/list_proxy'
 require 'freshbooks/payment'
 require 'freshbooks/project'
 require 'freshbooks/recurring'
 require 'freshbooks/staff'
 require 'freshbooks/task'
 require 'freshbooks/time_entry'
+require 'freshbooks/xml_serializer'

data/lib/freshbooks/base.rb

@@ -4,140 +4,82 @@ module FreshBooks
     class AuthenticationError < Exception; end;
     class UnknownSystemError < Exception; end;
     class InvalidParameterError < Exception; end;
+    class InvalidAccountUrlError < Exception; end;
     
-    attr_accessor :resp
-
     def initialize(data = {})
-      @old_values = {}
       @changed_fields = []
+      self.class.attributes.each do |name, options|
+        send("#{name}=", []) if options[:type] == :array
+      end
       data.each do |name, value|
         send("#{name}=", value) if self.class.attributes[name]
       end
+      #@changed_fields = [] # reset changed fields
     end
-    
-    # Convert an instance of this class to an XML element
+        
     def to_xml(elem_name = nil)
       root = REXML::Element.new(node_name)
-      
       self.class.attributes.each do |name, options|
-        next if options[:read_only] || !send("#{name}_changed?")
-
         value = send(name)
-
-        if self.class.method_defined?("#{name}_to_xml")
-          send("#{name}_to_xml", root)
-        elsif value.is_a?(Array)
-          unless value.empty?
-            node = root.add_element(name.to_s)
-            value.each do |item|
-              node.add_element(item.to_xml)
-            end
-          end
-        elsif !value.nil?
-          root.add_element(name.to_s).text = value
+        next if options[:read_only] || !send("#{name}_changed?") || value.nil?
+        
+        if options[:to_xml]
+          send(options[:to_xml], root)
+        else
+          element = XmlSerializer.to_node(name.to_s, value, options[:type])
+          root.add_element(element) if element != nil
         end
       end
-      
       root
     end
         
-    def create
-      self.class.ensure_allowed! :create
-      resp = Base.call_api("#{node_name}.create", node_name => self)
-      if resp.success?
-        self.send("#{node_name}_id=", resp.elements[1].text.to_i)
-      end
-      resp.success? ? self.send("#{node_name}_id") : nil
-    end
-    
-    def update
-      self.class.ensure_allowed! :update
-      resp = Base.call_api("#{node_name}.update", node_name => self)
-      resp.success?
-    end
-    
-    def delete
-      self.class.delete(self.send("#{node_name}_id"))
-    end
-    
-    def send_by_email
-      self.class.send_by_email(self.send("#{node_name}_id"))
-    end
-    
-    def send_by_snail_mail
-      self.class.send_by_snail_mail(self.send("#{node_name}_id"))
-    end
-    
-    def node_name
-      self.class.node_name
-    end
-    
     class << self
-      def setup(account_url, auth_token, request_headers = {})
-        @@account_url = account_url
-        @@auth_token = auth_token
-        @@request_headers = request_headers
-        @@response = nil
-      end
+      attr_reader :connection
       
-      def list(options = {})
-        ensure_allowed! :list
-        resp = Base.call_api("#{node_name}.list", options)
-        return nil unless resp.success?
-
-        elems = resp.elements[1].elements
-        elems.map { |elem| self.new_from_xml(elem) }
+      def establish_connection!(account_url, auth_token, request_headers = {})
+        @connection = Connection.new(account_url, auth_token, request_headers)
       end
       
-      def get(id)
-        ensure_allowed! :get
-        resp = Base.call_api("#{node_name}.get", "#{node_name}_id" => id)
-        resp.success? ? self.new_from_xml(resp.elements[1]) : nil
+      def new_from_xml(xml_root)
+        object = self.new
+        attributes.each do |name, options|
+          node = xml_root.elements[name.to_s]
+          next if node.nil?
+          
+          value = FreshBooks::XmlSerializer.to_value(node, options[:type])
+          object.send("#{name}=", value)
+        end
+        object
       end
             
-      def delete(id)
-        ensure_allowed! :delete
-        resp = Base.call_api("#{node_name}.delete", "#{node_name}_id" => id)
-        resp.success?
-      end
-      
-      def send_by_email(id)
-        ensure_allowed! :send_by_email
-        resp = Base.call_api("#{node_name}.sendByEmail", "#{node_name}_id" => id)
-        resp.success?
-      end
-      
-      def send_by_snail_mail(id)
-        ensure_allowed! :send_by_snail_mail
-        resp = Base.call_api("#{node_name}.sendBySnailMail", "#{node_name}_id" => id)
-        resp.success?
-      end
-      
       def node_name
         self.to_s.split('::').last.underscore
       end
       
       #
-      # Defines structure attribute. Generates attr_accessor and #{name}_changed? method
+      # Defines structure attribute. Generates attr_accessor and #{name}_changed? method.
+      # Options are:
+      #  :read_only - specifies that attribute is read-only and attr_writer is protected
+      #  :to_xml - overrides xml generation for this attribute
       #
-      # class Test < Base
-      #   attribute :test_id, :integer
-      # end
+      #  class Test < Base
+      #    attribute :test_id, :integer
+      #  end
       #
-      # test = Test.new
-      # test.test_id_changed?  # false
-      # test.test_id = 1
-      # test.test_id_changed?  # true
-      # test.test_id           # 1
+      #  test = Test.new
+      #  test.test_id_changed?  # false
+      #  test.test_id = 1
+      #  test.test_id_changed?  # true
+      #  test.test_id           # 1
       #
       def attribute(name, type, options = {})
         self.attributes[name] = options.update(:type => type)
         
         define_method("#{name}=") do |value|
           @changed_fields << name
-          @old_values[name] = send(name) if @old_values[name].nil?
           instance_variable_set("@#{name}", value)
         end
+        self.send(:protected, "#{name}=") if options[:read_only]
         
         define_method("#{name}_changed?") do
           @changed_fields.include?(name)
@@ -179,108 +121,92 @@ module FreshBooks
       # Defines allowed API methods.
       #
       # class Test < Base
-      #   method :list
+      #   actions :list
       # end
       #
       # Test.list         # [...]
       # Test.get(1)       # "Error: Method get is not allowed for Test"
       #
-      def method(*args)
-        @methods = (methods + args).uniq
-      end
-      
-      def methods
-        @methods ||= []
-      end
-      
-      def ensure_allowed!(name)
-        unless methods.include?(name)
-          raise "Error: Method #{name} is not allowed for #{self}"
-        end
-      end
-      
-      # Create a new instance of this class from an XML element
-      def new_from_xml(xml_root)
-        object = self.new
-        attributes.each do |name, options|
-          node = xml_root.elements[name.to_s]
-          next if node.nil?
+      def define_class_method(name, &block)
+        self.class.send(:define_method, name, &block)
+      end            
 
-          case options[:type]
-          when :integer
-            value = node.text.to_i
-          when :float
-            value = node.text.to_f
-          when :array
-            value = node.elements.map do |item|
-              FreshBooks::const_get(item.name.classify)::new_from_xml(item)
-            end
-          else
-            value = node.text.to_s
-          end
-          
-          object.send("#{name}=", value)
-        end
-        object
-      end
-      
-      def call_api(method, elems = [])
-        doc = REXML::Document.new '<?xml version="1.0" encoding="UTF-8"?>'
-        request = doc.add_element 'request'
-        request.attributes['method'] = method
+      def actions(*args)
+        args.each do |action|
+          method = action.to_s
+          api_method = method.camelize(:lower)
 
-        elems.each do |key, value|
-          if value.is_a?(Base)
-            elem = value.to_xml
-            request.add_element(elem)
+          case method
+          when 'list'
+            define_class_method(method) do |*args|
+              api_list_action(api_method, *args)
+            end
+          when 'get'
+            define_class_method(method) do |id|
+              api_get_action(api_method, id)
+            end
+          when 'create'
+            define_method(method) do
+              api_create_action(api_method)
+            end
+          when 'update'
+            define_method(method) do
+              api_update_action(api_method)
+            end
+          when 'delete'
+            define_class_method(method) do |id|
+              api_delete_action(api_method, id)
+            end
+            define_method(method) do
+              self.class.api_delete_action(api_method, self.send("#{node_name}_id"))
+            end
           else
-            request.add_element(REXML::Element.new(key)).text = value.to_s
+            define_class_method(method) do |id|
+              api_action(api_method, id)
+            end
+            define_method(method) do
+              self.class.api_action(api_method, self.send("#{node_name}_id"))
+            end
           end
         end
-           
-        result = self.post(request.to_s)
         
-        @@response = Response.new(result)
-
-        #
-        # Failure
-        #
-        if @@response.fail?
-          error_msg = @@response.error_msg
-
-          raise InternalError.new,         error_msg if error_msg =~ /not formatted correctly/
-          raise AuthenticationError.new,   error_msg if error_msg =~ /[Aa]uthentication failed/
-          raise UnknownSystemError.new,    error_msg if error_msg =~ /does not exist/
-          raise InvalidParameterError.new, error_msg if error_msg =~ /Invalid parameter: (.*)/
-
-          # Raise an exception for unexpected errors
-          raise error_msg
+        def api_list_action(method, options = {})
+          resp = Base.connection.call_api("#{node_name}.#{method}", options)
+          resp.success? ? ListProxy.new_from_xml(self, resp) : nil
         end
 
-        @@response
-      end
-            
-      def response
-        @@response
-      end
-
-      def post(body)
-        connection = Net::HTTP.new(@@account_url, 443)
-        connection.use_ssl = true
-        connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-        request = Net::HTTP::Post.new(FreshBooks::SERVICE_URL)
-        request.basic_auth @@auth_token, 'X'
-        request.body = body
-        request.content_type = 'application/xml'
-        @@request_headers.each_pair do |name, value|
-          request[name.to_s] = value
+        def api_get_action(method, id)
+          resp = Base.connection.call_api("#{node_name}.#{method}", "#{node_name}_id" => id)
+          resp.success? ? self.new_from_xml(resp.elements[1]) : nil
         end
 
-        result = connection.start { |http| http.request(request) }
+        def api_delete_action(method, id)
+          resp = Base.connection.call_api("#{node_name}.#{method}", "#{node_name}_id" => id)
+          resp.success?
+        end
 
-        result.body
+        def api_action(method, id)
+          resp = Base.connection.call_api("#{node_name}.#{method}", "#{node_name}_id" => id)
+          resp.success?
+        end
       end
     end
+        
+    protected
+    
+    def node_name
+      self.class.node_name
+    end
+    
+    def api_create_action(method)
+      resp = Base.connection.call_api("#{node_name}.#{method}", node_name => self)
+      self.send("#{node_name}_id=", resp.elements[1].text.to_i) if resp.success?
+      resp.success?
+    end
+
+    def api_update_action(method)
+      resp = Base.connection.call_api("#{node_name}.#{method}", node_name => self)
+      resp.success?
+    end    
   end
-end
+end

data/lib/freshbooks/category.rb

@@ -2,10 +2,10 @@ module FreshBooks
   class Category < Base
     attribute :category_id, :integer
     attribute :name,        :string
-    attribute :tax1,        :integer
-    attribute :tax2,        :integer
+    attribute :tax1,        :float
+    attribute :tax2,        :float
     
     has_many :expenses
-    method :list, :get, :create, :update, :delete
+    actions :list, :get, :create, :update, :delete
   end
 end

data/lib/freshbooks/client.rb

@@ -24,9 +24,9 @@ module FreshBooks
     attribute :s_state,       :string
     attribute :s_country,     :string
     attribute :s_code,        :string
-    attribute :url,           :string, :read_only => true
+    attribute :links,         :object, :read_only => true
     
     has_many :expenses, :estimates, :invoices, :payments, :projects, :recurrings
-    method :list, :get, :create, :update, :delete
+    actions :list, :get, :create, :update, :delete
   end
 end

data/lib/freshbooks/estimate.rb

@@ -1,30 +1,25 @@
 module FreshBooks
   class Estimate < Base
-    attribute :estimate_id, :integer
-    attribute :client_id, :integer
-    attribute :status, :string
-    attribute :date, :string
-    attribute :po_number, :integer
-    attribute :discount, :float
-    attribute :notes, :string
-    attribute :terms, :string
-    attribute :first_name, :string
-    attribute :last_name, :string
-    attribute :organization, :string
-    attribute :p_street1, :string
-    attribute :p_street2, :string
-    attribute :p_city, :string
-    attribute :p_state, :string
-    attribute :p_country, :string
-    attribute :p_code, :string
-    attribute :lines, :array
+    attribute :estimate_id,   :integer
+    attribute :client_id,     :integer
+    attribute :status,        :string
+    attribute :date,          :date
+    attribute :po_number,     :integer
+    attribute :discount,      :float
+    attribute :notes,         :string
+    attribute :terms,         :string
+    attribute :first_name,    :string
+    attribute :last_name,     :string
+    attribute :organization,  :string
+    attribute :p_street1,     :string
+    attribute :p_street2,     :string
+    attribute :p_city,        :string
+    attribute :p_state,       :string
+    attribute :p_country,     :string
+    attribute :p_code,        :string
+    attribute :lines,         :array
     
     belongs_to :client
-    method :list, :get, :create, :update, :delete, :send_by_email
-    
-    def initialize(data = {})
-      super
-      self.lines ||= []
-    end
+    actions :list, :get, :create, :update, :delete, :send_by_email
   end
 end

data/lib/freshbooks/expense.rb

@@ -6,11 +6,11 @@ module FreshBooks
     attribute :project_id,  :integer
     attribute :client_id,   :integer
     attribute :amount,      :float
-    attribute :date,        :string
+    attribute :date,        :date
     attribute :notes,       :string
     attribute :status,      :string
     
     belongs_to :staff, :category, :project, :client
-    method :list, :get, :create, :update, :delete, :send_by_email
+    actions :list, :get, :create, :update, :delete, :send_by_email
   end
 end

data/lib/freshbooks/invoice.rb

@@ -3,7 +3,7 @@ module FreshBooks
     attribute :invoice_id,    :integer
     attribute :client_id,     :integer
     attribute :number,        :string
-    attribute :date,          :string
+    attribute :date,          :date
     attribute :po_number,     :integer
     attribute :terms,         :string
     attribute :first_name,    :string
@@ -24,11 +24,6 @@ module FreshBooks
     
     belongs_to :client
     has_many :payments
-    method :list, :get, :create, :update, :delete, :send_by_email, :send_by_snail_mail
-    
-    def initialize(data = {})
-      super
-      self.lines ||= []
-    end
+    actions :list, :get, :create, :update, :delete, :send_by_email, :send_by_snail_mail
   end
 end

data/lib/freshbooks/item.rb

@@ -7,6 +7,6 @@ module FreshBooks
     attribute :quantity,    :integer
     attribute :inventory,   :integer
     
-    method :list, :get, :create, :update, :delete
+    actions :list, :get, :create, :update, :delete
   end
 end

data/lib/freshbooks/line.rb

@@ -8,6 +8,6 @@ module FreshBooks
     attribute :tax2_name,     :string
     attribute :tax1_percent,  :float
     attribute :tax2_percent,  :float
-    attribute :amount,        :float
+    attribute :amount,        :float, :read_only => true
   end
 end

data/lib/freshbooks/payment.rb

@@ -11,12 +11,12 @@ module FreshBooks
     attribute :payment_id,  :integer
     attribute :client_id,   :integer
     attribute :invoice_id,  :integer
-    attribute :date,        :string
+    attribute :date,        :date
     attribute :amount,      :float
     attribute :type,        :string
     attribute :notes,       :string
     
     belongs_to :client, :invoice
-    method :list, :get, :create, :update
+    actions :list, :get, :create, :update
   end
 end

data/lib/freshbooks/project.rb

@@ -15,16 +15,11 @@ module FreshBooks
     attribute :bill_method, :string
     attribute :rate,        :float
     attribute :description, :string
-    attribute :tasks,       :array
+    attribute :tasks,       :array, :to_xml => :tasks_to_xml
     
     belongs_to :client
     has_many :expenses
-    method :list, :get, :create, :update, :delete
-    
-    def initialize(data = {})
-      super
-      self.tasks ||= []
-    end
+    actions :list, :get, :create, :update, :delete
     
     protected
     

data/lib/freshbooks/recurring.rb

@@ -18,7 +18,7 @@ module FreshBooks
   class Recurring < Base
     attribute :recurring_id,    :integer
     attribute :client_id,       :integer
-    attribute :date,            :string
+    attribute :date,            :date
     attribute :po_number,       :integer
     attribute :terms,           :string
     attribute :first_name,      :string
@@ -37,15 +37,11 @@ module FreshBooks
     attribute :notes,           :string
     attribute :occurrences,     :integer
     attribute :frequency,       :string
-    attribute :send_email,      :integer
-    attribute :send_snail_mail, :integer
+    attribute :stopped,         :boolean
+    attribute :send_email,      :boolean
+    attribute :send_snail_mail, :boolean
     
     belongs_to :client
-    method :list, :get, :create, :update, :delete
-    
-    def initialize(data = {})
-      super
-      self.lines ||= []
-    end
+    actions :list, :get, :create, :update, :delete
   end
 end

data/lib/freshbooks/staff.rb

@@ -7,10 +7,10 @@ module FreshBooks
     attribute :email,           :string
     attribute :business_phone,  :string
     attribute :mobile_phone,    :string
-    attribute :rate,            :string
-    attribute :last_login,      :string
-    attribute :number_of_logins,:string
-    attribute :signup_date,     :string
+    attribute :rate,            :float
+    attribute :last_login,      :date_time
+    attribute :number_of_logins,:integer
+    attribute :signup_date,     :date_time
     attribute :street1,         :string
     attribute :street2,         :string
     attribute :city,            :string
@@ -19,6 +19,6 @@ module FreshBooks
     attribute :code,            :string
     
     has_many :expenses
-    method :list, :get
+    actions :list, :get
   end
 end

data/lib/freshbooks/task.rb

@@ -2,10 +2,10 @@ module FreshBooks
   class Task < Base
     attribute :task_id,     :integer
     attribute :name,        :string
-    attribute :billable,    :string
+    attribute :billable,    :boolean
     attribute :rate,        :float
     attribute :description, :string
     
-    method :list, :get, :create, :update, :delete
+    actions :list, :get, :create, :update, :delete
   end
 end

data/lib/freshbooks/time_entry.rb

@@ -5,9 +5,9 @@ module FreshBooks
     attribute :task_id,       :integer
     attribute :hours,         :float
     attribute :notes,         :string
-    attribute :date,          :string
+    attribute :date,          :date
     
     belongs_to :project, :task
-    method :list, :get, :create, :update, :delete
+    actions :list, :get, :create, :update, :delete
   end
 end

data/lib/freshbooks/version.rb

@@ -1,5 +1,5 @@
 module FreshBooks
-  VERSION = '3.0.1'     # Gem version
+  VERSION = '3.0.2'     # Gem version
   API_VERSION = '2.1'   # FreshBooks API version
   
   SERVICE_URL = "/api/#{API_VERSION}/xml-in"

data/spec/lib/freshbooks/base_spec.rb

@@ -18,7 +18,7 @@ describe FreshBooks::Base do
   
   class Test < FreshBooks::Base
     attribute :test_id, :integer
-    method :list, :get, :create, :update, :delete, :send_by_email, :send_by_snail_mail
+    actions :list, :get, :create, :update, :delete, :send_by_email, :send_by_snail_mail
   end
   
   class TestWithoutMethods < FreshBooks::Base
@@ -116,7 +116,7 @@ describe FreshBooks::Base do
     it "should not include unchanged attributes in xml" do
       @xml.to_s.should_not =~ Regexp.new(Regexp.escape('<amount>'))
     end
-    
+        
     it "should return correct xml and initialize correctly from xml" do
       first = First.new_from_xml(@xml)
       first.first_id.should == 1
@@ -136,11 +136,13 @@ describe FreshBooks::Base do
       @elem = mock('XmlObj', :text => '123')
       @resp = mock('XmlResp', :elements => [nil, @elem])
       @resp.stub!(:success?).and_return(true)
-      FreshBooks::Base.stub!(:call_api).and_return(@resp)
+      @connection = mock('Connection')
+      FreshBooks::Base.stub!(:connection).and_return(@connection)
+      @connection.stub!(:call_api).and_return(@resp)
     end
     
     it "should call api method" do
-      FreshBooks::Base.should_receive(:call_api).with('test.create', 'test' => @object).and_return(@resp)
+      @connection.should_receive(:call_api).with('test.create', 'test' => @object).and_return(@resp)
       @object.create
     end
     
@@ -156,12 +158,12 @@ describe FreshBooks::Base do
     end
     
     it "should return id if call succeeded" do
-      @object.create.should == 123
+      @object.create.should be_true
     end
     
     it "should return nil if call failed" do
       @resp.stub!(:success?).and_return(false)
-      @object.create.should be_nil
+      @object.create.should be_false
     end
   end
   
@@ -169,11 +171,13 @@ describe FreshBooks::Base do
     before(:each) do
       @resp = mock('XmlResp')
       @resp.stub!(:success?).and_return(true)
-      FreshBooks::Base.stub!(:call_api).and_return(@resp)
+      @connection = mock('Connection')
+      FreshBooks::Base.stub!(:connection).and_return(@connection)
+      @connection.stub!(:call_api).and_return(@resp)
     end
     
     it "should call api method" do
-      FreshBooks::Base.should_receive(:call_api).with('test.update', 'test' => @object).and_return(@resp)
+      @connection.should_receive(:call_api).with('test.update', 'test' => @object).and_return(@resp)
       @object.update
     end
     
@@ -193,11 +197,13 @@ describe FreshBooks::Base do
       @object.test_id = 1
       @resp = mock('XmlResp')
       @resp.stub!(:success?).and_return(true)
-      FreshBooks::Base.stub!(:call_api).and_return(@resp)
+      @connection = mock('Connection')
+      FreshBooks::Base.stub!(:connection).and_return(@connection)
+      @connection.stub!(:call_api).and_return(@resp)
     end
     
     it "should call api method" do
-      FreshBooks::Base.should_receive(:call_api).with('test.delete', 'test_id' => 1).and_return(@resp)
+      @connection.should_receive(:call_api).with('test.delete', 'test_id' => 1).and_return(@resp)
       @object.delete
     end
     
@@ -216,11 +222,13 @@ describe FreshBooks::Base do
     before(:each) do
       @resp = mock('XmlResp')
       @resp.stub!(:success?).and_return(true)
-      FreshBooks::Base.stub!(:call_api).and_return(@resp)
+      @connection = mock('Connection')
+      FreshBooks::Base.stub!(:connection).and_return(@connection)
+      @connection.stub!(:call_api).and_return(@resp)
     end
     
     it "should call api method" do
-      FreshBooks::Base.should_receive(:call_api).with('test.delete', 'test_id' => 1).and_return(@resp)
+      @connection.should_receive(:call_api).with('test.delete', 'test_id' => 1).and_return(@resp)
       Test.delete(1)
     end
     
@@ -239,12 +247,14 @@ describe FreshBooks::Base do
     before(:each) do
       @resp = mock('XmlResp', :elements => [])
       @resp.stub!(:success?).and_return(true)
-      FreshBooks::Base.stub!(:call_api).and_return(@resp)
+      @connection = mock('Connection')
+      FreshBooks::Base.stub!(:connection).and_return(@connection)
+      @connection.stub!(:call_api).and_return(@resp)
       Test.stub!(:new_from_xml).and_return(true)
     end
     
     it "should call api method" do
-      FreshBooks::Base.should_receive(:call_api).with('test.get', 'test_id' => 1).and_return(@resp)
+      @connection.should_receive(:call_api).with('test.get', 'test_id' => 1).and_return(@resp)
       Test.get(1)
     end
     
@@ -264,15 +274,25 @@ describe FreshBooks::Base do
     before(:each) do
       @elem1 = mock('XmlElement')
       @elem2 = mock('XmlElement')
-      @elems = mock('XmlElements', :elements => [@elem1, @elem2])
+      @elems = mock('XmlElements',
+        :elements => [@elem1, @elem2],
+        :attributes => {
+          'page'     => 1,
+          'pages'    => 10,
+          'per_page' => 30,
+          'total'    => 300
+        }
+      )
       @resp = mock('XmlResp', :elements => [nil, @elems])
       @resp.stub!(:success?).and_return(true)
-      FreshBooks::Base.stub!(:call_api).and_return(@resp)
+      @connection = mock('Connection')
+      FreshBooks::Base.stub!(:connection).and_return(@connection)
+      @connection.stub!(:call_api).and_return(@resp)
       Test.stub!(:new_from_xml).and_return(true)
     end
     
     it "should call api method" do
-      FreshBooks::Base.should_receive(:call_api).with('test.list', :name => 'value').and_return(@resp)
+      @connection.should_receive(:call_api).with('test.list', :name => 'value').and_return(@resp)
       Test.list(:name => 'value')
     end
     
@@ -280,12 +300,17 @@ describe FreshBooks::Base do
       @resp.stub!(:success?).and_return(false)
       Test.list.should be_nil
     end
+
+    it "should create a list proxy if request succeeded" do
+      @resp.stub!(:success?).and_return(true)
+      Test.list.should be_a(FreshBooks::ListProxy)
+    end
     
     it "should build instances from response records if request succeeded" do
       @resp.stub!(:success?).and_return(true)
       Test.should_receive(:new_from_xml).with(@elem1).and_return(1)
       Test.should_receive(:new_from_xml).with(@elem2).and_return(2)
-      Test.list.should == [1, 2]
+      Test.list.to_a.should == [1, 2]
     end
   end
   
@@ -294,11 +319,13 @@ describe FreshBooks::Base do
       @object.test_id = 1
       @resp = mock('XmlResp')
       @resp.stub!(:success?).and_return(true)
-      FreshBooks::Base.stub!(:call_api).and_return(@resp)
+      @connection = mock('Connection')
+      FreshBooks::Base.stub!(:connection).and_return(@connection)
+      @connection.stub!(:call_api).and_return(@resp)
     end
     
     it "should call api method" do
-      FreshBooks::Base.should_receive(:call_api).with('test.sendByEmail', 'test_id' => 1).and_return(@resp)
+      @connection.should_receive(:call_api).with('test.sendByEmail', 'test_id' => 1).and_return(@resp)
       @object.send_by_email
     end
     
@@ -317,11 +344,13 @@ describe FreshBooks::Base do
     before(:each) do
       @resp = mock('XmlResp')
       @resp.stub!(:success?).and_return(true)
-      FreshBooks::Base.stub!(:call_api).and_return(@resp)
+      @connection = mock('Connection')
+      FreshBooks::Base.stub!(:connection).and_return(@connection)
+      @connection.stub!(:call_api).and_return(@resp)
     end
     
     it "should call api method" do
-      FreshBooks::Base.should_receive(:call_api).with('test.sendByEmail', 'test_id' => 1).and_return(@resp)
+      @connection.should_receive(:call_api).with('test.sendByEmail', 'test_id' => 1).and_return(@resp)
       Test.send_by_email(1)
     end
     
@@ -341,11 +370,13 @@ describe FreshBooks::Base do
       @object.test_id = 1
       @resp = mock('XmlResp')
       @resp.stub!(:success?).and_return(true)
-      FreshBooks::Base.stub!(:call_api).and_return(@resp)
+      @connection = mock('Connection')
+      FreshBooks::Base.stub!(:connection).and_return(@connection)
+      @connection.stub!(:call_api).and_return(@resp)
     end
     
     it "should call api method" do
-      FreshBooks::Base.should_receive(:call_api).with('test.sendBySnailMail', 'test_id' => 1).and_return(@resp)
+      @connection.should_receive(:call_api).with('test.sendBySnailMail', 'test_id' => 1).and_return(@resp)
       @object.send_by_snail_mail
     end
     
@@ -364,11 +395,13 @@ describe FreshBooks::Base do
     before(:each) do
       @resp = mock('XmlResp')
       @resp.stub!(:success?).and_return(true)
-      FreshBooks::Base.stub!(:call_api).and_return(@resp)
+      @connection = mock('Connection')
+      FreshBooks::Base.stub!(:connection).and_return(@connection)
+      @connection.stub!(:call_api).and_return(@resp)
     end
     
     it "should call api method" do
-      FreshBooks::Base.should_receive(:call_api).with('test.sendBySnailMail', 'test_id' => 1).and_return(@resp)
+      @connection.should_receive(:call_api).with('test.sendBySnailMail', 'test_id' => 1).and_return(@resp)
       Test.send_by_snail_mail(1)
     end
     

data/spec/lib/freshbooks/time_entry_spec.rb

@@ -74,8 +74,8 @@ describe FreshBooks::TimeEntry do
   
   # it "should update an existing time_entry" do
   #   time_entries = FreshBooks::TimeEntry.list
-  #   @time_entry.hours = 2
-  #   @time_entry.update rescue nil
+  #   time_entry = FreshBooks::TimeEntry.new(:time_entry_id => @time_entry.time_entry_id, :hours => 2)
+  #   time_entry.update.should be_true
   #   FreshBooks::TimeEntry.get(@time_entry.time_entry_id).hours.should == 2
   #   FreshBooks::TimeEntry.list.size.should == time_entries.size
   # end

data/spec/spec_helper.rb

@@ -8,4 +8,4 @@ end
 
 require File.dirname(__FILE__) + '/../lib/freshbooks.rb'
 
-FreshBooks::Base.setup('flatsourcingtest.freshbooks.com', 'dd4d8a3c9a8541161e6409df207fad84')
+FreshBooks::Base.establish_connection!('flatsourcingtest.freshbooks.com', 'a2e32a3dcb2444c2f0fc47a5ae7227d2')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: turingstudio-freshbooks-rb
 version: !ruby/object:Gem::Version 
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors: 
 - The Turing Studio, Inc.
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-03 00:00:00 -08:00
+date: 2009-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,9 +81,8 @@ files:
 has_rdoc: true
 homepage: http://github.com/turingstudio/freshbooks-rb/
 post_install_message: 
-rdoc_options: 
-- --main
-- README.rdoc
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -100,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: freshbooks-rb
+rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2