keen 0.7.1 → 0.7.2

data/README.md

@@ -177,6 +177,9 @@ To track email opens, simply add an image to your email template that points to
 
 ### Changelog
 
+##### 0.7.2
++ Fix support for non-https API URL testing
+
 ##### 0.7.1
 + Allow configuration of the base API URL via the KEEN_API_URL environment variable. Useful for local testing and proxies.
 

data/lib/keen/client.rb

@@ -17,12 +17,6 @@ module Keen
     CONFIG = {
       :api_url => "https://api.keen.io",
       :api_version => "3.0",
-      :api_sync_http_options => {
-        :use_ssl => true,
-        :verify_mode => OpenSSL::SSL::VERIFY_PEER,
-        :verify_depth => 5,
-        :ca_file => File.expand_path("../../../config/cacert.pem", __FILE__) },
-      :api_async_http_options => {},
       :api_headers => lambda { |authorization, sync_or_async|
         user_agent = "keen-gem, v#{Keen::VERSION}, #{sync_or_async}"
         user_agent += ", #{RUBY_VERSION}, #{RUBY_PLATFORM}, #{RUBY_PATCHLEVEL}"

data/lib/keen/client/publishing_methods.rb

@@ -28,7 +28,7 @@ module Keen
 
         begin
           response = Keen::HTTP::Sync.new(
-            self.api_url, api_sync_http_options).post(
+            self.api_url).post(
               :path => api_event_resource_path(event_collection),
               :headers => api_headers(self.write_key, "sync"),
               :body => MultiJson.encode(properties))
@@ -53,7 +53,7 @@ module Keen
 
         deferrable = EventMachine::DefaultDeferrable.new
 
-        http_client = Keen::HTTP::Async.new(self.api_url, api_async_http_options)
+        http_client = Keen::HTTP::Async.new(self.api_url)
         http = http_client.post(
           :path => api_event_resource_path(event_collection),
           :headers => api_headers(self.write_key, "async"),

data/lib/keen/client/querying_methods.rb

@@ -171,8 +171,7 @@ module Keen
         query_params = preprocess_params(params)
 
         begin
-          response = Keen::HTTP::Sync.new(
-            self.api_url, api_sync_http_options).get(
+          response = Keen::HTTP::Sync.new(self.api_url).get(
               :path => "#{api_query_resource_path(query_name)}?#{query_params}",
               :headers => api_headers(self.read_key, "sync"))
         rescue Exception => http_error

data/lib/keen/http.rb

@@ -1,13 +1,20 @@
 module Keen
   module HTTP
     class Sync
-      def initialize(base_url, options={})
+      def initialize(base_url)
         require 'uri'
-        require 'net/https'
+        require 'net/http'
 
         uri = URI.parse(base_url)
         @http = Net::HTTP.new(uri.host, uri.port)
-        options.each_pair { |key, value| @http.send "#{key}=", value }
+
+        if uri.scheme == "https"
+          require 'net/https'
+          @http.use_ssl = true;
+          @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          @http.verify_depth = 5
+          @http.ca_file = File.expand_path("../../../config/cacert.pem", __FILE__)
+        end
       end
 
       def post(options)
@@ -24,21 +31,21 @@ module Keen
     end
 
     class Async
-      def initialize(base_url, options={})
+      def initialize(base_url)
         if defined?(EventMachine) && EventMachine.reactor_running?
           require 'em-http-request'
         else
           raise Error, "An EventMachine loop must be running to use publish_async calls"
         end
 
-        @base_url, @http_options = base_url, options
+        @base_url = base_url
       end
 
       def post(options)
         path, headers, body = options.values_at(
           :path, :headers, :body)
         uri = "#{@base_url}#{path}"
-        http_client = EventMachine::HttpRequest.new(uri, @http_options)
+        http_client = EventMachine::HttpRequest.new(uri)
         http_client.post(
           :body => body,
           :head => headers

data/lib/keen/version.rb

@@ -1,3 +1,3 @@
 module Keen
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keen
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json