analytics-psw 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c76464b815727cb3400f6bfbd23b2428617d8227
-  data.tar.gz: 0f8917692695f60b4f3fd9ffd6da207e30397b37
+  metadata.gz: fc5f45c2fc5deddf6aaa8691267c0b9c35dc6dd1
+  data.tar.gz: 19c47b727954c89593d81699ae7e99abb12e7c6a
 SHA512:
-  metadata.gz: 19412719111259a947b68218d18292b87105f57cb6b2d3118e5933ccccefd0d97cb53eef6ea22f932e8c904a594b48a61d566f9be883de4dc0a28a1ba9fd4f4b
-  data.tar.gz: f59deb6b35004a6131bbeb0eef37fc69ec6deaa0a9feec450a43005ce88be2a6af224fde60775d6feff87634d2989a2ef87a41822f90f1bff5c10195fc261fcc
+  metadata.gz: 45d8663fca8091a4df8645a7a4924e7ff0a503453ac08aec9e2a1ad4912349604cbbf95b072e400c045471ddad5392ef5e43ba6dca21c73d7ead6059a36f2c8a
+  data.tar.gz: b5768b05c9382ca82351331b86a2edc42afdff7189f76b28c2323da7b580fecb3ba3c79220931336bcafa4319e39b83cc21962bd19eef5b3cc7959cf3beab7da

data/README.md

@@ -27,12 +27,15 @@ require 'yaml' #optional, for importing information used to connect to the Analy
 ``` ruby
 opts = {}
 opts['server_url'] = "http://my.server.url"     #required No trailing slash needed
-opts['service'] = "MyServiceName"               #required Calling AnalyticsPSW.new searches for your service, or if it isn't found, creates it.
-opts['proxy'] = "http://proxy.server.address"   #optional Not required if you don't use a proxy server or if you set the http_proxy environment variable
+opts['service'] = "MyServiceName"               #required Calling AnalyticsPSW::Analytics.new searches for your service.  It must exist prior to using the GEM.
+opts['proxy'] = "http://proxy.server.address"   #optional Not required if you don't use a proxy server or if you set the http_proxy environment variable.  
+                                                #required for multi-get (run multiple get requests in parallel)
+opts['client_id'] = "fjdksl98s2jkljf"           #required for the GEM to manage your Oath2 token
+opts['client_secret'] = "jkdsl89sf9s"           #required for the GEM to manage your Oath2 token
 opts['event_types'] = ["event_one", "event_two", "event_three"] #optional Creates event types to associate with your service if they don't already exist
 opts['dimensions'] = [{"dimension_name" => "string"}, {"dimension_2" => "integer"}] #optional Creates dimensions to describe your events if they don't already exist
 
-ap = AnalyticsPSW.new(opts)
+ap = AnalyticsPSW::Analytics.new(opts)
 ```
 
 ### Options in separate .yml file
@@ -46,6 +49,10 @@ ap = AnalyticsPSW.new(YAML.load_file(analytics_settings.yml))
 ---
 server_url: http://127.0.0.1:3000
 service: my_service
+
+client_id=fjdksl98s2jkljf
+client_secret=jkdsl89sf9s
+
 event_types:
 - event_one
 - event_two
@@ -58,37 +65,34 @@ dimensions:
 ## Available Methods
 
 ``` ruby
-ap.record_event(event_type, metadata = {}, token=nil) # Send an event to the Analytics service. The event_type must already exist in the Analytics system.  'event_type' can either be a string or symbol
-
-ap.query_analytics(query_parameters, token=nil) # Send a hashmap query to the Analytics service and return an AnalyticsReport object. Required keys for query_parameters include one or more of :sum, :avg, :stddev, :fields. Optional keys are :customer, :where, :group_by, :order_by, :iterate_by, :limit. Use comma-separated strings for multiple values. The keys :sum, :avg, and :stddev return aggregates that prepend and append the key name with two underscores. For example, the sum aggregate would return as "__SUM__<field_name>".
-ap.create_report(name, query_parameters, token=nil) # Create a report query to run later.  Required keys for query_parameters include one or more of :sum, :avg,  :stddev, :fields. Optional keys are :customer, :where, :group_by, :order_by, :iterate_by, :limit. Use comma-separated strings for multiple values.
-ap.list_reports(token=nil) # List all reports for a service
-ap.report_criteria(report_name, token=nil) # List the properties for a report. 'report_name' can either be a string or symbol
-ap.run_report(report_name, where_criteria, token=nil) # Run a stored report and return an AnalyticsReport object. The 'where_criteria' are options 'where' parameters to replace in the stored report when running.  'report_name' can either be a string or symbol
-ap.delete_report(report_name, token=nil) # Delete a stored report. 'report_name' can either be a string or symbol
-
-ap.multi_query_analytics(query_parameters_array, token=nil) # Run multiple simultaneous queries. Send an array of hashmaps of query parameters to return an array of AnalyticsReport objects.
-
-ap.create_service(name, token=nil)  # Create a new service. 'name' can either be a string or symbol
-ap.list_service(token=nil) # List all available services
-ap.show_service_resource(service_name, token=nil) # List available resources for a service. 'service_name' can either be a string or symbol
-ap.show_service_metadata(service_name, token=nil) # List the metadata for a service. 'service_name' can either be a string or symbol
-ap.delete_service(service_name, token=nil) # Delete a service. 'service_name' can either be a string or symbol
-
-ap.create_event_type(name, description = "", token=nil) # Create an event type for a service. 'name' can either be a string or symbol
-ap.list_event_types(token=nil) # List all event types for a service
-ap.show_event_type(event_type_name, token=nil) # List the metadata for an event type. 'event_type_name' can either be a string or symbol
-
-ap.create_dimension(name, data_type, units = "", description = "", token=nil) # Create a new dimension. Only name and data_type are required. 'name' can either be a string or symbol
-ap.list_dimensions(token=nil)  # List all dimensions for a service
-ap.show_dimension_resources(dimension_name, token=nil) # List available resources for a dimension. 'dimension_name' can either be a string or symbol
-ap.show_dimension_metadata(dimension_name, token=nil)  # List metadata for a dimension. 'dimension_name' can either be a string or symbol
-
-ap.create_dimension_properties(dimension_name, dimension_value, property_hash, token=nil) # Add properties to a dimension value. This returns a 409 message if properties already exist. Use this method to add mutable string data to dimensions. For example, add a title to a video by adding a title property to the video's guid.
-ap.update_dimension_properties(dimension_name, dimension_value, property_hash, token=nil) # Update properties created for a dimension value.  The hash replaces all properties currently set.
-ap.create_or_update_dimension_properties(dimension_name, dimension_value, property_hash, token=nil) # Add properties to a dimension value if they already exist. Updates the properties otherwise. Use this method to add mutable string data to dimensions. For example, add a title to a video by adding a title property to the video's guid.
-ap.show_dimension_properties(dimension_name, dimension_value, token=nil) # List the properties currently set for a dimension value. The body will be JSON.
-ap.list_dimension_properties(dimension_name, token=nil) # List all properties for a dimension. This returns a JSON object with an array of JSON/location pairs.
+ap.record_event(event_type, metadata = {}) # Send an event to the Analytics service. The event_type must already exist in the Analytics system.  'event_type' can either be a string or symbol
+
+ap.query_analytics(query_parameters) # Send a hashmap query to the Analytics service and return an AnalyticsReport object. Required keys for query_parameters include one or more of :sum, :avg, :stddev, :fields. Optional keys are :customer, :where, :group_by, :order_by, :iterate_by, :limit. Use comma-separated strings for multiple values. The keys :sum, :avg, and :stddev return aggregates that prepend and append the key name with two underscores. For example, the sum aggregate would return as "__SUM__<field_name>".
+ap.create_report(name, query_parameters) # Create a report query to run later.  Required keys for query_parameters include one or more of :sum, :avg,  :stddev, :fields. Optional keys are :customer, :where, :group_by, :order_by, :iterate_by, :limit. Use comma-separated strings for multiple values.
+ap.list_reports # List all reports for a service
+ap.report_criteria(report_name) # List the properties for a report. 'report_name' can either be a string or symbol
+ap.run_report(report_name, where_criteria) # Run a stored report and return an AnalyticsReport object. The 'where_criteria' are options 'where' parameters to replace in the stored report when running.  'report_name' can either be a string or symbol
+ap.delete_report(report_name) # Delete a stored report. 'report_name' can either be a string or symbol
+
+ap.multi_query_analytics(query_parameters_array) # Run multiple simultaneous queries. Send an array of hashmaps of query parameters to return an array of AnalyticsReport objects.
+
+ap.show_service_resource(service_name) # List available resources for a service. 'service_name' can either be a string or symbol
+ap.show_service_metadata(service_name) # List the metadata for a service. 'service_name' can either be a string or symbol
+
+ap.create_event_type(name, description = "") # Create an event type for a service. 'name' can either be a string or symbol
+ap.list_event_types # List all event types for a service
+ap.show_event_type(event_type_name) # List the metadata for an event type. 'event_type_name' can either be a string or symbol
+
+ap.create_dimension(name, data_type, units = "", description = "") # Create a new dimension. Only name and data_type are required. 'name' can either be a string or symbol
+ap.list_dimensions  # List all dimensions for a service
+ap.show_dimension_resources(dimension_name) # List available resources for a dimension. 'dimension_name' can either be a string or symbol
+ap.show_dimension_metadata(dimension_name)  # List metadata for a dimension. 'dimension_name' can either be a string or symbol
+
+ap.create_dimension_properties(dimension_name, dimension_value, property_hash) # Add properties to a dimension value. This returns a 409 message if properties already exist. Use this method to add mutable string data to dimensions. For example, add a title to a video by adding a title property to the video's guid.
+ap.update_dimension_properties(dimension_name, dimension_value, property_hash) # Update properties created for a dimension value.  The hash replaces all properties currently set.
+ap.create_or_update_dimension_properties(dimension_name, dimension_value, property_hash) # Add properties to a dimension value if they already exist. Updates the properties otherwise. Use this method to add mutable string data to dimensions. For example, add a title to a video by adding a title property to the video's guid.
+ap.show_dimension_properties(dimension_name, dimension_value) # List the properties currently set for a dimension value. The body will be JSON.
+ap.list_dimension_properties(dimension_name) # List all properties for a dimension. This returns a JSON object with an array of JSON/location pairs.
 ```
 ### AnalyticReport object
 
