netologiest 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b6e1d7e36a3857d851d1bcc54007f3aeddfe753
-  data.tar.gz: 7b0f8a1fc72547248c13c4f9a93ddf485af85131
+  metadata.gz: 5d4a464c0f9f259a1a0304671d6ddfac401644b6
+  data.tar.gz: 8ea14f2bdd955ae999b4f56cc95dbe38cecfc4a2
 SHA512:
-  metadata.gz: dddf7b03ca6142c6b97ded47c1f8472ec8e534c7163a22edf2f17a8c214f01e00af1b782078dc2aa11301c614c380faf9a79886066f01c8bf6370e8a055d1892
-  data.tar.gz: 371b2fdab4d38087abe607cfa3c2fbd90a659d80090b89a53a2a887e508134ceadfbf125546ccf9628dd17b732020c5b0097e01ebc6767d5966df779509fbd78
+  metadata.gz: 06132c8c86005a92955c55f76448ea21e54f7f683b1570bfeeb51f2ab0977db9ede15d00f49f898ea6139dfbe724170122eb7d90bda9b9cb607f1f1680edc112
+  data.tar.gz: e7bf43ccc6a8f764b891f45634a65c676fe7614e9e60220bc194a61112d9e4101993d7b780e55b8c2349dcff0ba7fb5194803d3de9a9290408bf49cc99e18f03

data/README.md

@@ -25,7 +25,10 @@ For example (in your `secrets.yml`):
 
 ## Usage
 
-Netologiest having only one resource at moment (Course).
+#### Course
+
+Netologiest having only one resource at moment. It is a course.
+And you can get list of courses
 
 To get a list of courses
 
@@ -78,6 +81,25 @@ Also you can get detailed information about any course:
   }
 ```
 
+#### Lesson's video
+
+Lesson class is used to obtain iframe token or iframe url (with token)
+
+```ruby
+  # returns complete URL to video iframe
+  Netologiest::Lesson.video_url(course_id, lesson_id)
+
+  # OR
+
+  lesson = Netologiest::Lesson.new(course_id, lesson_id)
+  # makes request to API and refresh lesson_token
+  lesson.video_token
+  # returns token
+  lesson.lesson_token
+  # returns complete URL
+  lesson.video_url
+```  
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/netologiest/fork )

data/lib/netologiest.rb

@@ -1,5 +1,6 @@
 require 'netologiest/resource'
 require 'netologiest/resources/course'
+require 'netologiest/resources/lesson'
 require 'netologiest/config'
 require 'netologiest/exceptions'
 require 'netologiest/version'

data/lib/netologiest/resource.rb

@@ -69,21 +69,16 @@ module Netologiest
 
     def handle_detail(_response); end
 
-    protected
-
-    def build_url(*args)
-      File.join(Netologiest.config.api_url, *args.map(&:to_s))
-    end
-
     # rubocop:disable Metrics/MethodLength
     def get(url, options = {})
-      params = { token: token }.merge!(options)
+      params = { token: (options[:token] || token) }.merge!(options)
+
+      auth_method = options[:auth_method] || :authorize!
 
       RestClient.get(url, params: params) do |response, _request, _result|
         if response.code == 401
           begin
-            authorize!
-            params[:token] = token
+            params[:token] = send(auth_method)
             return RestClient.get(url, params: params)
           rescue RestClient::Unauthorized
             raise Netologiest::Unauthorized, response.body
@@ -93,5 +88,12 @@ module Netologiest
       end
     end
     # rubocop:enable Metrics/MethodLength
+
+    protected
+
+    def build_url(*args)
+      File.join(Netologiest.config.api_url, *args.map(&:to_s))
+    end
+
   end
 end

data/lib/netologiest/resources/lesson.rb

@@ -0,0 +1,51 @@
+module Netologiest
+  class Lesson < Netologiest::Resource
+    self.resource_name = 'lessons'
+
+    attr_reader :lesson_token, :lesson_token_expire,
+                :course_id, :id, :iframe_url
+
+    def initialize(course_id, lesson_id)
+      authorize!
+      @course_id = course_id
+      @id = lesson_id
+    end
+
+    def self.video_url(course_id, lesson_id)
+      lesson = new(course_id, lesson_id)
+      lesson.video_token
+      lesson.video_url
+    end
+
+    def video_token
+      url = build_url(
+        Netologiest::Course.resource_name,
+        course_id,
+        self.class.resource_name,
+        id,
+        'gettoken'
+      )
+
+      handle_lesson_token(get(url))
+    end
+
+    def video_url
+      @iframe_url = build_url(
+        Netologiest::Course.resource_name,
+        course_id,
+        self.class.resource_name,
+        id,
+        "iframe?token=#{lesson_token}"
+      )
+    end
+
+    private
+
+    def handle_lesson_token(response)
+      data = JSON.parse(response)
+      return unless data.present? || data.any?
+      @lesson_token_expire = data["expires_in"]
+      @lesson_token = data["access_token"]
+    end
+  end
+end

data/lib/netologiest/version.rb

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

data/spec/fixtures/lesson_token.json

@@ -0,0 +1,4 @@
+{
+  "access_token": "26C1WYAIWT3LRX12W8H4DTA9FRF3NLH9",
+  "expires_in": 600
+}

data/spec/helpers/webmock_helpers.rb

@@ -76,4 +76,19 @@ module NetologiestWebMock
       body: File.read("spec/fixtures/course.json")
     )
   end
+
+  ## Lessons methods
+
+  def lesson_token_stub(course_id, lesson_id)
+    token = "S3PBVG38O1209Y01X5LEK0PYH0MT3YDZ"
+    url = Netologiest.config.api_url
+    url += "/courses/#{course_id}/lessons/#{lesson_id}"
+    url += "/gettoken?token=#{token}"
+    stub_request(:get, url)
+      .to_return(
+        headers: { 'Content-Type' => 'application/json' },
+        status: 200,
+        body: File.read("spec/fixtures/lesson_token.json")
+      )
+  end
 end

data/spec/lesson_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+
+describe Netologiest::Lesson do
+  describe "valid access token" do
+    before(:each) do
+      mock_api
+      lesson_token_stub(931, 2268)
+    end
+
+    it "return token" do
+      lesson = described_class.new(931, 2268)
+      expect(lesson.video_token)
+        .to eq "26C1WYAIWT3LRX12W8H4DTA9FRF3NLH9"
+      expect(lesson.lesson_token_expire)
+        .to eq 600
+    end
+
+    it "return iframe url with token" do
+      url = described_class.video_url(931, 2268)
+      expected = "#{Netologiest.config.api_url}/courses/931/lessons/2268/"
+      expected += "iframe?token=26C1WYAIWT3LRX12W8H4DTA9FRF3NLH9"
+      expect(url).to eq expected
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netologiest
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,14 +161,17 @@ files:
 - lib/netologiest/exceptions.rb
 - lib/netologiest/resource.rb
 - lib/netologiest/resources/course.rb
+- lib/netologiest/resources/lesson.rb
 - lib/netologiest/version.rb
 - netologiest.gemspec
 - spec/course_spec.rb
 - spec/fixtures/auth.json
 - spec/fixtures/course.json
 - spec/fixtures/courses.json
+- spec/fixtures/lesson_token.json
 - spec/fixtures/netologiest_test.yml
 - spec/helpers/webmock_helpers.rb
+- spec/lesson_spec.rb
 - spec/resource_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -191,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby API client for Netology
@@ -200,8 +203,10 @@ test_files:
 - spec/fixtures/auth.json
 - spec/fixtures/course.json
 - spec/fixtures/courses.json
+- spec/fixtures/lesson_token.json
 - spec/fixtures/netologiest_test.yml
 - spec/helpers/webmock_helpers.rb
+- spec/lesson_spec.rb
 - spec/resource_spec.rb
 - spec/spec_helper.rb
 has_rdoc: