analytics-psw 0.1.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e095a0444b7d07efda86c02b10b581db447a3224
-  data.tar.gz: ec4d661156ee26a7649913c26a38ca6b79cb394e
+  metadata.gz: c76464b815727cb3400f6bfbd23b2428617d8227
+  data.tar.gz: 0f8917692695f60b4f3fd9ffd6da207e30397b37
 SHA512:
-  metadata.gz: 2fc5fb7e114172a7ce96d8eab4648fd26929e84b299e15e5c2dd0383b430cff34df1f3d5a07e1dd2a969770661c866a225460a9e38c720727f1bfcb4b8f503e8
-  data.tar.gz: 185449144eccc24d09d06bb516aceb6396958d8d38d5b199bcdea709f01b135b59481b1688dc9de463ba7dd3429447a37e88d95b14be3c4e921f6a9ae018b8fe
+  metadata.gz: 19412719111259a947b68218d18292b87105f57cb6b2d3118e5933ccccefd0d97cb53eef6ea22f932e8c904a594b48a61d566f9be883de4dc0a28a1ba9fd4f4b
+  data.tar.gz: f59deb6b35004a6131bbeb0eef37fc69ec6deaa0a9feec450a43005ce88be2a6af224fde60775d6feff87634d2989a2ef87a41822f90f1bff5c10195fc261fcc

data/README.md

@@ -1,6 +1,6 @@
 # Analytics::Psw
 
-Analytics-psw is a wrapper providing access to the Perceptive Cloud Platform Analytics service
+Analytics-psw is a wrapper providing access to the Perceptive Cloud Platform Analytics service.
 
 ## Installation
 