@@ -129,6 +133,7 @@ end
 
 ## Query Parameters
 
+
 | Parameter          | Values                                         |  Examples                                                                                                          |
 | -------------------| ---------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |
 | ` sum  `           |` any event or number dimension `               | ` { "sum" => "plays" } or { "sum" => "plays,process_time" } `                                                      |
@@ -173,4 +178,4 @@ Note: `iterate_by` always uses the global `event_time` dimension.
 
 ## License
 
-2013 Lexmark International Technology S.A. All rights reserved.
+2014 Lexmark International Technology S.A. All rights reserved.

data/lib/analytics-psw.rb

@@ -1,31 +1,19 @@
-require "faraday"
-require "json"
+require 'faraday'
+require 'json'
 require 'eventmachine'
 require 'em-http'
 
-require "analytics-psw/reports"
-require "analytics-psw/services"
-require "analytics-psw/event_types"
-require "analytics-psw/events"
-require "analytics-psw/dimension_properties"
-require "analytics-psw/dimensions"
-require "analytics-psw/customers"
+require 'analytics-psw/reports'
+require 'analytics-psw/services'
+require 'analytics-psw/event_types'
+require 'analytics-psw/events'
+require 'analytics-psw/dimension_properties'
+require 'analytics-psw/dimensions'
+require 'analytics-psw/customers'
 
 module AnalyticsPSW
   class Analytics
 
-    API_URL             = "/services"
-    JSON_CONTENT_TYPE   = "application/json"
-    SUM_CRITERIA_PARAM  = "sum"
-    AVG_CRITERIA_PARAM  = "avg"
-
-    PARSED_RESPONSE = {
-        body:     'body',
-        location: 'location',
-        status:   'status',
-        error_message: 'error_message'
-    }
-
     include AnalyticsPSW::Customers,
             AnalyticsPSW::Reports,
             AnalyticsPSW::Services,
@@ -35,62 +23,44 @@ module AnalyticsPSW
             AnalyticsPSW::DimensionProperties
 
     attr_accessor :service_location
-    attr_reader   :conn
 
     def initialize(opts = {})
       set_vars_from_opts(opts)
