homeaway-api 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87940e1ae0baa8fdae8331a9baad7b0db4d6436d
-  data.tar.gz: 2f084f225ccc9b15a83e02771295ee4cb8e3a7eb
+  metadata.gz: 03191fa72b667f0ea2cfbbfb7898e8314888e572
+  data.tar.gz: 358c23be39110cde5a6c91a86d6513e9f91f6a86
 SHA512:
-  metadata.gz: 04e32f37174e358729c67a2845382007d0ac4f8fddc28475604247f58e0d2590515d335289bf67b17cbcaa673900a298f769b4375600d61a5b638e9d48be505e
-  data.tar.gz: ecc599039662e2b1d3df53a5c87609dafcebe3f02268a3b5db414c128ba777c47d9748be8c1dff3d15d7d8de7ee97a3e8b2e04013791b5f145888d95a6ebd75b
+  metadata.gz: fa63f013b0c56621c4fdd1e0f017213087cfedbcac22f59f1ae95e9de04bc0c012a13d3207d23e9f4a8684ea62f9182ff8be6a8549df920e835dde2c992a7bca
+  data.tar.gz: 4fab671b70eae3d34f52a808487f4141a7509dda0ecfc90e3a1ce99f2c674ee31ae9aa24ef8e68d549aa06b987438290734c5a72993f97c07931cc0848d19876

data/lib/homeaway/api/client.rb

@@ -33,7 +33,7 @@ module HomeAway
       include HomeAway::API::Util::OAuth
 
       attr_accessor :configuration
-      attr_reader :mode, :token, :token_expires
+      attr_reader :mode, :token, :token_expires, :refresh_token
 
       # @!attribute [rw] configuration
       #   @return [Hash] the current client configuration
@@ -52,13 +52,14 @@ module HomeAway
       #
       # @option opts [String] :client_id Your HomeAway API OAuth client id. Required here if not set globally
       # @option opts [String] :client_secret Your HomeAway API OAuth client secret. Required here if not set globally
-      # @option opts [String] :token An existing token if you already have one saved from a previous usage of the api
+      # @option opts [String] :refresh_token An existing token if you already have one saved from a previous usage of the api
       # @return [HomeAway::API::Client] a newly instantiated HomeAway API client
       def initialize(opts={})
         @configuration = Hashie::Mash.new(self.class.default_configuration.merge(opts))
-        if opts.has_key?(:token)
+        if opts.has_key?(:refresh_token)
           @configuration[:manual_token_supplied] = true
-          set_token(opts.delete(:token))
+          @refresh_token = opts.delete(:refresh_token)
+          refresh
         end
         validate_configuration
         logger.debug("client initialized with configuration: #{@configuration}")
@@ -85,6 +86,11 @@ module HomeAway
         @token
       end
 
+      # @return [String] The current refresh token
+      def refresh_token
+        @refresh_token
+      end
+
       # @private
       def marshal_dump
         # we lose our logger instance naively here, marshal dump doesn't like
@@ -200,23 +206,6 @@ module HomeAway
         end
       end
 
-      def set_token(token)
-        @token = token
-        begin
-          listing '100000'
-          begin
-            me
-            logger.info('token supplied on client initialization provided 3-legged oauth')
-            @mode = :three_legged
-          rescue => e
-            logger.info('token supplied on client initialization provided 2-legged oauth')
-            @mode = :two_legged
-          end
-        rescue => e
-          logger.error("token supplied on client initialization was not valid: #{e.to_s}")
-          @mode = :unauthorized
-        end
-      end
     end
   end
 end

data/lib/homeaway/api/util/oauth.rb

@@ -39,6 +39,7 @@ module HomeAway
             token = auth_code_strategy.get_token(code, :headers => {'Authorization' => "Basic #{credentials}"})
             @token = token.token
             @token_expires = Time.at token.expires_at
+            @refresh_token = token.refresh_token
             @mode = :three_legged
             return true
           rescue => _
@@ -48,11 +49,14 @@ module HomeAway
 
         private
 
+        def oauth_site
+          @configuration[:oauth_site] ||= @configuration[:site]
+        end
+
         def oauth_client
-          site = @configuration[:oauth_site] ||= @configuration[:site]
           OAuth2::Client.new(@configuration.client_id,
                              @configuration.client_secret,
-                             :site => site,
+                             :site => oauth_site,
                              :raise_errors => false
           )
         end
@@ -69,12 +73,26 @@ module HomeAway
             token = client_credentials_strategy.get_token
             @token = token.token
             @token_expires = Time.at token.expires_at
+            @refresh_token = token.refresh_token
             @mode = :two_legged
             return true
           rescue => _
             raise HomeAway::API::Errors::UnauthorizedError.new
           end
         end
+
+        def refresh
+          token = OAuth2::AccessToken.new(oauth_client, nil, {:refresh_token => @refresh_token})
+          params = {
+              :headers => {'Authorization' => "Basic #{credentials}"}
+          }
+          token = token.refresh!(params)
+          @token = token.token
+          @token_expires = Time.at token.expires_at
+          @refresh_token = token.refresh_token
+          @mode = :three_legged
+          true
+        end
       end
     end
   end

data/lib/homeaway/api/version.rb

@@ -15,6 +15,6 @@
 
 module HomeAway
   module API
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: homeaway-api
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Charlie Meyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -252,16 +252,16 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -366,4 +366,3 @@ signing_key:
 specification_version: 4
 summary: Ruby SDK for interacting with the HomeAway API
 test_files: []
-has_rdoc: