smaak 0.2.1 → 0.2.2

data/spec/lib/smaak/server_spec.rb

@@ -1,10 +1,9 @@
 require './spec/spec_helper.rb'
 require 'smaak'
-require 'mock/request.rb'
 
 def mock_auth_message(env)
   request = Rack::Request.new(env)
-  adaptor = Smaak::create_adaptor(request)
+  adaptor = Smaak.create_adaptor(request)
   @iut.build_auth_message_from_request(adaptor)
 end
 
@@ -29,7 +28,7 @@ describe Smaak::Server do
     expect(@iut.nonce_store[@test_nonce]).to eq(nil)
 
     @test_expires = "#{Time.now.to_i + 5}"
-    @env = {"CONTENT_LENGTH" => "25", "REQUEST_METHOD" => "POST", "PATH_INFO" => "/gems/smaak", "HTTP_X_SMAAK_ENCRYPT" => "false", "HTTP_X_SMAAK_RECIPIENT" => Base64.strict_encode64(@test_server_public_key.export), "HTTP_X_SMAAK_IDENTIFIER" => @test_identifier, "HTTP_X_SMAAK_ROUTE_INFO" => @test_route_info, "HTTP_X_SMAAK_NONCE" => @test_nonce, "HTTP_X_SMAAK_EXPIRES" => @test_expires, "HTTP_X_SMAAK_PSK" => Smaak::Crypto::obfuscate_psk(@test_psk) }
+    @env = {"CONTENT_LENGTH" => "25", "REQUEST_METHOD" => "POST", "PATH_INFO" => "/gems/smaak", "HTTP_X_SMAAK_ENCRYPT" => "false", "HTTP_X_SMAAK_RECIPIENT" => Base64.strict_encode64(@test_server_public_key.export), "HTTP_X_SMAAK_IDENTIFIER" => @test_identifier, "HTTP_X_SMAAK_ROUTE_INFO" => @test_route_info, "HTTP_X_SMAAK_NONCE" => @test_nonce, "HTTP_X_SMAAK_EXPIRES" => @test_expires, "HTTP_X_SMAAK_PSK" => Smaak::Crypto.obfuscate_psk(@test_psk) }
     @auth_message = mock_auth_message(@env)
   end
 
@@ -113,7 +112,7 @@ describe Smaak::Server do
     end
 
     it "should set the psk to the x-smaak-psk header value" do
-      expect(@auth_message.psk).to eql(Smaak::Crypto::obfuscate_psk(@test_psk))
+      expect(@auth_message.psk).to eql(Smaak::Crypto.obfuscate_psk(@test_psk))
     end
 
     it "should set expires to the x-smaak-expires header value" do

data/spec/lib/smaak/smaak_service_spec.rb

@@ -11,7 +11,7 @@ class Tester < Smaak::SmaakService
     @@instance
   end
 
-  def configure_services(configuration = nil)
+  def configure_services(_configuration = nil)
     @configured = true
   end
 end
@@ -44,8 +44,8 @@ describe Smaak::SmaakService do
 
   context "as a singleton" do
     it "should implement the singleton pattern and be thread-safe" do
-      expect(Tester::mutex.is_a? Mutex).to eq(true)
-      expect(Tester::instance.nil?).to eq(false)
+      expect(Tester.mutex.is_a? Mutex).to eq(true)
+      expect(Tester.instance.nil?).to eq(false)
     end
   end
 end

data/spec/lib/smaak_spec.rb

@@ -14,8 +14,8 @@ describe Smaak do
     @test_route_info = 'identifier'
     @test_recipient = @test_server_public_key.export
     @test_encrypt = true
-    @auth_message = Smaak::AuthMessage.new(@test_identifier, @test_route_info, @test_nonce, @test_expires, Smaak::Crypto::obfuscate_psk(@test_psk), @test_recipient, @test_encrypt)
-    @adaptor = Smaak::create_adaptor(@request)
+    @auth_message = Smaak::AuthMessage.new(@test_identifier, @test_route_info, @test_nonce, @test_expires, Smaak::Crypto.obfuscate_psk(@test_psk), @test_recipient, @test_encrypt)
+    @adaptor = Smaak.create_adaptor(@request)
     @mock_specification = Smaak::Cavage04.new(@adaptor)
   end
 
@@ -27,31 +27,31 @@ describe Smaak do
 
   context "when asked which headers should be signed" do
     it "should list all the smaak header extensions" do
