tvteka 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 045958c47238b641a9b5f35ab5a508351ff62a6b
-  data.tar.gz: 644205a7d28abd12ddab261c2effcac5cd7e72e2
+  metadata.gz: a59fcaa24b02b6422aab41f7aa6c14e1722dd603
+  data.tar.gz: 1d72a076f585b9fd03f56c0505e9149ad907892e
 SHA512:
-  metadata.gz: 57558d7324e4fa2ceee91d4cf48043960e15d9600226f7c8c37c4abb81de575be2f198383aa01c0aeffd26f4717fe2288ce76b53e010fb1114702581ad7d6d5d
-  data.tar.gz: 1caf168ecc5cdeab7ddb8d81859e0714d25fff900f1220195e91b271d2bc162024afc84376cb513758ae16862375f80213ebc0d896d78953ae2643fe3c7dd740
+  metadata.gz: 8933db3a7a16462e1ecb6bbde65e7e7a34c8a4cac92cf64a87a219a8c9dd5861064d7397503397b3b85cb697959a2e90e7da0b0961964173f6ed38154775e0ee
+  data.tar.gz: 4938b59afb053b4552c1a373d9f73e3fca0a36fc0f6ea3d6dbdba8778e2f6977d7d5fa57d553714f4820d5fe87d9dc6187b849291090366458f7910bc2732919

data/lib/tvteka/api.rb

@@ -0,0 +1,78 @@
+module Tvteka
+  class API
+    
+    def get(request_type, url, params, &block)
+      cookies = params.delete(:cookies)
+      params = params.to_a.map {|p| "#{p[0]}=#{p[1]}" }.join("&")
+      request = create_request(url + "?" + params, :get)
+      add_cookies(request, cookies) if cookies
+      create_task(request_type, request, &block).resume
+    end
+    
+    private
+
+    def config
+      NSURLSessionConfiguration.defaultSessionConfiguration
+    end
+
+    def session
+      NSURLSession.sessionWithConfiguration(config)
+    end
+
+    def create_request(url, method)
+      url = NSURL.URLWithString(url)
+      request = NSMutableURLRequest.requestWithURL(url)
+      request.addValue("application/vnd.tvp.xbmc+json", forHTTPHeaderField: "Content-Type")
+      request.addValue("application/vnd.tvp.xbmc+json", forHTTPHeaderField: "Accept")
+      request.setHTTPMethod(method.to_s.upcase)
+      request
+    end
+    
+    def add_cookies(request, cookies)
+      cookies.each do |k, v|
+        request.setValue("#{k}=#{v}", forHTTPHeaderField: "Cookie")
+      end
+    end
+
+    def create_task(request_type, request, &block)
+      if block_given?
+        session.dataTaskWithRequest(request, completionHandler: -> (data, response, error) {
+          block.call(APIResponse.new(request_type, data, response, error))
+        })
+      else
+        session.dataTaskWithRequest(request)
+      end
+    end
+
+    class APIResponse
+      attr_reader :success, :data, :error
+
+      def initialize(request_type, data, response, error)
+        @success = (200...300).include?(response.statusCode)
+        
+        if request_type == :session
+          parsed_data = NSJSONSerialization.JSONObjectWithData(data, options:0, error: nil)
+          @data = Tvteka::Session.new(parsed_data)
+        elsif request_type == :session
+          parsed_data = NSJSONSerialization.JSONObjectWithData(data, options:0, error: nil)
+          @data = Tvteka::Session.new(parsed_data)
+        elsif request_type == :live
+          puts data
+          parsed_data = NSJSONSerialization.JSONObjectWithData(data, options:0, error: nil)
+          @data = Tvteka::Channel.init_from_array(parsed_data)
+        elsif request_type == :live_channel
+          parsed_data = NSJSONSerialization.JSONObjectWithData(data, options:0, error: nil)
+          @data = Tvteka::Show.init_from_array(parsed_data)
+        else
+          @data = NSJSONSerialization.JSONObjectWithData(data, options: 0, error: nil)
+        end
+          
+        @error = error
+      end
+
+      def successful?
+        @success
+      end
+    end
+  end
+end

data/lib/tvteka/client.rb

@@ -3,29 +3,25 @@ module Tvteka
     def self.session(username, password, options = {}, &block)
       options = { "session[login]" => username, "session[password]" => password, "device[type]" => "xmbc", "device[id]" => "c0:3d:45:28:fc:ad" }.merge(options)
       
-      request.post("http://tvteka.com/session/register", options) do |response|
-        response.process_data(:session) if response.success?
+      Tvteka::API.new.get(:session, "http://tvteka.com/session/register", options) do |response|
         block.call response
       end
     end
     
     def self.verify(token, &block)
-      request.post("http://tvteka.com/session/verify", {}, {"deviceToken" => token}) do |response|
-        response.process_data(:verify) if response.success?
+      Tvteka::API.new.get(:verify, "http://tvteka.com/session/verify", {cookies: {"deviceToken" => token}}) do |response|
         block.call response
       end
     end
     
     def self.live(token, &block)
-      request.get("http://tvteka.tv/live", {}, {"deviceToken" => token}) do |response|
-        response.process_data(:live) if response.success?
+      Tvteka::API.new.get(:live, "http://tvteka.com/live", {cookies: {"deviceToken" => token}}) do |response|
         block.call response
       end
     end
     
     def self.live_channel(token, channel, &block)
-      request.get("http://tvteka.tv/live/#{channel}", {}, {"deviceToken" => token}) do |response|
-        response.process_data(:live_channel) if response.success?
+      Tvteka::API.new.get(:live_channel, "http://tvteka.com/live/#{channel}", {cookies: {"deviceToken" => token}}) do |response|
         block.call response
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tvteka
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Aleksandr Lossenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-01 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
@@ -47,11 +47,10 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/tvteka.rb
+- lib/tvteka/api.rb
 - lib/tvteka/channel.rb
 - lib/tvteka/client.rb
 - lib/tvteka/error.rb
-- lib/tvteka/request.rb
-- lib/tvteka/response.rb
 - lib/tvteka/session.rb
 - lib/tvteka/show.rb
 homepage: https://bitbucket.org/egze/tvteka/

data/lib/tvteka/request.rb

@@ -1,68 +0,0 @@
-module Tvteka
-  class Request
-    
-    BASE_URL = ""
-    
-    def get(url, params = {}, cookies = {}, &block)
-      r = STHTTPRequest.requestWithURLString(url)
-      
-      r.setHeaderWithName("Accept", value: "application/vnd.tvp.xbmc+json")
-      
-      r.completionBlock = Proc.new do |header, body|
-        block.call response.build_with_result(body)
-      end
-
-      r.errorBlock = Proc.new do |error|
-        puts error.inspect
-        block.call response.build_with_error(error)
-      end
-      
-      cookies.each do |k, v|
-        r.addCookieWithName(k, value: v)
-      end
-      
-      r.startAsynchronous
-    end
-    
-    def post(url, params = {}, cookies = {}, &block)
-      r = STHTTPRequest.requestWithURLString(url)
-      
-      r.setHeaderWithName("Accept", value: "application/vnd.tvp.xbmc+json")
-      
-      r.POSTDictionary = params
-      
-      r.completionBlock = Proc.new do |header, body|
-        block.call response.build_with_result(body)
-      end
-
-      r.errorBlock = Proc.new do |error|
-        puts error.inspect
-        block.call response.build_with_error(error)
-      end
-      
-      cookies.each do |k, v|
-        r.addCookieWithName(k, value: v)
-      end
-      
-      r.startAsynchronous
-    end
-
-    
-
-    def http_client
-     AFMotion::SessionClient.build_shared("http://tvteka.com") do
-        session_configuration :default
-        header "Accept", "application/json"
-        response_serializer :json
-      end
-    end
-
-    def response
-      Tvteka::Response
-    end
-
-    def create_options(options)
-      {}.merge(options)
-    end
-  end
-end

data/lib/tvteka/response.rb

@@ -1,46 +0,0 @@
-module Tvteka
-  class Response
-    def self.build_with_result(result)
-      response = self.new
-
-      response.success = true
-      response.json = result
-
-      response
-    end
-    
-    def self.build_with_error(error)
-      response = self.new
-
-      response.success = false
-      response.error = Tvteka::Error.new(error)
-
-      response
-    end
-
-    attr_accessor :data, :json, :success, :error
-
-    def process_data(type = :default)
-      if type == :session
-        parsed_data = NSJSONSerialization.JSONObjectWithData(String(self.json).dataUsingEncoding(NSUnicodeStringEncoding), options:0, error: Pointer.new(:object))
-        self.data = Tvteka::Session.new(parsed_data)
-      elsif type == :verify
-        parsed_data = NSJSONSerialization.JSONObjectWithData(String(self.json).dataUsingEncoding(NSUnicodeStringEncoding), options:0, error: Pointer.new(:object))
-        self.data = Tvteka::Session.new(parsed_data)
-      elsif type == :live
-        parsed_data = NSJSONSerialization.JSONObjectWithData(String(self.json).dataUsingEncoding(NSUnicodeStringEncoding), options:0, error: Pointer.new(:object))
-        self.data = Tvteka::Channel.init_from_array(parsed_data)
-      elsif type == :live_channel
-        parsed_data = NSJSONSerialization.JSONObjectWithData(String(self.json).dataUsingEncoding(NSUnicodeStringEncoding), options:0, error: Pointer.new(:object))
-        self.data = Tvteka::Show.init_from_array(parsed_data)
-      else
-        self.data = self.json
-      end
-    end
-
-    def success?
-      @success
-    end
-    
-  end
-end