tamber 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34977d3642e3fadc688e4fb95a73e54a44ec2dc5
-  data.tar.gz: e336d5302a49b3d7c0905e79c3030754c0bb3061
+  metadata.gz: 04cbb04bf2dbb1a3c938529885994ffda6b37cd2
+  data.tar.gz: f63ed8198c31d0167d1e7e4295d1b98eb0828f47
 SHA512:
-  metadata.gz: d7be4a452e9be2c12b590fbefdb5fb9dfb58df43cc861d271431921664867cd2320e190b62daf26da558d3bc7dbbc3cf44339d4be103662745c381cd144503c5
-  data.tar.gz: 1d0292b2c0abb24435af72dac96621cf1297d4fd70caa014f031033390ddf6958ad8d79bfd4353311fb190098c0cda24f6f10d99b5151d479ed9b9769bfd1597
+  metadata.gz: a835f33afe46afd0ea1bf1466f3d436a722d4de7b9c5edf0bb4cd7706676bfb10f00e41846fe62841f02255354700db70a29971903495598623b4dd0c6d260a7
+  data.tar.gz: 745676b9e419f44b4e5df47e272eeb245d9e5bdbe56610969ad9b66a45c8d037830eb104b7e98f15dfb38ac9c1dcb3fc2dec76f00d0c450e6d25f1a826803250

data/Rakefile

@@ -5,13 +5,3 @@ task :default => [:test]
 Rake::TestTask.new do |t|
   t.pattern = './test/*_test.rb'
 end
-
-# desc "update bundled certs"
-# task :update_certs do
-#   require "restclient"
-#   File.open(File.join(File.dirname(__FILE__), 'lib', 'data', 'ca-certificates.crt'), 'w') do |file|
-#     resp = RestClient.get "https://raw.githubusercontent.com/bagder/ca-bundle/master/ca-bundle.crt"
-#     abort("bad response when fetching bundle") unless resp.code == 200
-#     file.write(resp.to_str)
-#   end
-# end

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/tamber.rb

@@ -42,7 +42,7 @@ module Tamber
   @read_timeout = 80
 
   class << self
-    attr_accessor :project_key, :engine_key, :api_base, :api_version, :verify_ssl_certs, :open_timeout, :read_timeout
+    attr_accessor :project_key, :engine_key, :api_version, :verify_ssl_certs, :open_timeout, :read_timeout
   end
 
 
@@ -59,7 +59,6 @@ module Tamber
   end
 
   def self.request(method, url, params={})
-    api_base_url = api_base_url || @api_base
 
     if project_key =~ /\s/
       raise TamberError.new('Your project key is invalid, as it contains ' \
@@ -88,8 +87,7 @@ module Tamber
       end
     end
 
-    # params = Util.objects_to_ids(params)
-    url = api_url(api_base_url,url)
+    url = @api_url + url
 
     case method.to_s.downcase.to_sym
     when :get, :head, :delete
@@ -104,15 +102,17 @@ module Tamber
                         :method => method, :open_timeout => open_timeout,
                         :payload => payload, :url => url, :timeout => read_timeout)
 
-    response = execute_request_with_rescues(request_opts, api_base_url)
+    response = execute_request_with_rescues(request_opts)
 
     [parse(response)]
   end
 
 
 
-  def self.request_headers(project_key, engine_key, method)
-    encoded_key  = Base64.encode64(project_key + ':' + engine_key)
+  def self.request_headers(pkey, ekey, method)
+    pkey ||= ''
+    ekey ||= ''
+    encoded_key  = Base64.encode64(pkey + ':' + ekey)
     headers = {
       :user_agent => "Tamber/v1 RubyBindings/#{Tamber::VERSION}",
       :authorization => "Basic "+encoded_key,
@@ -148,6 +148,10 @@ module Tamber
     TamberError.new("Invalid response object from API: "+rbody.inspect)
   end
 
+  def self.handle_restclient_error(e, request_opts)
+    parse(e)
+  end
+
   def self.execute_request(opts)
     RestClient::Request.execute(opts)
   end
@@ -163,36 +167,36 @@ module Tamber
     rescue JSON::ParserError
       raise general_api_error(response.body)
     end
-
     Util.symbolize_names(response)
   end
 
   private
 
-  def self.execute_request_with_rescues(request_opts, api_base_url, retry_count = 0)
-    response = execute_request(request_opts)
-    # begin
-    #   response = execute_request(request_opts)
-    # rescue SocketError => e
-    #   response = handle_restclient_error(e, request_opts, retry_count, api_base_url)
-    # rescue NoMethodError => e
-    #   # Work around RestClient bug
-    #   if e.message =~ /\WRequestFailed\W/
-    #     e = APIConnectionError.new('Unexpected HTTP response code')
-    #     response = handle_restclient_error(e, request_opts, retry_count, api_base_url)
-    #   else
-    #     raise
-    #   end
-    # rescue RestClient::ExceptionWithResponse => e
-    #   if e.response
-    #     handle_api_error(e.response)
-    #   else
-    #     response = handle_restclient_error(e, request_opts, retry_count, api_base_url)
-    #   end
-    # rescue RestClient::Exception, Errno::ECONNREFUSED => e
-    #   response = handle_restclient_error(e, request_opts, retry_count, api_base_url)
-    # end
-
-    # response
+  def self.execute_request_with_rescues(request_opts)
+    # response = execute_request(request_opts)
+    begin
+      response = execute_request(request_opts)
+    rescue SocketError => e
+      response = handle_restclient_error(e, request_opts)
+    rescue NoMethodError => e
+      # Work around RestClient bug
+      if e.message =~ /\WRequestFailed\W/
+        raise TamberError.new('Error: Unexpected HTTP response code')
+      else
+        raise
+      end
+    rescue RestClient::ExceptionWithResponse => e
+      puts "ExceptionWithResponse: #{e}"
+      if e.response
+        puts "e.response"
+        parse(e.response)
+      else
+        response = handle_restclient_error(e, request_opts)
+      end
+    rescue RestClient::Exception, Errno::ECONNREFUSED => e
+      response = handle_restclient_error(e, request_opts)
+    end
+
+    response
   end
 end

data/lib/tamber/version.rb

@@ -1,3 +1,3 @@
 module Tamber
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/tamber.gemspec

@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   s.add_dependency('rest-client', '~> 1.4')
   s.add_dependency('json', '~> 1.8.1')
-  s.add_dependency('activesupport', '~> 4.2.6')
+  s.add_dependency('activesupport', '~> 4.2.4')
 
   s.add_development_dependency('mocha', '~> 0.13.2')
   s.add_development_dependency('shoulda', '~> 3.4.0')

data/test/behavior_test.rb

@@ -9,8 +9,6 @@ module Tamber
           :desirability => 0.2
         )
         puts e
-      rescue TamberError => error
-        puts error.message
       end
     end
 
@@ -20,10 +18,7 @@ module Tamber
           :name => 'mention',
         )
         puts e
-      rescue TamberError => error
-        puts error.message
       end
-
     end
   end
 end

data/test/discover_test.rb

@@ -15,8 +15,6 @@ module Tamber
           }
         )
         d.each { |rec| puts "item: #{rec.item}, score: #{rec.score}"}
-      rescue TamberError => error
-        puts error.message
       end
     end
 
@@ -26,8 +24,6 @@ module Tamber
           :item => 'item_i5gq90scc1'
         )
         d.each { |rec| puts "item: #{rec.item}, score: #{rec.score}"}
-      rescue TamberError => error
-        puts error.message
       end
     end
 
@@ -38,8 +34,6 @@ module Tamber
           :item => 'item_i5gq90scc1'
         )
         d.each { |rec| puts "item: #{rec.item}, score: #{rec.score}"}
-      rescue TamberError => error
-        puts error.message
       end
     end
 

data/test/event_test.rb

@@ -10,9 +10,7 @@ module Tamber
           :behavior => 'mention',
           :get_recs => {}
         )
-        e.recommended.each { |rec| puts "item: #{rec.item}, score: #{rec.score}"}
-      rescue TamberError => error
-        puts error.message
+        puts e
       end
     end
 
@@ -22,8 +20,6 @@ module Tamber
           :user => 'user_jctzgisbru',
         )
         puts e
-      rescue TamberError => error
-        puts error.message
       end
     end
 
@@ -44,8 +40,6 @@ module Tamber
           ]
         )
         puts e
-      rescue TamberError => error
-        puts error.message
       end
     end
 

data/test/item_test.rb

@@ -5,7 +5,7 @@ module Tamber
     should "be creatable" do
       begin
         e = Tamber::Item.create(
-          :id => 'item_i7gq90scc1',
+          :id => 'item_i5gq90scc1',
           :properties =>  {
             'type'=> 'artwork',
             'artist'=> 'Alexander Calder',
@@ -23,7 +23,7 @@ module Tamber
     should "be updatable" do
       begin
         e = Tamber::Item.update(
-          :id => 'item_i7gq90scc1',
+          :id => 'item_i5gq90scc1',
           :updates => {
             :add => {
               :properties => {
@@ -47,7 +47,7 @@ module Tamber
     should "be retrievable" do
       begin
         e = Tamber::Item.retrieve(
-          :id => 'item_i7gq90scc1',
+          :id => 'item_i5gq90scc1',
         )
         puts e
       rescue TamberError => error
@@ -58,7 +58,7 @@ module Tamber
     should "be removable" do
       begin
         e = Tamber::Item.remove(
-          :id => 'item_i7gq90scc1',
+          :id => 'item_i5gq90scc1',
         )
         puts e
       rescue TamberError => error

data/test/user_test.rb

@@ -18,9 +18,6 @@ module Tamber
             }
           ]
         )
-        puts u
-      rescue TamberError => error
-        puts error.message
       end
     end
 
@@ -35,9 +32,8 @@ module Tamber
           :id => id,
           :metadata => metadata
         )
+        puts "retrieved user #{u}"
         assert u.id == id
-      rescue TamberError => error
-        puts error.message
       end
     end
 
@@ -53,10 +49,7 @@ module Tamber
         )
         puts u.inspect
         puts u.metadata
-        puts u.metadata[:name]
         assert u.id == id
-      rescue TamberError => error
-        puts error.message
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tamber
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Alexi Robbins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 4.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 4.2.4
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +109,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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: pry
+  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: pry-byebug
+  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'
 description: Tamber is the easiest way to put head-scratchingly accurate, real time
   recommendations in your app.  See https://tamber.com for details.
 email:
@@ -171,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the Tamber API