@@ -26,11 +26,11 @@ 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 will search for your service, and if it isn't found, create 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['event_types'] = ["event_one", "event_two", "event_three"] #optional, will create event types to associate with your service if they don't already exist
-opts['dimensions'] = [{"dimension_name" => "string"}, {"dimension_2" => "integer"}] #optional, will create dimensions to describe your events if they don't already exist
+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['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)
 ```
@@ -41,7 +41,8 @@ ap = AnalyticsPSW.new(YAML.load_file(analytics_settings.yml))
 ```
 
 ### Sample YAML file
-```
+
+``` ruby
 ---
 server_url: http://127.0.0.1:3000
 service: my_service
@@ -57,61 +58,103 @@ dimensions:
 ## Available Methods
 
 ``` ruby
-ap.record_event(event_type, metadata = {}) # sends an event to the Analytics service. Event_type must exist on the Analytics system
-
-ap.query_analytics(query_parameters) # sends a hashmap query to the Analytics service. Possible keys include: required: one or more of :sum, :avg, :fields, optional: :customer, :where, :group_by, :order_by, :iterage_by. Use comma-separated strings if multiple values are needed
-ap.create_report(name, query_parameters) # create a report query to be ran later.  'query_parameters' same as above.
-ap.list_reports # list all reports for a service
-ap.show_report(report_id) # list the properties for a report
-ap.run_report(report_id, where_criteria) # run a stored report.  'where_criteria' are options 'where' paramters to replace in the stored report when running.
-ap.delete_report(report_id) # delete a stored report
-
-ap.create_service(name)  # creates a new service
-ap.list_service # list all available services
-ap.show_service_resource(service_id) # list available resources for a service
-ap.show_service_metadata(service_id) # list the properties of a service
-ap.delete_service(service_id) # delete a report
-
-ap.create_event_type(name, description = "") # creates an event type for the service being used
-ap.list_event_types #list all event types for a service
-ap.show_event_type(event_type_id) # list properties of an event type
-
-ap.create_dimension(name, data_type, units = "", description = "") # creates a new dimension (field that describes an event, but isn't tied to any one event). Only name and data_type are required.
-ap.list_dimensions  # list all dimensions for a service
-ap.show_dimension_resources(dimension_id) # list available resources for a dimension
-ap.show_dimension_metadata(dimension_id)  # list metadata for a dimension
-
-ap.create_dimension_properties(dimension_name, dimension_value, property_hash) # adds properties to a dimension value. This will return status=409 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) # updates 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) # adds propertie to a dimension value if they already exist. Updates the properties otherwise.  This will return status=409 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.show_dimension_properties(dimension_name, dimension_value) # get the properties currently set for a dimension value.  The body will be json.
-ap.list_dimension_properties(dimension_name) # list all values that have properties set.  This will return a json object with an array of json/location pairs.
+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.
+```
+### AnalyticReport object
+
+AnalyticsReport:
+``` ruby
+:status # Return code from the REST call.
+:rows # An array of hashes containing AnalyticsReportField objects. Each hash is a "row".
+:error_message # Error returns from persistence layer if query/report was unsuccessful. 
+ ```
+ 
+AnalyticsReportField:
+``` ruby
+:name # Name of the field returned
+:is_aggregate # Boolean used to determine if the :value is an aggregate
+:value # Value of the field returned. If it's an aggregate, the :value is a hash. Example:  { 'sum' => 20, 'avg' => 4, 'stddev' => 1.32 } 
+ sum() # Method to return the 'sum' value of the field. If none exists, the method returns zero.
+ avg() # Method to return the 'avg' value of the field.  If none exists, the method returns zero.
+ stddev() # Method to return the 'stddev' value of the field.  If none exists, the method returns zero.
+```
+
+#### Example Code:
+
+``` ruby
+report = ap.query_analytics(query_parameters)
+
+field_value = report.rows[0][:field].value
+
+report.rows.each do |row|
+  row.each do |field_name, field_object|
+    if field_object.is_aggregate
+       value = field_object.sum
+    else
+       value = field_object.value
+    end   
+  end
+end
 ```
 
 ## Query Parameters
 
-| Parameter          | Values                                     |  Examples                                                                                                          |
-| -------------------| ------------------------------------------ | ------------------------------------------------------------------------------------------------------------------ |
-| ` sum  `           |` any event or number dimension `           | ` { "sum" => "plays" } or { "sum" => "plays,process_time" } `                                                      |
-| ` avg  `           | ` any event or number dimension  `         | ` { "avg" => "plays" } or { "avg" => "plays,process_time" } `                                                      |
-| ` fields `         | ` any mapped dimension `                   | ` { "fields" => "user_name } or { "fields" => "user_name,location" } `                                             |
-| ` customer `       | ` any customer associated with a service ` | ` { "customer" => "lexmark" } `                                                                                    |
-| ` where `          | ` <dimension> <operator> <value> `         | ` { "where" => [ "begin_date gt 2013-12-10", "end_date lt 2013-12-20", "user_name eq bob", "location is null" ] }` |
-| ` - <dimension> `  | ` any mapped dimension `                   |                                                                                                                    |
-| ` - <operator> `   | ` any valid operator `                     |                                                                                                                    |
-| ` - - ls  `        | ` less than operator  `                    | ` { "where" => [ "end_date lt 2013-12-10" ] }`                                                                     |
-| ` - - gt `         | ` greater than operator `                  | ` { "where" => [ "begin_date gt 2013-12-10" ] }`                                                                   |
-| ` - - eq  `        | ` equal to operator  `                     | ` { "where" => [ "user_name eq bob" ] }`                                                                           |
-| ` - - lte `        | ` less than equal to operator `            | ` { "where" => [ "begin_date gte 2013-12-10" ] }`                                                                  |
-| ` - - gte`         | ` greater than equal to operator  `        | ` { "where" => [ "end_date lte 2013-12-10" ] }`                                                                    |
-| ` - - in `         | ` in operator for multiple values `        | ` { "where" => [ "user_name in bob,ted,allen" ] }`                                                                 |
-| ` - - is `         | ` is operator for boolean and null value ` | ` { "where" => [ "awesome is true" ] }`                                                                            |
-| ` group_by `       | ` any mapped dimension(s) `                | ` { "group_by" => "user_name" } or { "group_by" => "user_name,location" } `                                        |
-| ` order_by `       | ` <dimension> <ascending or descending> `  | ` { "order_by" => "user_name ascending" } or { "order_by" => "user_name descending" } `                            |
-| ` iterate_by `     | ` YEAR, MONTH, DAY, or HOUR  `             | ` { "iterate_by" => "MONTH" } or { "iterate_by" => "HOUR" } `                                                      |
-| ` limit `          | ` any integer value  `                     | ` { "limit" => 10 } `                                                                                              |
-
-**Required** `sum`, `avg`, and/or `fields`
+| Parameter          | Values                                         |  Examples                                                                                                          |
+| -------------------| ---------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |
+| ` sum  `           |` any event or number dimension `               | ` { "sum" => "plays" } or { "sum" => "plays,process_time" } `                                                      |
+| ` avg  `           | ` any event or number dimension  `             | ` { "avg" => "plays" } or { "avg" => "plays,process_time" } `                                                      |
+| ` stddev  `        | ` any event or number dimension  `             | ` { "stddev" => "plays" } or { "stddev" => "plays,process_time" } `                                                |
+| ` fields `         | ` any mapped dimension `                       | ` { "fields" => "user_name } or { "fields" => "user_name,location" } `                                             |
+| ` customer `       | ` any customer(s) associated with a service `  | ` { "customer" => "lexmark" } or { "customer" => "lexmark,perceptive" `                                            |
+| ` where `          | ` <dimension> <operator> <value> `             | ` { "where" => [ "begin_date gt 2013-12-10", "end_date lt 2013-12-20", "user_name eq bob", "location is null" ] }` |
+| &nbsp;&nbsp;&nbsp;`  <dimension> `   | ` any mapped dimension `                       |                                                                                                                    |
+| &nbsp;&nbsp;&nbsp;`  <operator> `    | ` any valid operator `                         |                                                                                                                    |
+| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`   lt  `          | ` less than operator  `                        | ` { "where" => [ "end_date lt 2013-12-10" ] }`                                                                     |
+| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`   gt `           | ` greater than operator `                      | ` { "where" => [ "begin_date gt 2013-12-10" ] }`                                                                   |
+| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`   eq  `          | ` equal to operator  `                         | ` { "where" => [ "user_name eq bob" ] }`                                                                           |
+| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`   lte `          | ` less than equal to operator `                | ` { "where" => [ "begin_date gte 2013-12-10" ] }`                                                                  |
+| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`   gte`           | ` greater than equal to operator  `            | ` { "where" => [ "end_date lte 2013-12-10" ] }`                                                                    |
+| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`   in `           | ` in operator for multiple values `            | ` { "where" => [ "user_name in bob,ted,allen" ] }`                                                                 |
+| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`   is `           | ` is operator for Boolean and null value `     | ` { "where" => [ "awesome is true" ] }`                                                                            |
+| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`    empty  `      | ` no data has been written `        | ` { "where" => [ "username is empty" ] } `                                                                         |
+| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`    defined  `    | ` data written but could be nil`  | ` { "where" => [ "username is defined" ] } `                                                                       |
+| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`   is_not `       | ` is not operator for Boolean and null value ` | ` { "where" => [ "awesome is_not null" ] }`                                                                        |
+| ` group_by `       | ` any mapped dimension(s) `                    | ` { "group_by" => "user_name" } or { "group_by" => "user_name,location" } `                                        |
+| ` order_by `       | ` <dimension> <ascending or descending> `      | ` { "order_by" => "user_name ascending" } or { "order_by" => "user_name descending" } `                            |
+| ` iterate_by `     | ` YEAR, MONTH, DAY, or HOUR  `                 | ` { "iterate_by" => "MONTH" } or { "iterate_by" => "HOUR" } `                                                      |
+| ` limit `          | ` any integer value  `                         | ` { "limit" => 10 } `                                                                                              |
+
+**Required** `sum`, `avg`, `stddev`, and/or `fields`
 
 **Optional** `customer`, `where`, `group_by`, `order_by`, and `iterate_by`
 
@@ -130,4 +173,4 @@ Note: `iterate_by` always uses the global `event_time` dimension.
 
 ## License
 
-2013 Lexmark International Technology S.A. All rights reserved.
+2013 Lexmark International Technology S.A. All rights reserved.

data/lib/analytics-psw/customers.rb

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

data/lib/analytics-psw/dimension_properties.rb

@@ -0,0 +1,46 @@
+module AnalyticsPSW
+  module DimensionProperties
+
+    def list_dimension_properties(dimension_name, token=nil)
+      resp = get_json("#{@service_location}/dimensions/#{dimension_name.to_s}/properties", token)
+      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)
+      parse_json_response(resp)
+    end
+
+    def create_dimension_properties(dimension_name, dimension_value, properties = {}, token=nil)
+      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)
+      parse_json_response(response)
+    end
+
+    def update_dimension_properties(dimension_name, dimension_value, properties = {}, token=nil)
+      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)
+      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)
+    end
+
+    private
+
+    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 == ""
+      end
+      dimension_properties_body
+    end
+
+    def dimension_property_exists? (dimension_name, dimension_value, token=nil)
+      dim_properties = list_dimension_properties(dimension_name,token)['body']
+      dim_properties[dimension_name].present? && dim_properties[dimension_name] == dimension_value
+    end
+
+  end
+end

data/lib/analytics-psw/dimensions.rb

@@ -0,0 +1,26 @@
+module AnalyticsPSW
+  module Dimensions
+
+    def create_dimension(name, data_type, units = "", description = "", token=nil)
+      metadata = create_metadata({:name => name.to_s, :description => description, :data_type => data_type, :units => units})
+      resp = post_json("#{@service_location}/dimensions", "dimension", metadata, token)
+      parse_json_response(resp)
+    end
+
+    def list_dimensions(token=nil)
+      resp = get_json("#{@service_location}/dimensions", token)
+      parse_json_response(resp)
+    end
+
+    def show_dimension_resources(dimension_name, token=nil)
+      resp = get_json("#{@service_location}/dimensions/#{dimension_name.to_s}", token)
+      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)
+      parse_json_response(resp)
+    end
+
+  end
+end

data/lib/analytics-psw/event_types.rb

@@ -0,0 +1,21 @@
+module AnalyticsPSW
+  module EventTypes
+
+    def create_event_type(name, description = "", token=nil)
+      metadata = create_metadata({:name => name.to_s, :description => description})
+      resp = post_json("#{@service_location}/event_types", "event_type", metadata, token)
+      parse_json_response(resp)
+    end
+
+    def list_event_types(token=nil)
+      resp = get_json("#{@service_location}/event_types", token)
+      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)
+      parse_json_response(resp)
+    end
+
+  end
+end