-      @conn             = faraday_connection
-      @token = get_token unless @client_id.nil?
-      @service_location = "#{@server_url}#{API_URL}/#{@service_name}"
-      find_or_create_event_types(@event_types) if @event_types
+      @conn = faraday_connection
+      update_token if @client_id
+      @service_location = "#{@server_url}/services/#{@service_name}"
+      find_or_create_event_types
       find_or_create_dimensions(@dimensions) if @dimensions
     end
 
     private
 
     def set_vars_from_opts(opts)
-      @server_url = opts["server_url"]
-      @service_name = opts["service"].strip if opts["service"]
-      raise "Please ensure you have provided the appropriate server url and service name" unless @server_url && @service_name && @service_name != ""
-      @server_url = @server_url.chomp("/")
-      @proxy = opts["proxy"]
-      @proxy = "" if @server_url.start_with?("http://127.0.0.1") or @server_url.start_with?("http://localhost")
-      @event_types = opts["event_types"]
-      @dimensions = opts["dimensions"]
-      @client_id = opts["client_id"]
-      @client_secret = opts["client_secret"]
-    end
-
-    def get_token(token=nil)
-      return token unless token.nil?
-      return @token unless @token.nil?
-      @client_id.nil? ? @token : update_token
+      @server_url = opts['server_url'] ? opts['server_url'].chomp('/') : nil
+      @service_name = opts['service']
+      raise 'Please ensure you have provided the appropriate server url and service name' unless @server_url && @service_name && @service_name != ''
+      @proxy = opts['proxy']
+      @proxy = '' if @server_url.start_with?('http://127.0.0.1') or @server_url.start_with?('http://localhost')
+      @event_types = opts['event_types'] || []
+      @dimensions = opts['dimensions'] || []
+      @client_id = opts['client_id']
+      @client_secret = opts['client_secret']
     end
 
     def update_token
       url = "#{@server_url}/oauth/token?client_id=#{@client_id}&client_secret=#{@client_secret}"
-      raw = post_token(:post, url, "token", {})
+      raw = post_json(url, 'token', {})
       parse_raw = parse_json_response(raw)
       resp = parse_raw['body']
       @token = resp['access_token']
     end
 
-    def post_token (http_method, url, object_type, metadata)
-      json_object = create_json_object(object_type, metadata)
-      json_block  = ->(req) do
-        req.url url
-        req.headers["Content-Type"] = JSON_CONTENT_TYPE
-        req.body                    = json_object
-      end
-      conn.send(http_method, &json_block)
+    def get_json(url, params = {})
+       headers = @token ? {'Authorization' => "Bearer #{@token}"} : nil
+       @conn.get(url, params, headers)
     end
 
-    def get_json(url, token=nil, params = {})
-       headers =  {'Authorization' => "Bearer #{get_token(token)}"}
-       conn.get(url, params, headers)
-    end
-
-    def multi_get_json(service_location, query_parameters, token=nil)
+    def multi_get_json(service_location, query_parameters)
       results = []
 
       EventMachine.run do
@@ -101,7 +71,7 @@ module AnalyticsPSW
 
         query_parameters.each_with_index do |param, idx|
           http = EventMachine::HttpRequest.new(service_location, connection_opts)
-          req = http.get query: param, head: {'Authorization' => "Bearer #{get_token(token)}"}
+          req = http.get query: param, head: {'Authorization' => "Bearer #{@token}"}
           multi.add idx, req
         end
 
@@ -120,23 +90,23 @@ module AnalyticsPSW
       results
     end
 
-    def post_json(url, object_type, metadata, token=nil)
-      http_json(:post, url, object_type, metadata, token)
+    def post_json(url, object_type, metadata)
+      http_json(:post, url, object_type, metadata)
     end
 
-    def put_json(url, object_type, metadata, token=nil)
-      http_json(:put, url, object_type, metadata, token)
+    def put_json(url, object_type, metadata)
+      http_json(:put, url, object_type, metadata)
     end
 
-    def http_json(http_method, url, object_type, metadata, token)
+    def http_json(http_method, url, object_type, metadata)
       json_object = create_json_object(object_type, metadata)
       json_block  = ->(req) do
         req.url url
-        req.headers["Content-Type"] = JSON_CONTENT_TYPE
-        req.headers["Authorization"]= "Bearer #{get_token(token)}"
-        req.body                    = json_object
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['Authorization']= "Bearer #{@token}" if @token
+        req.body = json_object
       end
