keen 0.7.4 → 0.7.5

data/README.md

@@ -226,6 +226,9 @@ To track email opens, simply add an image to your email template that points to
 
 ### Changelog
 
+##### 0.7.5
++ Use `CGI.escape` instead of `URI.escape` to get accurate URL encoding for certain characters
+
 ##### 0.7.4
 + Add support for deletes (thanks again [cbartlett](https://github.com/cbartlett)!)
 + Allow event collection names for publishing/deleting methods to be symbols

data/lib/keen/client.rb

@@ -89,7 +89,7 @@ module Keen
     end
 
     def api_event_collection_resource_path(event_collection)
-      "/#{api_version}/projects/#{project_id}/events/#{URI.escape(event_collection.to_s)}"
+      "/#{api_version}/projects/#{project_id}/events/#{CGI.escape(event_collection.to_s)}"
     end
 
     def preprocess_params(params)
@@ -111,7 +111,7 @@ module Keen
 
       query_params = ""
       params.each do |param, value|
-        query_params << "#{param}=#{URI.escape(value)}&"
+        query_params << "#{param}=#{CGI.escape(value)}&"
       end
 
       query_params.chop!

data/lib/keen/version.rb

@@ -1,3 +1,3 @@
 module Keen
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/spec/keen/client/maintenance_methods_spec.rb

@@ -10,7 +10,7 @@ describe Keen::Client do
     :api_url => api_url ) }
 
   def delete_url(event_collection, filter_params=nil)
-    "#{api_url}/#{api_version}/projects/#{project_id}/events/#{event_collection}#{filter_params ? "?filters=#{URI.escape(MultiJson.encode(filter_params[:filters]))}" : ""}"
+    "#{api_url}/#{api_version}/projects/#{project_id}/events/#{event_collection}#{filter_params ? "?filters=#{CGI.escape(MultiJson.encode(filter_params[:filters]))}" : ""}"
   end
 
   describe '#delete' do

data/spec/keen/client/publishing_methods_spec.rb

@@ -37,9 +37,9 @@ describe Keen::Client::PublishingMethods do
     end
 
     it "should url encode the event collection" do
-      stub_keen_post(api_event_collection_resource_url(api_url, "foo%20bar"), 201, "")
+      stub_keen_post(api_event_collection_resource_url(api_url, "foo+bar"), 201, "")
       client.publish("foo bar", event_properties)
-      expect_keen_post(api_event_collection_resource_url(api_url, "foo%20bar"), event_properties, "sync", write_key)
+      expect_keen_post(api_event_collection_resource_url(api_url, "foo+bar"), event_properties, "sync", write_key)
     end
 
     it "should wrap exceptions" do
@@ -137,12 +137,12 @@ describe Keen::Client::PublishingMethods do
         }
       end
 
-      it "should uri encode the event collection" do
-        stub_keen_post(api_event_collection_resource_url(api_url, "foo%20bar"), 201, api_success)
+      it "should url encode the event collection" do
+        stub_keen_post(api_event_collection_resource_url(api_url, "foo+bar"), 201, api_success)
         EM.run {
           client.publish_async("foo bar", event_properties).callback {
             begin
-              expect_keen_post(api_event_collection_resource_url(api_url, "foo%20bar"), event_properties, "async", write_key)
+              expect_keen_post(api_event_collection_resource_url(api_url, "foo+bar"), event_properties, "async", write_key)
             ensure
               EM.stop
             end

data/spec/keen/client/querying_methods_spec.rb

@@ -68,29 +68,29 @@ describe Keen::Client do
 
       it "should encode filters properly" do
         filters = [{
-          :property_name => "animal",
+          :property_name => "the+animal",
           :operator => "eq",
           :property_value => "dogs"
         }]
-        filter_str = MultiJson.encode(filters)
+        filter_str = CGI.escape(MultiJson.encode(filters))
         test_query("&filters=#{filter_str}", :filters => filters)
       end
 
       it "should encode absolute timeframes properly" do
         timeframe = {
-          :start => "2012-08-13T19:00Z",
-          :end => "2012-08-13T19:00Z",
+          :start => "2012-08-13T19:00Z+00:00",
+          :end => "2012-08-13T19:00Z+00:00",
         }
-        timeframe_str = MultiJson.encode(timeframe)
+        timeframe_str = CGI.escape(MultiJson.encode(timeframe))
         test_query("&timeframe=#{timeframe_str}", :timeframe => timeframe)
       end
 
       it "should encode steps properly" do
         steps = [{
-          :event_collection => "signups",
+          :event_collection => "sign ups",
           :actor_property => "user.id"
         }]
-        steps_str = MultiJson.encode(steps)
+        steps_str = CGI.escape(MultiJson.encode(steps))
         test_query("&steps=#{steps_str}", :steps => steps)
       end
 

metadata

@@ -1,40 +1,49 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: keen
-version: !ruby/object:Gem::Version
-  version: 0.7.4
+version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: 
+  segments: 
+  - 0
+  - 7
+  - 5
+  version: 0.7.5
 platform: ruby
-authors:
+authors: 
 - Kyle Wild
 - Josh Dzielak
 - Daniel Kador
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-06-11 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id001
 description: Send events and build analytics features into your Ruby applications.
 email: josh@keen.io
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -64,31 +73,41 @@ files:
 - spec/spec_helper.rb
 - spec/synchrony/spec_helper.rb
 - spec/synchrony/synchrony_spec.rb
+has_rdoc: true
 homepage: https://github.com/keenlabs/keen-gem
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Keen IO API Client
-test_files:
+test_files: 
 - spec/integration/api_spec.rb
 - spec/integration/spec_helper.rb
 - spec/keen/client/maintenance_methods_spec.rb