data/lib/analytics-psw/events.rb

@@ -0,0 +1,47 @@
+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
+    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']
+    end
+
+    def dimensions_exist?(metadata, token=nil)
+      get_list_of_dimensions(token).map {|d| d['name'] }.to_set.subset?(metadata.keys.to_set)
+    end
+
+    def get_list_of_dimensions(token=nil)
+      dimensions_response = list_dimensions(token)
+      dimensions_body = dimensions_response['body']
+      dimensions_body['dimensions']
+    end
+
+    def invalid_metadata_response
+      {'status' => 422, 'body' => {}, 'error_message' => 'Invalid event type and/or dimensions for service.'}
+    end
+
+  end
+end
+

data/lib/analytics-psw/reports.rb

@@ -0,0 +1,74 @@
+require 'analytics_report'
+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)
+      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)
+
+      raw_reports.map do |raw_report|
+        create_analytics_report(raw_report)
+      end
+
+    end
+
+    def create_report(name, query_parameters, token=nil)
+      query_parameters[:name] = name.to_s
+      resp = post_json("#{@service_location}/reports", "report", query_parameters, token )
+      parse_json_response(resp)
+    end
+
+    def list_reports(token=nil)
+      resp = get_json("#{@service_location}/reports", token)
+      parse_json_response(resp)
+    end
+
+    def report_criteria(report_name, token=nil)
+      resp = get_json("#{@service_location}/reports/#{report_name.to_s}/criteria", token)
+      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)
+      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)
+      parse_json_response(resp)
+    end
+
+private
+
+    def create_analytics_report(raw_report)
+      analytics_params = {status: raw_report['status']}
+      if analytics_params[:status] == 200
+        analytics_params[:rows] = convert_body_to_rows(raw_report['body'])
+      else
+        analytics_params[:rows] = [{}]
+        analytics_params[:error_message] = raw_report['error_message']
+      end
+      AnalyticsReport.new(analytics_params)
+    end
+
+    def convert_body_to_rows(body)
+      body.map {|row|
+        fields = Hash[row.map {|field, value|
+          field_params = {name: field, value: value, is_aggregate: value.class == Hash}
+          [field.to_sym, AnalyticsReportField.new(field_params)]
+        }]
+        fields
+      }
+    end
+  end
+end