-      expect(Smaak::headers_to_be_signed.include?("x-smaak-recipient")).to eql(true)
-      expect(Smaak::headers_to_be_signed.include?("x-smaak-identifier")).to eql(true)
-      expect(Smaak::headers_to_be_signed.include?("x-smaak-psk")).to eql(true)
-      expect(Smaak::headers_to_be_signed.include?("x-smaak-expires")).to eql(true)
-      expect(Smaak::headers_to_be_signed.include?("x-smaak-nonce")).to eql(true)
-      expect(Smaak::headers_to_be_signed.include?("x-smaak-encrypt")).to eql(true)
+      expect(Smaak.headers_to_be_signed.include?("x-smaak-recipient")).to eql(true)
+      expect(Smaak.headers_to_be_signed.include?("x-smaak-identifier")).to eql(true)
+      expect(Smaak.headers_to_be_signed.include?("x-smaak-psk")).to eql(true)
+      expect(Smaak.headers_to_be_signed.include?("x-smaak-expires")).to eql(true)
+      expect(Smaak.headers_to_be_signed.include?("x-smaak-nonce")).to eql(true)
+      expect(Smaak.headers_to_be_signed.include?("x-smaak-encrypt")).to eql(true)
     end
   end
 
   context "when told about a new request adaptor" do
     it "should remember the adaptor class associated with the request class" do
-      Smaak::add_request_adaptor(Integer, String)
-      expect(Smaak::adaptors[Integer]).to eql(String)
+      Smaak.add_request_adaptor(Integer, String)
+      expect(Smaak.adaptors[Integer]).to eql(String)
     end
   end
 
   context "when asked to create a request adaptor" do
     it "should raise an ArgumentError if the request type does not have an adaptor configured" do
       expect {
-        Smaak::create_adaptor(0.1)
-      }.to raise_error ArgumentError, "Unknown request class Float. Add an adaptor using Smaak::add_request_adaptor."
+        Smaak.create_adaptor(0.1)
+      }.to raise_error ArgumentError, "Unknown request class Float. Add an adaptor using Smaak.add_request_adaptor."
     end
 
     it "should create a new instance of the adaptor class specified in the request adaptor dictionary" do
-      adaptor = Smaak::create_adaptor(Net::HTTP::Post.new("http://rubygems.org:80/gems/smaak"))
+      adaptor = Smaak.create_adaptor(Net::HTTP::Post.new("http://rubygems.org:80/gems/smaak"))
       expect(adaptor.is_a? Smaak::NetHttpAdaptor).to eql(true)
     end
   end
@@ -59,17 +59,17 @@ describe Smaak do
   context "when asked to select a header signature specification" do
     it "should raise an ArgumentError if the specification is unknown" do
       expect {
-        Smaak::select_specification(@adaptor, "unknown specification")
+        Smaak.select_specification(@adaptor, "unknown specification")
       }.to raise_error ArgumentError, "Unknown specification"
     end
 
     it "should return an instance of a known specification" do
-      expect(Smaak::select_specification(@adaptor, Smaak::Cavage04::SPECIFICATION).is_a?(Smaak::Cavage04)).to eql(true)
+      expect(Smaak.select_specification(@adaptor, Smaak::Cavage04::SPECIFICATION).is_a?(Smaak::Cavage04)).to eql(true)
     end
 
     it "should raise an ArgumentError if the adaptor specified is nil" do
       expect {
-        Smaak::select_specification(nil, Smaak::Cavage04::SPECIFICATION)
+        Smaak.select_specification(nil, Smaak::Cavage04::SPECIFICATION)
       }.to raise_error ArgumentError, "Adaptor must be provided"
     end
   end
@@ -77,33 +77,33 @@ describe Smaak do
   context "when asked to sign authorization headers given a key, auth_message, request adaptor and specification" do
     it "should select the requested specification" do
       expect(Smaak::Cavage04).to receive(:new).and_return(@mock_specification)
-      Smaak::sign_authorization_headers(@test_server_private_key, @auth_message, @adaptor, Smaak::Cavage04::SPECIFICATION)
+      Smaak.sign_authorization_headers(@test_server_private_key, @auth_message, @adaptor, Smaak::Cavage04::SPECIFICATION)
     end
 
     it "should compile the signature header from the auth_message using the specification" do
       expect(Smaak::Cavage04).to receive(:new).and_return(@mock_specification)
       expect(@mock_specification).to receive(:compile_signature_headers).with(@auth_message).and_return "headers"
