authy 2.2.0 → 2.3.0

data/.gitignore

@@ -0,0 +1,58 @@
+# rcov generated
+coverage
+coverage.data
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+.DS_Store
+
+# For TextMate
+*.tmproj
+tmtags
+
+# For emacs:
+*~
+\#*
+.\#*
+
+# For vim:
+*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc
+
+*.kdev4
+
+examples/db
+.ruby-version
+.ruby-gemset
+.rvmrc
+Gemfile.lock
+

data/.rspec

@@ -1 +1,2 @@
 --color
+--order random

data/Gemfile

@@ -1,6 +1,6 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem 'httpclient', ">= 2.2.6"
+gem 'httpclient', ">= 2.3.4"
 
 group :development do
   gem "rspec"

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 David A. Cuadrado
+Copyright (c) 2012-2014 Authy Inc
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -14,7 +14,7 @@ Ruby library to access the Authy API
 ## Registering a user
 
 __NOTE: User is matched based on cellphone and country code not e-mail.
-A cellphone is uniquely associated with an authy_id.__  
+A cellphone is uniquely associated with an authy_id.__
 
 
 `Authy::API.register_user` requires the user e-mail address and cellphone. Optionally you can pass in the country_code or we will asume
@@ -35,8 +35,8 @@ Assuming you have a `users` database with a `authy_id` field in the `users` data
 ## Verifying a user
 
 
-__NOTE: Token verification is only enforced if the user has completed registration. To change this behaviour see Forcing Verification section below.__  
-   
+__NOTE: Token verification is only enforced if the user has completed registration. To change this behaviour see Forcing Verification section below.__
+
    >*Registration is completed once the user installs and registers the Authy mobile app or logins once successfully using SMS.*
 
 `Authy::API.verify` takes the authy_id that you are verifying and the token that you want to verify. You should have the authy_id in your database
@@ -50,7 +50,7 @@ __NOTE: Token verification is only enforced if the user has completed registrati
       # token is invalid
     end
 ```
-    
+
 ### Forcing Verification
 
 If you wish to verify tokens even if the user has not yet complete registration, pass force=true when verifying the token.
@@ -58,7 +58,7 @@ If you wish to verify tokens even if the user has not yet complete registration,
 ```ruby
     response = Authy::API.verify(:id => user.authy_id, :token => 'token-user-entered', :force => true)
 ```
-    
+
 ## Requesting a SMS token
 
 `Authy::API.request_sms` takes the authy_id that you want to send a SMS token. This requires Authy SMS plugin to be enabled.
@@ -128,7 +128,7 @@ This call will be ignored if the user is using the Authy Mobile App. If you ensu
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
 Copyright
-== 
+==
 
-Copyright (c) 2012 Authy Inc. See LICENSE.txt for
+Copyright (c) 2012-2014 Authy Inc. See LICENSE.txt for
 further details.

data/Rakefile

@@ -1,36 +1,14 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+require 'bundler/gem_tasks'
 require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "authy"
-  gem.homepage = "http://github.com/authy/authy"
-  gem.license = "MIT"
-  gem.summary = %Q{Ruby library to access Authy services}
-  gem.description = %Q{Ruby library to access Authy services}
-  gem.email = "krawek@gmail.com"
-  gem.authors = ["Authy", "David A. Cuadrado"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rspec/core'
 require 'rspec/core/rake_task'
+
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
+task :default => :spec
+
 RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
@@ -43,8 +21,6 @@ Reek::Rake::Task.new do |t|
   t.source_files = 'lib/**/*.rb'
 end
 
-task :default => :spec
-
 require 'yard'
 YARD::Rake::YardocTask.new
 
@@ -53,4 +29,3 @@ task :simplecov do
   ENV['COVERAGE'] = "true"
   Rake::Task['spec'].execute
 end
-

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.3.0

data/authy.gemspec

@@ -1,83 +1,32 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+
+require 'authy/version'
 
 Gem::Specification.new do |s|
-  s.name = "authy"
-  s.version = "2.2.0"
+  s.name        = "authy"
+  s.version     = Authy::VERSION
+  s.authors     = ["Authy Inc"]
+  s.email       = ["support@authy.com"]
+  s.homepage    = "https://github.com/authy/authy-ruby"
+  s.summary     = %q{Ruby library to access Authy services}
+  s.description = %q{Ruby library to access Authy services}
+  s.license = 'MIT'
+
+  s.rubyforge_project = "authy"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Authy", "David A. Cuadrado"]
-  s.date = "2013-06-17"
-  s.description = "Ruby library to access Authy services"
-  s.email = "krawek@gmail.com"
-  s.executables = ["authy-api-console"]
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "authy.gemspec",
-    "bin/authy-api-console",
-    "examples/demo.rb",
-    "lib/authy.rb",
-    "lib/authy/api.rb",
-    "lib/authy/config.rb",
-    "lib/authy/core_ext.rb",
-    "lib/authy/models/user.rb",
-    "lib/authy/response.rb",
-    "lib/authy/url_helpers.rb",
-    "spec/authy/api_spec.rb",
-    "spec/authy/response_spec.rb",
-    "spec/authy/url_helpers_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = "http://github.com/authy/authy"
-  s.licenses = ["MIT"]
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Ruby library to access Authy services"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.add_dependency('httpclient', '>= 2.3.4')
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httpclient>, [">= 2.2.6"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
-      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>, [">= 0"])
-    else
-      s.add_dependency(%q<httpclient>, [">= 2.2.6"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<pry>, [">= 0"])
-      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>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<httpclient>, [">= 2.2.6"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<pry>, [">= 0"])
-    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>, [">= 0"])
-  end
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('pry')
+  s.add_development_dependency('yard')
+  s.add_development_dependency('rdoc')
+  s.add_development_dependency('simplecov')
+  s.add_development_dependency('reek')
 end
-

data/lib/authy.rb

@@ -10,4 +10,4 @@ require 'authy/response'
 require 'authy/models/user'
 require 'authy/config'
 require 'authy/api'
-
+require 'authy/version'

data/lib/authy/api.rb

@@ -88,7 +88,7 @@ module Authy
       response = if state
                    url = "#{Authy.api_uri}/#{eval_uri(uri, params)}"
                    params = clean_uri_params(uri_params, params)
-                   http_client.get(url, {:api_key => Authy.api_key}.merge(params))
+                   http_client.get(url, escape_params({:api_key => Authy.api_key}.merge(params)))
                  else
                    build_error_response(error)
                  end
@@ -96,18 +96,16 @@ module Authy
     end
 
     def self.build_error_response(error = "blank uri param found")
-      OpenStruct.new(
-                     {
-                       'status'  => 400,
-                       'body' =>
-                       {
-                         'success' => false,
-                         'message' => error,
-                         'errors' => {
-                           'message' => error
-                         }
-                       }.to_json
-                     })
+      OpenStruct.new({
+        'status' => 400,
+        'body' => {
+          'success' => false,
+          'message' => error,
+          'errors' => {
+            'message' => error
+          }
+        }.to_json
+      })
     end
   end
 end

data/lib/authy/url_helpers.rb

@@ -14,20 +14,22 @@ module Authy
       end
 
       def eval_uri(uri, params = {})
-        uri.gsub(/:\w+/) {|s| params[s.gsub(":", "")]}
+        uri.gsub(/:\w+/) do |s|
+          param_name = s.gsub(":", "")
+          HTTP::Message.escape(params[param_name].to_s)
+        end
       end
 
       def validate_for_url(names, to_validate = {})
         names.each do |name|
           value = to_validate[name]
           if value.nil? or value.to_s.empty? or value.to_s.split(" ").size == 0
-            puts "#{name} param is blank."
             return [ false, "#{name} is blank." ]
           end
         end
         [ true, ""]
       end
-      
+
       def escape_for_url(field)
         URI.escape(field.to_s.strip, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
       end
@@ -50,6 +52,16 @@ module Authy
         end
       end
 
+      def escape_params(params)
+        params.each do |attr, value|
+          if value.kind_of?(String)
+            params[attr] = HTTP::Message.escape(value)
+          elsif value.kind_of?(Hash)
+            escape_params(value)
+          end
+        end
+      end
+
       # Copied and extended from httpclient's HTTP::Message#escape_query()
       def escape_query(query, namespace = nil) # :nodoc:
         pairs = []

data/lib/authy/version.rb

@@ -0,0 +1,3 @@
+module Authy
+  VERSION = "2.3.0"
+end

data/spec/authy/api_spec.rb

@@ -58,6 +58,19 @@ describe "Authy::API" do
       response.should_not be_ok
       response.errors['message'].should =~ /invalid api key/i
     end
+
+    it "should escape the params" do
+      expect {
+        Authy::API.verify(:token => '[=#%@$&#(!@);.,', :id => @user['id'])
+      }.to_not raise_error
+    end
+
+    it "should fail if a param is missing" do
+      response = Authy::API.verify(:id => @user['id'])
+      response.should be_kind_of(Authy::Response)
+      response.should_not be_ok
+      response["message"] =~ /token is blank/
+    end
   end
 
   ["sms", "phone_call"].each do |kind|
@@ -71,7 +84,7 @@ describe "Authy::API" do
       it "should request a #{title} token" do
         uri_param = kind == "phone_call" ? "call" : kind
         url = "#{Authy.api_uri}/protected/json/#{uri_param}/#{Authy::API.escape_for_url(@user.id)}"
-        HTTPClient.any_instance.should_receive(:request).with(:get, url, {:query=>{:api_key=> Authy.api_key}, :header=>nil, :follow_redirect=>nil}) { mock(:ok? => true, :body => "", :status => 200) }
+        HTTPClient.any_instance.should_receive(:request).with(:get, url, {:query=>{:api_key=> Authy.api_key}, :header=>nil, :follow_redirect=>nil}) { double(:ok? => true, :body => "", :status => 200) }
         response = Authy::API.send("request_#{kind}", :id => @user.id)
         response.should be_ok
       end

metadata

@@ -2,42 +2,41 @@
 name: authy
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
-- Authy
-- David A. Cuadrado
+- Authy Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: 2.3.4
   name: httpclient
-  type: :runtime
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: 2.3.4
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec
-  type: :development
-  prerelease: false
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -45,15 +44,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry
-  type: :development
-  prerelease: false
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -61,15 +60,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: yard
-  type: :development
-  prerelease: false
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -77,15 +76,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: rdoc
-  type: :development
-  prerelease: false
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -93,15 +92,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: jeweler
-  type: :development
-  prerelease: false
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -109,6 +108,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -116,8 +117,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: simplecov
-  type: :development
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -125,6 +124,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -132,8 +133,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: reek
-  type: :development
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -141,18 +140,17 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby library to access Authy services
-email: krawek@gmail.com
+email:
+- support@authy.com
 executables:
 - authy-api-console
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.md
+extra_rdoc_files: []
 files:
 - .document
+- .gitignore
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -167,11 +165,12 @@ files:
 - lib/authy/models/user.rb
 - lib/authy/response.rb
 - lib/authy/url_helpers.rb
+- lib/authy/version.rb
 - spec/authy/api_spec.rb
 - spec/authy/response_spec.rb
 - spec/authy/url_helpers_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/authy/authy
+homepage: https://github.com/authy/authy-ruby
 licenses:
 - MIT
 post_install_message: 
@@ -183,9 +182,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -1090702034643817061
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
@@ -194,9 +190,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project: authy
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby library to access Authy services
-test_files: []
+test_files:
+- spec/authy/api_spec.rb
+- spec/authy/response_spec.rb
+- spec/authy/url_helpers_spec.rb
+- spec/spec_helper.rb
+has_rdoc: 

data/Gemfile.lock

@@ -1,59 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    coderay (1.0.9)
-    diff-lcs (1.2.4)
-    git (1.2.5)
-    httpclient (2.3.3)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.8.0)
-    method_source (0.8.1)
-    multi_json (1.7.5)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rake (10.0.4)
-    rdoc (4.0.1)
-      json (~> 1.4)
-    reek (1.3.1)
-      ruby2ruby (~> 2.0.2)
-      ruby_parser (~> 3.1.1)
-      sexp_processor
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    ruby2ruby (2.0.5)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.1.3)
-      sexp_processor (~> 4.1)
-    sexp_processor (4.2.1)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.5)
-    yard (0.8.6.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  httpclient (>= 2.2.6)
-  jeweler
-  pry
-  rdoc
-  reek
-  rspec
-  simplecov
-  yard