-      conn.send(http_method, &json_block)
+      @conn.send(http_method, &json_block)
     end
 
     def create_json_object(object_type, metadata = {})
@@ -144,53 +114,51 @@ module AnalyticsPSW
     end
 
     def create_metadata(hashmap)
-      hashmap.reject { |k,v| v == "" }
+      hashmap.reject { |k,v| v == '' }
     end
 
-    def find_or_create_event_types(event_types)
-      all_event_types = JSON.parse(get_json("#{@service_location}/event_types.json?access_token=#{get_token}").body)
-      all_event_types["event_types"].each do |event_type|
-        event_types.delete(event_type["name"]) if event_types.include?(event_type["name"])
-      end
-      event_types.each do |event_type|
+    def find_or_create_event_types
+      all_event_types = get_all_events
+      new_events = @event_types - all_event_types
+      new_events.each do |event_type|
         create_event_type(event_type)
       end
-      event_types
+      @event_types |= all_event_types
     end
 
     def find_or_create_dimensions(dimensions)
       all_dimensions = get_all_dimension_names
       dimensions.each do |dimension|
         dimension.each do |name, data_type|
-          create_dimension(name, data_type) unless all_dimensions.include?(name)
+          unless all_dimensions.include?(name)
+            create_dimension(name, data_type)
+            all_dimensions << name
+          end
         end
       end
+      @dimensions = all_dimensions
     end
 
-    def get_all_dimension_names
-      dimension_names = []
-      dimensions = JSON.parse(get_json("#{@service_location}/dimensions.json?access_token=#{get_token}").body)
-      dimensions["dimensions"].each do |one_dimension|
-        dimension_names << one_dimension["name"]
-      end
-      dimension_names
+    def get_all_events
+      event_types = list_event_types['body']['event_types']
+      event_types ? event_types.map{|e| e['name']} : []
     end
 
-    def create_service_private(name, description = "")
-      metadata = create_metadata({name: name, description: description})
-      post_json(API_URL, "service", metadata)
+    def get_all_dimension_names
+      dimensions = list_dimensions['body']['dimensions']
+      dimensions ? dimensions.map { |d| d['name']} : []
     end
 
     def parse_json_response(json_response)
       parsed_response = {}
-      parsed_response[PARSED_RESPONSE[:status]]   = json_response.status if json_response.status.present?
+      parsed_response['status'] = json_response.status if json_response.status.present?
 
       if [200, 201, 202].include?(json_response.status)
-        parsed_response[PARSED_RESPONSE[:body]]     = JSON.parse(json_response.body)   if json_response.body.present?
-        parsed_response[PARSED_RESPONSE[:location]] = json_response.headers["location"] if json_response.headers.present? && json_response.headers["location"]
+        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[PARSED_RESPONSE[:body]]     = {}
-        parsed_response[PARSED_RESPONSE[:error_message]] = json_response.body
+        parsed_response['body'] = {}
+        parsed_response['error_message'] = json_response.body
       end
 
       parsed_response
@@ -198,27 +166,24 @@ module AnalyticsPSW
 
     def multi_parse_json_response(response)
       parsed_response = {}
-      parsed_response[PARSED_RESPONSE[:status]] = response.response_header.present? ? response.response_header.status : 500
+      parsed_response['status'] = response.response_header.present? ? response.response_header.status : 500
 
-
-      if [200, 201, 202].include?(parsed_response[PARSED_RESPONSE[:status]])
-        parsed_response[PARSED_RESPONSE[:body]] = JSON.parse response.response if response.response.present?
-        parsed_response[PARSED_RESPONSE[:location]] = response.headers.location if response.headers.present? && response.headers.location.present?
+      if [200, 201, 202].include?(parsed_response['status'])
+        parsed_response['body'] = JSON.parse response.response if response.response.present?
+        parsed_response['location'] = response.headers.location if response.headers.present? && response.headers.location.present?
       else
-        parsed_response[PARSED_RESPONSE[:body]] = {}
-        parsed_response[PARSED_RESPONSE[:error_message]] = response.error if response.error.present?
+        parsed_response['body'] = {}
+        parsed_response['error_message'] = response.error if response.error.present?
       end
       parsed_response
     end
 
-    def delete_resource(url, token=nil)
-      conn.delete (url + "?access_token=#{get_token}")
+    def delete_resource(url)
+      @conn.delete (url + "?access_token=#{@token}")
     end
 
     def faraday_connection
-      return Faraday.new(@server_url) if @proxy == nil
-      Faraday.new(@server_url, {proxy: {uri: @proxy}})
+      @proxy ? Faraday.new(@server_url, {proxy: {uri: @proxy}}) : Faraday.new(@server_url)
     end
-
   end
 end

data/lib/analytics-psw/customers.rb

@@ -1,11 +1,9 @@
 module AnalyticsPSW
   module Customers
-
-    def list_customers (token=nil)
-      resp = get_json("#{@service_location}/customers", token)
+    def list_customers
+      resp = get_json("#{@service_location}/customers")
       parse_json_response(resp)
     end
-
   end
 end
 

data/lib/analytics-psw/dimension_properties.rb

@@ -1,30 +1,29 @@
 module AnalyticsPSW
   module DimensionProperties
-
-    def list_dimension_properties(dimension_name, token=nil)
-      resp = get_json("#{@service_location}/dimensions/#{dimension_name.to_s}/properties", token)
+    def list_dimension_properties(dimension_name)
+      resp = get_json("#{@service_location}/dimensions/#{dimension_name}/properties")
       parse_json_response(resp)
     end
 
-    def show_dimension_properties(dimension_name, dimension_value, token=nil)
-      resp = get_json("#{@service_location}/dimensions/#{dimension_name.to_s}/properties/#{dimension_value.to_s}", token)
+    def show_dimension_properties(dimension_name, dimension_value)
+      resp = get_json("#{@service_location}/dimensions/#{dimension_name}/properties/#{dimension_value}")
       parse_json_response(resp)
     end
 
-    def create_dimension_properties(dimension_name, dimension_value, properties = {}, token=nil)
+    def create_dimension_properties(dimension_name, dimension_value, properties = {})
       metadata = create_dimension_properties_metadata(dimension_value, properties)
-      response = post_json("#{@service_location}/dimensions/#{dimension_name.to_s}/properties/#{dimension_value.to_s}", "dimension_property", metadata, token)
+      response = post_json("#{@service_location}/dimensions/#{dimension_name}/properties/#{dimension_value}", 'dimension_property', metadata)
       parse_json_response(response)
     end
 
-    def update_dimension_properties(dimension_name, dimension_value, properties = {}, token=nil)
+    def update_dimension_properties(dimension_name, dimension_value, properties = {})
       metadata = create_dimension_properties_metadata(dimension_value, properties)
-      response = put_json("#{@service_location}/dimensions/#{dimension_name.to_s}/properties/#{dimension_value.to_s}", "dimension_property", metadata, token)
+      response = put_json("#{@service_location}/dimensions/#{dimension_name}/properties/#{dimension_value}", 'dimension_property', metadata)
       parse_json_response(response)
     end
 
-    def create_or_update_dimension_properties(dimension_name, dimension_value, properties = {}, token=nil)
-      dimension_property_exists?(dimension_name, dimension_value, token) ? update_dimension_properties(dimension_name, dimension_value, properties, token) : create_dimension_properties(dimension_name, dimension_value, properties, token)
+    def create_or_update_dimension_properties(dimension_name, dimension_value, properties = {})
+      dimension_property_exists?(dimension_name, dimension_value) ? update_dimension_properties(dimension_name, dimension_value, properties) : create_dimension_properties(dimension_name, dimension_value, properties)
     end
 
     private
@@ -32,15 +31,14 @@ module AnalyticsPSW
     def create_dimension_properties_metadata(dimension_value, properties)
       dimension_properties_body = {'value' => dimension_value, 'properties' => {}}
       properties.each do |key, value|
-        dimension_properties_body['properties'][key] = value unless value == ""
+        dimension_properties_body['properties'][key] = value unless value == ''
       end
       dimension_properties_body
     end
 
-    def dimension_property_exists? (dimension_name, dimension_value, token=nil)
-      dim_properties = list_dimension_properties(dimension_name,token)['body']
+    def dimension_property_exists? (dimension_name, dimension_value)
+      dim_properties = list_dimension_properties(dimension_name)['body']
       dim_properties[dimension_name].present? && dim_properties[dimension_name] == dimension_value
     end
-
   end
 end

data/lib/analytics-psw/dimensions.rb

