smaak 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 683a8c3b800d595a278cb6bfad07519e316b9c5e
-  data.tar.gz: 5d039ed1e75512585e3d537551533a9950f9b437
+  metadata.gz: c00546dad5a52379b07bfbf7af3b17a40d20d048
+  data.tar.gz: 64c7c243b3451b8329e2ee8beb2bb2398fd7796d
 SHA512:
-  metadata.gz: 6cf29eb1070a61d30c67049937e3aaa1d9d270a6f346cbbcc185b442227887fad27bba095d627f1b0c9329c2a67d9fd834045afecbe8d8aa9accab5efae9c4a5
-  data.tar.gz: b5e49e9b7f5916c9ab4db94c1ecf5c7a672f517b439d925a8f703d384da00a45456cac5f82bb177750f7fd23564ccf4623863e430eba3e1373cf7203c8e65296
+  metadata.gz: ccc4dc56a2bd6ddb3112ed252b9b1165b03290e24106fa091cd81a93d216d567d6d12bcc6dfad12f77cf24797ec2cb41ad9693065949c5bb20930d49a96bed97
+  data.tar.gz: 2e8466aed402283960edf3cf5fcdcfb5c29dd45657a5e27aa42bdfd2c70ba3fb798c7f313e38db51798c9da494fb83917e2f000254c206e849f96d13481218e6

data/lib/smaak/client.rb

@@ -51,9 +51,18 @@ module Smaak
       adaptor = Smaak::create_adaptor(req)
       req = (sign_request(identifier, adaptor)).request
       response = http.request(req)
-      response.body = Smaak::Crypto::decrypt(response.body, @key) if @association_store[identifier]['encrypt']  and response.code[0] == '2'
+      
+      response.body = Smaak::Crypto::decrypt(response.body, @key) if encrypt_associate?(identifier) and response.code[0] == '2'
       puts "[smaak error]: response from #{identifier} was #{response.code}" if not response.code[0] == '2'
       response
     end
+
+    def encrypt_associate?(identifier)
+      return false if identifier.nil?
+      return false if @association_store[identifier].nil?
+      return true if @association_store[identifier]["encrypt"] == true
+      return true if @association_store[identifier]["encrypt"].to_s.downcase == "true"
+      false
+    end
   end
 end

data/lib/smaak/version.rb

@@ -1,3 +1,3 @@
 module Smaak
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/spec/lib/smaak/client_spec.rb

@@ -171,12 +171,11 @@ describe Smaak::Client do
       expect(mock_http).to receive(:request).with(mock_req).and_return(mock_response)
       expect(Smaak::Crypto).to receive(:encrypt).and_return ""
       expect(Smaak::Crypto).to receive(:decrypt).with("", @iut.key)
-      
       @iut.post('encrypted', @test_uri, @test_body, false, OpenSSL::SSL::VERIFY_NONE)
     end
 
     it "should decrypt the response body only if the response code is a 200 class code (2XX)" do
-      @iut.add_association('encrypted', @test_service_public_key, @test_service_psk, true)
+      @iut.add_association('encrypted', @test_service_public_key, @test_service_psk, "true")
       url = URI.parse(@test_uri)
       mock_http = Net::HTTP.new(url.host, url.port)
       mock_req = Net::HTTP::Post.new(url.to_s)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smaak
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Ernst van Graan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: persistent-cache