authy 0.0.8 → 1.0.0

data/Gemfile

@@ -1,13 +1,13 @@
 source "http://rubygems.org"
 
-gem 'dcu-typhoeus', :require => 'typhoeus'
+gem 'httpclient'
 
 group :development do
   gem "rspec"
   gem 'pry'
-  gem "yard", "~> 0.7"
-  gem "rdoc", "~> 3.12"
-  gem "jeweler", "~> 1.8.3"
+  gem "yard"
+  gem "rdoc"
+  gem "jeweler"
   gem "simplecov", ">= 0"
-  gem "reek", "~> 1.2.8"
+  gem "reek"
 end

data/Gemfile.lock

@@ -1,18 +1,10 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.11)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
     coderay (1.0.8)
-    dcu-typhoeus (0.4.3)
-      activesupport (~> 3.2)
-      ffi (~> 1.0)
-      mime-types (~> 1.18)
     diff-lcs (1.1.3)
-    ffi (1.3.1)
     git (1.2.5)
-    i18n (0.6.1)
+    httpclient (2.3.2)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -20,22 +12,18 @@ GEM
       rdoc
     json (1.7.6)
     method_source (0.8.1)
-    mime-types (1.19)
     multi_json (1.5.0)
-    pry (0.9.10)
+    pry (0.9.11.4)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
-      slop (~> 3.3.1)
+      slop (~> 3.4)
     rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
