keen 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71233f3a2e9ddc96e83f3da3dafa0039cedecda5
-  data.tar.gz: 42310b5093a4e6521f18bd42216054e5559ea0c1
+  metadata.gz: 7f3ca87ca38420ae7e1f6a5eedb518cd15ea8dff
+  data.tar.gz: 80f93a25b21544455b44e72201ce0aad31b71300
 SHA512:
-  metadata.gz: ba7604df56cd05a57e56d2faa1f357356302d5769c1ceab719047cff3ed9882d192384855e6f3567260724ec535842b901b18b3ba4301cc90c5531d4d3390672
-  data.tar.gz: 3e7b5fb538b3102842823aeec35224c371e7f47cee570bdf5f912645520dcdf0dad44560bf828285d864240b0a8798aa6e7e2fef29b85f3b19733bef2a621599
+  metadata.gz: 3ed597078e79fc3ea6f039b9932f3272d60bf14982fe71276d163bd4b250699410a4cc05ca07f1864d74c30235675726784bff7338d6508248980d60b3e7a18c
+  data.tar.gz: 400daed8bfbbc1cc4a978650a6e435655c35943169bd15089f4a83179eed3443b80b62880fb521dd2c7382600194b25de43713d34e0cb41e8129a9cf702e074c

data/.rspec

@@ -1,2 +1,3 @@
 --format progress
 --color
+--tty

data/keen.gemspec

@@ -5,7 +5,7 @@ require "keen/version"
 Gem::Specification.new do |s|
   s.name        = "keen"
   s.version     = Keen::VERSION
-  s.authors     = ["Alex Kleissner", "Josh Dzielak", "Joe Wegner"]
+  s.authors     = ["Alex Kleissner", "Joe Wegner"]
   s.email       = "opensource@keen.io"
   s.homepage    = "https://github.com/keenlabs/keen-gem"
   s.summary     = "Keen IO API Client"

data/lib/keen/aes_helper.rb

@@ -7,11 +7,12 @@ module Keen
 
     BLOCK_SIZE = 32
 
-    def aes256_encrypt(key, plaintext)
+    def aes256_encrypt(key, plaintext, iv = nil)
       aes = OpenSSL::Cipher::AES.new(256, :CBC)
       aes.encrypt
       aes.key = key
-      iv = aes.random_iv
+      aes.iv = iv unless iv.nil?
+      iv ||= aes.random_iv
       [aes.update(plaintext) + aes.final, iv]
     end
 
@@ -40,4 +41,4 @@ module Keen
       padded
     end
   end
-end
+end

data/lib/keen/client.rb

@@ -100,6 +100,8 @@ module Keen
     end
 
     def preprocess_params(params)
+      params = params.delete_if {|key, val| val.nil?}
+
       preprocess_encodables(params)
       preprocess_timeframe(params)
       preprocess_group_by(params)

data/lib/keen/scoped_key.rb

@@ -24,10 +24,10 @@ module Keen
       self.data = data
     end
 
-    def encrypt!
+    def encrypt!(iv = nil)
       json_str = MultiJson.dump(self.data)
       padded_api_key = pad(self.api_key)
-      encrypted, iv = aes256_encrypt(padded_api_key, json_str)
+      encrypted, iv = aes256_encrypt(padded_api_key, json_str, iv)
       hexlify(iv) + hexlify(encrypted)
     end
   end

data/lib/keen/version.rb

@@ -1,3 +1,3 @@
 module Keen
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/spec/keen/client_spec.rb

@@ -86,4 +86,36 @@ describe Keen::Client do
       }.to raise_error(Keen::HttpError, exception_body)
     end
   end
+
+  describe "preprocess_params" do
+    it "returns an empty string with no parameters" do
+      params = {}
+      expect(
+        client.instance_eval{preprocess_params(params)}
+      ).to eq("")
+    end
+
+    it "strips out nil parameters" do
+      params = { :timeframe => nil, :group_by => "foo.bar" }
+      expect(
+        client.instance_eval{preprocess_params(params)}
+      ).to eq("group_by=foo.bar")
+    end
+  end
+
+  describe "preprocess_timeframe" do
+    it "does nothing for string values" do
+      params = { :timeframe => 'this_3_days' }
+      expect {
+        client.instance_eval{preprocess_timeframe(params)}
+      }.to_not change { params }
+    end
+
+    it "multi encodes for hash values" do
+      params = {:timeframe => {:start => '2012-08-13T19:00:00.000Z', :end => '2013-09-20T19:00:00.000Z'} }
+      expect {
+        client.instance_eval{preprocess_timeframe(params)}
+      }.to change {params}.to({:timeframe => "{\"start\":\"2012-08-13T19:00:00.000Z\",\"end\":\"2013-09-20T19:00:00.000Z\"}"})
+    end
+  end
 end

data/spec/keen/scoped_key_spec.rb

@@ -29,6 +29,24 @@ describe Keen::ScopedKey do
       other_api_key.data.should == data
     end
 
+    describe "when an IV is not provided" do
+      it "should not produce the same encrypted key text" do
+        new_scoped_key.encrypt!.should_not == (new_scoped_key.encrypt!)
+      end
+    end
+
+    describe "when an IV is provided" do
+      it "should produce the same encrypted key text for a " do
+        iv = "\0" * 32
+        new_scoped_key.encrypt!(iv).should == (new_scoped_key.encrypt!(iv))
+      end
+
+      it "should raise error when an invalid IV is supplied" do
+        iv = "fakeiv"
+        expect { new_scoped_key.encrypt!(iv) }.to raise_error(OpenSSL::Cipher::CipherError)
+      end
+    end
+
     it "should not decrypt the scoped key with a bad api key" do
       encrypted_str = new_scoped_key.encrypt!
       expect {

data/spec/spec_helper.rb

@@ -67,5 +67,9 @@ end
 
 RSpec.configure do |config|
   config.include(Keen::SpecHelpers)
+
+  config.color      = true
+  config.tty        = true
+  config.formatter  = :progress # :progress, :documentation, :html, :textmate
 end
 

metadata

@@ -1,141 +1,140 @@
 --- !ruby/object:Gem::Specification
 name: keen
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Alex Kleissner
-- Josh Dzielak
 - Joe Wegner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: guard
   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: guard-rspec
   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: rb-inotify
   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: rb-fsevent
   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: rb-fchange
   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: ruby_gntp
   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: rb-readline
   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: Send events and build analytics features into your Ruby applications.
@@ -144,9 +143,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE
@@ -185,17 +184,17 @@ require_paths:
 - lib
 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: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Keen IO API Client