@@ -1,24 +1,25 @@
 module AnalyticsPSW
   module Dimensions
 
-    def create_dimension(name, data_type, units = "", description = "", token=nil)
+    def create_dimension(name, data_type, units = '', description = '')
       metadata = create_metadata({:name => name.to_s, :description => description, :data_type => data_type, :units => units})
-      resp = post_json("#{@service_location}/dimensions", "dimension", metadata, token)
+      resp = post_json("#{@service_location}/dimensions", "dimension", metadata)
+      @dimensions |= [name.to_s] if resp.status && [200, 201, 202].include?(resp.status)
       parse_json_response(resp)
     end
 
-    def list_dimensions(token=nil)
-      resp = get_json("#{@service_location}/dimensions", token)
+    def list_dimensions
+      resp = get_json("#{@service_location}/dimensions")
       parse_json_response(resp)
     end
 
-    def show_dimension_resources(dimension_name, token=nil)
-      resp = get_json("#{@service_location}/dimensions/#{dimension_name.to_s}", token)
+    def show_dimension_resources(dimension_name)
+      resp = get_json("#{@service_location}/dimensions/#{dimension_name}")
       parse_json_response(resp)
     end
 
-    def show_dimension_metadata(dimension_name, token=nil)
-      resp = get_json("#{@service_location}/dimensions/#{dimension_name.to_s}/metadata", token)
+    def show_dimension_metadata(dimension_name)
+      resp = get_json("#{@service_location}/dimensions/#{dimension_name}/metadata")
       parse_json_response(resp)
     end
 

data/lib/analytics-psw/event_types.rb

@@ -1,19 +1,20 @@
 module AnalyticsPSW
   module EventTypes
 
-    def create_event_type(name, description = "", token=nil)
+    def create_event_type(name, description = "")
       metadata = create_metadata({:name => name.to_s, :description => description})
-      resp = post_json("#{@service_location}/event_types", "event_type", metadata, token)
+      resp = post_json("#{@service_location}/event_types", "event_type", metadata)
+      @event_types |= [name.to_s] if resp.status && [200, 201, 202].include?(resp.status)
       parse_json_response(resp)
     end
 
-    def list_event_types(token=nil)
-      resp = get_json("#{@service_location}/event_types", token)
+    def list_event_types
+      resp = get_json("#{@service_location}/event_types")
       parse_json_response(resp)
     end
 
-    def show_event_type(event_name, token=nil)
-      resp = get_json("#{@service_location}/event_types/#{event_name.to_s}", token)
+    def show_event_type(event_name)
+      resp = get_json("#{@service_location}/event_types/#{event_name.to_s}")
       parse_json_response(resp)
     end
 

data/lib/analytics-psw/events.rb

@@ -1,45 +1,31 @@
 module AnalyticsPSW
   module Events
 
-    def record_event(event_type, metadata = {}, token=nil)
-
-      if valid_metadata_for_record_event?(event_type, metadata, token)
-        metadata[:event_type] = event_type.to_s
-        parse_json_response(post_json("#{@service_location}/events", "event", metadata, token))
-      else
-        invalid_metadata_response
-      end
+    def record_event(event_type, metadata = {})
+      return invalid_event_type_response unless event_type_exists? event_type
+      return invalid_metadata_response unless dimensions_exist? metadata
+      metadata[:event_type] = event_type.to_s
+      parse_json_response(post_json("#{@service_location}/events", 'event', metadata))
     end
 
   private
 
-    def valid_metadata_for_record_event?(event_type, metadata, token)
-
-      event_type_exists?(event_type, token) && dimensions_exist?(metadata, token)
-    end
-
-    def event_type_exists?(current_event_type, token)
-      get_list_of_event_types(token).map {|d| d['name']}.include?(current_event_type)
-    end
-
-    def get_list_of_event_types(token)
-      event_types_response = list_event_types(token)
-      event_types_body = event_types_response['body']
-      event_types_body['event_types']
+    def event_type_exists?(current_event_type)
+      @event_types.include? current_event_type
     end
 
-    def dimensions_exist?(metadata, token=nil)
-      get_list_of_dimensions(token).map {|d| d['name'] }.to_set.subset?(metadata.keys.to_set)
+    def dimensions_exist?(metadata)
+      metadata.keys.each do |key|
+        return false unless @dimensions.include? key
+      end
     end
 