data/lib/analytics-psw/services.rb

@@ -0,0 +1,29 @@
+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)
+      parse_json_response(resp)
+    end
+
+    def show_service_metadata(service_name, token=nil)
+      resp = get_json("/services/#{service_name.to_s}/metadata", token)
+      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

data/lib/analytics-psw.rb

@@ -1,157 +1,224 @@
 require "faraday"
 require "json"
-require "analytics_reports"
-require "analytics_services"
-require "analytics_event_types"
-require "analytics_dimension_properties"
-require "analytics_dimensions"
-
-class AnalyticsPSW
-
-  API_URL = "/services"
-  JSON_CONTENT_TYPE = "application/json"
-  SUM_CRITERIA_PARAM = "sum"
-  AVG_CRITERIA_PARAM = "avg"
-
-  PARSED_RESPONSE_STATUS = 'status'
-  PARSED_RESPONSE_BODY = 'body'
-  PARSED_RESPONSE_LOCATION = 'location'
-
-  include AnalyticsReports, AnalyticsServices, AnalyticsEventTypes, AnalyticsDimensions, AnalyticsDimensionProperties
-
-  attr_accessor :service_location
-
-  def initialize(opts = {})
-    set_vars_from_opts(opts)
-    @conn = faraday_connection
-    service = find_or_create_service(@service_name)
-    @service_location = service["location"] if service
-    find_or_create_event_types(@event_types) if @event_types
-    find_or_create_dimensions(@dimensions) if @dimensions
-  end
+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"
+
+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,
+            AnalyticsPSW::EventTypes,
+            AnalyticsPSW::Events,
+            AnalyticsPSW::Dimensions,
+            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
+      find_or_create_dimensions(@dimensions) if @dimensions
+    end
 
-  def record_event(event_type, metadata = {})
-    metadata[:event_type] = event_type
-    resp = post_json("#{@service_location}/events", "event", metadata)
-    parse_json_response(resp)
-  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
+    end
 
-private
+    def update_token
+      url = "#{@server_url}/oauth/token?client_id=#{@client_id}&client_secret=#{@client_secret}"
+      raw = post_token(:post, url, "token", {})
+      parse_raw = parse_json_response(raw)
+      resp = parse_raw['body']
+      @token = resp['access_token']
+    end
 
-  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"]
-  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)
+    end
 
-  def post_json(url, object_type, metadata)
-    json_object = create_json_object(object_type, metadata)
-    @conn.post do |req|
-      req.url url
-      req.headers["Content-Type"] = JSON_CONTENT_TYPE
-      req.body = json_object
+    def get_json(url, token=nil, params = {})
+       headers =  {'Authorization' => "Bearer #{get_token(token)}"}
+       conn.get(url, params, headers)
     end
-  end
 
-  def put_json(url, object_type, metadata)
-    json_object = create_json_object(object_type, metadata)
-    @conn.put do |req|
-      req.url url
-      req.headers["Content-Type"] = JSON_CONTENT_TYPE
-      req.body = json_object
+    def multi_get_json(service_location, query_parameters, token=nil)
+      results = []
+
+      EventMachine.run do
+        multi = EventMachine::MultiRequest.new
+
+        connection_opts = {}
+        connection_opts = {proxy: {host: @proxy.sub(/^https?\:\/\//, ''), port: 80}} if @proxy.present?
+
+        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)}"}
+          multi.add idx, req
+        end
+
+        multi.callback do
+          response = multi.responses[:callback]
+          error =  multi.responses[:errback]
+          EventMachine.stop
+
+          (0..query_parameters.size-1).each do |idx|
+            results += [multi_parse_json_response(response[idx])] if response[idx].present?
+            results += [multi_parse_json_response(error[idx])] if error[idx].present?
+          end
+        end
+      end
+
+      results
     end
-  end
 
-  def get_with_hash(url, hash_object = {})
-    @conn.get url, hash_object
-  end
+    def post_json(url, object_type, metadata, token=nil)
+      http_json(:post, url, object_type, metadata, token)
+    end
 
-  def create_json_object(object_type, metadata = {})
-    json_object= {object_type => metadata}
-    json_object.to_json
-  end
+    def put_json(url, object_type, metadata, token=nil)
+      http_json(:put, url, object_type, metadata, token)
+    end
 
-  def create_metadata(hashmap)
-    metadata = {}
-    hashmap.each do |key, value|
-      metadata[key] = value unless value == ""
+    def http_json(http_method, url, object_type, metadata, token)
+      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
+      end
+      conn.send(http_method, &json_block)
     end
-    metadata
-  end
 
-  def find_or_create_event_types(event_types)
-    all_event_types = JSON.parse(get_with_hash("#{@service_location}/event_types.json").body)
-    all_event_types["event_types"].each do |event_type|
-      event_types.delete(event_type["name"]) if event_types.include?(event_type["name"])
+    def create_json_object(object_type, metadata = {})
+      {object_type => metadata}.to_json
     end
-    event_types.each do |event_type|
-      create_event_type(event_type)
+
+    def create_metadata(hashmap)
+      hashmap.reject { |k,v| v == "" }
     end
-    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)
+    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|
+        create_event_type(event_type)
       end
