Merge pull request #34 from csciuto/master

Bringing in #22 plus updates to TravisCI to not test 1.8.7

Author: csciuto

.travis.yml

@@ -4,7 +4,5 @@ rvm:
   - 2.0.0
   - 1.9.3
   - 1.9.2
-  - 1.8.7
   - jruby-19mode
-  - jruby-18mode
 #script: rspec spec

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    constantcontact (1.3.1)
+    constantcontact (1.3.2)
       json (~> 1.8, >= 1.8.1)
       mime-types (~> 1.25, >= 1.25.1)
       rest-client (~> 1.6, >= 1.6.7)

README.md

@@ -9,7 +9,7 @@ Installation
 ====
 Via bundler:
 ```ruby
-gem 'constantcontact', '~> 1.3.1'
+gem 'constantcontact', '~> 1.3.2'
 ```
 Otherwise:
 ```bash

constantcontact.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name = "constantcontact"
-  s.version = '1.3.1'
+  s.version = '1.3.2'
   s.platform = Gem::Platform::RUBY
   s.authors = ["ConstantContact"]
   s.homepage = "http://www.constantcontact.com"

lib/constantcontact.rb

@@ -51,6 +51,7 @@ module Components
     autoload :TrackingActivity, 'constantcontact/components/tracking/tracking_activity'
     autoload :TrackingSummary, 'constantcontact/components/tracking/tracking_summary'
     autoload :VerifiedEmailAddress, 'constantcontact/components/account/verified_email_address'
+    autoload :AccountInfo, 'constantcontact/components/account/account_info'
     autoload :Event, 'constantcontact/components/event_spot/event'
     autoload :EventFee, 'constantcontact/components/event_spot/event_fee'
     autoload :Registrant, 'constantcontact/components/event_spot/registrant'
@@ -118,4 +119,4 @@ module Models
       autoload :BillingChangeNotification, 'constantcontact/webhooks/models/billing_change_notification'
     end
   end
-end
+end

lib/constantcontact/api.rb

@@ -17,6 +17,11 @@ def initialize(api_key = nil)
     end
 
 
+    def get_account_info(access_token)
+      Services::AccountService.get_account_info(access_token)
+    end
+
+
     # Get verified addresses for the account
     # @param [String] access_token - Valid access token
     # @param [String] status - status to filter query results by

lib/constantcontact/components/account/account_info.rb

@@ -0,0 +1,31 @@
+#
+# account_info.rb
+# ConstantContact
+#
+# Copyright (c) 2013 Constant Contact. All rights reserved.
+
+module ConstantContact
+  module Components
+    class AccountInfo < Component
+      attr_accessor :website, :organization_name, :first_name, :last_name, :email, :phone, :country_code, :state_code
+
+      # Class constructor
+      # @return [AccountInfo]
+      def initialize
+      end
+
+      # Factory method to create an AccountInfo object from a json string
+      # @param [Hash] props - properties to create object from
+      # @return [AccountInfo]
+      def self.create(props)
+        obj = AccountInfo.new
+        if props
+          props.each do |key, value|
+            obj.send("#{key}=", value) if obj.respond_to? key
+          end
+        end
+        obj
+      end
+    end
+  end
+end

lib/constantcontact/services/account_service.rb

@@ -9,6 +9,17 @@ module Services
     class AccountService < BaseService
       class << self
 
+        # Get a summary of account information
+        # @param [String] access_token
+        # @return
+        def get_account_info(access_token)
+          url = Util::Config.get('endpoints.base_url') + Util::Config.get('endpoints.account_info')
+          url = build_url(url)
+          response = RestClient.get(url, get_headers(access_token))
+          Components::AccountInfo.create(JSON.parse(response.body))
+        end
+
+
         # Get all verified email addresses associated with an account
         # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [Hash] params - hash of query parameters/values to append to the request
@@ -27,4 +38,4 @@ def get_verified_email_addresses(access_token, params)
       end
     end
   end
-end
+end

lib/constantcontact/services/base_service.rb

@@ -51,6 +51,10 @@ def build_url(url, params = nil)
               if value.respond_to? :iso8601
                 params[key] = value.iso8601
               end
+
+              if key.to_s == 'next' && value.match(/^.*?next=(.*)$/)
+                params[key] = $1
+              end
             end
           else
             params ||= {}
@@ -63,4 +67,4 @@ def build_url(url, params = nil)
       end
     end
   end
-end
+end

lib/constantcontact/util/config.rb

@@ -23,6 +23,7 @@ class Config
           :add_contacts_activity          => 'activities/addcontacts',
 
           :account_verified_addresses     => 'account/verifiedemailaddresses',
+          :account_info                   => 'account/info',
 
           :contact                        => 'contacts/%s',
           :contacts                       => 'contacts',
@@ -169,4 +170,4 @@ def get_value(index, value)
 
     end
   end
-end
+end

lib/constantcontact/version.rb

@@ -7,6 +7,6 @@
 module ConstantContact
   module SDK
     # Gem version
-    VERSION = "1.3.1"
+    VERSION = "1.3.2"
   end
 end

spec/constantcontact/services/base_service_spec.rb

@@ -24,6 +24,26 @@
       expect(headers[:user_agent].include?(RUBY_DESCRIPTION)).to be_true
       expect(headers[:x_ctct_request_source]).to be_a String
       expect(headers[:x_ctct_request_source].include?(ConstantContact::SDK::VERSION)).to be_true
-   end
- end
-end
+    end
+  end
+
+  describe "#build_url" do
+    it "combines all the given parameters into the url" do
+      components = ConstantContact::Services::BaseService.send(:build_url, "http://testing.com", :arg1 => 'abc', :arg2 => 123).split('&')
+      expect(components[0]).to eq('http://testing.com?api_key=api+key')
+      expect(components.length).to eq(3)
+      expect(components.include?('arg1=abc')).to be_true
+      expect(components.include?('arg2=123')).to be_true
+    end
+
+    it "does not parse the next param when not in next_link format" do
+      url = ConstantContact::Services::BaseService.send(:build_url, "http://testing.com", :next => "abcdef")
+      expect(url).to eq('http://testing.com?api_key=api+key&next=abcdef')
+    end
+
+    it "parses next id from next param given in next_link format" do
+      url = ConstantContact::Services::BaseService.send(:build_url, "http://testing.com", :next => "/some/path?next=abcdefg")
+      expect(url).to eq('http://testing.com?api_key=api+key&next=abcdefg')
+    end
+  end
+end