analytics-psw 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b6e9f607285d3b857b09d8184d0574ec5342da1
-  data.tar.gz: e6836265df1b2cf10d85ae9882a41807071179d2
+  metadata.gz: 9690e2147d8783257c8dac2434b4aaeefc43e685
+  data.tar.gz: ac1356c8a0a8eda726162ee4140d48a3a143c570
 SHA512:
-  metadata.gz: a7046c2495b68a33f354575f2c14fac7e48812355dabb92b07119bca74a3bf02a3dbcdb03414d8deadc0b263a07f34d3ad512cd710d9e3d497d19523890b1a8c
-  data.tar.gz: 1472c13dc9ed25b8799b50f0a4087a48d4bb1dc88c2506d56ed0a003d83f69924b34d53bf115d044cf106b4c6d3b8ef370df771a3f045bc03612787bb129e03b
+  metadata.gz: 4910eea5494ffd59db4dbb55df02172ed2b8fc366116d576b60fda4de474401be469cafb189fe4a6b4c9094bb176b6b2605bd5a727d727e126d64e6faec9bc63
+  data.tar.gz: 14776571c8758a048240c65d56025638ee1807a67e73d035eb99de42cd4c885cc003dd2b360c1a7706d0fd82768e66f4fd1d97e65aee603a48741ad5aed90f53

data/lib/analytics-psw.rb

@@ -1,147 +1,157 @@
-require "faraday"
-require "json"
-
-class AnalyticsPSW
-
-  API_URL = "/services"
-  JSON_CONTENT_TYPE = "application/json"
-
-  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
-
-  def record_event(event_type, metadata = {})
-    metadata[:event_type] = event_type
-    resp = post_json("#{@service_location}/events", "event", metadata)
-    parse_json_response(resp)
-  end
-
-  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_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 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
-
-  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"]
-  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
-    end
-  end
-
-  def get_with_hash(url, hash_object = {})
-    @conn.get url, hash_object
-  end
-
-  def create_json_object(object_type, metadata = {})
-    json_object= {object_type => metadata}
-    json_object.to_json
-  end
-
-  def create_metadata(hashmap)
-    metadata = {}
-    hashmap.each do |key, value|
-      metadata[key] = value unless value == ""
-    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"])
-    end
-    event_types.each do |event_type|
-      create_event_type(event_type)
-    end
-    event_types
-  end
-
-  def find_or_create_dimensions(dimensions)
-    all_dimensions = get_all_dimensions
-    dimensions.each do |dimension|
-      dimension.each do |name, data_type|
-        create_dimension(name, data_type) unless all_dimensions.include?(name)
-      end
-    end
-  end
-
-  def get_all_dimensions
-    all_dimensions = []
-    dimensions = JSON.parse(get_with_hash("#{@service_location}/dimensions.json").body)
-    dimensions["dimensions"].each do |one_dimension|
-      all_dimensions << one_dimension["name"]
-    end
-    all_dimensions
-  end
-
-  def find_or_create_service(service_name)
-    service_location = find_service_location(service_name)
-    if !service_location
-      service_location = create_service(service_name)
-    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
-    end
-    service_location
-  end
-
-  def create_service(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["status"] = json_response.status if json_response.status
-    parsed_response["body"] = json_response.body if json_response.body && json_response.body.strip != ""
-    parsed_response["location"] = json_response.headers["location"] if json_response.headers && json_response.headers["location"]
-    parsed_response
-  end
-
-  def faraday_connection
-    return Faraday.new(@server_url) if @proxy == nil
-    Faraday.new(@server_url, {:proxy => {:uri => @proxy}})
-  end
-
+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
+
+  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"]
+  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
+    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
+    end
+  end
+
+  def get_with_hash(url, hash_object = {})
+    @conn.get url, hash_object
+  end
+
+  def create_json_object(object_type, metadata = {})
+    json_object= {object_type => metadata}
+    json_object.to_json
+  end
+
+  def create_metadata(hashmap)
+    metadata = {}
+    hashmap.each do |key, value|
+      metadata[key] = value unless value == ""
+    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"])
+    end
+    event_types.each do |event_type|
+      create_event_type(event_type)
+    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)
+      end
+    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"]
+    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)
+    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
+    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
+    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
+
+  def delete_resource(url)
+    @conn.delete url
+  end
+
+  def faraday_connection
+    return Faraday.new(@server_url) if @proxy == nil
+    Faraday.new(@server_url, {:proxy => {:uri => @proxy}})
+  end
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: analytics-psw
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jordan Keyes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,56 +28,56 @@ dependencies:
   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
   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: 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'
 description: Analytics-psw is a wrapper providing access to the Perceptive Cloud Platform
@@ -99,17 +99,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.0.14
+rubygems_version: 2.1.4
 signing_key: 
 specification_version: 4
 summary: Perceptive Cloud Platform Analytics Service Wrapper