signed_json 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f40f32c57443555eeb355a349ff0cc13d15fdea
-  data.tar.gz: 4d2cb908d2373eea85da54dad795a6080764b32d
+  metadata.gz: 7f87c5b0f1a4ece38890c06ce7ea92402ac1051f
+  data.tar.gz: 0f74718e9382c444ded4db1a5fccbced5fcc8430
 SHA512:
-  metadata.gz: 329bdc5c2246244cfca4b3c704b7099d81af8338e8059498857238284772c1ed26d856b08d3ff46aeee5a171e9f0aec29ebe41d6da615b16cbf3d5fc4d7d891c
-  data.tar.gz: 50971730f9c7c370067c67fb5c14e44536e691192a309ad1f30e3460fcf9707a45bb7d1ea73f48090b1fb1ce771e5d4b2aa59b3633f1e41f5d0ef9e1b4940369
+  metadata.gz: 0b1a8f253f94571aec508af9fd4202627bf0f15a9e8aedf4f1c5b38bca11440f02d13444a3a9161d8da3947cdc4ffaec1fa7ef0a134900cc96092fbf5c6a9814
+  data.tar.gz: 7320c16827347b01d0bcc9416d8ab2e801ce1c2cdd680e892934f3a83d1b32b2f6359b5e3e47d94443913ef45eb4c7a8888d1988946fb9725980937b6ceb0b4a

data/lib/signed_json/version.rb

@@ -1,3 +1,3 @@
 module SignedJson
-  VERSION = "1.0.1"
+  VERSION = "2.0.0"
 end

data/lib/signed_json.rb

@@ -10,11 +10,12 @@ module SignedJson
     end
 
     def encode(input)
-      [digest_for(input), input].to_json
+      data_to_encode = [digest_for(input), input]
+      json_generate(data_to_encode)
     end
 
     def decode(input)
-      digest, data = json_decode(input)
+      digest, data = decode_digest_and_data(input)
       raise SignatureError unless digest === digest_for(data)
       data
     end
@@ -25,23 +26,29 @@ module SignedJson
     def digest_for(input)
       require 'openssl' unless defined?(OpenSSL) # from ActiveSupport::MessageVerifier
       digest = OpenSSL::Digest.const_get(@digest).new
-      OpenSSL::HMAC.hexdigest(digest, @secret, input.to_json)
+      OpenSSL::HMAC.hexdigest(digest, @secret, json_generate(input))
     end
 
     private
 
-    def json_decode(input)
-      begin
-        parts = JSON.parse(input)
-      rescue TypeError, JSON::ParserError
+    def decode_digest_and_data(json)
+      parts = json_parse(json)
+      unless parts.instance_of?(Array) && parts.length == 2
         raise InputError
       end
+      parts
+    end
 
-      raise InputError unless
-        parts.instance_of?(Array) && parts.length == 2
+    def json_parse(json)
+      JSON.parse(json)
+    rescue TypeError, JSON::ParserError
+      raise InputError
+    end
 
-      parts
+    def json_generate(data)
+      # Use JSON.dump; JSON.generate only handles top-level object/array.
+      JSON.dump(data)
     end
-  end
 
+  end
 end

data/signed_json.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency('json')
 
-  s.add_development_dependency('rspec', ['~> 2.3'])
+  s.add_development_dependency('rspec', ['~> 3.1'])
   s.add_development_dependency('rake')
 end

data/spec/signed_json_spec.rb

@@ -5,23 +5,23 @@ describe SignedJson do
   describe "round trip encoding/decoding" do
 
     it "round-trips a string" do
-      "a string".should round_trip_as_signed_json
+      expect("a string").to round_trip_as_signed_json
     end
 
     it "round-trips an array of strings and ints" do
-      [1, 'a', 2, 'b'].should round_trip_as_signed_json
+      expect([1, "a", 2, "b"]).to round_trip_as_signed_json
     end
 
     it "round-trips a hash with string keys, string and int values" do
-      { 'a' => 'b', 'b' => 2 }.should round_trip_as_signed_json
+      expect({"a" => "b", "b" => 2}).to round_trip_as_signed_json
     end
 
     it "round-trips a nested array" do
-      [ 'a', [ 'b', [ 'c', 'd' ], 'e' ], 'f' ].should round_trip_as_signed_json
+      expect(["a", ["b", ["c", "d"], "e"], "f"]).to round_trip_as_signed_json
     end
 
     it "round-trips a hash/array/string/int structure" do
-      { 'a' => [ 'b' ], 'd' => { 'e' => 'f' }, 'g' => 10 }.should round_trip_as_signed_json
+      expect({"a" => ["b"], "d" => {"e" => "f"}, "g" => 10}).to round_trip_as_signed_json
     end
 
   end
@@ -30,12 +30,12 @@ describe SignedJson do
 
     it "returns a string" do
       encoded = SignedJson::Signer.new('right').encode('test')
-      encoded.should be_instance_of(String)
+      expect(encoded).to be_instance_of(String)
     end
 
     it "returns a valid JSON-encoded array" do
       encoded = SignedJson::Signer.new('right').encode('test')
-      JSON.parse(encoded).should be_instance_of(Array)
+      expect(JSON.parse(encoded)).to be_instance_of(Array)
     end
 
   end
@@ -44,21 +44,21 @@ describe SignedJson do
 
     it "raises SignatureError for incorrect key/signature" do
       encoded = SignedJson::Signer.new('right').encode('test')
-      lambda {
+      expect {
         SignedJson::Signer.new('wrong').decode(encoded)
-      }.should raise_error(SignedJson::SignatureError)
+      }.to raise_error(SignedJson::SignatureError)
     end
 
     it "raises InputError for invalid input" do
-      lambda {
+      expect {
         SignedJson::Signer.new('key').decode('blarg')
-      }.should raise_error(SignedJson::InputError)
+      }.to raise_error(SignedJson::InputError)
     end
 
     it "raises InputError for nil input" do
-      lambda {
+      expect {
         SignedJson::Signer.new('key').decode(nil)
-      }.should raise_error(SignedJson::InputError)
+      }.to raise_error(SignedJson::InputError)
     end
 
   end

data/spec/spec_helper.rb

@@ -23,7 +23,7 @@ RSpec::Matchers.define :round_trip_as_signed_json do
     false
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     if @reason == :not_encoded
       "Expected encoded to be different to original input: #{actual}"
     elsif @reason == :mismatch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signed_json
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Paul Annesley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement