touchpass 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    touchpass (0.0.8.18)
+    touchpass (0.1.0)
       geocoder (~> 1.1.0)
       httparty (~> 0.8.0)
       json (~> 1.6.5)
@@ -18,7 +18,7 @@ GEM
       hashie
     diff-lcs (1.1.3)
     ffi (1.0.11)
-    geocoder (1.1.2)
+    geocoder (1.1.4)
     growl (1.0.3)
     guard (1.0.2)
       ffi (>= 0.5.0)
@@ -41,7 +41,7 @@ GEM
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.10.1)
     thor (0.14.6)
-    xml-simple (1.1.1)
+    xml-simple (1.1.2)
     yamler (0.1.0)
 
 PLATFORMS

data/bin/touchpass

@@ -270,7 +270,7 @@ class TpCLI < Thor
     when :xml
       puts XmlSimple.xml_out(response, 'NoAttr' => true, 'RootName' => 'response')
     when :json
-      puts JSON.pretty_generate(response)
+      puts JSON.pretty_generate(response.to_h)
     end
   end
 

data/lib/touchpass/client.rb

@@ -69,7 +69,7 @@ module Touchpass
       response
     end
 
-    # Get details for a party
+    # Get details for a party (by party id)
     def get_party_by_id(party_id, options = {})
       require_api_key
       require_param(party_id, "party id")
@@ -78,6 +78,7 @@ module Touchpass
       submit_request("get", party_url_id(party_id), http_options)
     end
 
+    # Get details for a party (by username)
     def get_party(username, options = {})
       require_api_key
       require_param(username, "username")
@@ -87,7 +88,7 @@ module Touchpass
     end
 
     # Update details for a party
-    # uses options: :email, :first_name, :last_name
+    # options: :email, :first_name, :last_name, :username
     def update_party_by_id(party_id, options = {}) 
       require_api_key
       require_param(party_id, "party id")
@@ -96,6 +97,8 @@ module Touchpass
       submit_request("put", party_url_id(party_id), http_options)
     end
 
+    # Update details for a party
+    # options: :email, :first_name, :last_name, :username
     def update_party(username, options = {})
       require_api_key
       require_param(username, "username")
@@ -105,7 +108,7 @@ module Touchpass
     end
 
     # Register a new device for a party
-    # uses: :messaging_type, :messaging_value
+    # options: :messaging_type, :messaging_value
     def register_device(username, udid, name, app_id, options = {})
       require_api_key
       require_param(username, "username")
@@ -156,7 +159,6 @@ module Touchpass
     end
 
     # Get all devices for a party
-    # needs: :username
     def get_devices(username, options = {})
       require_api_key
       require_param(username, "username")
@@ -174,8 +176,7 @@ module Touchpass
       end
     end
 
-    # Get details for a specific device, returns an 'errors' hash if
-    # the device cannot be found
+    # Get details for a specific device
     def get_device(username, device_id, options = {})
       require_api_key
       require_param(username, "username")
@@ -187,8 +188,8 @@ module Touchpass
       submit_request("get", url, http_options)
     end
     
-    # Update details of a device, returns an 'errors' hash if the device cannot be found
-    # uses options: :name, :messaging_type, :messaging_value, :update_pub_key
+    # Update details of a device
+    # options: :name, :messaging_type, :messaging_value, :update_pub_key
     def update_device(username, device_id, options = {})
       require_api_key
       require_param(username, "username")
@@ -201,7 +202,7 @@ module Touchpass
       submit_request("put", url, http_options)
     end
 
-    # Remove device, returns an 'errors' hash if the device cannot be found
+    # Remove device
     def remove_device(username, device_id, options = {})
       require_api_key
       require_param(username, "username")
@@ -225,7 +226,9 @@ module Touchpass
       # them using each device's public key.
       http_options = standard_http_options(options)
       response = submit_request("get", "#{@hostname}/#{to_party}/devices", http_options)
-      vp_devices = response["devices"]
+
+      vp_devices = response["devices"] || []
+      raise "VP has no registered devices" if vp_devices.empty?
 
       # create a verification object
       options = options.merge(:to_party => to_party)
@@ -233,7 +236,10 @@ module Touchpass
       http_options = standard_http_options(options, %W{to_party to_device_id to_app_id})
       http_options[:body].merge!(verification.http_params)
 
-      submit_request("post", "#{@hostname}/verifications", http_options)
+      response = submit_request("post", "#{@hostname}/verifications", http_options)
+
+      verification.attributes = response
+      verification
     end
 
     # Get a page of verifications for a particular party id
@@ -267,8 +273,25 @@ module Touchpass
       submit_request("get", url, http_options)
     end
 
+    # fetch verification until state is not 'created'
+    def poll_verification(verification_id, options = {})
+      http_options = standard_http_options(options)
+      timeout = options[:timeout] || 60   # default poll for 60 seconds
+      sleep_time = 5
+      response = nil
+
+      while timeout > 0
+        response = get_verification(verification_id)
+        break if response['state'] != Verification::STATE_CREATED
+        sleep sleep_time
+        timeout -= sleep_time
+      end
+
+      response
+    end
+
     # Update Verification
