u2f 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c24a1971210f173c24a9e93c488133a3165db70
-  data.tar.gz: bfa2a34fd0d63d308d57cc9be246861cf4c95842
+  metadata.gz: 0dbc29d27e9240d257117ceeb21f4b9ccfd4eaca
+  data.tar.gz: 56de14fcf1ef2a43fb94baf79e64e9ed5342ab29
 SHA512:
-  metadata.gz: e00d61768512827fe9037384b6311bac3f4fc32651cb4e2e5269966b89cc62e28fb5dc4736ed97240ddc99ef3d40e2c88c244ea92ae88105a5a1f0bb21dddee1
-  data.tar.gz: 0abeed621b15a657d315fdb89896d7180120422613012120a91e85f5be50061c398b4649b88befb14b695d380af187e0529f173179dc1db8e0d7a94b70a0ee3e
+  metadata.gz: c6adbe094c03b9b0456172d3fa5549766bfa0ef892d95f1d8952660b93f278ea24b06bb227f0cc9812f2f583eee73bb7945e496b3418cf61262b5699f17a692a
+  data.tar.gz: edc10c0b3fec9b9a5340cff09a3ac24bc60a9d9690fc73687edef2186804c3e7a4582eccf885d3709e62b59c22d14991d3528317b05e9b971dd8491ce3c3383e

data/lib/u2f.rb

@@ -3,7 +3,6 @@ require 'json'
 require 'openssl'
 
 require 'u2f/client_data'
-require 'u2f/collection'
 require 'u2f/errors'
 require 'u2f/request_base'
 require 'u2f/register_request'

data/lib/u2f/request_base.rb

@@ -10,8 +10,8 @@ module U2F
       }
     end
 
-    def to_json
-      ::JSON.dump(as_json)
+    def to_json(options = {})
+      ::JSON.pretty_generate(as_json, options)
     end
 
     def version

data/lib/u2f/u2f.rb

@@ -16,14 +16,13 @@ module U2F
     #   - +key_handles+:: +Array+ of previously registered U2F key handles
     #
     # * *Returns*:
-    #   - A +Collection+ of +SignRequest+ objects
+    #   - An +Array+ of +SignRequest+ objects
     #
     def authentication_requests(key_handles)
       key_handles = [key_handles] unless key_handles.is_a? Array
-      sign_requests = key_handles.map do |key_handle|
+      key_handles.map do |key_handle|
         SignRequest.new(key_handle, challenge, app_id)
       end
-      Collection.new(sign_requests)
     end
 
     ##
@@ -79,11 +78,11 @@ module U2F
     # Generate data to be used when registering a U2F device
     #
     # * *Returns*:
-    #   - A +Collection+ of +RegisterRequest+ objects
+    #   - An +Array+ of +RegisterRequest+ objects
     #
     def registration_requests
       # TODO: generate a request for each supported version
-      Collection.new(RegisterRequest.new(challenge, @app_id))
+      [RegisterRequest.new(challenge, @app_id)]
     end
 
     ##

data/lib/version.rb

@@ -1,3 +1,3 @@
 module U2F
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u2f
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Johan Brissmyr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -106,7 +106,6 @@ files:
 - README.md
 - lib/u2f.rb
 - lib/u2f/client_data.rb
-- lib/u2f/collection.rb
 - lib/u2f/errors.rb
 - lib/u2f/register_request.rb
 - lib/u2f/register_response.rb
@@ -117,7 +116,6 @@ files:
 - lib/u2f/u2f.rb
 - lib/version.rb
 - spec/lib/client_data_spec.rb
-- spec/lib/collection_spec.rb
 - spec/lib/register_request_spec.rb
 - spec/lib/register_response_spec.rb
 - spec/lib/sign_request_spec.rb
@@ -150,7 +148,6 @@ specification_version: 4
 summary: U2F library
 test_files:
 - spec/lib/client_data_spec.rb
-- spec/lib/collection_spec.rb
 - spec/lib/register_request_spec.rb
 - spec/lib/register_response_spec.rb
 - spec/lib/sign_request_spec.rb

data/lib/u2f/collection.rb

@@ -1,13 +0,0 @@
-module U2F
-  ##
-  # Extension of +Array+ which implements a +to_json+ serializer
-  class Collection < Array
-    def initialize(array)
-      super([*array])
-    end
-
-    def to_json
-      "[#{map { |a| a.to_json }.join(',')}]"
-    end
-  end
-end

data/spec/lib/collection_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe U2F::Collection do
-  let(:collection) { U2F::Collection.new(input) }
-  describe '#to_json' do
-    subject { collection.to_json }
-    context 'with single object' do
-      let(:input) { 'one' }
-      it do
-        is_expected.to match_json_expression(['one'])
-      end
-    end
-    context 'with single object' do
-      let(:input) { ['one', 'two'] }
-      it do
-        is_expected.to match_json_expression(['one', 'two'])
-      end
-    end
-  end
-end