+      event_types
     end
-  end
 
-  def get_all_dimension_names
-    dimension_names = []
-    dimensions = JSON.parse(get_with_hash("#{@service_location}/dimensions.json").body)
-    dimensions["dimensions"].each do |one_dimension|
-      dimension_names << one_dimension["name"]
+    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)
+        end
+      end
     end
-    dimension_names
-  end
 
-  def find_or_create_service(service_name)
-    service_location = find_service_location(service_name)
-    if !service_location
-      service_location = create_service_private(service_name)
+    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
     end
-    service_location
-  end
 
-  def find_service_location(service_name)
-    service_location = nil
-    all_services = JSON.parse(get_with_hash("#{API_URL}.json").body)
-    all_services["services"].each do |service|
-      service_location = service if service["name"] == service_name
+    def create_service_private(name, description = "")
+      metadata = create_metadata({name: name, description: description})
+      post_json(API_URL, "service", metadata)
     end
-    service_location
-  end
 
-  def create_service_private(name, description = "")
-    metadata = create_metadata({:name => name, :description => description})
-    post_json(API_URL, "service", metadata)
-  end
+    def parse_json_response(json_response)
+      parsed_response = {}
+      parsed_response[PARSED_RESPONSE[:status]]   = json_response.status if json_response.status.present?
 
-  def parse_json_response(json_response)
-    parsed_response = {}
-    parsed_response[PARSED_RESPONSE_STATUS] = json_response.status if json_response.status
-    parsed_response[PARSED_RESPONSE_BODY] = json_response.body if json_response.body && json_response.body.strip != ""
-    parsed_response[PARSED_RESPONSE_LOCATION] = json_response.headers["location"] if json_response.headers && json_response.headers["location"]
-    parsed_response
-  end
+      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"]
+      else
+        parsed_response[PARSED_RESPONSE[:body]]     = {}
+        parsed_response[PARSED_RESPONSE[:error_message]] = json_response.body
+      end
 
-  def delete_resource(url)
-    @conn.delete url
-  end
+      parsed_response
+    end
 
-  def faraday_connection
-    return Faraday.new(@server_url) if @proxy == nil
-    Faraday.new(@server_url, {:proxy => {:uri => @proxy}})
-  end
+    def multi_parse_json_response(response)
+      parsed_response = {}
+      parsed_response[PARSED_RESPONSE[:status]] = response.response_header.present? ? response.response_header.status : 500
 
 
-end
+      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?
+      else
+        parsed_response[PARSED_RESPONSE[:body]] = {}
+        parsed_response[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}")
+    end
+
+    def faraday_connection
+      return Faraday.new(@server_url) if @proxy == nil
+      Faraday.new(@server_url, {proxy: {uri: @proxy}})
+    end
+
+  end
+end

data/lib/analytics_report.rb

@@ -0,0 +1,10 @@
+require 'active_model'
+
+class AnalyticsReport
+
+  include ActiveModel::Model
+
+  # :rows is an array of hashes where each hash is a row containing AnalyticsReportField objects
+  attr_accessor :status, :rows, :error_message
+
+end

data/lib/analytics_report_field.rb

@@ -0,0 +1,25 @@
+require 'active_model'
+
+class AnalyticsReportField
+
+  include ActiveModel::Model
+
+  attr_accessor :name, :value, :is_aggregate
+
+  def to_s
+    @value.to_s
+  end
+
+  def sum
+    @value['sum'].present? ? @value['sum'] : 0
+  end
+
+  def avg
+    @value['avg'].present? ? @value['avg'] : 0
+  end
+
+  def stddev
+    @value['stddev'].present? ? @value['stddev'] : 0
+  end
+
+end

metadata

@@ -1,83 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: analytics-psw
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.3.0
 platform: ruby
 authors:
-- Jordan Keyes
+- Lexmark International Technology S.A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-08-05 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: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        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'
 description: Analytics-psw is a wrapper providing access to the Perceptive Cloud Platform
@@ -88,14 +130,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/analytics-psw.rb
-- lib/analytics_dimension_properties.rb
-- lib/analytics_dimensions.rb
-- lib/analytics_event_types.rb
-- lib/analytics_reports.rb
-- lib/analytics_services.rb
 - LICENSE.txt
 - README.md
+- lib/analytics-psw.rb
+- lib/analytics-psw/customers.rb
+- lib/analytics-psw/dimension_properties.rb
+- lib/analytics-psw/dimensions.rb
+- lib/analytics-psw/event_types.rb
+- lib/analytics-psw/events.rb
+- lib/analytics-psw/reports.rb
+- lib/analytics-psw/services.rb
+- lib/analytics_report.rb
+- lib/analytics_report_field.rb
 homepage: 
 licenses:
 - 3-Clause BSD
@@ -106,17 +152,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.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Perceptive Cloud Platform Analytics Service Wrapper

data/lib/analytics_dimension_properties.rb

@@ -1,87 +0,0 @@
-module AnalyticsDimensionProperties
-
-  SERVICE_NAME_PARAM = 'service_name'
-  DIMENSION_NAME_PARAM = 'dimension_name'
-  DIMENSION_PROPERTY_VALUE_PARAM = 'dimension_property_value'
-
-  def list_dimension_properties(dimension_name)
-    response = request_uri_to_dimension_properties(dimension_name)
-    if valid_uri_response?(response)
-      uri = uri_from_uri_response(response)
-      response = get_with_hash(uri)
-    end
-    parse_json_response(response)
-  end
-
-  def show_dimension_properties(dimension_name, dimension_value)
-    response = request_uri_to_dimension_properties(dimension_name, dimension_value)
-    if valid_uri_response?(response)
-      uri = uri_from_uri_response(response)
-      response = get_with_hash(uri)
-    end
-    parse_json_response(response)
-  end
-
-  def create_dimension_properties(dimension_name, dimension_value, properties = {})
-    metadata = create_dimension_properties_metadata(dimension_value, properties)
-    response = request_uri_to_dimension_properties(dimension_name)
-    if valid_uri_response?(response)
-      uri = uri_from_uri_response(response)
-      response = post_json(uri, "dimension_property", metadata)
-    end
-    parse_json_response(response)
-  end
-
-  def update_dimension_properties(dimension_name, dimension_value, properties = {})
-    metadata = create_dimension_properties_metadata(dimension_value, properties)
-    response = request_uri_to_dimension_properties(dimension_name, dimension_value)
-    if valid_uri_response?(response)
-      uri = uri_from_uri_response(response)
-      response = put_json(uri, "dimension_property", metadata)
-    end
-    parse_json_response(response)
-  end
-
-  def create_or_update_dimension_properties(dimension_name, dimension_value, properties = {})
-    response = request_uri_to_dimension_properties(dimension_name, dimension_value)
-    if valid_uri_response?(response)
-      return update_dimension_properties(dimension_name, dimension_value, properties)
-    end
-    create_dimension_properties(dimension_name, dimension_value, properties)
-  end
-
-  private
-
-  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 == ""
-    end
-    dimension_properties_body
-  end
-
-  def request_uri_to_dimension_properties(dimension_name, dimension_value = nil)
-    uri_path = "#{@server_url}/uris/dimension_property"
-    uri_path_query_params = dimension_property_uri_query_params(dimension_name, dimension_value)
-    get_with_hash(uri_path, uri_path_query_params)
-  end
-
-  def valid_uri_response?(uri_response)
-    uri_response.status == 200
-  end
-
-  def uri_from_uri_response(uri_response)
-    parsed_json_body = JSON.parse(uri_response.body)
-    parsed_json_body['uri']['location']
-  end
-
-  def dimension_property_uri_query_params(dimension_name, dimension_value)
-    query_params = {
-      SERVICE_NAME_PARAM => @service_name,
-      DIMENSION_NAME_PARAM => dimension_name,
-    }
-    query_params[DIMENSION_PROPERTY_VALUE_PARAM] = dimension_value unless dimension_value.nil?
-    query_params
-  end
-
-end

data/lib/analytics_dimensions.rb

@@ -1,24 +0,0 @@
-module AnalyticsDimensions
-
-  def create_dimension(name, data_type, units = "", description = "")
-    metadata = create_metadata({:name => name, :description => description, :data_type => data_type, :units => units})
-    resp = post_json("#{@service_location}/dimensions", "dimension", metadata)
-    parse_json_response(resp)
-  end
-
-  def list_dimensions
-    resp = get_with_hash("#{@service_location}/dimensions")
-    parse_json_response(resp)
-  end
-
-  def show_dimension_resources(dimension_id)
-    resp = get_with_hash("#{@service_location}/dimensions/#{dimension_id}")
-    parse_json_response(resp)
-  end
-
-  def show_dimension_metadata(dimension_id)
-    resp = get_with_hash("#{@service_location}/dimensions/#{dimension_id}/metadata")
-    parse_json_response(resp)
-  end
-
-end

data/lib/analytics_event_types.rb

@@ -1,19 +0,0 @@
-module AnalyticsEventTypes
-
-  def create_event_type(name, description = "")
-    metadata = create_metadata({:name => name, :description => description})
-    resp = post_json("#{@service_location}/event_types", "event_type", metadata)
-    parse_json_response(resp)
-  end
-
-  def list_event_types
-    resp = get_with_hash("#{@service_location}/event_types")
-    parse_json_response(resp)
-  end
-
-  def show_event_type(event_type_id)
-    resp = get_with_hash("#{@service_location}/event_types/#{event_type_id}")
-    parse_json_response(resp)
-  end
-
-end

data/lib/analytics_reports.rb

@@ -1,35 +0,0 @@
-module AnalyticsReports
-
-  def query_analytics(query_parameters)
-    resp = get_with_hash("#{@service_location}/reports/query.json", query_parameters)
-    raise "Problem with your query. Please check the required parameters and try again" if resp.status == 400
-    parse_json_response(resp)
-  end
-
-  def create_report(name, query_parameters)
-    query_parameters[:name] = name
-    resp = post_json("#{@service_location}/reports", "report", query_parameters )
-    parse_json_response(resp)
-  end
-
-  def list_reports
-    resp = get_with_hash("#{@service_location}/reports")
-    parse_json_response(resp)
-  end
-
-  def show_report(report_id)
-    resp = get_with_hash("#{@service_location}/reports/#{report_id}")
-    parse_json_response(resp)
-  end
-
-  def run_report(report_id, where_criteria = {})
-    resp = get_with_hash("#{@service_location}/reports/#{report_id}/results", where_criteria)
-    parse_json_response(resp)
-  end
-
-  def delete_report(report_id)
-    resp = delete_resource("#{@service_location}/reports/#{report_id}")
-    parse_json_response(resp)
-  end
-
-end

data/lib/analytics_services.rb

@@ -1,26 +0,0 @@
-module AnalyticsServices
-
-  def create_service(name)
-    create_service_private(name)
-  end
-
-  def list_services
-    resp = get_with_hash("/services")
-    parse_json_response(resp)
-  end
-
-  def show_service_resources(service_id)
-    resp = get_with_hash("/services/#{service_id}")
-    parse_json_response(resp)
-  end
-
-  def show_service_metadata(service_id)
-    resp = get_with_hash("/services/#{service_id}/metadata")
-    parse_json_response(resp)
-  end
-
-  def delete_service(service_id)
-    resp = delete_resource("/services/#{service_id}")
-    parse_json_response(resp)
-  end
-end