et 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e414688a6eb0fc5a464071284eaad87cf914f16
-  data.tar.gz: 647e0fbd0c9fadbe733f480e4d29db3d06e6a18a
+  metadata.gz: fc9070225e55bddacb4e001dc623f86641bfc8c9
+  data.tar.gz: 6bc4ab6648a4dfab9bf3ac949c341edab3c1e444
 SHA512:
-  metadata.gz: f8b87ae613c19d680bc2219b596e980351f04ddf9baee09efc1ce1624f9885e150db28312b8430c983ceccb90e78a701128afb8868607274dd6bcbdcf5515ec0
-  data.tar.gz: 7cdb0f85e3fecc7aa82431e8d3e1cda5d745b65582ccfbefe8539868ab29e19e5ea161796e7d54c12d2ab6c7d019185d0f380e78e31208add0ec1a747e5d74b2
+  metadata.gz: 9b6c5e8708f547f96a2a4e33bff090655cb9dbc051dea2d9fe2ff3727b0f1df35f3796304a205b1bbd2d02907273c2055e58987eee86b7502c85f84894c6efa8
+  data.tar.gz: d9b1be81739512f93c0884295a461a240a13b27484276b71bc4bf083b3bebde665ad708f9b213a937d8639ace58e32cd5bc23be908f85dfc4a944c135f13a996

data/lib/et/api.rb

@@ -15,16 +15,16 @@ module ET
     end
 
     def list_lessons
-      resp = nil
-      api_client.with_ssl_fallback do |client|
-        resp = client.get('/lessons.json', :submittable => 1)
+      response = nil
+      api_client.open do |client|
+        response = client.get('/lessons.json', :submittable => 1)
       end
-      resp.body['lessons']
+      response.body['lessons']
     end
 
     def get_lesson(slug)
       resp = nil
-      api_client.with_ssl_fallback do |client|
+      api_client.open do |client|
         resp = client.get(lesson_url(slug), :submittable => 1)
       end
       resp.body['lesson']
@@ -34,7 +34,7 @@ module ET
       response = nil
       dest = random_filename
 
-      download_client(url).with_ssl_fallback do |client|
+      download_client(url).open do |client|
         response = client.get(URI(url).path)
       end
       if response.status == 200
@@ -51,7 +51,7 @@ module ET
       submission_file = lesson.archive!
       io = Faraday::UploadIO.new(submission_file, "application/x-tar")
       resp = nil
-      api_client.with_ssl_fallback do |client|
+      api_client.open do |client|
         resp = client.post(submission_url(lesson.slug),
           "submission" => { "archive" => io})
       end

data/lib/et/fallback_connection.rb

@@ -9,10 +9,10 @@ module ET
       @fallback_connection = Faraday.new(opts.merge(:ssl => {:verify => false}))
     end
 
-    def with_ssl_fallback(&block)
+    def open(&block)
       begin
         block.call(@connection)
-      rescue OpenSSL::SSL::SSLError => e
+      rescue Faraday::SSLError => e
         if operating_system.platform_family?(:windows)
           block.call(@fallback_connection)
         else

data/lib/et/version.rb

@@ -1,3 +1,3 @@
 module ET
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/lib/api_spec.rb

@@ -20,7 +20,7 @@ describe ET::API do
         end
       end
 
-      allow_any_instance_of(ET::FallbackConnection).to receive(:with_ssl_fallback).and_yield(client)
+      allow_any_instance_of(ET::FallbackConnection).to receive(:open).and_yield(client)
 
       results = api.list_lessons
 
@@ -46,14 +46,14 @@ describe ET::API do
       end
 
       allow_any_instance_of(ET::FallbackConnection).
-        to receive(:with_ssl_fallback).and_yield(client)
+        to receive(:open).and_yield(client)
 
       result = api.get_lesson("rock-paper-scissors")
 
       expect(result['title']).to eq("Rock, Paper, Scissors")
       expect(result['archive_url']).to   eq('http://example.com/rock-paper-scissors.tar.gz')
     end
-  end  
+  end
 
   context 'downloading files' do
     it 'returns nil when a 404 is encountered' do
@@ -69,7 +69,7 @@ describe ET::API do
       end
 
       allow_any_instance_of(ET::FallbackConnection).
-        to receive(:with_ssl_fallback).and_yield(client)
+        to receive(:open).and_yield(client)
 
       expect(api.download_file("http://example.com/#{filename}")).to be_nil
     end
@@ -91,7 +91,7 @@ describe ET::API do
       end
 
       allow_any_instance_of(ET::FallbackConnection).
-        to receive(:with_ssl_fallback).and_yield(client)
+        to receive(:open).and_yield(client)
       allow(Dir).to receive(:mktmpdir).and_return(path)
       allow(SecureRandom).to receive(:hex).and_return(filename)
 

data/spec/lib/fallback_connection_spec.rb

@@ -10,10 +10,10 @@ describe ET::FallbackConnection do
       expect(ET::OperatingSystem).to receive(:new).and_return(dbl_os)
 
       allow_any_instance_of(Faraday::Connection).
-        to receive(:get).and_raise(OpenSSL::SSL::SSLError)
-        
-      expect{ cnn.with_ssl_fallback{|client| client.get('/') }}.
-        to raise_error(OpenSSL::SSL::SSLError)
+        to receive(:get).and_raise(Faraday::SSLError.new(OpenSSL::SSL::SSLError))
+
+      expect{ cnn.open {|client| client.get('/') }}.
+        to raise_error(Faraday::SSLError)
     end
 
     it 'swallows the exception for windows machines and reissues' do
@@ -25,7 +25,7 @@ describe ET::FallbackConnection do
       allow_any_instance_of(Faraday::Connection).to receive(:get) do |*args|
         if args[0].ssl.verify != false
           #simulate a windows SSL verification failed
-          raise OpenSSL::SSL::SSLError
+          raise Faraday::SSLError.new(OpenSSL::SSL::SSLError.new)
         elsif args[0].ssl.verify == false
           #flip the switch that the request was reissued without SSL verification
           called_twice = true
@@ -33,7 +33,7 @@ describe ET::FallbackConnection do
         end
       end
 
-      cnn.with_ssl_fallback do |client|
+      cnn.open do |client|
         client.get('/')
       end
       expect(called_twice).to be(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Adam Sheehan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry