xeroizer 2.15.6 → 2.15.7

data/lib/xeroizer/http.rb

@@ -133,17 +133,22 @@ module Xeroizer
       def handle_oauth_error!(response)
         error_details = CGI.parse(response.plain_body)
         description   = error_details["oauth_problem_advice"].first
+        problem = error_details["oauth_problem"].first
 
         # see http://oauth.pbworks.com/ProblemReporting
         # In addition to token_expired and token_rejected, Xero also returns
         # 'rate limit exceeded' when more than 60 requests have been made in
         # a second.
-        case (error_details["oauth_problem"].first)
-          when "token_expired"                then raise OAuth::TokenExpired.new(description)
-          when "token_rejected"               then raise OAuth::TokenInvalid.new(description)
-          when "rate limit exceeded"          then raise OAuth::RateLimitExceeded.new(description)
-          when error_details["oauth_problem"] then raise OAuth::UnknownError.new(error_details["oauth_problem"].first + ':' + description)
-          else raise OAuth::UnknownError.new("Xero API may be down or the way OAuth errors are provided by Xero may have changed.")
+        if problem
+          case (problem)
+            when "token_expired"                then raise OAuth::TokenExpired.new(description)
+            when "token_rejected"               then raise OAuth::TokenInvalid.new(description)
+            when "rate limit exceeded"          then raise OAuth::RateLimitExceeded.new(description)
+            when "consumer_key_unknown"         then raise OAuth::ConsumerKeyUnknown.new(description)
+            else raise OAuth::UnknownError.new(problem + ':' + description)
+          end
+        else
+          raise OAuth::UnknownError.new("Xero API may be down or the way OAuth errors are provided by Xero may have changed.")
         end
       end
 

data/lib/xeroizer/models/bank_transaction.rb

@@ -1,10 +1,13 @@
 require 'xeroizer/models/line_item'
 require 'xeroizer/models/line_item_sum'
+require 'xeroizer/models/attachment'
 
 module Xeroizer
   module Record
     class BankTransactionModel < BaseModel
       set_permissions :read
+
+      include AttachmentModel::Extensions
     end
 
     class BankTransaction < Base
@@ -15,6 +18,7 @@ module Xeroizer
       } unless defined?(BANK_TRANSACTION_STATUS)
       BANK_TRANSACTION_STATUSES = BANK_TRANSACTION_STATUS.keys.sort
 
+      include Attachment::Extensions
 
       def initialize(parent)
         super parent

data/lib/xeroizer/models/tax_rate.rb

@@ -14,11 +14,9 @@ module Xeroizer
     end
     
     class TaxRate < Base
-      set_primary_key :tax_type
-      set_possible_primary_keys :tax_type, :name
-      
       set_primary_key :name
-      
+      set_possible_primary_keys :tax_type, :name
+
       string  :name
       string  :tax_type
       string  :status

data/lib/xeroizer/oauth.rb

@@ -27,8 +27,9 @@ module Xeroizer
     class TokenExpired < StandardError; end
     class TokenInvalid < StandardError; end
     class RateLimitExceeded < StandardError; end
+    class ConsumerKeyUnknown < StandardError; end
     class UnknownError < StandardError; end
