learn-web 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a29bd27bf589876bd18bab7205b1551543eaaf5
-  data.tar.gz: bc3a4f490cffb940c0d566cdd5c2b03fc5b17135
+  metadata.gz: 9bc55f9891c64b1405c9055bbc8d69a0f41b8195
+  data.tar.gz: b5c05c586e2386262b0d5536dff54f9801d62347
 SHA512:
-  metadata.gz: 2a55c7a1aa9230e7ecd36dabc60dbf585e7632ae4b4c53b314cb1b98dbdc8e3e3fda338a5f3a2baf4b05dfb631c7cff4454b7d4cb67c053bae0bc2bc59383b5e
-  data.tar.gz: 5c25beac760b0324729c53a3279d3f38e78368f31fb8b05f975fa5a8b2e8d7bb1140cf8d8ac4b5c85d1b781e3f0ef0c9f8b28e026acb358081df1345abc6541f
+  metadata.gz: 1980895824514add35d587a5e1267eec635f536cbc270dfc0aad8644da29cb61951bd842dd2b49c510f9505fde146920beaf682450497dd9ba4ce0364fa0e00b
+  data.tar.gz: 206fbfe990b713e1d514efde193c45706d086338c1588a1907dc6e1773643c24577cc265e371c0e34739b6729d95eadbe6ded281eb719d0c6241e9166875a85a

data/lib/learn_web/client.rb

@@ -1,3 +1,5 @@
+require 'learn_web/client/request'
+require 'learn_web/client/connection'
 require 'learn_web/client/user'
 require 'learn_web/client/pull_request'
 require 'learn_web/client/lesson'
@@ -12,6 +14,8 @@ module LearnWeb
     LEARN_URL = 'https://learn.co'
     API_ROOT  = '/api/v1'
 
+    include LearnWeb::Client::Request
+    include LearnWeb::Client::Connection
     include LearnWeb::Client::PullRequest
     include LearnWeb::Client::Lesson
     include LearnWeb::Client::ValidateRepo

data/lib/learn_web/client/connection.rb

@@ -0,0 +1,13 @@
+module LearnWeb
+  class Client
+    module Connection
+      def get(url, options = {})
+        request :get, url, options
+      end
+
+      def post(url, options = {})
+        request :post, url, options
+      end
+    end
+  end
+end

data/lib/learn_web/client/environment.rb

@@ -8,9 +8,7 @@ module LearnWeb
       end
 
       def environment_setup_list
-        response = @conn.get do |req|
-          req.url environment_setup_list_endpoint
-        end
+        response = get(environment_setup_list_endpoint)
 
         LearnWeb::Client::Environment::SetupList.new(response)
       end

data/lib/learn_web/client/fork.rb

@@ -8,11 +8,11 @@ module LearnWeb
       end
 
       def fork_repo(repo_name:)
-        response = @conn.post do |req|
-          req.url fork_endpoint
-          req.headers['Authorization'] = "Bearer #{token}"
-          req.params['repo_name'] = repo_name
-        end
+        response = post(
+          fork_endpoint,
+          headers: { 'Authorization' => "Bearer #{token}" },
+          params: { 'repo_name' => repo_name }
+        )
 
         LearnWeb::Client::Fork::Request.new(response)
       end

data/lib/learn_web/client/lesson.rb

@@ -13,20 +13,20 @@ module LearnWeb
       end
 
       def current_lesson
-        response = @conn.get do |req|
-          req.url current_lesson_endpoint
-          req.headers['Authorization'] = "Bearer #{token}"
-        end
+        response = get(
+          current_lesson_endpoint,
+          headers: { 'Authorization' => "Bearer #{token}" }
+        )
 
         LearnWeb::Client::Lesson::CurrentLesson.new(response)
       end
 
       def next_lesson
-        response = @conn.get do |req|
-          req.url next_lesson_endpoint
-          req.headers['Authorization'] = "Bearer #{token}"
-          req.params['dir_name'] = File.basename(FileUtils.pwd)
-        end
+        response = get(
+          next_lesson_endpoint,
+          headers: { 'Authorization' => "Bearer #{token}" },
+          params: { 'dir_name' => File.basename(FileUtils.pwd) }
+        )
 
         LearnWeb::Client::Lesson::NextLesson.new(response)
       end

