analytics-psw 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5bd2ac49dc5a4f6a747f7ee132c50bc7d5f7fdb
-  data.tar.gz: cecfcc3fb2835f8ec0063208699444d3a323a7bc
+  metadata.gz: f718295fde446b1e90031da42fff34f5ac528c02
+  data.tar.gz: 1abbd19425aaf4b1ad35bb77c707d0f42f3f77d4
 SHA512:
-  metadata.gz: 3ba8d918d1c2bd5d55afd34f23b1f707aa10560500c798db71905c51fcf9ec3e44820a4b8f40781f54525c235132def794cbf8c5ed0d637155e36308054478cf
-  data.tar.gz: e837e674a81bee0d9768d43d65f8a78d8be9b7e525feb27b3d52c406333313800198e7ba99e81348090cdd104be23052b47e32c0858ffb83ec265b216ee0cadc
+  metadata.gz: 4065b7e304d7c25919b3ed1ffa00790db55a5ea549ebd9fd5cf59b48ecd3d728a3a84baaac970f4cd1d3e1519049804ec03f359581bbd7bda60414925daa17cb
+  data.tar.gz: 010b07685d2db3ad6e2603d2ba29e428e7b94710ea1744e99bd309a39fe3b5118ea13cbafb8f96f9ce3899b3cff5f5c09de5041692773ba399d575e8b12658bb

data/lib/analytics-psw/customers.rb

@@ -1,8 +1,7 @@
 module AnalyticsPSW
   module Customers
     def list_customers
-      resp = http_request(:get, "#{@service_location}/customers")
-      parse_json_response(resp)
+      http_request(:get, "#{@service_location}/customers")
     end
   end
 end

data/lib/analytics-psw/dimension_properties.rb

@@ -1,27 +1,23 @@
 module AnalyticsPSW
   module DimensionProperties
     def list_dimension_properties(dimension_name)
-      resp = http_request(:get, "#{@service_location}/dimensions/#{dimension_name}/properties")
-      parse_json_response(resp)
+      http_request(:get, "#{@service_location}/dimensions/#{dimension_name}/properties")
     end
 
     def show_dimension_properties(dimension_name, dimension_value)
-      resp = http_request(:get, "#{@service_location}/dimensions/#{dimension_name}/properties/#{dimension_value}")
-      parse_json_response(resp)
+      http_request(:get, "#{@service_location}/dimensions/#{dimension_name}/properties/#{dimension_value}")
     end
 
     def create_dimension_properties(dimension_name, dimension_value, properties = {})
       metadata = create_dimension_properties_metadata(dimension_value, properties)
       body = create_json_body('dimension_property', metadata)
-      response = http_request(:post, "#{@service_location}/dimensions/#{dimension_name}/properties/#{dimension_value}", nil, body)
-      parse_json_response(response)
+      http_request(:post, "#{@service_location}/dimensions/#{dimension_name}/properties/#{dimension_value}", nil, body)
     end
 
     def update_dimension_properties(dimension_name, dimension_value, properties = {})
       metadata = create_dimension_properties_metadata(dimension_value, properties)
       body = create_json_body('dimension_property', metadata)
-      response = http_request(:put, "#{@service_location}/dimensions/#{dimension_name}/properties/#{dimension_value}", nil, body)
-      parse_json_response(response)
+      http_request(:put, "#{@service_location}/dimensions/#{dimension_name}/properties/#{dimension_value}", nil, body)
     end
 
     def create_or_update_dimension_properties(dimension_name, dimension_value, properties = {})

data/lib/analytics-psw/dimensions.rb

@@ -4,23 +4,20 @@ module AnalyticsPSW
     def create_dimension(name, data_type, units = '', description = '')
       body = create_json_body('dimension', {:name => name.to_s, :description => description, :data_type => data_type, :units => units})
       resp = http_request(:post, "#{@service_location}/dimensions", nil, body)
-      @dimensions |= [name.to_s] if resp.status && [200, 201, 202].include?(resp.status)
-      parse_json_response(resp)
+      @dimensions |= [name.to_s] if resp['status'] && [200, 201, 202].include?(resp['status'])
+      resp
     end
 
     def list_dimensions