-    def get_list_of_dimensions(token=nil)
-      dimensions_response = list_dimensions(token)
-      dimensions_body = dimensions_response['body']
-      dimensions_body['dimensions']
+    def invalid_event_type_response
+      {'status' => 422, 'body' => {}, 'error_message' => 'Invalid event type for service.'}
     end
 
     def invalid_metadata_response
-      {'status' => 422, 'body' => {}, 'error_message' => 'Invalid event type and/or dimensions for service.'}
+      {'status' => 422, 'body' => {}, 'error_message' => 'Invalid dimensions for service.'}
     end
 
   end

data/lib/analytics-psw/reports.rb

@@ -4,47 +4,44 @@ require 'analytics_report_field'
 module AnalyticsPSW
   module Reports
 
-    def query_analytics(query_parameters, token=nil)
-      raw_report = get_json("#{@service_location}/reports/query.json", token, query_parameters)
+    def query_analytics(query_parameters)
+      raw_report = get_json("#{@service_location}/reports/query.json", query_parameters)
       parsed_report = parse_json_response(raw_report)
-
       create_analytics_report(parsed_report)
     end
 
-    def multi_query_analytics(query_parameters, token=nil)
-      raw_reports = multi_get_json("#{@service_location}/reports/query.json", query_parameters, token)
-
+    def multi_query_analytics(query_parameters)
+      raw_reports = multi_get_json("#{@service_location}/reports/query.json", query_parameters)
       raw_reports.map do |raw_report|
         create_analytics_report(raw_report)
       end
 
     end
 
-    def create_report(name, query_parameters, token=nil)
+    def create_report(name, query_parameters)
       query_parameters[:name] = name.to_s
-      resp = post_json("#{@service_location}/reports", "report", query_parameters, token )
+      resp = post_json("#{@service_location}/reports", 'report', query_parameters )
       parse_json_response(resp)
     end
 
-    def list_reports(token=nil)
-      resp = get_json("#{@service_location}/reports", token)
+    def list_reports
+      resp = get_json("#{@service_location}/reports")
       parse_json_response(resp)
     end
 
-    def report_criteria(report_name, token=nil)
-      resp = get_json("#{@service_location}/reports/#{report_name.to_s}/criteria", token)
+    def report_criteria(report_name)
+      resp = get_json("#{@service_location}/reports/#{report_name.to_s}/criteria")
       parse_json_response(resp)
     end
 
-    def run_report(report_name, where_criteria = {}, token=nil)
-      raw_report = get_json("#{@service_location}/reports/#{report_name.to_s}/results", token, where_criteria)
+    def run_report(report_name, where_criteria = {})
+      raw_report = get_json("#{@service_location}/reports/#{report_name.to_s}/results", where_criteria)
       parsed_report = parse_json_response(raw_report)
-
       create_analytics_report(parsed_report)
     end
 
-    def delete_report(report_name, token=nil)
-      resp = delete_resource("#{@service_location}/reports/#{report_name.to_s}", token)
+    def delete_report(report_name)
+      resp = delete_resource("#{@service_location}/reports/#{report_name.to_s}")
       parse_json_response(resp)
     end
 

data/lib/analytics-psw/services.rb

@@ -1,29 +1,13 @@
 module AnalyticsPSW
   module Services
-
-    def create_service(name, token=nil)
-      create_service_private(name.to_s, token)
-    end
-
-    def list_services(token=nil)
-      resp = get_json("/services", token)
-      parse_json_response(resp)
-    end
-
-    def show_service_resources(service_name, token=nil)
-      resp = get_json("/services/#{service_name.to_s}", token)
+    def show_service_resources(service_name)
+      resp = get_json("/services/#{service_name.to_s}")
       parse_json_response(resp)
     end
 
-    def show_service_metadata(service_name, token=nil)
-      resp = get_json("/services/#{service_name.to_s}/metadata", token)
+    def show_service_metadata(service_name)
+      resp = get_json("/services/#{service_name.to_s}/metadata")
       parse_json_response(resp)
     end
-
-    def delete_service(service_name, token=nil)
-      resp = delete_resource("/services/#{service_name.to_s}", token)
-      parse_json_response(resp)
-    end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: analytics-psw
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Lexmark International Technology S.A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !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
   Analytics service
 email: