ruby-satisfaction 0.7.0 → 0.7.3

data/Gemfile.lock

@@ -28,7 +28,7 @@ GEM
     open_gem (1.4.2)
       launchy (~> 0.3.5)
     rake (0.8.7)
-    rr (1.0.2)
+    rr (1.0.4)
     rspec (2.2.0)
       rspec-core (~> 2.2)
       rspec-expectations (~> 2.2)
@@ -56,7 +56,7 @@ DEPENDENCIES
   nokogiri (>= 1.4.2)
   oauth (>= 0.3.5)
   open_gem (>= 1.4)
-  rr (= 1.0.2)
+  rr (= 1.0.4)
   rspec (~> 2.2)
   ruby-debug (>= 0.10.4)
   ruby-satisfaction!

data/README.markdown

@@ -11,6 +11,13 @@ For questions, please visit the [Get Satisfaction API community][3]
 
 Changelog
 =========
+0.7.1
+
+* Integration smoke tests to validate proper ssl
+request.
+* Test loader code on the SSL context also
+* Suppress the 'warning: peer certificate won't be verified in this SSL session'
+
 0.7.0
 
 * Revised Sfn::Resource so that it supports calls to API endpoints for nested resources

data/lib/satisfaction/loader.rb

@@ -34,6 +34,7 @@ class Sfn::Loader
     end
     
     http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true if uri.scheme.try(:downcase) == 'https'
     add_authentication(request, http, options)
     response = execute(http, request)
 
@@ -86,6 +87,7 @@ class Sfn::Loader
     request.set_form_data(form)
     
     http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true if uri.scheme.try(:downcase) == 'https'
     add_authentication(request, http, options)
     response = execute(http, request)
 

data/lib/satisfaction/version.rb

@@ -1,8 +1,8 @@
-module Satisfaction
+module GemSatisfaction
   module VERSION
     MAJOR = 0
     MINOR = 7
-    PATCH = 0
+    PATCH = 3
     PRE   = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/lib/satisfaction.rb

@@ -1,4 +1,5 @@
 require 'satisfaction/external_dependencies'
+
 module Sfn
 end
 class Satisfaction

data/ruby-satisfaction.gemspec

@@ -3,7 +3,7 @@ require File.expand_path("../lib/satisfaction/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "ruby-satisfaction"
-  s.version     = Satisfaction::VERSION::STRING
+  s.version     = GemSatisfaction::VERSION::STRING
   s.platform    = Gem::Platform::RUBY
   s.author     = 'Get Satisfaction'
   s.email       = ["nerds+rubygems@getsatisfaction.com"]
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "fakeweb", "~> 1.3"
   s.add_development_dependency "open_gem", ">= 1.4"
   s.add_development_dependency "ruby-debug", ">= 0.10.4"
-  s.add_development_dependency "rr", '1.0.2'
+  s.add_development_dependency "rr", '1.0.4'
 
   s.extra_rdoc_files = [ "README.markdown" ]
   s.files        = `git ls-files`.split("\n") - ['.rvmrc', '.gitignore']

data/spec/integration_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe 'Smoke test SSL conections' do
+  before do
+    @app_host = 'getsatisfaction.com'
+    @api_host = 'api.getsatisfaction.com'
+    FakeWeb.clean_registry
+    FakeWeb.allow_net_connect = true
+  end
+
+  shared_examples_for 'get' do
+    it 'should get the first page of getsat topics' do
+      results = @sfn.companies['getsatisfaction'].topics.page(1, :limit => 10)
+      results.items.size.should == 10
+    end
+  end
+
+  context 'over ssl' do
+    before do
+      @sfn = Satisfaction.new(
+        :root => "https://#{@api_host}",
+        :autoload => false,
+        :request_token_url => "https://#{@app_host}/api/request_token",
+        :access_token_url => "https://#{@app_host}/api/access_token",
+        :authorize_url => "https://#{@app_host}/api/authorize"
+      )
+    end
+
+    it_should_behave_like 'get'  
+  end
+
+  context 'not over ssl' do
+    before do
+      @sfn = Satisfaction.new(
+        :root => "http://#{@api_host}",
+        :autoload => false,
+        :request_token_url => "http://#{@app_host}/api/request_token",
+        :access_token_url => "http://#{@app_host}/api/access_token",
+        :authorize_url => "http://#{@app_host}/api/authorize"
+      )
+    end
+
+    it_should_behave_like 'get'
+  end
+end

data/spec/satisfaction/loader_spec.rb

@@ -3,8 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe Sfn::Loader do
 
   # ==== GET ==========================================================================================================
-
-  describe "#get" do
+  shared_examples_for "#get" do
     before(:each) do
       @response = nil
       @status_code = '200'
@@ -12,12 +11,12 @@ describe Sfn::Loader do
       @get = lambda do
         FakeWeb.register_uri(
           :get,
-          'http://test',
+          "http://#{@api_host}:#{@api_port}",
           :body => @response_body,
           :status => [@status_code]
         )
         stub(@loader).add_authentication {}
-        @response = @loader.get('http://test')
+        @response = @loader.get(@api_url)
       end
     end
 
@@ -48,44 +47,6 @@ describe Sfn::Loader do
       end
     end
 
-    describe "when we are in a redirect loop" do
-      attr_reader :loader
-
-      before(:each) do
-        @url = 'http://loop/'
-        @loader = Sfn::Loader.new
-        stub(loader).add_authentication {}
-      end
-
-      describe "and the status is 301" do
-        before(:each) do
-          @get = lambda { 
-            FakeWeb.register_uri(:get, @url, :status => 301, :location => @url)
-            @response = loader.get(@url)
-          }
-        end
-
-        it "should raise a TooManyRedirects exception with an appropriate message" do
-          @get.should raise_error(Sfn::TooManyRedirects, "Too many redirects")
-        end
-      end
-
-      describe "and the status is 302" do
-        before(:each) do
-          @get = lambda { 
-            FakeWeb.register_uri(:get, @url, :status => 302, :location => @url)
-            @response = loader.get(@url)
-          }
-        end
-
-        it "should raise a TooManyRedirects exception with an appropriate message" do
-          @get.should raise_error(Sfn::TooManyRedirects, "Too many redirects")
-        end
-      end
-
-
-    end
-
     describe "when the status is 400 (Bad Request)" do
       before(:each) do
         @status_code = '400'
@@ -193,20 +154,20 @@ describe Sfn::Loader do
   end
 
   # ==== POST ==================================================================================================
-  describe "#post" do
+  shared_examples_for "#post" do
     before(:each) do
       @response = nil
       @status_code = '200'
       @post = lambda do
         FakeWeb.register_uri(
           :post,
-          'http://test',
+          "http://#{@api_host}:#{@api_port}",
           :body => @response_body,
           :status => [@status_code]
         )
         loader = Sfn::Loader.new
         stub(loader).add_authentication {}
-        @response = loader.post('http://test', "a=b")
+        @response = loader.post(@api_url, "a=b")
       end
     end
 
@@ -265,13 +226,113 @@ describe Sfn::Loader do
       end
     end
 
+  # ---- GATEWAY -----------------------------------------------------------------------------------------------
+    describe "when the status is 502 (Bad Gateway, returned when a Unicorn worker is killed)" do
+      before(:each) do
+        @status_code = '502'
+      end
+
+      it "should raise an Sfn::BadGateway error" do
+        @post.should raise_error(Sfn::BadGateway, "Bad Gateway")
+      end
+    end
+
+    describe "when the status is 504 (GatewayTimeOut)" do
+      before(:each) do
+        @status_code = '504'
+      end
+
+      it "should raise an Sfn::GatewayTimeOut error" do
+        @post.should raise_error(Sfn::GatewayTimeOut, "Gateway TimeOut")
+      end
+    end
+  end
+
+  context 'over ssl' do
+    before do
+      @api_host = 'test'
+      @api_url  = "https://#{@api_host}"
+      @api_port = "443" 
+      any_instance_of(Net::HTTP) do |n|
+        mock(n).use_ssl=(true)
+      end
+    end
+
+    it_should_behave_like '#get'
+    it_should_behave_like '#post'
+  end
+
+  context 'not over ssl' do
+    before do
+      @api_host = 'test'
+      @api_url  = "http://#{@api_host}"
+      @api_port = ""
+    end
+
+    it_should_behave_like '#get'
+    it_should_behave_like '#post'
+
+    
+    describe "when we are in a redirect loop" do
+      attr_reader :loader
+
+      before(:each) do
+        @url = @api_url
+        @loader = Sfn::Loader.new
+        stub(loader).add_authentication {}
+      end
+
+      describe "and the status is 301" do
+        before(:each) do
+          @get = lambda { 
+            FakeWeb.register_uri(:get, "http://#{@api_host}:#{@api_port}", :status => 301, :location => @url)
+            @response = loader.get(@url)
+          }
+        end
+
+        it "should raise a TooManyRedirects exception with an appropriate message" do
+          @get.should raise_error(Sfn::TooManyRedirects, "Too many redirects")
+        end
+      end
+
+      describe "and the status is 302" do
+        before(:each) do
+          @get = lambda { 
+            FakeWeb.register_uri(:get, "http://#{@api_host}:#{@api_port}", :status => 302, :location => @url)
+            @response = loader.get(@url)
+          }
+        end
+
+        it "should raise a TooManyRedirects exception with an appropriate message" do
+          @get.should raise_error(Sfn::TooManyRedirects, "Too many redirects")
+        end
+      end
+    end
+  end
+
   # ---- MAINTENANCE --------------------------------------------------------------------------------------------------
+  describe 'MAINTENANCE' do
+    before(:each) do
+      @api_url = "http://test"
+      @response = nil
+      @status_code = '200'
+      @post = lambda do
+        FakeWeb.register_uri(
+          :post,
+          @api_url,
+          :body => @response_body,
+          :status => [@status_code]
+        )
+        loader = Sfn::Loader.new
+        stub(loader).add_authentication {}
+        @response = loader.post(@api_url, "a=b")
+      end
+    end
 
     shared_examples_for "the site is in maintenance mode" do
-
       describe "and there is not an element with a class of error_message_summary in the HTML" do
         before(:each) do
-          FakeWeb.register_uri(:get, 'http://test', :body => "blah", :status => "503")
+          FakeWeb.register_uri(:get, @api_url, :body => "blah", :status => "503")
         end
 
         it "should raise an error and include the default maintenance message" do
@@ -282,15 +343,14 @@ describe Sfn::Loader do
       describe "and there is an element with a class of error_message_summary in the HTML" do
         before(:each) do
           @custom_error = "Something crazy is going down!"
-          @response_body = "<html><head></head><body><h2 class='error_message_summary'>#{@custom_error}</h2></body>"
-          FakeWeb.register_uri(:get, 'http://test', :body => @response_body, :status => "503")
-        end
+            @response_body = "<html><head></head><body><h2 class='error_message_summary'>#{@custom_error}</h2></body>"
+            FakeWeb.register_uri(:get, @api_url, :body => @response_body, :status => "503")
+          end
 
         it "should raise an error and include the contents of the element" do
           @post.should raise_error(Sfn::SiteMaintenance, @custom_error)
         end
       end
-
     end
 
     describe "when the status is 405 (Method Not Allowed)" do
@@ -303,7 +363,7 @@ describe Sfn::Loader do
 
       describe "when the site is not in maintenance mode" do
         before(:each) do
-          FakeWeb.register_uri(:get, 'http://test', :body => "blah", :status => "200")
+          FakeWeb.register_uri(:get, @api_url, :body => "blah", :status => "200")
         end
 
         it "should raise an error and include the reponse body" do
@@ -337,28 +397,5 @@ describe Sfn::Loader do
         end
       end
     end
-
-  # ---- GATEWAY -----------------------------------------------------------------------------------------------
-    describe "when the status is 502 (Bad Gateway, returned when a Unicorn worker is killed)" do
-      before(:each) do
-        @status_code = '502'
-      end
-
-      it "should raise an Sfn::BadGateway error" do
-        @post.should raise_error(Sfn::BadGateway, "Bad Gateway")
-      end
-    end
-
-    describe "when the status is 504 (GatewayTimeOut)" do
-      before(:each) do
-        @status_code = '504'
-      end
-
-      it "should raise an Sfn::GatewayTimeOut error" do
-        @post.should raise_error(Sfn::GatewayTimeOut, "Gateway TimeOut")
-      end
-    end
-
   end
-
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-satisfaction
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Get Satisfaction
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-12 00:00:00 -07:00
+date: 2011-12-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -198,12 +198,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 31
         segments: 
         - 1
         - 0
-        - 2
-        version: 1.0.2
+        - 4
+        version: 1.0.4
   type: :development
   version_requirements: *id012
 description: Ruby client for using Get Satisfaction's RESTful API. Get Satisfaction is a simple way to build online communities that enable productive conversations between companies and their customers. More than 46,000 companies use Get Satisfaction to provide a more social support experience, build better products, increase SEO and improve customer loyalty. Get Satisfaction communities are available at http://getsatisfaction.com.
@@ -243,6 +243,7 @@ files:
 - lib/satisfaction/util.rb
 - lib/satisfaction/version.rb
 - ruby-satisfaction.gemspec
+- spec/integration_spec.rb
 - spec/satisfaction/associations_spec.rb
 - spec/satisfaction/identity_map_spec.rb
 - spec/satisfaction/loader_spec.rb
@@ -285,6 +286,7 @@ signing_key:
 specification_version: 3
 summary: Get Satisfaction ruby client
 test_files: 
+- spec/integration_spec.rb
 - spec/satisfaction/associations_spec.rb
 - spec/satisfaction/identity_map_spec.rb
 - spec/satisfaction/loader_spec.rb