netologiest 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d4a464c0f9f259a1a0304671d6ddfac401644b6
-  data.tar.gz: 8ea14f2bdd955ae999b4f56cc95dbe38cecfc4a2
+  metadata.gz: ab1fb2642d66268d3db3645c476ac5c31edc2394
+  data.tar.gz: '0289f3f6d664b1e66395703fac33ecf26db6b068'
 SHA512:
-  metadata.gz: 06132c8c86005a92955c55f76448ea21e54f7f683b1570bfeeb51f2ab0977db9ede15d00f49f898ea6139dfbe724170122eb7d90bda9b9cb607f1f1680edc112
-  data.tar.gz: e7bf43ccc6a8f764b891f45634a65c676fe7614e9e60220bc194a61112d9e4101993d7b780e55b8c2349dcff0ba7fb5194803d3de9a9290408bf49cc99e18f03
+  metadata.gz: 1bf045b926f9a041bb79e8cd002e3e969a0a683b162ac56aa1fe7241518defeecfdffb8061ce170e00ff9a9021f4aaecd508d86e8c279599c84bb6e6a82d4529
+  data.tar.gz: e26b2deabd30815a72346f03de4a6a4b7b34fd66b7adf7d28c3a7a5eb72b3a53290aef4b0267a110b5aae4982d0251fc985d221aeb0acb2536bacc4441c9795b

data/lib/netologiest.rb

@@ -4,6 +4,7 @@ require 'netologiest/resources/lesson'
 require 'netologiest/config'
 require 'netologiest/exceptions'
 require 'netologiest/version'
+require 'netologiest/http_client'
 
 # Ruby client for Netology API
 module Netologiest

data/lib/netologiest/http_client.rb

@@ -0,0 +1,32 @@
+class HttpClient
+  class << self
+    def get(url, params: {})
+      uri = URI(url)
+      uri.query = URI.encode_www_form(params)
+      response = Response.new(Net::HTTP.get_response(uri))
+      if block_given?
+        yield response
+      else
+        response
+      end
+    end
+  end
+
+  class Response
+    attr_reader :body, :code
+
+    def success?
+      response.is_a?(Net::HTTPSuccess)
+    end
+
+    private
+
+    attr_reader :response
+
+    def initialize(response)
+      @response = response
+      @body = response.body
+      @code = response.code.to_i
+    end
+  end
+end

data/lib/netologiest/resource.rb

@@ -1,6 +1,4 @@
 require 'json'
-require 'rest-client'
-require 'active_support'
 
 module Netologiest
   # This class describe client for
@@ -41,18 +39,18 @@ module Netologiest
       )
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics//MethodLength
+    # rubocop:disable /AbcSize, Metrics//MethodLength
     def authorize!
       url = build_url('gettoken')
       params = { client_secret: Netologiest.config.api_key }
-      RestClient.get(url, params: params) do |response, _request, _result|
+      HttpClient.get(url, params: params) do |response, _request, _result|
         case response.code
         when 200
           body = JSON.parse(response.body)
           @token_expire = Time.now.to_i + body.fetch('expires_in').to_i
           @token = body['access_token']
         when 401
-          fail Netologiest::Unauthorized, response.body
+          raise Netologiest::Unauthorized, response.body
         else
           response
         end
@@ -61,7 +59,8 @@ module Netologiest
     # rubocop:enable Metrics/AbcSize, Metrics//MethodLength
 
     def token_expired?
-      return true unless token_expire.present?
+      return true if token_expire.to_s.empty?
+
       token_expire < Time.now.to_i
     end
 
@@ -75,16 +74,19 @@ module Netologiest
 
       auth_method = options[:auth_method] || :authorize!
 
-      RestClient.get(url, params: params) do |response, _request, _result|
+      HttpClient.get(url, params: params) do |response, _request, _result|
         if response.code == 401
           begin
             params[:token] = send(auth_method)
-            return RestClient.get(url, params: params)
-          rescue RestClient::Unauthorized
-            raise Netologiest::Unauthorized, response.body
+            new_response = HttpClient.get(url, params: params)
+            if new_response.success?
+              return new_response.body
+            else
+              raise Netologiest::Unauthorized, response.body
+            end
           end
         end
-        response
+        response.body
       end
     end
     # rubocop:enable Metrics/MethodLength
@@ -94,6 +96,5 @@ module Netologiest
     def build_url(*args)
       File.join(Netologiest.config.api_url, *args.map(&:to_s))
     end
-
   end
 end

data/lib/netologiest/resources/course.rb

@@ -21,7 +21,8 @@ module Netologiest
 
     def parse_json(response)
       data = JSON.parse(response)
-      return unless data.present? || data.any?
+      return if data.kind_of?(Array) && data.empty?
+
       data
     end
   end

data/lib/netologiest/resources/lesson.rb

@@ -43,9 +43,10 @@ module Netologiest
 
     def handle_lesson_token(response)
       data = JSON.parse(response)
-      return unless data.present? || data.any?
+      return if data.kind_of?(Hash) && data.empty?
+
       @lesson_token_expire = data["expires_in"]
       @lesson_token = data["access_token"]
     end
   end
-end
+end

data/lib/netologiest/version.rb

@@ -1,4 +1,4 @@
 # :nodoc:
 module Netologiest
-  VERSION = "0.0.2"
+  VERSION = "0.0.3".freeze
 end

data/netologiest.gemspec

@@ -23,8 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_dependency "anyway_config", "~> 0", ">= 0.3"
-  spec.add_dependency "rest-client"
-  spec.add_dependency 'activesupport'
   spec.add_dependency 'json'
 end

data/spec/lesson_spec.rb

@@ -22,4 +22,4 @@ describe Netologiest::Lesson do
       expect(url).to eq expected
     end
   end
-end
+end

data/spec/resource_spec.rb

@@ -6,6 +6,6 @@ describe Netologiest::Resource do
   it "get authorization token automaticaly" do
     res = described_class.new
     expect(res.token).to eq "S3PBVG38O1209Y01X5LEK0PYH0MT3YDZ"
-    expect(res.token_expire.present?).to be_truthy
+    expect(res.token_expire.to_s.empty?).not_to be_truthy
   end
 end

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ begin
 rescue LoadError
 end
 
-ENV["NETOLOGIEST_CONF"] = File.expand_path("../fixtures/netologiest_test.yml", __FILE__)
+ENV["NETOLOGIEST_CONF"] = File.expand_path('fixtures/netologiest_test.yml', __dir__)
 
 RSpec.configure do |config|
   config.mock_with :rspec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netologiest
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,33 +81,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: anyway_config
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -115,19 +95,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: anyway_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +145,7 @@ files:
 - lib/netologiest.rb
 - lib/netologiest/config.rb
 - lib/netologiest/exceptions.rb
+- lib/netologiest/http_client.rb
 - lib/netologiest/resource.rb
 - lib/netologiest/resources/course.rb
 - lib/netologiest/resources/lesson.rb
@@ -194,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby API client for Netology
@@ -209,4 +196,3 @@ test_files:
 - spec/lesson_spec.rb
 - spec/resource_spec.rb
 - spec/spec_helper.rb
-has_rdoc: