quickeebooks 0.0.9 → 0.1.0

data/HISTORY.md

@@ -0,0 +1,7 @@
+## 0.1.0 (2013-01-16)
+
+* Quickbooks Online now supports a single HTTP endpoint for API calls, no need to first determine the Base URL. `Quickeebooks::Online::ServiceBase` has been adjusted to use a single API endpoint.
+
+## < 0.0.9
+
+History was not being tracked so there is no changelog of activity before `0.0.9`

data/lib/quickeebooks/online/service/service_base.rb

@@ -19,14 +19,14 @@ module Quickeebooks
         attr_accessor :oauth
         attr_accessor :base_uri
 
-        QB_BASE_URI = "https://qbo.intuit.com/qbo1/rest/user/v2"
+        QB_BASE_URI = "https://qbo.sbfinance.intuit.com"
         XML_NS = %{xmlns:ns2="http://www.intuit.com/sb/cdm/qbo" xmlns="http://www.intuit.com/sb/cdm/v2" xmlns:ns3="http://www.intuit.com/sb/cdm"}
 
         def initialize(oauth_access_token = nil, realm_id = nil)
           if !oauth_access_token.nil? && !realm_id.nil?
             msg = "Quickeebooks::Online::ServiceBase - "
             msg += "This version of the constructor is deprecated. "
-            msg += "Use the no-arg constructor and set the AccessToken and the RealmID using the accessors."
+            msg += "Use the no-arg constructor and set the AccessToken (access_token=) and the RealmID (realm_id=) using the setters."
             warn(msg)
             access_token = oauth_access_token
             realm_id = realm_id
@@ -46,61 +46,29 @@ module Quickeebooks
           @base_uri = uri
         end
 
-        # Given a realm ID we need to determine the real Base URL
-        # to use for all subsequenet REST operations
-        # See: https://ipp.developer.intuit.com/0010_Intuit_Partner_Platform/0050_Data_Services/0400_QuickBooks_Online/0100_Calling_Data_Services/0010_Getting_the_Base_URL
-        def determine_base_url
-          if service_response
-            if service_response.code == "200"
-              element = base_doc.xpath("//qbo:QboUser/qbo:CurrentCompany/qbo:BaseURI")[0]
-              if element
-                @base_uri = element.text
-              else
-                raise IntuitRequestException.new("Response error: Could not extract BaseURI from response. Invalid XML: #{service_response.body}")
-              end
-            else
-              raise IntuitRequestException.new("Response error: invalid code #{service_response.code}")
-            end
-          end
-        end
-
         def url_for_resource(resource)
           url_for_base("resource/#{resource}")
         end
 
         def url_for_base(raw)
-          determine_base_url unless determined_base_url?
-          "#{@base_uri}/#{raw}/v2/#{@realm_id}"
-        end
-
-        def qb_base_uri_with_realm_id
-          "#{QB_BASE_URI}/#{@realm_id}"
-        end
-
-        # store service base response
-        # so it can be accessed by other methods
-        def service_response
-          @service_response ||= check_response(@oauth.request(:get, qb_base_uri_with_realm_id))
+          "#{QB_BASE_URI}/#{raw}/v2/#{@realm_id}"
         end
 
-        # allows for reuse of service base's xml doc
-        # rather than loading it each time we need it
-        def base_doc
-          @base_doc ||= parse_xml(service_response.body)
-        end
-        
         # gives us the qbo user's LoginName
         # useful for verifying email address against
         def login_name
-          @login_name ||= base_doc.xpath("//qbo:QboUser/qbo:LoginName")[0].text
+          @login_name ||= begin
+            url = "https://qbo.intuit.com/qbo1/rest/user/v2/#{@realm_id}"
+            response = @oauth.request(:get, url)
+            if response && response.code.to_i == 200
+              xml = parse_xml(response.body)
+              xml.xpath("//qbo:QboUser/qbo:LoginName")[0].text
+            end
+          end
         end
 
         private
         
-        def determined_base_url?
-          @base_uri != nil
-        end
-
         def parse_xml(xml)
           Nokogiri::XML(xml)
         end
@@ -112,8 +80,6 @@ module Quickeebooks
         def fetch_collection(model, filters = [], page = 1, per_page = 20, sort = nil, options ={})
           raise ArgumentError, "missing model to instantiate" if model.nil?
           
-          determine_base_url unless determined_base_url?
-
           post_body_lines = []
 
           if filters.is_a?(Array) && filters.length > 0
@@ -167,7 +133,6 @@ module Quickeebooks
           unless headers.has_key?('Content-Type')
             headers.merge!({'Content-Type' => 'application/xml'})
           end
-          determine_base_url unless determined_base_url?
           # puts "METHOD = #{method}"
           # puts "URL = #{url}"
           # puts "BODY = #{body == nil ? "<NIL>" : body}"

data/lib/quickeebooks/version.rb

@@ -1,5 +1,5 @@
 module Quickeebooks
 
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 
 end

data/spec/quickeebooks/online/services/account_spec.rb

@@ -10,7 +10,6 @@ describe "Quickeebooks::Online::Service::Account" do
     qb_secret = "secreet"
 
     @realm_id = "9991111222"
-    @base_uri = "https://qbo.intuit.com/qbo36"
     @oauth_consumer = OAuth::Consumer.new(qb_key, qb_key, {
         :site                 => "https://oauth.intuit.com",
         :request_token_path   => "/oauth/v1/get_request_token",
@@ -24,10 +23,6 @@ describe "Quickeebooks::Online::Service::Account" do
     @service.instance_eval {
       @realm_id = "9991111222"
     }
-    @service.base_uri = @base_uri
-    determine_base_url = @service.qb_base_uri_with_realm_id
-    xml = File.read(File.dirname(__FILE__) + "/../../../xml/online/determine_base_url.xml")
-    FakeWeb.register_uri(:get, determine_base_url, :status => ["200", "OK"], :body => xml)
   end
   
   it "receives 404 from invalid base URL" do

data/spec/quickeebooks/online/services/company_meta_data_spec.rb

@@ -10,7 +10,6 @@ describe "Quickeebooks::Online::Service::CompanyMetaData" do
     qb_secret = "secreet"
 
     @realm_id = "9991111222"
-    @base_uri = "https://qbo.intuit.com/qbo36"
     @oauth_consumer = OAuth::Consumer.new(qb_key, qb_key, {
         :site                 => "https://oauth.intuit.com",
         :request_token_path   => "/oauth/v1/get_request_token",
@@ -24,10 +23,6 @@ describe "Quickeebooks::Online::Service::CompanyMetaData" do
     @service.instance_eval {
       @realm_id = "9991111222"
     }
-    @service.base_uri = @base_uri
-    determine_base_url = @service.qb_base_uri_with_realm_id
-    xml = File.read(File.dirname(__FILE__) + "/../../../xml/online/determine_base_url.xml")
-    FakeWeb.register_uri(:get, determine_base_url, :status => ["200", "OK"], :body => xml)
   end
 
   it "can get the realm's company_meta_data record" do

data/spec/quickeebooks/online/services/customer_spec.rb

@@ -10,7 +10,6 @@ describe "Quickeebooks::Online::Service::Customer" do
     qb_secret = "secreet"
 
     @realm_id = "9991111222"
-    @base_uri = "https://qbo.intuit.com/qbo36"
     @oauth_consumer = OAuth::Consumer.new(qb_key, qb_key, {
         :site                 => "https://oauth.intuit.com",
         :request_token_path   => "/oauth/v1/get_request_token",
@@ -24,10 +23,6 @@ describe "Quickeebooks::Online::Service::Customer" do
     @service.instance_eval {
       @realm_id = "9991111222"
     }
-    @service.base_uri = @base_uri
-    determine_base_url = @service.qb_base_uri_with_realm_id
-    xml = File.read(File.dirname(__FILE__) + "/../../../xml/online/determine_base_url.xml")
-    FakeWeb.register_uri(:get, determine_base_url, :status => ["200", "OK"], :body => xml)    
   end
   
   it "can fetch a list of customers" do

data/spec/quickeebooks/online/services/invoice_spec.rb

@@ -10,7 +10,6 @@ describe "Quickeebooks::Online::Service::Invoice" do
     qb_secret = "secreet"
 
     @realm_id = "9991111222"
-    @base_uri = "https://qbo.intuit.com/qbo36"
     @oauth_consumer = OAuth::Consumer.new(qb_key, qb_key, {
         :site                 => "https://oauth.intuit.com",
         :request_token_path   => "/oauth/v1/get_request_token",
@@ -23,10 +22,6 @@ describe "Quickeebooks::Online::Service::Invoice" do
     @service.instance_eval {
       @realm_id = "9991111222"
     }
-    @service.base_uri = @base_uri
-    determine_base_url = @service.qb_base_uri_with_realm_id
-    xml = File.read(File.dirname(__FILE__) + "/../../../xml/online/determine_base_url.xml")
-    FakeWeb.register_uri(:get, determine_base_url, :status => ["200", "OK"], :body => xml)
   end
   
   it "can create an invoice" do

data/spec/quickeebooks/online/services/service_base_spec.rb

@@ -28,27 +28,11 @@ describe "Quickeebooks::Online::Service::ServiceBase" do
     }
   end
   
-  it "can determine base url" do
-    @service.determine_base_url
-    @service.base_uri.should_not == nil
-    @service.url_for_resource(Quickeebooks::Online::Model::Customer.resource_for_collection).should == "https://qbo.intuit.com/qbo36/resource/customers/v2/#{@realm_id}"
-  end
-
   it "can determine login_name" do
+    xml = File.read(File.dirname(__FILE__) + "/../../../xml/online/user.xml")
+    user_url = "https://qbo.intuit.com/qbo1/rest/user/v2/#{@realm_id}"
+    FakeWeb.register_uri(:get, user_url, :status => ["200", "OK"], :body => xml)
     @service.login_name.should == 'foo@example.com'
   end
   
-  it "throws exception when response XML is invalid when determining base url" do
-    xml = File.read(File.dirname(__FILE__) + "/../../../xml/online/invalid_user.xml")
-    user_url = Quickeebooks::Online::Service::ServiceBase::QB_BASE_URI + "/" + @realm_id
-    FakeWeb.register_uri(:get, user_url, :status => ["200", "OK"], :body => xml)
-    @service = Quickeebooks::Online::Service::ServiceBase.new
-    @service.access_token = @oauth
-    @service.instance_eval {
-      @realm_id = "9991111222"
-    }
-    lambda { @service.determine_base_url }.should raise_error(IntuitRequestException)
-    @service.base_uri.should == nil
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quickeebooks
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roxml
@@ -179,6 +179,7 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - Gemfile.lock
+- HISTORY.md
 - lib/quickeebooks/online/model/account.rb
 - lib/quickeebooks/online/model/account_detail_type.rb
 - lib/quickeebooks/online/model/account_reference.rb