keen 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 59fa0dd54e4200a1adfae054d2720f25a5153113
-  data.tar.gz: 1700087db79e25937d840ee0de8b7a57d3769db5
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmM2M2JiNDY0NWU3NDBkYTI4N2QzNDEwNzYwNjkyMmZkYzI5NjQ2Yw==
+  data.tar.gz: !binary |-
+    MGY5ZTNiZWUwNGY4ZTE2Y2JmZTdiNGU4MjdiMDBlOTU5NmI2NWFiYw==
 SHA512:
-  metadata.gz: 3c8f0064da21debd51c315b2319f7f95e9e2bc10510f9c02bc38b53efb017229dea11dad6b73472d0e74fafd283bb450cad5b11e3619e9f79c587be9b6fccb41
-  data.tar.gz: 957775acf03e4e4d4bcea48bd889492cb813d4c629f4f4e29ba722acee5787a1fafd381ccc73e706ac04faa68a077da7d7be6e9ec0a3d31a8c526cd14666799a
+  metadata.gz: !binary |-
+    Y2UwMzI3NjRjMDgyMWJlNjI2M2JiMTZkOWQyM2RjYmEyYTAzYjkzMDk2N2Q2
+    ZWJlZTc0NTA1YzUzNGIwOTg0MWQ5NGMwNWQyMTQxODQxZDM4OTRhNWIyN2I4
+    MDBmNWRhYWMzODE3ZGU2NDQxMDY3Mjk1MTJmZTEyNTg1ZmNlNGM=
+  data.tar.gz: !binary |-
+    M2I3MDNlZTQzYTY0OWJiMjAzZTA4M2FmMjUxOTBjNmZiYzY2YWM3NjczYzE1
+    MWI5NDlmMzA2ZDNhNTA3NWU1NDIxOGRiM2NhY2Y4NGY3NWZjZWY0MDMwZTc5
+    NjExYzkyZmZjYzI3YWFjMmU2MWFmMTc4OTYwMjFhYTI3YzMxNjE=

data/.travis.yml

@@ -5,7 +5,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.2.2
-  - jruby-19mode
+  - 2.4.0
 
 env:
   - PATTERN=keen
@@ -18,10 +18,5 @@ before_install:
   - gem update --system
   - gem --version
 
-matrix:
-  exclude:
-    - rvm: jruby-19mode
-      env: PATTERN=synchrony
-
 script:
   - bundle exec rake pattern

data/keen.gemspec

@@ -20,19 +20,19 @@ Gem::Specification.new do |s|
 
   # guard
   unless RUBY_VERSION.start_with? '1.8'
-    s.add_development_dependency 'guard'
-    s.add_development_dependency 'guard-rspec'
+    s.add_development_dependency 'guard', '~> 2.14'
+    s.add_development_dependency 'guard-rspec', '~> 4.7'
 
     # guard cross-platform listener trick
-    s.add_development_dependency 'rb-inotify'
-    s.add_development_dependency 'rb-fsevent'
-    s.add_development_dependency 'rb-fchange'
+    s.add_development_dependency 'rb-inotify', '~> 0.9'
+    s.add_development_dependency 'rb-fsevent', '~> 0.9'
+    s.add_development_dependency 'rb-fchange', '~> 0.0.6'
 
     # guard notifications
-    s.add_development_dependency 'ruby_gntp'
+    s.add_development_dependency 'ruby_gntp', '~> 0.3'
 
     # fix guard prompt
-    s.add_development_dependency 'rb-readline' # or compile ruby w/ readline
+    s.add_development_dependency 'rb-readline', '~> 0.5' # or compile ruby w/ readline
   end
 
   # debuggers

data/lib/keen/aes_helper.rb

@@ -17,6 +17,7 @@ module Keen
       end
 
       def aes256_encrypt(key, plaintext, iv = nil)
+        raise OpenSSL::Cipher::CipherError.new("iv must be 16 bytes") if !iv.nil? && iv.length != 16
         aes = OpenSSL::Cipher::AES.new(256, :CBC)
         aes.encrypt
         aes.key = unhexlify(key)

data/lib/keen/aes_helper_old.rb

@@ -21,6 +21,7 @@ module Keen
       end
 
       def aes256_encrypt(key, plaintext, iv = nil)
+        raise OpenSSL::Cipher::CipherError.new("iv must be 16 bytes") if !iv.nil? && iv.length != 16
         padded_key = pad(key)
         aes = OpenSSL::Cipher::AES.new(256, :CBC)
         aes.encrypt
@@ -40,11 +41,15 @@ module Keen
       end
 
       def pad(msg)
-        pad_len = BLOCK_SIZE - (msg.length % BLOCK_SIZE)
+        missing_chars = msg.length % BLOCK_SIZE
+        return msg if missing_chars == 0
+        
+        pad_len = BLOCK_SIZE - missing_chars
+
         padding = pad_len.chr * pad_len
         padded = msg + padding
         padded
       end
     end
   end
-end
+end

data/lib/keen/version.rb

@@ -1,3 +1,3 @@
 module Keen
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

data/spec/keen/client_spec.rb

@@ -59,7 +59,7 @@ describe Keen::Client do
     end
 
     it "should return empty for bad json on a 200/201" do
-      process_response.call(200, "invalid json").should == {}
+      expect(process_response.call(200, "invalid json")).to eq({})
     end
 
     it "should raise a bad request error for a 400" do

data/spec/keen/scoped_key_old_spec.rb

@@ -37,7 +37,7 @@ describe Keen::ScopedKey do
 
     describe "when an IV is provided" do
       it "should produce the same encrypted key text for a " do
-        iv = "\0" * 32
+        iv = "\0" * 16
         new_scoped_key.encrypt!(iv).should == (new_scoped_key.encrypt!(iv))
       end
 
@@ -53,5 +53,11 @@ describe Keen::ScopedKey do
         other_api_key = Keen::ScopedKey.decrypt!(bad_api_key, encrypted_str)
       }.to raise_error(OpenSSL::Cipher::CipherError)
     end
+
+    it "should properly encrypt with master keys that are 32 characters long" do
+       master_key = "\0" * 32
+       scoped_key = Keen::ScopedKey.new(master_key, data).encrypt!
+       Keen::ScopedKey.decrypt!(master_key, scoped_key).data.should == data
+    end
   end
 end

data/spec/keen/scoped_key_spec.rb

@@ -37,7 +37,7 @@ describe Keen::ScopedKey do
 
     describe "when an IV is provided" do
       it "should produce the same encrypted key text for a " do
-        iv = "\0" * 32
+        iv = "\0" * 16
         new_scoped_key.encrypt!(iv).should == (new_scoped_key.encrypt!(iv))
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keen
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Alex Kleissner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -43,98 +43,112 @@ dependencies:
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rb-fchange
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  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.
@@ -189,17 +203,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.6.8
 signing_key: 
 specification_version: 4
 summary: Keen IO API Client
@@ -219,4 +233,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/synchrony/spec_helper.rb
 - spec/synchrony/synchrony_spec.rb
-has_rdoc: