analytics-psw 0.4.4 → 0.4.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTJlODFjYWE4ODM2Y2NkYzllYWU1YTIwY2Q4NjFjZGM1ZDdiYWU4NQ==
-  data.tar.gz: !binary |-
-    MTYzZTY2NmM1OTVmYzZjMTYwMDEwZjA3ZGM4MTNmNDIzMjY0YzE3Mw==
+SHA1:
+  metadata.gz: f8052e495bc9a11e751a3b1bdd84ed544013072d
+  data.tar.gz: b7e69ed4bdab5dce23d302340a34236bd51844a9
 SHA512:
-  metadata.gz: !binary |-
-    M2UwNmQxMzc5ZTAwOWVlYzE2MTAyZmUzM2RlNDg5NWEwMGIzNmEwNzc3ZDMy
-    ZjlhNmVlNGMxOTE1ZmM3NjUzNzhmMzIxMWNlNzQ5NjdkYjc4MDY5MDg2Yjc0
-    YzdjZDRmMDgyNzkxYWYxYTdmYThhNzMwYjliNjRiZTk2Y2E3MjU=
-  data.tar.gz: !binary |-
-    MzAxY2U4YjI2NTdlNTllZDY2MjVlOWMzZjA0YTViM2ZkOWMyOWIxZmU2NTcy
-    ZDNkMjUwZmFkODJjMTA5ZjMzYTc4NjBlMmE0MGYzZjAxODk5YjAzNTQyNTE0
-    MmQ3OTE5M2JiMTU0NzY5MzYxNzI3ZjY3NDQ0MDU1ODA5YzQ4ZWE=
+  metadata.gz: 8ed874d756b989fee71d244b25c4f8c2d4aa8258166f29fb2b8d35efb6cb8a68d11d8471002bd72c430b1fec5d97b4cd7c1ec72fd046274ef4c4324979636856
+  data.tar.gz: 26f5692994276ff7ca5200442187d8db582966411294581c7f8b69ba7233df81ba7c5bd576956ad8711ef6de8ca2653986dc24b86ff0120dec56871b85364bc1

data/lib/analytics-psw.rb

@@ -12,6 +12,7 @@ require 'analytics-psw/dimensions'
 require 'analytics-psw/customers'
 require 'analytics-psw/utilities'
 require 'analytics-psw/recent_events'
+require 'analytics-psw/api'
 require 'analytics-psw/railtie'
 require 'analytics-psw/rack/request_logging'
 require 'analytics-psw/rack/request_logger'

data/lib/analytics-psw/api.rb

@@ -0,0 +1,45 @@
+module AnalyticsPSW
+  class Api
+    def initialize(server_url, client_id, client_secret, proxy = nil)
+      @server_url = server_url
+      @client_id = client_id
+      @client_secret = client_secret
+      @proxy = proxy
+    end
+
+    def connection
+      opts = {}
+      opts[:proxy] = { uri: @proxy } if @proxy
+      Faraday.new(@server_url, opts)
+    end
+
+    def access_token_hash
+      response_hash = {}
+      response = connection.post do |request|
+        request.url "#{@server_url}/oauth/token?client_id=#{@client_id}&client_secret=#{@client_secret}"
+        request.headers['Content-Type'] = 'application/json'
+      end
+      parsed_response = self.class.parse_json_response(response)
+      if parsed_response['body'].present?
+        response_hash[:token] = parsed_response['body']['access_token']
+        response_hash[:expires] = Time.now + parsed_response['body']['expires_in']
+      end
+      response_hash
+    end
+
+    def self.parse_json_response(json_response)
+      parsed_response = {}
+      parsed_response['status'] = json_response.status if json_response.status.present?
+
+      if [200, 201, 202].include?(json_response.status)
+        parsed_response['body'] = JSON.parse(json_response.body) if json_response.body.present?
+        parsed_response['location'] = json_response.headers['location'] if json_response.headers.present? && json_response.headers['location']
+      else
+        parsed_response['body'] = {}
+        parsed_response['error_message'] = json_response.body
+      end
+
+      parsed_response
+    end
+  end
+end

data/lib/analytics-psw/utilities.rb

@@ -3,20 +3,13 @@ module AnalyticsPSW
     private
 
     def update_token
-      @expires = nil
-      response = @conn.post do |request|
-        request.url "#{@server_url}/oauth/token?client_id=#{@client_id}&client_secret=#{@client_secret}"
-        request.headers['Content-Type'] = 'application/json' 
-      end
-      parsed_response = parse_json_response(response)
-      if parsed_response['body'].present?
-        @token = parsed_response['body']['access_token']
-        @expires = Time.now + parsed_response['body']['expires_in']
-      end
+      access_token_hash = Api.new(@server_url, @client_id, @client_secret, @proxy).access_token_hash
+      @token = access_token_hash[:token]
+      @expires = access_token_hash[:expires]
     end
 
     def faraday_connection
-      @proxy ? Faraday.new(@server_url, {proxy: {uri: @proxy}}) : Faraday.new(@server_url)
+      Api.new(@server_url, @client_id, @client_secret, @proxy).connection
     end
 
     def http_request(http_method, url, params = nil, body = nil, retries = 2)
@@ -66,18 +59,7 @@ module AnalyticsPSW
     end
 
     def parse_json_response(json_response)
-      parsed_response = {}
-      parsed_response['status'] = json_response.status if json_response.status.present?
-
-      if [200, 201, 202].include?(json_response.status)
-        parsed_response['body'] = JSON.parse(json_response.body) if json_response.body.present?
-        parsed_response['location'] = json_response.headers['location'] if json_response.headers.present? && json_response.headers['location']
-      else
-        parsed_response['body'] = {}
-        parsed_response['error_message'] = json_response.body
-      end
-
-      parsed_response
+      Api.parse_json_response(json_response)
     end
 
     def multi_parse_json_response(response)

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: analytics-psw
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Lexmark International Technology S.A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.8
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Analytics-psw is a wrapper providing access to the Perceptive Cloud Platform
@@ -147,6 +147,7 @@ files:
 - LICENSE.txt
 - README.md
 - lib/analytics-psw.rb
+- lib/analytics-psw/api.rb
 - lib/analytics-psw/customers.rb
 - lib/analytics-psw/dimension_properties.rb
 - lib/analytics-psw/dimensions.rb
@@ -172,17 +173,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Perceptive Cloud Platform Analytics Service Wrapper