-      Smaak::sign_authorization_headers(@test_server_private_key, @auth_message, @adaptor, Smaak::Cavage04::SPECIFICATION)
+      Smaak.sign_authorization_headers(@test_server_private_key, @auth_message, @adaptor, Smaak::Cavage04::SPECIFICATION)
     end
 
     it "should sign the signature headers using the key" do
       expect(Smaak::Cavage04).to receive(:new).and_return(@mock_specification)
       expect(@mock_specification).to receive(:compile_signature_headers).with(@auth_message).and_return "headers"
       expect(Smaak::Crypto).to receive(:sign_data).with("headers", @test_server_private_key).and_return("signed headers")
-      Smaak::sign_authorization_headers(@test_server_private_key, @auth_message, @adaptor, Smaak::Cavage04::SPECIFICATION)
+      Smaak.sign_authorization_headers(@test_server_private_key, @auth_message, @adaptor, Smaak::Cavage04::SPECIFICATION)
     end
 
     it "should compile an auth header using the signature as the signature data base 64 encoded" do
       expect(Smaak::Cavage04).to receive(:new).and_return(@mock_specification)
       expect(@mock_specification).to receive(:compile_signature_headers).with(@auth_message).and_return "headers"
       expect(Smaak::Crypto).to receive(:sign_data).with("headers", @test_server_private_key).and_return("signed headers")
-      expect(@mock_specification).to receive(:compile_auth_header).with(Base64::strict_encode64("signed headers"))
-      Smaak::sign_authorization_headers(@test_server_private_key, @auth_message, @adaptor, Smaak::Cavage04::SPECIFICATION)
+      expect(@mock_specification).to receive(:compile_auth_header).with(Base64.strict_encode64("signed headers"))
+      Smaak.sign_authorization_headers(@test_server_private_key, @auth_message, @adaptor, Smaak::Cavage04::SPECIFICATION)
     end
 
     it "should return the adapter" do
       expect(Smaak::Cavage04).to receive(:new).and_return(@mock_specification)
-      expect(Smaak::sign_authorization_headers(@test_server_private_key, @auth_message, @adaptor, Smaak::Cavage04::SPECIFICATION)).to eql(@adaptor)
+      expect(Smaak.sign_authorization_headers(@test_server_private_key, @auth_message, @adaptor, Smaak::Cavage04::SPECIFICATION)).to eql(@adaptor)
     end
   end
 
@@ -111,7 +111,7 @@ describe Smaak do
     it "should select the requested specification" do
       expect(Smaak::Cavage04).to receive(:new).and_return(@mock_specification)
       expect {
-        Smaak::verify_authorization_headers(@adaptor, @test_server_public_key)
+        Smaak.verify_authorization_headers(@adaptor, @test_server_public_key)
       }.to raise_error
     end
 
@@ -119,7 +119,7 @@ describe Smaak do
       expect(Smaak::Cavage04).to receive(:new).and_return(@mock_specification)
       expect(@mock_specification).to receive(:extract_signature_headers).and_return "headers"
       expect {
-        Smaak::verify_authorization_headers(@adaptor, @test_server_public_key)
+        Smaak.verify_authorization_headers(@adaptor, @test_server_public_key)
       }.to raise_error
     end
 
@@ -127,41 +127,41 @@ describe Smaak do
       expect(Smaak::Cavage04).to receive(:new).and_return(@mock_specification)
       expect(@mock_specification).to receive(:extract_signature_headers).and_return "headers"
       expect(@mock_specification).to receive(:extract_signature).and_return Base64.strict_encode64("signature")
-      Smaak::verify_authorization_headers(@adaptor, @test_server_public_key)
+      Smaak.verify_authorization_headers(@adaptor, @test_server_public_key)
     end
 
     it "should return false if the signature is nil" do
       expect(Smaak).to receive(:get_signature_data_from_request).with(@adaptor).and_return(["headers", nil])
-      expect(Smaak::verify_authorization_headers(@adaptor, @test_server_public_key)).to eql(false)
+      expect(Smaak.verify_authorization_headers(@adaptor, @test_server_public_key)).to eql(false)
     end
 
     it "should return false if the signature headers are nil" do
       expect(Smaak).to receive(:get_signature_data_from_request).with(@adaptor).and_return([nil, "signature"])
-      expect(Smaak::verify_authorization_headers(@adaptor, @test_server_public_key)).to eql(false)
+      expect(Smaak.verify_authorization_headers(@adaptor, @test_server_public_key)).to eql(false)
     end
 
     it "should raise an ArgumentError if the public key is nil" do
       expect {
-        Smaak::verify_authorization_headers(@adaptor, nil)
+        Smaak.verify_authorization_headers(@adaptor, nil)
       }.to raise_error ArgumentError, "Key is required"
     end
 
     it "should verify the signature using the signature headers base 64 encoded, with the public key. I.e. can I produce the same signature?" do
       expect(Smaak).to receive(:get_signature_data_from_request).with(@adaptor).and_return(["headers", "signature"])
-      expect(Smaak::Crypto).to receive(:verify_signature).with("signature", Smaak::Crypto::encode64("headers"), @test_server_public_key).and_return true
-      Smaak::verify_authorization_headers(@adaptor, @test_server_public_key)
+      expect(Smaak::Crypto).to receive(:verify_signature).with("signature", Smaak::Crypto.encode64("headers"), @test_server_public_key).and_return true
+      Smaak.verify_authorization_headers(@adaptor, @test_server_public_key)
     end
 
     it "should return false if verification fails" do
       expect(Smaak).to receive(:get_signature_data_from_request).with(@adaptor).and_return(["headers", "signature"])
-      expect(Smaak::Crypto).to receive(:verify_signature).with("signature", Smaak::Crypto::encode64("headers"), @test_server_public_key).and_return false
-      expect(Smaak::verify_authorization_headers(@adaptor, @test_server_public_key)).to eql(false)
+      expect(Smaak::Crypto).to receive(:verify_signature).with("signature", Smaak::Crypto.encode64("headers"), @test_server_public_key).and_return false
+      expect(Smaak.verify_authorization_headers(@adaptor, @test_server_public_key)).to eql(false)
     end
 
     it "should return true if verification succeeds" do
       expect(Smaak).to receive(:get_signature_data_from_request).with(@adaptor).and_return(["headers", "signature"])
-      expect(Smaak::Crypto).to receive(:verify_signature).with("signature", Smaak::Crypto::encode64("headers"), @test_server_public_key).and_return true
-      expect(Smaak::verify_authorization_headers(@adaptor, @test_server_public_key)).to eql(true)
+      expect(Smaak::Crypto).to receive(:verify_signature).with("signature", Smaak::Crypto.encode64("headers"), @test_server_public_key).and_return true
+      expect(Smaak.verify_authorization_headers(@adaptor, @test_server_public_key)).to eql(true)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,17 @@
+require 'coveralls'
+Coveralls.wear!
+
 require 'rspec'
 require 'rspec/mocks'
 require 'tempfile'
-require 'simplecov'
-require 'simplecov-rcov'
-#require 'byebug'
+# require 'simplecov'
+# require 'simplecov-rcov'
+# require 'byebug'
 require 'net/http'
 require 'rack/request'
 
+
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # Require this file using `require "spec_helper"` to ensure that it is only
@@ -27,7 +32,7 @@ require 'lib/smaak/smaak_service.rb'
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
-  #config.expect_with(:rspec) { |c| c.syntax = :should }
+  # config.expect_with(:rspec) { |c| c.syntax = :should }
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
@@ -37,8 +42,8 @@ RSpec.configure do |config|
 end
 RSpec::Expectations.configuration.warn_about_potential_false_positives = false
 
-SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-SimpleCov.start do
-  add_filter "/spec/"
-end
+# SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+# SimpleCov.start do
+#  add_filter "/spec/"
+# end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smaak
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ernst van Graan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-24 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: persistent-cache-ram
@@ -67,33 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.11.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.11.1
-- !ruby/object:Gem::Dependency
-  name: simplecov-rcov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +118,7 @@ files:
 - .gitignore
 - .ruby-gemset
 - .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -159,7 +146,6 @@ files:
 - spec/lib/smaak/server_spec.rb
 - spec/lib/smaak/smaak_service_spec.rb
 - spec/lib/smaak_spec.rb
-- spec/mock/request.rb
 - spec/spec_helper.rb
 homepage: https://github.com/evangraan/smaak.git
 licenses:
@@ -200,5 +186,4 @@ test_files:
 - spec/lib/smaak/server_spec.rb
 - spec/lib/smaak/smaak_service_spec.rb
 - spec/lib/smaak_spec.rb
-- spec/mock/request.rb
 - spec/spec_helper.rb

data/spec/mock/request.rb

@@ -1,7 +0,0 @@
-class Request
-  attr_accessor :env
-
-  def initialize(env)
-    @env = env
-  end
-end