-    reek (1.2.13)
-      ripper_ruby_parser (~> 0.0.7)
-      ruby2ruby (~> 1.2.5)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    ripper_ruby_parser (0.0.8)
-      sexp_processor (~> 3.0)
+    reek (1.3)
+      ruby2ruby (~> 2.0.0)
+      ruby_parser (~> 3.0.4)
+      sexp_processor
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -44,28 +32,28 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.1)
-    ruby2ruby (1.2.5)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
-    sexp_processor (3.2.0)
+    ruby2ruby (2.0.1)
+      ruby_parser (~> 3.0.0)
+      sexp_processor (~> 4.0)
+    ruby_parser (3.0.4)
+      sexp_processor (~> 4.1)
+    sexp_processor (4.1.4)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slop (3.3.3)
+    slop (3.4.3)
     yard (0.8.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  dcu-typhoeus
-  jeweler (~> 1.8.3)
+  httpclient
+  jeweler
   pry
-  rdoc (~> 3.12)
-  reek (~> 1.2.8)
+  rdoc
+  reek
   rspec
   simplecov
-  yard (~> 0.7)
+  yard

data/README.md

@@ -42,9 +42,10 @@ __NOTE: Token verification is only enforced if the user has completed registrati
     response = Authy::API.verify(:id => user.authy_id, :token => 'token-user-entered')
 
     if response.ok?
-      //token was valid, user can sign in
+      # token was valid, user can sign in
     else
-      //token is invalid
+      # token is invalid
+    end
 
 ### Forcing Verification
 
@@ -59,10 +60,11 @@ If you wish to verify tokens even if the user has not yet complete registration,
     response = Authy::API.request_sms(:id => user.authy_id)
 
     if response.ok?
-      //sms was sent
+      # sms was sent
     else
-      response.
-      //sms failed to send
+      response.errors
+      #sms failed to send
+    end
 
 
 This call will be ignored if the user is using the Authy Mobile App. If you still want to send

data/VERSION

@@ -1 +1 @@
-0.0.8
+1.0.0

data/authy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "authy"
-  s.version = "0.0.8"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Authy", "David A. Cuadrado"]
-  s.date = "2013-01-14"
+  s.date = "2013-01-24"
   s.description = "Ruby library to access Authy services"
   s.email = "krawek@gmail.com"
   s.executables = ["authy-api-console"]
@@ -48,33 +48,33 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dcu-typhoeus>, [">= 0"])
+      s.add_runtime_dependency(%q<httpclient>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.7"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<reek>, ["~> 1.2.8"])
+      s.add_development_dependency(%q<reek>, [">= 0"])
     else
-      s.add_dependency(%q<dcu-typhoeus>, [">= 0"])
+      s.add_dependency(%q<httpclient>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
-      s.add_dependency(%q<yard>, ["~> 0.7"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<reek>, ["~> 1.2.8"])
+      s.add_dependency(%q<reek>, [">= 0"])
     end
   else
-    s.add_dependency(%q<dcu-typhoeus>, [">= 0"])
+    s.add_dependency(%q<httpclient>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])
-    s.add_dependency(%q<yard>, ["~> 0.7"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<reek>, ["~> 1.2.8"])
+    s.add_dependency(%q<reek>, [">= 0"])
   end
 end
 

data/lib/authy.rb

@@ -1,10 +1,11 @@
 $:.unshift File.expand_path("..", __FILE__)
 
-require 'bundler/setup'
-
-require 'typhoeus'
+require 'httpclient'
+require 'httpclient/include_client'
 require 'json'
+
 require 'authy/response'
 require 'authy/models/user'
 require 'authy/config'
 require 'authy/api'
+

data/lib/authy/api.rb

@@ -4,7 +4,10 @@ module Authy
   #  Authy.api_uri = 'http://test-authy-api.heroku.com/'
   #
   class API
-    include Typhoeus
+    USER_AGENT = "authy-ruby"
+
+    extend HTTPClient::IncludeClient
+    include_http_client
 
     def self.register_user(attributes)
       api_key = attributes.delete(:api_key)
@@ -14,7 +17,7 @@ module Authy
       }
 
       url = "#{Authy.api_uri}/protected/json/users/new"
-      response = Typhoeus::Request.post(url, :params => params)
+      response = http_client.post(url, :body => escape_query(params))
 
       Authy::User.new(response)
     end
@@ -29,7 +32,7 @@ module Authy
       user_id = params.delete(:id) || params.delete('id')
 
       url = "#{Authy.api_uri}/protected/json/verify/#{escape_for_url(token)}/#{escape_for_url(user_id)}"
-      response = Typhoeus::Request.get(url, :params => {:api_key => Authy.api_key}.merge(params))
+      response = http_client.get(url, {:api_key => Authy.api_key}.merge(params))
 
       Authy::Response.new(response)
     end
@@ -41,7 +44,7 @@ module Authy
       user_id = params.delete(:id) || params.delete('id')
 
       url = "#{Authy.api_uri}/protected/json/sms/#{escape_for_url(user_id)}"
-      response = Typhoeus::Request.get(url, :params => {:api_key => Authy.api_key}.merge(params))
+      response = http_client.get(url, {:api_key => Authy.api_key}.merge(params))
 
       Authy::Response.new(response)
     end
@@ -50,5 +53,34 @@ module Authy
     def self.escape_for_url(field)
       URI.escape(field.to_s.strip, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
     end
+
+    # Copied and extended from httpclient's HTTP::Message#escape_query()
+    def self.escape_query(query, namespace = nil) # :nodoc:
+      pairs = []
+      query.each { |attr, value|
+        left = namespace ? "#{namespace}[#{attr.to_s}]" : attr.to_s
+        if values = Array.try_convert(value)
+          values.each { |value|
+            if value.respond_to?(:read)
+              value = value.read
+            end
+
+            if value.kind_of?(Hash)
+              pairs.push(escape_query(value, left+"[]"))
+            else
+              pairs.push(HTTP::Message.escape(left+ '[]') << '=' << HTTP::Message.escape(value.to_s))
+            end
+          }
+        elsif values = Hash.try_convert(value)
+          pairs.push(escape_query(values, left.dup))
+        else
+          if value.respond_to?(:read)
+            value = value.read
+          end
+          pairs.push(HTTP::Message.escape(left) << '=' << HTTP::Message.escape(value.to_s))
+        end
+      }
+      pairs.join('&')
+    end
   end
 end

data/lib/authy/response.rb

@@ -12,23 +12,30 @@ module Authy
     end
 
     def ok?
-      @raw_response.code == 200
+      @raw_response.status == 200
     end
+    alias :success? :ok?
 
     def body
       @raw_response.body
     end
 
     def code
-      @raw_response.code
+      @raw_response.status
     end
 
     def error_msg
-      (@raw_response.curl_error_message == "No error" && self.empty?) ? self.body : @raw_response.curl_error_message
+      if ok?
+        "No error"
+      elsif self.empty?
+        self.body
+      else
+        self["message"] || "No error"
+      end
     end
 
     def errors
-      self['errors'] || @errors
+      self["errors"] || @errors
     end
 
     protected
@@ -41,12 +48,9 @@ module Authy
     end
 
     def parse_body
-      begin
-        body = JSON.parse(@raw_response.body)
-        body.each do |k,v|
-          self[k] = v
-        end
-      rescue Exception => e
+      body = JSON.parse(@raw_response.body) rescue {}
+      body.each do |k,v|
+        self[k] = v
       end
     end
   end

data/spec/authy/response_spec.rb

@@ -1,9 +1,10 @@
+require 'spec_helper'
+
 describe "Authy::Response" do
   before :each do
     @fake_response = OpenStruct.new
     @fake_response.body = {'v1' => 'r1','v2' => 42}.to_json
-    @fake_response.code = 200
-    @fake_response.curl_error_message = 'No error'
+    @fake_response.status = 200
 
     @response = Authy::Response.new(@fake_response)
   end
@@ -15,7 +16,7 @@ describe "Authy::Response" do
   it "should be ok if the return code is 200" do
     @response.ok?.should be_true
 
-    @fake_response.code = 401
+    @fake_response.status = 401
     @response = Authy::Response.new(@fake_response)
     @response.ok?.should be_false
   end
@@ -24,6 +25,7 @@ describe "Authy::Response" do
     @response.error_msg.should == "No error"
 
     @fake_response.body = 'invalid json'
+    @fake_response.status = 401
     @response = Authy::Response.new(@fake_response)
 
     @response.error_msg.should == "invalid json"

metadata

@@ -2,7 +2,7 @@
 name: authy
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Authy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -19,7 +19,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: dcu-typhoeus
+  name: httpclient
   type: :runtime
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -64,50 +64,50 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   name: yard
   type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
   name: rdoc
   type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '0'
   name: jeweler
   type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -128,18 +128,18 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: '0'
   name: reek
   type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: '0'
 description: Ruby library to access Authy services
 email: krawek@gmail.com
 executables:
@@ -182,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 4514592161514013586
+      hash: -14009376793020186
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false