-      resp = http_request(:get, "#{@service_location}/dimensions")
-      parse_json_response(resp)
+      http_request(:get, "#{@service_location}/dimensions")
     end
 
     def show_dimension_resources(dimension_name)
-      resp = http_request(:get, "#{@service_location}/dimensions/#{dimension_name}")
-      parse_json_response(resp)
+      http_request(:get, "#{@service_location}/dimensions/#{dimension_name}")
     end
 
     def show_dimension_metadata(dimension_name)
-      resp = http_request(:get, "#{@service_location}/dimensions/#{dimension_name}/metadata")
-      parse_json_response(resp)
+      http_request(:get, "#{@service_location}/dimensions/#{dimension_name}/metadata")
     end
 
     private

data/lib/analytics-psw/event_types.rb

@@ -3,19 +3,17 @@ module AnalyticsPSW
 
     def create_event_type(name, description = "")
       body = create_json_body('event_type', {:name => name.to_s, :description => description})
-      resp = http_request(:post, "#{@service_location}/event_types", nil, body)
-      @event_types |= [name.to_s] if resp.status && [200, 201, 202].include?(resp.status)
-      parse_json_response(resp)
+      event_type_response = http_request(:post, "#{@service_location}/event_types", nil, body)
+      @event_types |= [name.to_s] if event_type_response['status'] && [200, 201, 202].include?(event_type_response['status'])
+      event_type_response
     end
 
     def list_event_types
-      resp = http_request(:get, "#{@service_location}/event_types")
-      parse_json_response(resp)
+      http_request(:get, "#{@service_location}/event_types")
     end
 
     def show_event_type(event_name)
-      resp = http_request(:get, "#{@service_location}/event_types/#{event_name.to_s}")
-      parse_json_response(resp)
+      http_request(:get, "#{@service_location}/event_types/#{event_name.to_s}")
     end
 
     private

data/lib/analytics-psw/events.rb

@@ -6,7 +6,7 @@ module AnalyticsPSW
       return invalid_metadata_response unless dimensions_exist? metadata
       metadata[:event_type] = event_type.to_s
       body = create_json_body('event', metadata)
-      parse_json_response(http_request(:post, "#{@service_location}/events", nil, body))
+      http_request(:post, "#{@service_location}/events", nil, body)
     end
 
   private

data/lib/analytics-psw/recent_events.rb

@@ -0,0 +1,9 @@
+module AnalyticsPSW
+  module RecentEvents
+    #recent events can take in 2 params, "customer" and "limit", ie 'customer'=>'qa_customer'
+    def recent_events(options={})
+  	  http_request(:get, "#{@service_location}/recent_events",options)
+    end
+    
+  end
+end

data/lib/analytics-psw/reports.rb

@@ -5,9 +5,8 @@ module AnalyticsPSW
   module Reports
 
     def query_analytics(query_parameters)
-      raw_report = http_request(:get, "#{@service_location}/reports/query.json", query_parameters)
-      parsed_report = parse_json_response(raw_report)
-      create_analytics_report(parsed_report)
+      report_response = http_request(:get, "#{@service_location}/reports/query.json", query_parameters)
+      create_analytics_report(report_response)
     end
 
     def multi_query_analytics(query_parameters)
@@ -21,29 +20,24 @@ module AnalyticsPSW
     def create_report(name, query_parameters)
       query_parameters[:name] = name.to_s
       body = create_json_body('report', query_parameters)
-      resp = http_request(:post, "#{@service_location}/reports", nil, body)
-      parse_json_response(resp)
+      http_request(:post, "#{@service_location}/reports", nil, body)
     end
 
     def list_reports
-      resp = http_request(:get, "#{@service_location}/reports")
-      parse_json_response(resp)
+      http_request(:get, "#{@service_location}/reports")
     end
 
     def report_criteria(report_name)
-      resp = http_request(:get, "#{@service_location}/reports/#{report_name}/criteria")
-      parse_json_response(resp)
+      http_request(:get, "#{@service_location}/reports/#{report_name}/criteria")
     end
 
     def run_report(report_name, where_criteria = {})
-      raw_report = http_request(:get, "#{@service_location}/reports/#{report_name}/results", where_criteria)
-      parsed_report = parse_json_response(raw_report)
-      create_analytics_report(parsed_report)
+      report_response = http_request(:get, "#{@service_location}/reports/#{report_name}/results", where_criteria)
+      create_analytics_report(report_response)
     end
 
     def delete_report(report_name)
-      resp = http_request(:delete, "#{@service_location}/reports/#{report_name}")
-      parse_json_response(resp)
+      http_request(:delete, "#{@service_location}/reports/#{report_name}")
     end
 
 private

data/lib/analytics-psw/services.rb

@@ -1,13 +1,11 @@
 module AnalyticsPSW
   module Services
     def show_service_resources(service_name)
-      resp = http_request(:get, "/services/#{service_name.to_s}")
-      parse_json_response(resp)
+      http_request(:get, "/services/#{service_name.to_s}")
     end
 
     def show_service_metadata(service_name)
-      resp = http_request(:get, "/services/#{service_name.to_s}/metadata")
-      parse_json_response(resp)
+      http_request(:get, "/services/#{service_name.to_s}/metadata")
     end
   end
 end

data/lib/analytics-psw/utilities.rb

@@ -3,10 +3,11 @@ module AnalyticsPSW
     private
 
     def update_token
+      @expires = nil
       url = "#{@server_url}/oauth/token?client_id=#{@client_id}&client_secret=#{@client_secret}"
-      raw = http_request(:post, url)
-      resp = parse_json_response(raw)
-      @token = resp['body']['access_token']
+      token_response = http_request(:post, url)
+      @token = token_response['body']['access_token']
+      @expires = Time.now + token_response['body']['expires_in']
     end
 
     def faraday_connection
@@ -14,6 +15,7 @@ module AnalyticsPSW
     end
 
     def http_request(http_method, url, params = nil, body = nil)
+      update_token if @expires and Time.now > @expires
       json_block  = ->(req) do
         req.url url
         req.headers['Content-Type'] = 'application/json'
@@ -21,10 +23,11 @@ module AnalyticsPSW
         req.params = params if params
         req.body = body if body
       end
-      @conn.send(http_method, &json_block)
+      parse_json_response(@conn.send(http_method, &json_block))
     end
 
     def multi_get_json(service_location, query_parameters)
+      update_token if @expires and Time.now > @expires
       results = []
       EventMachine.run do
         multi = EventMachine::MultiRequest.new

data/lib/analytics-psw.rb

@@ -11,6 +11,7 @@ require 'analytics-psw/dimension_properties'
 require 'analytics-psw/dimensions'
 require 'analytics-psw/customers'
 require 'analytics-psw/utilities'
+require 'analytics-psw/recent_events'
 
 module AnalyticsPSW
   class Analytics
@@ -22,7 +23,8 @@ module AnalyticsPSW
             AnalyticsPSW::Events,
             AnalyticsPSW::Dimensions,
             AnalyticsPSW::DimensionProperties,
-            AnalyticsPSW::Utilities
+            AnalyticsPSW::Utilities,
+            AnalyticsPSW::RecentEvents
 
     attr_accessor :service_location
 
@@ -32,7 +34,7 @@ module AnalyticsPSW
       update_token if @client_id && @client_secret
       @service_location = "#{@server_url}/services/#{@service_name}"
       resp = http_request(:get, @service_location)
-      raise 'The service name provided does not appear to be valid' unless resp.status == 200
+      raise 'The service name provided does not appear to be valid' unless resp['status'] == 200
       find_or_create_event_types
       find_or_create_dimensions(@dimensions) if @dimensions
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: analytics-psw
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Lexmark International Technology S.A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,6 +152,7 @@ files:
 - lib/analytics-psw/dimensions.rb
 - lib/analytics-psw/event_types.rb
 - lib/analytics-psw/events.rb
+- lib/analytics-psw/recent_events.rb
 - lib/analytics-psw/reports.rb
 - lib/analytics-psw/services.rb
 - lib/analytics-psw/utilities.rb