-        
+
     unless defined? XERO_CONSUMER_OPTIONS
       XERO_CONSUMER_OPTIONS = {
         :site               => "https://api.xero.com",

data/lib/xeroizer/version.rb

@@ -1,3 +1,3 @@
 module Xeroizer
-  VERSION = "2.15.6".freeze
+  VERSION = "2.15.7".freeze
 end

data/lib/xeroizer.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'date'
 require 'forwardable'
 require 'active_support/inflector'
-# require "active_support/core_ext"
+require "active_support/core_ext"
 require 'oauth'
 require 'oauth/signature/rsa/sha1'
 require 'nokogiri'
@@ -11,7 +11,7 @@ require 'time'
 require 'bigdecimal'
 require 'cgi'
 
-$: << File.expand_path(File.dirname(__FILE__)) 
+$: << File.expand_path(File.dirname(__FILE__))
 
 require 'big_decimal_to_s'
 require 'class_level_inheritable_attributes'

data/test/unit/models/bank_transaction_validation_test.rb

@@ -8,7 +8,7 @@ class BankTransactionValidationTest < Test::Unit::TestCase
     
     assert false == instance.valid?, "Expected invalid because of invalid type"
     
-    expected_error = "Invalid type. Expected either SPEND or RECEIVE."
+    expected_error = "Invalid type. Expected either SPEND, RECEIVE, RECEIVE-PREPAYMENT or RECEIVE-OVERPAYMENT."
 
     assert_equal expected_error, instance.errors_for(:type).first, "Expected an error about type"
 

data/test/unit/models/tax_rate_test.rb

@@ -8,12 +8,12 @@ class TaxRateTest < Test::Unit::TestCase
     @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
   end
 
-  should "have a primary key value of :tax_type" do
-    assert_equal :tax_type, Xeroizer::Record::TaxRate.primary_key_name
+  should "have a primary key value of :name" do
+    assert_equal :name, Xeroizer::Record::TaxRate.primary_key_name
   end
 
   should "build and save a tax rate with components via PUT" do
-    @client.expects(:http_put).with { |client, url, body, extra_params|
+    @client.expects(:http_post).with { |client, url, body, extra_params|
       url == "https://api.xero.com/api.xro/2.0/TaxRates" &&
         body == expected_tax_rate_create_body
     }.returns(tax_rate_create_successful_response)

data/test/unit/oauth_test.rb

@@ -75,7 +75,7 @@ class OAuthTest < Test::Unit::TestCase
     end
     
     should "handle ApiExceptions" do
-      Xeroizer::OAuth.any_instance.stubs(:post).returns(stub(:plain_body => get_file_as_string("api_exception.xml"),
+      Xeroizer::OAuth.any_instance.stubs(:put).returns(stub(:plain_body => get_file_as_string("api_exception.xml"),
           :code => "400"))
       
       assert_raises Xeroizer::ApiException do
@@ -85,7 +85,7 @@ class OAuthTest < Test::Unit::TestCase
     end
     
     should "handle random root elements" do
-      Xeroizer::OAuth.any_instance.stubs(:post).returns(stub(:plain_body => "<RandomRootElement></RandomRootElement>",
+      Xeroizer::OAuth.any_instance.stubs(:put).returns(stub(:plain_body => "<RandomRootElement></RandomRootElement>",
           :code => "200"))
       
       assert_raises Xeroizer::UnparseableResponse do

data/test/unit/record/base_test.rb

@@ -33,7 +33,7 @@ class RecordBaseTest < Test::Unit::TestCase
     end
     
     should "new_record? should be false after successfully creating a record" do 
-      Xeroizer::OAuth.any_instance.stubs(:post).returns(stub(:plain_body => get_record_xml(:contact), :code => '200'))
+      Xeroizer::OAuth.any_instance.stubs(:put).returns(stub(:plain_body => get_record_xml(:contact), :code => '200'))
       assert_equal(true, @contact.new_record?)
       assert_nil(@contact.contact_id)
       assert_equal(true, @contact.save, "Error saving contact: #{@contact.errors.inspect}")

data/test/unit/record/record_association_test.rb

@@ -6,7 +6,7 @@ class RecordAssociationTest < Test::Unit::TestCase
   def setup
     @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
     mock_api('Invoices')
-    @client.stubs(:http_post).returns(get_record_xml(:invoice, "762aa45d-4632-45b5-8087-b4f47690665e"))
+    @client.stubs(:http_put).returns(get_record_xml(:invoice, "762aa45d-4632-45b5-8087-b4f47690665e"))
   end
   
   context "belongs_to association" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xeroizer
 version: !ruby/object:Gem::Version
-  version: 2.15.6
+  version: 2.15.7
   prerelease: 
 platform: ruby
 authors:
@@ -630,7 +630,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1906039754233718837
+      hash: -261170401126906910
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -639,7 +639,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1906039754233718837
+      hash: -261170401126906910
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.29