romniture 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Y2MxNmZmZTA4YTA3ZGFjOGFiNGJmNGU4MTUwNjYxMzk5ZmQ0OGMyNQ==
+  data.tar.gz: !binary |-
+    NTkxY2NiOWE0MGNhYzkxMmNiMTViMDVjZTUxNWQ2MzU3MzdlODNmNQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    Y2FiMmU1ZmQ0N2E5ZTllNjZjMDkwYzJiYWYzMmRhOWYzMzRiYzQwNTA0OWE2
+    MzM1ZTUxNjdlNWJhNTFiNWNjZWQxMmJkMGNkY2Y5YTJmZTYxNjBiMWQ0N2Zm
+    NjQ5YTM4MzcxOWU1YjAxNTRhMDc1ODNjYzk3MGMzYjFmN2E3ZDE=
+  data.tar.gz: !binary |-
+    ZDlhYjllOWUyNWQ4MjUzZTAwYmNiZmE5ZmJlMzczMDY4NTdiZjljZWM4OGZl
+    NDBjOGRlMWMyMjZiODI1MzdjNWY0YTEwYjRjMmI5YmFkMTU2OWVkZGM4YWJj
+    MmRjM2NlNGVkY2NkZTBlMzU5MzQzOWM4ZjM3NjcxYmQ3OWEyNjg=

data/README.markdown

@@ -12,12 +12,12 @@ Omniture's API is closed, you have to be a paying customer in order to access th
 ## initialization and authentication
 romniture requires you supply the `username`, `shared_secret` and `environment` which you can access within the Company > Web Services section of the Admin Console.  The environment you'll use to connect to Omniture's API depends on which data center they're using to store your traffic data and will be one of:
 
-* San Jose (https://api.omniture.com/admin/1.2/rest/)
-* Dallas (https://api2.omniture.com/admin/1.2/rest/)
-* London (https://api3.omniture.com/admin/1.2/rest/)
-* San Jose Beta (https://beta-api.omniture.com/admin/1.2/rest/)
-* Dallas (beta) (https://beta-api2.omniture.com/admin/1.2/rest/)
-* Sandbox (https://api-sbx1.omniture.com/admin/1.2/rest/)
+* San Jose (https://api.omniture.com/admin/1.3/rest/)
+* Dallas (https://api2.omniture.com/admin/1.3/rest/)
+* London (https://api3.omniture.com/admin/1.3/rest/)
+* San Jose Beta (https://beta-api.omniture.com/admin/1.3/rest/)
+* Dallas (beta) (https://beta-api2.omniture.com/admin/1.3/rest/)
+* Sandbox (https://api-sbx1.omniture.com/admin/1.3/rest/)
 
 Here's an example of initializing with a few configuration options.
 

data/lib/romniture/client.rb

@@ -5,12 +5,12 @@ module ROmniture
     DEFAULT_REPORT_WAIT_TIME = 0.25
     
     ENVIRONMENTS = {
-      :san_jose       => "https://api.omniture.com/admin/1.2/rest/",
-      :dallas         => "https://api2.omniture.com/admin/1.2/rest/",
-      :london         => "https://api3.omniture.com/admin/1.2/rest/",
-      :san_jose_beta  => "https://beta-api.omniture.com/admin/1.2/rest/",
-      :dallas_beta    => "https://beta-api2.omniture.com/admin/1.2/rest/",
-      :sandbox        => "https://api-sbx1.omniture.com/admin/1.2/rest/"
+      :san_jose       => "https://api.omniture.com/admin/1.3/rest/",
+      :dallas         => "https://api2.omniture.com/admin/1.3/rest/",
+      :london         => "https://api3.omniture.com/admin/1.3/rest/",
+      :san_jose_beta  => "https://beta-api.omniture.com/admin/1.3/rest/",
+      :dallas_beta    => "https://beta-api2.omniture.com/admin/1.3/rest/",
+      :sandbox        => "https://api-sbx1.omniture.com/admin/1.3/rest/"
     }    
     
     def initialize(username, shared_secret, environment, options={})
@@ -26,8 +26,15 @@ module ROmniture
         
     def request(method, parameters = {})
       response = send_request(method, parameters)
-      
-      JSON.parse(response.body)
+
+      begin
+        JSON.parse(response.body)
+      rescue JSON::ParserError => pe
+        response.body
+      rescue Exception => e
+        log(Logger::ERROR, "Error in request response:\n#{response.body}")
+        raise "Error in request response:\n#{response.body}"
+      end
     end
     
     def get_report(method, report_description)      
@@ -143,4 +150,4 @@ module ROmniture
       JSON.parse(response.body)
     end
   end
-end
+end

data/lib/romniture/version.rb

@@ -1,3 +1,3 @@
 module ROmniture
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/client_test.rb

@@ -2,14 +2,15 @@ require 'rubygems'
 require 'test/unit'
 require 'yaml'
 
+$:.unshift File.expand_path('../../lib', __FILE__)
 require 'romniture'
 
 class ClientTest < Test::Unit::TestCase
-  
+
   def setup
     config = YAML::load(File.open("test/config.yml"))
     @config = config["omniture"]
-    
+
     @client = ROmniture::Client.new(
       @config["username"],
       @config["shared_secret"],
@@ -18,14 +19,14 @@ class ClientTest < Test::Unit::TestCase
       :wait_time => @config["wait_time"]
     )
   end
-  
+
   def test_simple_request
     response = @client.request('Company.GetReportSuites')
-    
+
     assert_instance_of Hash, response, "Returned object is not a hash."
     assert(response.has_key?("report_suites"), "Returned hash does not contain any report suites.")
   end
-  
+
   def test_report_request
     response = @client.get_report "Report.QueueOvertime", {
       "reportDescription" => {
@@ -35,11 +36,11 @@ class ClientTest < Test::Unit::TestCase
         "metrics" => [{"id" => "pageviews"}]
         }
       }
-    
+
     assert_instance_of Hash, response, "Returned object is not a hash."
     assert(response["report"].has_key?("data"), "Returned hash has no data!")
   end
-  
+
   def test_a_bad_request
     # Bad request, mixing commerce and traffic variables
     assert_raise(ROmniture::Exceptions::OmnitureReportException) do
@@ -54,5 +55,9 @@ class ClientTest < Test::Unit::TestCase
       })
     end
   end
-  
+
+  def test_return_response_body_on_parse_error
+    non_json_response = @client.request('Company.GetTokenCount')
+    assert_instance_of String, non_json_response, "Company.GetTokenCount returned #{non_json_response}."
+  end
 end

metadata

@@ -1,61 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: romniture
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+version: !ruby/object:Gem::Version
+  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Mike Sukmanowsky
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-30 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httpi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A library that allows access to Omniture's REST API libraries (developer.omniture.com)
-email: 
+email:
 - mike.sukmanowsky@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.markdown
@@ -66,39 +55,28 @@ files:
 - lib/romniture/exceptions.rb
 - lib/romniture/version.rb
 - test/client_test.rb
-has_rdoc: true
 homepage: http://github.com/msukmanowsky/ROmniture
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+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: romniture
-rubygems_version: 1.5.0
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use Omniture's REST API with ease.
-test_files: 
+test_files:
 - test/client_test.rb