data/lib/learn_web/client/pull_request.rb

@@ -8,12 +8,11 @@ module LearnWeb
       end
 
       def issue_pull_request(repo_name:, branch_name:)
-        response = @conn.post do |req|
-          req.url pr_endpoint
-          req.headers['Authorization'] = "Bearer #{token}"
-          req.params['repo_name'] = repo_name
-          req.params['branch_name'] = branch_name
-        end
+        response = post(
+          pr_endpoint,
+          headers: { 'Authorization' => "Bearer #{token}" },
+          params: { 'repo_name' => repo_name, 'branch_name' => branch_name }
+        )
 
         LearnWeb::Client::PullRequest::Response.new(response)
       end

data/lib/learn_web/client/request.rb

@@ -0,0 +1,40 @@
+module LearnWeb
+  class Client
+    module Request
+
+      private
+
+      def request(method, url, options = {})
+        begin
+          @conn.send(method) do |req|
+            req.url url
+            build_request(req, options)
+          end
+        rescue Faraday::ConnectionFailed
+          puts "Connection error. Please try again."
+        end
+      end
+
+      def build_request(request, options)
+        build_headers(request, options[:headers])
+        build_params(request, options[:params])
+      end
+
+      def build_headers(request, headers)
+        if headers
+          headers.each do |header, value|
+            request.headers[header] = value
+          end
+        end
+      end
+
+      def build_params(request, params)
+        if params
+          params.each do |param, value|
+            request.params[param] = value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/learn_web/client/user.rb

@@ -8,10 +8,10 @@ module LearnWeb
       end
 
       def me
-        response = @conn.get do |req|
-          req.url me_endpoint
-          req.headers['Authorization'] = "Bearer #{token}"
-        end
+        response = get(
+          me_endpoint,
+          headers: { 'Authorization' => "Bearer #{token}" }
+        )
 
         LearnWeb::Client::User::Me.new(response, silent_output: silent_output)
       end

data/lib/learn_web/client/user/me.rb

@@ -24,13 +24,13 @@ module LearnWeb
             case response.status
             when 401
               puts "It seems your OAuth token is incorrect. Please re-run config with: learn reset"
-              exit
+              exit 1
             when 500
               puts "Something went wrong. Please try again."
-              exit
+              exit 1
             else
               puts "Something went wrong. Please try again."
-              exit
+              exit 1
             end
           end
 

data/lib/learn_web/client/validate_repo.rb

@@ -8,11 +8,11 @@ module LearnWeb
       end
 
       def validate_repo_slug(repo_slug:)
-        response = @conn.post do |req|
-          req.url validate_repo_slug_endpoint
-          req.headers['Authorization'] = "Bearer #{token}"
-          req.params['repo_slug'] = repo_slug
-        end
+        response = post(
+          validate_repo_slug_endpoint,
+          headers: { 'Authorization' => "Bearer #{token}" },
+          params: { 'repo_slug' => repo_slug }
+        )
 
         LearnWeb::Client::ValidateRepo::Slug.new(response)
       end

data/lib/learn_web/version.rb

@@ -1,3 +1,3 @@
 module LearnWeb
-  VERSION = '1.0.5'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-web
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,6 +82,7 @@ files:
 - lib/learn_web.rb
 - lib/learn_web/attribute_populatable.rb
 - lib/learn_web/client.rb
+- lib/learn_web/client/connection.rb
 - lib/learn_web/client/environment.rb
 - lib/learn_web/client/environment/setup_list.rb
 - lib/learn_web/client/fork.rb
@@ -91,6 +92,7 @@ files:
 - lib/learn_web/client/lesson/next_lesson.rb
 - lib/learn_web/client/pull_request.rb
 - lib/learn_web/client/pull_request/response.rb
+- lib/learn_web/client/request.rb
 - lib/learn_web/client/user.rb
 - lib/learn_web/client/user/me.rb
 - lib/learn_web/client/validate_repo.rb
@@ -116,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: An interface to Learn.co