-    # uses: options[:address]
+    # options: :address
     def update_verification(verification_id, device_id, options = {})
       require_api_key
       require_param(verification_id, "verification id")
@@ -318,7 +341,6 @@ module Touchpass
     end
 
     # Reject a verification
-    # needs: :id
     def reject_verification(verification_id, device_id, options = {})
       require_api_key
       require_param(verification_id, "verification id")
@@ -372,9 +394,13 @@ module Touchpass
       msg = ""
       if response['error']
         msg = response['error']
-      elsif response['errors'].kind_of(Array)
-        # TODO
-        msg = response['errors'].inspect
+      elsif response['errors'].kind_of?(Array)
+        list = []
+        response['errors'].each do |error|
+          err = error['field'] && error['field'] != 'base' ? error['field'] + " " + error['message'] : error['message']
+          list.push(err) if err
+        end
+        msg = list.join(", ")
       end
       msg
     end
@@ -407,7 +433,8 @@ module Touchpass
       raise "#{name} required" unless value && value.to_s.length > 0
     end
 
-    # Submit the request to the server and process the response (for errors)
+    # Submit the request to the server and process the response (for errors).
+    # raises an exception if errors are received in the response.
     def submit_request(http_verb, request, options)
 
       request = request + "." + REQUEST_FORMAT
@@ -436,7 +463,9 @@ module Touchpass
         puts "DEBUG: "
       end
 
-      response.to_hash
+      response = response.to_hash
+      raise error_message(response) if errors?(response)
+      response
     end
 
   end # class Touchpass::Client

data/lib/touchpass/verification.rb

@@ -1,9 +1,12 @@
 module Touchpass
   class Verification
 
+    STATE_CREATED = 'created'
+
     attr_reader :crypted_salts, :crypted_tokens, :crypted_messages
     attr_reader :claimed_token
     attr_reader :location_verification, :claimed_prp, :resolution
+    attr_accessor :attributes
 
     def initialize(vp_devices, options = {})
       
@@ -13,6 +16,7 @@ module Touchpass
       @claimed_token = hashed_token
       @vp_devices = vp_devices
       @crypted_messages = []
+      @attributes = {}
 
       # Encrypt message using each verifying party's (to_party) device public keys
       add_message(options[:message]) if !options[:message].nil? 
@@ -85,7 +89,23 @@ module Touchpass
       
       params
     end
-    
+
+    def [](key)
+      @attributes.kind_of?(Hash) ? @attributes[key] : nil
+    end
+
+    def to_h
+      @attributes
+    end
+
+    def id
+      self['id']
+    end
+
+    def state
+      self['state']
+    end
+
     private
 
     def param_hash(values)

data/lib/touchpass/version.rb

@@ -1,3 +1,3 @@
 module Touchpass
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/touchpass_client_spec.rb

@@ -56,8 +56,10 @@ describe "Touchpass Client" do
       username.length.should be >= 15
       email     = "#{username}@geodica.com"
       password  = "password"
-      new_party  = tpclient.register_party(username, password, email)
-      expect_response_error(new_party, :username, "is too long (maximum is 15 characters)")
+
+      lambda {
+        new_party = tpclient.register_party(username, password, email)
+      }.should raise_exception(/username is too long/)
     end    
 
     it "should not allow a party to register with an empty email address" do
@@ -184,8 +186,8 @@ describe "Touchpass Client" do
     end
     
     it "should allow for removal of a device by id" do
-      udid            = random_hash # a random string
-      messaging_value = random_hash # random string      
+      udid = random_hash # a random string
+      messaging_value = random_hash # random string
 
       new_device = tpclient.register_device(@new_party['username'], udid,
                                             "#{@username}'s Device", 
@@ -200,8 +202,9 @@ describe "Touchpass Client" do
       retrieved_devices['devices'].should_not be nil
       retrieved_devices['devices'].size.should be 0
       
-      retrieved_device = tpclient.get_device(@username, new_device['id'])
-      expect_response_error(retrieved_device)
+      lambda {
+        retrieved_device = tpclient.get_device(@username, new_device['id'])
+      }.should raise_exception(/Device cannot be found/)
     end
 
   end
@@ -307,11 +310,13 @@ describe "Touchpass Client" do
       
       # We should *not* be able to canel or reject this verification
       # since it's already been validated.
-      response = @vp_client.cancel_verification(verification['id'], @new_device['id'])
-      expect_response_error(response, :base, "Verification has already been responded")
+      lambda {
+        response = @vp_client.cancel_verification(verification['id'], @new_device['id'])
+      }.should raise_exception(/has already been responded/)
 
-      response = @vp_client.reject_verification(verification['id'], @new_device['id'])
-      expect_response_error(response, :base, "Verification has already been responded")
+      lambda {
+        response = @vp_client.reject_verification(verification['id'], @new_device['id'])
+      }.should raise_exception(/has already been responded/)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: touchpass
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: