tinder 1.7.0 → 1.8.0

data/lib/faraday/response/raise_on_authentication_failure.rb

@@ -4,7 +4,7 @@ require 'faraday'
 module Faraday
   class Response::RaiseOnAuthenticationFailure < Response::Middleware
     def on_complete(response)
-      raise Tinder::AuthenticationFailed if response[:status] == 401
+      raise Tinder::AuthenticationFailed if [401, 404].include?(response[:status])
     end
   end
 end

data/lib/tinder.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+require 'active_support'
 require 'tinder/connection'
 require 'tinder/campfire'
 require 'tinder/room'

data/lib/tinder/campfire.rb

@@ -19,8 +19,8 @@ module Tinder
     # == Options:
     # * +:ssl+: use SSL for the connection, which is required if you have a Campfire SSL account.
     #           Defaults to true
-    # * +:ssl_verify+: verify SSL certificate if using SSL
-    #           Defaults to true
+    # * +:ssl_options+: SSL options passed to the underlaying Faraday connection. Allows to specify if the SSL certificate should be verified (:verify => true|false) and to specify the path to the ssl certs directory (:ca_path => "path/certs")
+    #           Defaults to {:verify => true}
     # * +:proxy+: a proxy URI. (e.g. :proxy => 'http://user:pass@example.com:8000')
     #
     #   c = Tinder::Campfire.new("mysubdomain", :ssl => true)

data/lib/tinder/connection.rb

@@ -35,7 +35,9 @@ module Tinder
 
     def initialize(subdomain, options = {})
       @subdomain = subdomain
-      @options = {:ssl => true, :ssl_verify => true, :proxy => ENV['HTTP_PROXY']}.merge(options)
+      @options = {:ssl => true, :ssl_options => {:verify => true}, :proxy => ENV['HTTP_PROXY']}
+      @options[:ssl_options][:verify] = options.delete(:ssl_verify) unless options[:ssl_verify].nil?
+      @options.merge!(options)
       @uri = URI.parse("#{@options[:ssl] ? 'https' : 'http' }://#{subdomain}.#{HOST}")
       @token = options[:token]
 
@@ -50,11 +52,7 @@ module Tinder
     def connection
       @connection ||= begin
         conn = self.class.connection.dup
-        conn.url_prefix = @uri.to_s
-        conn.proxy options[:proxy]
-        if options[:ssl_verify] == false
-          conn.ssl[:verify] = false
-        end
+        set_connection_options(conn)
         conn
       end
     end
@@ -62,11 +60,7 @@ module Tinder
     def raw_connection
       @raw_connection ||= begin
         conn = self.class.raw_connection.dup
-        conn.url_prefix = @uri.to_s
-        conn.proxy options[:proxy]
-        if options[:ssl_verify] == false
-          conn.ssl[:verify] = false
-        end
+        set_connection_options(conn)
         conn
       end
     end
@@ -101,5 +95,14 @@ module Tinder
     def ssl?
       uri.scheme == 'https'
     end
+
+  private
+    def set_connection_options(conn)
+      conn.url_prefix = @uri.to_s
+      conn.proxy options[:proxy]
+      if options[:ssl_options]
+        conn.ssl.merge!(options[:ssl_options])
+      end
+    end
   end
 end

data/lib/tinder/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Tinder
-  VERSION = '1.7.0' unless defined?(::Tinder::VERSION)
+  VERSION = '1.8.0' unless defined?(::Tinder::VERSION)
 end

data/spec/tinder/connection_spec.rb

@@ -12,6 +12,15 @@ describe Tinder::Connection do
       lambda { connection.get('/rooms.json') }.should raise_error(Tinder::AuthenticationFailed)
     end
 
+    it "should raise an exception when an invalid subdomain is specified" do
+      stub_connection(Tinder::Connection) do |stub|
+        stub.get("/rooms.json") {[404, {}, "Not found"]}
+      end
+
+      connection = Tinder::Connection.new('test', :token => 'foo')
+      lambda { connection.get('/rooms.json') }.should raise_error(Tinder::AuthenticationFailed)
+    end
+
     it "should lookup token when username/password provided" do
       stub_connection(Tinder::Connection) do |stub|
         stub.get("/users/me.json") {[200, {}, fixture('users/me.json')]}
@@ -48,5 +57,21 @@ describe Tinder::Connection do
       connection = Tinder::Connection.new('test', :username => 'user', :password => 'pass', :ssl_verify => false)
       connection.connection.ssl[:verify].should be == false
     end
+
+    it "should allow passing any ssl_options to Faraday" do
+      stub_connection(Tinder::Connection) do |stub|
+        stub.get("/users/me.json") {[200, {}, fixture('users/me.json')]}
+      end
+      connection = Tinder::Connection.new('test',
+        :username => 'user',
+        :password => 'pass',
+        :ssl_options => {
+          :verify  => false,
+          :ca_path => "/usr/lib/ssl/certs",
+          :ca_file => "/etc/ssl/custom"
+        }
+      )
+      connection.connection.ssl.should eql(:verify => false, :ca_path => "/usr/lib/ssl/certs", :ca_file => "/etc/ssl/custom")
+    end
   end
 end

data/tinder.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'multipart-post', '~> 1.1'
   gem.add_runtime_dependency 'twitter-stream', '~> 0.1'
 
-  gem.authors = ["Brandon Keepers"]
+  gem.authors = ["Brandon Keepers", "Brian Ryckbost"]
   gem.description = %q{A Ruby API for interfacing with Campfire, the 37Signals chat application.}
   gem.email = ['brandon@opensoul.org']
   gem.extra_rdoc_files = ['README.markdown']

metadata

@@ -1,165 +1,233 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: tinder
-version: !ruby/object:Gem::Version
-  version: 1.7.0
+version: !ruby/object:Gem::Version 
+  hash: 55
   prerelease: 
+  segments: 
+  - 1
+  - 8
+  - 0
+  version: 1.8.0
 platform: ruby
-authors:
+authors: 
 - Brandon Keepers
+- Brian Ryckbost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-11-16 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: fakeweb
-  requirement: &70192463323300 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
-  prerelease: false
-  version_requirements: *70192463323300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70192463353520 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
+        version: "0.8"
   type: :development
-  prerelease: false
-  version_requirements: *70192463353520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70192463353060 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 6
+        version: "2.6"
   type: :development
-  prerelease: false
-  version_requirements: *70192463353060
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &70192463352560 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.3'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
+        version: "2.3"
     - - <
-      - !ruby/object:Gem::Version
-        version: '4'
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 4
+        version: "4"
   type: :runtime
-  prerelease: false
-  version_requirements: *70192463352560
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: eventmachine
-  requirement: &70192463351840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.12'
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 12
+        version: "0.12"
   type: :runtime
-  prerelease: false
-  version_requirements: *70192463351840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: faraday
-  requirement: &70192463351340 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.6'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        version: "0.6"
     - - <
-      - !ruby/object:Gem::Version
-        version: '0.8'
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
+        version: "0.8"
   type: :runtime
-  prerelease: false
-  version_requirements: *70192463351340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: faraday_middleware
-  requirement: &70192463350580 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.6'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        version: "0.6"
     - - <
-      - !ruby/object:Gem::Version
-        version: '0.8'
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
+        version: "0.8"
   type: :runtime
-  prerelease: false
-  version_requirements: *70192463350580
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: hashie
-  requirement: &70192463349860 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70192463349860
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: mime-types
-  requirement: &70192463349400 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.16'
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 1
+        - 16
+        version: "1.16"
   type: :runtime
-  prerelease: false
-  version_requirements: *70192463349400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: multi_json
-  requirement: &70192463348940 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70192463348940
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: multipart-post
-  requirement: &70192463348480 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
   type: :runtime
-  prerelease: false
-  version_requirements: *70192463348480
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: twitter-stream
-  requirement: &70192463348020 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
   type: :runtime
-  prerelease: false
-  version_requirements: *70192463348020
+  version_requirements: *id012
 description: A Ruby API for interfacing with Campfire, the 37Signals chat application.
-email:
+email: 
 - brandon@opensoul.org
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.markdown
-files:
+files: 
 - .gemtest
 - .gitignore
 - .rspec
@@ -191,29 +259,40 @@ files:
 - tinder.gemspec
 homepage: http://github.com/collectiveidea/tinder
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the Campfire API
-test_files:
+test_files: 
 - spec/fixtures/rooms.json
 - spec/fixtures/rooms/room80749.json
 - spec/fixtures/rooms/room80751.json