lib/keen/client.rb in keen-0.4.3 vs lib/keen/client.rb in keen-0.4.4

@@ -1,10 +1,11 @@
 require 'keen/http'
 require 'keen/version'
 require 'openssl'
 require 'multi_json'
 require 'base64'
+require 'uri'
 
 module Keen
   class Client
     attr_accessor :project_id, :api_key
 
@@ -16,20 +17,25 @@
         :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 => {
-        "Content-Type" => "application/json",
-        "User-Agent" => "keen-gem v#{Keen::VERSION}"
+      :api_headers => lambda { |sync_or_async|
+        user_agent = "keen-gem, v#{Keen::VERSION}, #{sync_or_async}"
+        user_agent += ", #{RUBY_VERSION}, #{RUBY_PLATFORM}, #{RUBY_PATCHLEVEL}"
+        if defined?(RUBY_ENGINE)
+          user_agent += ", #{RUBY_ENGINE}"
+        end
+        { "Content-Type" => "application/json",
+          "User-Agent" => user_agent }
       }
     }
 
-    def beacon_url(event_name, properties)
+    def beacon_url(event_collection, properties)
       json = MultiJson.encode(properties)
       data = [json].pack("m0").tr("+/", "-_").gsub("\n", "")
-      "https://#{api_host}/#{api_version}/projects/#{@project_id}/events/#{event_name}?api_key=#{@api_key}&data=#{data}"
+      "https://#{api_host}#{api_path(event_collection)}?api_key=#{@api_key}&data=#{data}"
     end
 
     def initialize(*args)
       options = args[0]
       unless options.is_a?(Hash)
@@ -42,33 +48,36 @@
 
       @project_id, @api_key = options.values_at(
         :project_id, :api_key)
     end
 
-    def publish(event_name, properties)
+    def publish(event_collection, properties)
       check_configuration!
+      check_event_data!(event_collection, properties)
+
       begin
         response = Keen::HTTP::Sync.new(
           api_host, api_port, api_sync_http_options).post(
-            :path => api_path(event_name),
-            :headers => api_headers_with_auth,
+            :path => api_path(event_collection),
+            :headers => api_headers_with_auth("sync"),
             :body => MultiJson.encode(properties))
       rescue Exception => http_error
         raise HttpError.new("Couldn't connect to Keen IO: #{http_error.message}", http_error)
       end
       process_response(response.code, response.body.chomp)
     end
 
-    def publish_async(event_name, properties)
+    def publish_async(event_collection, properties)
       check_configuration!
+      check_event_data!(event_collection, properties)
 
       deferrable = EventMachine::DefaultDeferrable.new
 
       http_client = Keen::HTTP::Async.new(api_host, api_port, api_async_http_options)
       http = http_client.post({
-        :path => api_path(event_name),
-        :headers => api_headers_with_auth,
+        :path => api_path(event_collection),
+        :headers => api_headers_with_auth("async"),
         :body => MultiJson.encode(properties)
       })
 
       if defined?(EM::Synchrony)
         if http.error
@@ -93,12 +102,12 @@
         deferrable
       end
     end
 
     # deprecated
-    def add_event(event_name, properties, options={})
-      self.publish(event_name, properties, options)
+    def add_event(event_collection, properties, options={})
+      self.publish(event_collection, properties, options)
     end
 
     private
 
     def process_response(status_code, response_body)
@@ -115,23 +124,36 @@
       else
         raise HttpError.new(body)
       end
     end
 
-    def api_path(collection)
-      "/#{api_version}/projects/#{project_id}/events/#{collection}"
+    def api_path(event_collection)
+      "/#{api_version}/projects/#{project_id}/events/#{URI.escape(event_collection)}"
     end
 
-    def api_headers_with_auth
-      api_headers.merge("Authorization" => api_key)
+    def api_headers_with_auth(sync_or_async)
+      api_headers(sync_or_async).merge("Authorization" => api_key)
     end
 
     def check_configuration!
       raise ConfigurationError, "Project ID must be set" unless project_id
       raise ConfigurationError, "API Key must be set" unless api_key
     end
 
+    def check_event_data!(event_collection, properties)
+      raise ArgumentError, "Event collection can not be nil" unless event_collection
+      raise ArgumentError, "Event properties can not be nil" unless properties
+    end
+
     def method_missing(_method, *args, &block)
-      CONFIG[_method.to_sym] || super
+      if config = CONFIG[_method.to_sym]
+        if config.is_a?(Proc)
+          config.call(*args)
+        else
+          config
+        end
+      else
+        super
+      end
     end
   end
 end