analytics-psw 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 4bf8f2134683aece988ea3f1726661d3d7c556d0
-  data.tar.gz: afa99d34d709b1efcc5144aa4cc32452445f2fa5
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTdmY2VhYmRjMGVkNTRlOGZjYzQzNmY5MTFmMzU5YWJkY2EwY2M3ZQ==
+  data.tar.gz: !binary |-
+    NTAzOTQ0YzM0NjY3MTgwYzI0MjUyNmFiODVmM2U3YjI1ZGQwMTAxNA==
 SHA512:
-  metadata.gz: 22b87c82d55db88f9b3856ab87c49a28248e649bad06c120395438edea07766dcc2473f63ff9f0d7011d892a1643365fc48280ed907a7f57007f2dbc906e8957
-  data.tar.gz: e1f5403a0206bace7f8687dbc9512d850a6c1dba8dcf092a65bc04af2c0d58250acfced6f730354afee2ada4a45db55e2615fbe0f3aa7f57b0a61a8ddca5924e
+  metadata.gz: !binary |-
+    MDIzNzFlYWQ4NjczMjUyMTA2YmM4ZjBiYzU0NDIzZjUwNjQ3MjAxNzRmYmE3
+    MzY4ZTNhNjY3MDQ2YzM5YmM1MzI1OGFhZWI0ZTFmZmU1M2Y0Y2VhODI4NjU2
+    YmIwMzk3ZGU1ZmMyYzcwNjFkMmM0ODkxMWI2MmU0ODdhZDRkYmQ=
+  data.tar.gz: !binary |-
+    MjYyZDIzNTBiMmEyMWEzYzIzZWMzMWMxZjMzOWQzNTUwZGU0NmUzNDY1NmFl
+    YTg4YzYzMzhiZDI0MjE4NjdlOTNmMDMxYjNkMmE0Nzg5OTQ4YzZiOTY3MDUx
+    ZWUzYjJiNGNhYmU2YmFiYjEyNmUzYzg0NmIzMjJmYmNhMTJiMzA=

data/lib/analytics-psw.rb

@@ -29,7 +29,12 @@ module AnalyticsPSW
             AnalyticsPSW::Utilities,
             AnalyticsPSW::RecentEvents
 
-    attr_accessor :service_location
+    attr_accessor :service_location, :event_types, :dimensions
+
+    def self.get(opts = {})
+      klass = opts['mock'] ? MockAnalytics : Analytics
+      klass.new(opts)
+    end
 
     def initialize(opts = {})
       set_vars_from_opts(opts)
@@ -56,4 +61,24 @@ module AnalyticsPSW
       @client_secret = opts['client_secret']
     end
   end
+
+  class MockAnalytics
+    attr_accessor :event_types, :dimensions
+
+    def initialize(opts = {})
+      debug("initializing mock Analytics")
+      @event_types = opts['event_types'] || []
+      @dimensions = opts['dimensions'] ? (opts['dimensions'].map { |hsh| hsh.keys }.flatten) : []
+    end
+
+    def record_event(event_type, metadata = {}, asynchronous = false)
+      debug("record event: #{event_type}, #{metadata.inspect}")
+    end
+
+    def debug(msg)
+      return unless defined?(Rails)
+
+      Rails.logger.info("Analytics: " + msg)
+    end
+  end
 end

data/lib/analytics-psw/rack/request_logger.rb

@@ -54,5 +54,11 @@ module AnalyticsPSW::Rack
     def request
       Rack::Request.new(@env)
     end
+
+    def analytics_load
+      if @env['request_logging.load']
+        @env['request_logging.load'].call
+      end
+    end
   end
 end

data/lib/analytics-psw/rack/request_logging.rb

@@ -3,6 +3,7 @@ module AnalyticsPSW::Rack
     protected
 
     def log_request
+      return unless analytics_load
       return unless analytics_service
       return unless analytics_event_types.include?(analytics_event_type)
       analytics_service.record_event(analytics_event_type, log_request_params, true)
@@ -17,15 +18,15 @@ module AnalyticsPSW::Rack
     end
 
     def analytics_event_types
-      analytics_service.instance_variable_get('@event_types')
+      analytics_service.event_types
     end
 
     def analytics_dimensions
-      analytics_service.instance_variable_get('@dimensions')
+      analytics_service.dimensions
     end
 
     def log_request_headers
-      %w(HTTP_USER_AGENT REQUEST_PATH)
+      %w(HTTP_USER_AGENT REQUEST_PATH PATH_INFO SERVER_NAME REMOTE_HOST REQUEST_METHOD)
     end
 
     def log_request_header_params
@@ -41,6 +42,7 @@ module AnalyticsPSW::Rack
 
     def canonical_request_path
       return nil unless defined?(Rails)
+      return nil unless Rails.application.routes.respond_to?(:router)
 
       Rails.application.routes.router.recognize(request) do |route, _|
         return route.path.spec.to_s

data/lib/analytics_report.rb

@@ -1,10 +1,27 @@
 require 'active_model'
 
 class AnalyticsReport
+  if defined?(ActiveModel::Model)
+    include ActiveModel::Model
+  else
+    extend ActiveSupport::Concern
+    include ActiveModel::Validations
+    include ActiveModel::Conversion
 
-  include ActiveModel::Model
+    included do
+      extend ActiveModel::Naming
+      extend ActiveModel::Translation
+    end
+
+    def initialize(params={})
+      params.each do |attr, value|
+        self.public_send("#{attr}=", value)
+      end if params
+
+      super()
+    end
+  end
 
   # :rows is an array of hashes where each hash is a row containing AnalyticsReportField objects
   attr_accessor :status, :rows, :error_message
-
-end
+end

data/lib/analytics_report_field.rb

@@ -1,8 +1,26 @@
 require 'active_model'
 
 class AnalyticsReportField
-
-  include ActiveModel::Model
+  if defined?(ActiveModel::Model)
+    include ActiveModel::Model
+  else
+    extend ActiveSupport::Concern
+    include ActiveModel::Validations
+    include ActiveModel::Conversion
+
+    included do
+      extend ActiveModel::Naming
+      extend ActiveModel::Translation
+    end
+
+    def initialize(params={})
+      params.each do |attr, value|
+        self.public_send("#{attr}=", value)
+      end if params
+
+      super()
+    end
+  end
 
   attr_accessor :name, :value, :is_aggregate
 
@@ -22,4 +40,4 @@ class AnalyticsReportField
     @value['stddev'].present? ? @value['stddev'] : 0
   end
 
-end
+end

data/lib/tasks/analytics.rake

@@ -39,7 +39,7 @@ namespace :analytics do
     end
     opts[:where] = [
                     "event_time gte #{begin_date}",
-                    "event_time lte #{end_date}",
+                    "event_time lte #{end_date}T23:59:59+00:00",
                    ]
     dump_report(event_type, analytics.query_analytics(opts))
     puts ""
@@ -56,6 +56,6 @@ def analytics_define_group_by_tasks(analytics, event_type, dimensions)
     end
 
     desc "Display all analytics reports"
-    task all: Rake.application.tasks.select { |t| t.scope.path == "analytics" && t.name != 'analytics:group_by' }.map(&:name)
+    task all: Rake.application.tasks.select { |t| (t.scope.is_a?(Array) ? t.scope == [ "analytics" ] : t.scope.path == "analytics") && t.name != 'analytics:group_by' }.map(&:name)
   end
 end

metadata

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