yt 0.5.4 → 0.5.5

data/lib/yt/models/playlist.rb

@@ -1,50 +1,52 @@
 require 'yt/models/resource'
 
 module Yt
-  class Playlist < Resource
-    has_many :playlist_items
+  module Models
+    class Playlist < Resource
+      has_many :playlist_items
 
-    def delete
-      do_delete {@id = nil}
-      !exists?
-    end
+      def delete
+        do_delete {@id = nil}
+        !exists?
+      end
 
-    def update(options = {})
-      options[:title] ||= title
-      options[:description] ||= description
-      options[:tags] ||= tags
-      options[:privacy_status] ||= privacy_status
-
-      snippet = options.slice :title, :description, :tags
-      status = {privacyStatus: options[:privacy_status]}
-      body = {id: @id, snippet: snippet, status: status}
-      params = {params: {part: 'snippet,status'}, body: body}
-
-      do_update(params, expect: Net::HTTPOK) do |data|
-        @id = data['id']
-        @snippet = Snippet.new data: data['snippet'] if data['snippet']
-        @status = Status.new data: data['status'] if data['status']
-        true
+      def update(options = {})
+        options[:title] ||= title
+        options[:description] ||= description
+        options[:tags] ||= tags
+        options[:privacy_status] ||= privacy_status
+
+        snippet = options.slice :title, :description, :tags
+        status = {privacyStatus: options[:privacy_status]}
+        body = {id: @id, snippet: snippet, status: status}
+
+        do_update(params: {part: 'snippet,status'}, body: body) do |data|
+          @id = data['id']
+          @snippet = Snippet.new data: data['snippet'] if data['snippet']
+          @status = Status.new data: data['status'] if data['status']
+          true
+        end
       end
-    end
 
-    def exists?
-      !@id.nil?
-    end
+      def exists?
+        !@id.nil?
+      end
 
-  private
+    private
 
-    def delete_params
-      super.tap do |params|
-        params[:path] = '/youtube/v3/playlists'
-        params[:params] = {id: @id}
+      def delete_params
+        super.tap do |params|
+          params[:path] = '/youtube/v3/playlists'
+          params[:params] = {id: @id}
+        end
       end
-    end
 
-    def update_params
-      super.tap do |params|
-        params[:path] = '/youtube/v3/playlists'
-        params[:body_type] = :json
+      def update_params
+        super.tap do |params|
+          params[:path] = '/youtube/v3/playlists'
+          params[:body_type] = :json
+          params[:expected_response] = Net::HTTPOK
+        end
       end
     end
   end

data/lib/yt/models/playlist_item.rb

@@ -1,41 +1,43 @@
 require 'yt/models/base'
 
 module Yt
-  class PlaylistItem < Base
-    attr_reader :id, :video, :position
+  module Models
+    class PlaylistItem < Base
+      attr_reader :id, :video, :position
 
-    def initialize(options = {})
-      @id = options[:id]
-      @auth = options[:auth]
-      if options[:snippet]
-        @position = options[:snippet]['position']
-        @video = Video.new video_params_for options
+      def initialize(options = {})
+        @id = options[:id]
+        @auth = options[:auth]
+        if options[:snippet]
+          @position = options[:snippet]['position']
+          @video = Video.new video_params_for options
+        end
       end
-    end
 
-    def delete
-      do_delete {@id = nil}
-      !exists?
-    end
+      def delete
+        do_delete {@id = nil}
+        !exists?
+      end
 
-    def exists?
-      !@id.nil?
-    end
+      def exists?
+        !@id.nil?
+      end
 
-  private
+    private
 
-    def delete_params
-      super.tap do |params|
-        params[:path] = '/youtube/v3/playlistItems'
-        params[:params] = {id: @id}
+      def delete_params
+        super.tap do |params|
+          params[:path] = '/youtube/v3/playlistItems'
+          params[:params] = {id: @id}
+        end
       end
-    end
 
-    def video_params_for(options = {})
-      {}.tap do |params|
-        params[:id] = options[:snippet].fetch('resourceId', {})['videoId']
-        params[:snippet] = options[:snippet].except 'resourceId'
-        params[:auth] = options[:auth]
+      def video_params_for(options = {})
+        {}.tap do |params|
+          params[:id] = options[:snippet].fetch('resourceId', {})['videoId']
+          params[:snippet] = options[:snippet].except 'resourceId'
+          params[:auth] = options[:auth]
+        end
       end
     end
   end

data/lib/yt/models/rating.rb

@@ -1,26 +1,28 @@
 require 'yt/models/base'
 
 module Yt
-  class Rating < Base
-    attr_reader :rating
+  module Models
+    class Rating < Base
+      attr_reader :rating
 
-    def initialize(options = {})
-      @rating = options[:rating].to_sym if options[:rating]
-      @video_id = options[:video_id]
-      @auth = options[:auth]
-    end
+      def initialize(options = {})
+        @rating = options[:rating].to_sym if options[:rating]
+        @video_id = options[:video_id]
+        @auth = options[:auth]
+      end
 
-    def update(new_rating)
-      do_update(params: {rating: new_rating}) {@rating = new_rating}
-    end
+      def update(new_rating)
+        do_update(params: {rating: new_rating}) {@rating = new_rating}
+      end
 
-  private
+    private
 
-    def update_params
-      super.tap do |params|
-        params[:method] = :post
-        params[:path] = '/youtube/v3/videos/rate'
-        params[:params] = {id: @video_id}
+      def update_params
+        super.tap do |params|
+          params[:method] = :post
+          params[:path] = '/youtube/v3/videos/rate'
+          params[:params] = {id: @video_id}
+        end
       end
     end
   end

data/lib/yt/models/request.rb

@@ -4,99 +4,121 @@ require 'json' # for JSON.parse
 require 'active_support/core_ext' # for Hash.from_xml, Hash.to_param
 
 require 'yt/config'
-require 'yt/errors/failed'
-require 'yt/errors/unauthenticated'
+require 'yt/errors/missing_auth'
+require 'yt/errors/request_error'
 
 module Yt
-  class Request
-    def initialize(options = {})
-      options[:query] ||= options[:params].to_param
-      @uri = URI::HTTPS.build options.slice(:host, :path, :query)
-      @method = options.fetch :method, :get
-      @format = options[:format]
-      @body = options[:body]
-      @body_type = options[:body_type]
-      @auth = options[:auth]
-      @headers = {}
-    end
+  module Models
+    class Request
+      def initialize(options = {})
+        @auth = options[:auth]
+        @body = options[:body]
+        @body_type = options.fetch :body_type, :json
+        @expected_response = options.fetch :expected_response, Net::HTTPSuccess
+        @format = options.fetch :format, :json
+        @headers = options.fetch :headers, {}
+        @host = options.fetch :host, google_api_host
+        @method = options.fetch :method, :get
+        @path = options[:path]
+        @query = options.fetch(:params, {}).to_param
+      end
 
-    def run
-      add_authorization_to_request! if requires_authorization?
-      fetch_response.tap do |response|
-        if response.is_a? Net::HTTPSuccess
-          response.body = parse_format response.body
+      def run
+        case response
+        when @expected_response
+          response.tap{|response| response.body = parse_format response.body}
+        when Net::HTTPUnauthorized
+          raise Errors::MissingAuth, request_error_message
         else
-          raise Errors::Failed, to_error(response)
+          raise Yt::Error, request_error_message
         end
       end
-    end
 
-    def self.default_params
-      {}.tap do |params|
-        params[:format] = :json
-        params[:host] = 'www.googleapis.com'
-        params[:body_type] = :json
+    private
+
+      def response
+        @response ||= Net::HTTP.start(*net_http_options) do |http|
+          http.request http_request
+        end
       end
-    end
 
-  private
-
-    def add_authorization_to_request!
-      if @auth.respond_to? :access_token
-        @headers['Authorization'] = "Bearer #{@auth.access_token}"
-      elsif Yt.configuration.api_key
-        params = URI.decode_www_form @uri.query || ''
-        params << [:key, Yt.configuration.api_key]
-        @uri.query = URI.encode_www_form params
-      else
-        raise Errors::Unauthenticated, to_error
+      def http_request
+        @http_request ||= net_http_class.new(uri.request_uri).tap do |request|
+          set_headers! request
+          set_body! request
+        end
       end
-    end
 
-    def requires_authorization?
-      @uri.host == Request.default_params[:host]
-    end
+      def set_headers!(request)
+        if @body_type == :json
+          request.initialize_http_header 'Content-Type' => 'application/json'
+          request.initialize_http_header 'Content-length' => '0' unless @body
+        end
+        @headers.each{|name, value| request.add_field name, value}
+      end
 
-    def fetch_response
-      klass = "Net::HTTP::#{@method.capitalize}".constantize
-      request = klass.new @uri.request_uri
-      case @body_type
-      when :json
-        request.initialize_http_header 'Content-Type' => 'application/json'
-        request.initialize_http_header 'Content-length' => '0' unless @body
-        request.body = @body.to_json if @body
-      when :form
-        request.set_form_data @body if @body
+      def set_body!(request)
+        case @body_type
+          when :json then request.body = @body.to_json
+          when :form then request.set_form_data @body
+        end if @body
       end
-      @headers.each{|k,v| request.add_field k, v}
 
-      Net::HTTP.start(@uri.host, @uri.port, use_ssl: true) do |http|
-        http.request request
+      def net_http_options
+        [uri.host, uri.port, use_ssl: true]
       end
-    end
 
-    def parse_format(body)
-      case @format
-        when :xml then Hash.from_xml body
-        when :json then JSON body
-      end if body
-    end
+      def net_http_class
+        "Net::HTTP::#{@method.capitalize}".constantize
+      end
+
+      def uri
+        @uri ||= build_uri
+      end
 
-    def to_error(response = nil)
-      request_msg = {}.tap do |msg|
-        msg[:method] = @method
-        msg[:headers] = @headers
-        msg[:url] = @uri.to_s
-        msg[:body] = @body
+      def build_uri
+        add_authorization! if @host == google_api_host
+        URI::HTTPS.build host: @host, path: @path, query: @query
       end
 
-      response_msg = {}.tap do |msg|
-        msg[:code] = response.code
-        msg[:headers] = {}.tap{|h| response.each_header{|k,v| h[k] = v }}
-        msg[:body] = response.body
-      end if response
+      def add_authorization!
+        if @auth.respond_to? :access_token
+          @headers['Authorization'] = "Bearer #{@auth.access_token}"
+        elsif Yt.configuration.api_key
+          params = URI.decode_www_form @query || ''
+          params << [:key, Yt.configuration.api_key]
+          @query = URI.encode_www_form params
+        end
+      end
+
+      def google_api_host
+        'www.googleapis.com'
+      end
 
-      {request: request_msg, response: response_msg}.to_json
+      def parse_format(body)
+        case @format
+          when :xml then Hash.from_xml body
+          when :json then JSON body
+        end if body
+      end
+
+      def request_error_message
+        {}.tap do |message|
+          message[:request_curl] = as_curl
+          message[:response_body] = JSON(response.body) rescue response.body
+        end.to_json
+      end
+
+      def as_curl
+        'curl'.tap do |curl|
+          curl <<  " -X #{http_request.method}"
+          http_request.each_header do |name, value|
+            curl << %Q{ -H "#{name}: #{value}"}
+          end
+          curl << %Q{ -d '#{http_request.body}'} if http_request.body
+          curl << %Q{ "#{@uri.to_s}"}
+        end
+      end
     end
   end
 end

data/lib/yt/models/resource.rb

@@ -2,26 +2,28 @@ require 'yt/models/base'
 require 'yt/models/url'
 
 module Yt
-  class Resource < Base
-    attr_reader :auth
-    has_one :id
-    has_one :snippet, delegate: [:title, :description, :thumbnail_url, :published_at, :tags]
-    has_one :status, delegate: [:privacy_status, :public?, :private?, :unlisted?]
+  module Models
+    class Resource < Base
+      attr_reader :auth
+      has_one :id
+      has_one :snippet, delegate: [:title, :description, :thumbnail_url, :published_at, :tags]
+      has_one :status, delegate: [:privacy_status, :public?, :private?, :unlisted?]
 
-    def initialize(options = {})
-      @url = URL.new(options[:url]) if options[:url]
-      @id = options[:id] || (@url.id if @url)
-      @auth = options[:auth]
-      @snippet = Snippet.new(data: options[:snippet]) if options[:snippet]
-      @status = Status.new(data: options[:status]) if options[:status]
-    end
+      def initialize(options = {})
+        @url = URL.new(options[:url]) if options[:url]
+        @id = options[:id] || (@url.id if @url)
+        @auth = options[:auth]
+        @snippet = Snippet.new(data: options[:snippet]) if options[:snippet]
+        @status = Status.new(data: options[:status]) if options[:status]
+      end
 
-    def kind
-      @url ? @url.kind.to_s : self.class.to_s.demodulize.underscore
-    end
+      def kind
+        @url ? @url.kind.to_s : self.class.to_s.demodulize.underscore
+      end
 
-    def username
-      @url.username if @url
+      def username
+        @url.username if @url
+      end
     end
   end
 end

data/lib/yt/models/snippet.rb

@@ -1,48 +1,50 @@
 require 'yt/models/description'
 
 module Yt
-  class Snippet
-    def initialize(options = {})
-      @data = options[:data]
-    end
+  module Models
+    class Snippet
+      def initialize(options = {})
+        @data = options[:data]
+      end
 
-    # Return the title of the YouTube resource.
-    #
-    # @return [String] Title of the YouTube resource
-    def title
-      @title ||= @data.fetch 'title', ''
-    end
+      # Return the title of the YouTube resource.
+      #
+      # @return [String] Title of the YouTube resource
+      def title
+        @title ||= @data.fetch 'title', ''
+      end
 
-    # Return the description of a YouTube resource.
-    #
-    # @return [Yt::Description] A Yt::Description object for the YouTube resource
-    def description
-      @description ||= Description.new @data.fetch('description', '')
-    end
+      # Return the description of a YouTube resource.
+      #
+      # @return [Yt::Description] A Yt::Description object for the YouTube resource
+      def description
+        @description ||= Description.new @data.fetch('description', '')
+      end
 
-    # Return the publication date of a YouTube resource.
-    #
-    # @return [Time or nil] The publication date for the YouTube resource
-    def published_at
-      @published_at ||= Time.parse @data['publishedAt']
-    end
+      # Return the publication date of a YouTube resource.
+      #
+      # @return [Time or nil] The publication date for the YouTube resource
+      def published_at
+        @published_at ||= Time.parse @data['publishedAt']
+      end
 
-    # Return the tags of a YouTube resource.
-    #
-    # @return [Array] An array of Yt::Tag object, one for each tag of the resource.
-    #
-    # @note YouTube API only includes tags in a resource’s snippet if the
-    #       resource is a video belonging to the authenticated account.
-    def tags
-      @tags ||= @data.fetch 'tags', []
-    end
+      # Return the tags of a YouTube resource.
+      #
+      # @return [Array] An array of Yt::Tag object, one for each tag of the resource.
+      #
+      # @note YouTube API only includes tags in a resource’s snippet if the
+      #       resource is a video belonging to the authenticated account.
+      def tags
+        @tags ||= @data.fetch 'tags', []
+      end
 
-    # Return the URL of a thumbnail image of the YouTube resource.
-    #
-    # @return [String] A URL.
-    def thumbnail_url(size = :default)
-      @thumbnails ||= @data.fetch 'thumbnails', {}
-      @thumbnails.fetch(size.to_s, {})['url']
+      # Return the URL of a thumbnail image of the YouTube resource.
+      #
+      # @return [String] A URL.
+      def thumbnail_url(size = :default)
+        @thumbnails ||= @data.fetch 'thumbnails', {}
+        @thumbnails.fetch(size.to_s, {})['url']
+      end
     end
   end
 end

data/lib/yt/models/status.rb

@@ -1,26 +1,28 @@
 module Yt
-  class Status
-    def initialize(options = {})
-      @data = options[:data]
-    end
+  module Models
+    class Status
+      def initialize(options = {})
+        @data = options[:data]
+      end
 
-    # @return [Boolean] Is the resource public?
-    def public?
-      privacy_status == 'public'
-    end
+      # @return [Boolean] Is the resource public?
+      def public?
+        privacy_status == 'public'
+      end
 
-    # @return [Boolean] Is the resource private?
-    def private?
-      privacy_status == 'private'
-    end
+      # @return [Boolean] Is the resource private?
+      def private?
+        privacy_status == 'private'
+      end
 
-    # @return [Boolean] Is the resource unlisted?
-    def unlisted?
-      privacy_status == 'unlisted'
-    end
+      # @return [Boolean] Is the resource unlisted?
+      def unlisted?
+        privacy_status == 'unlisted'
+      end
 
-    def privacy_status
-      @privacy_status ||= @data['privacyStatus']
+      def privacy_status
+        @privacy_status ||= @data['privacyStatus']
+      end
     end
   end
 end

data/lib/yt/models/subscription.rb

@@ -1,35 +1,37 @@
 require 'yt/models/base'
 
 module Yt
-  class Subscription < Base
+  module Models
+    class Subscription < Base
 
-    attr_reader :id
+      attr_reader :id
 
-    def initialize(options = {})
-      @id = options[:id]
-      @auth = options[:auth]
-    end
+      def initialize(options = {})
+        @id = options[:id]
+        @auth = options[:auth]
+      end
 
-    def delete(options = {})
-      begin
-        do_delete {@id = nil}
-      rescue Errors::Base => error
-        ignorable_errors = error.reasons & ['subscriptionNotFound']
-        raise error unless options[:ignore_errors] && ignorable_errors.any?
+      def delete(options = {})
+        begin
+          do_delete {@id = nil}
+        rescue Yt::Error => error
+          ignorable_errors = error.reasons & ['subscriptionNotFound']
+          raise error unless options[:ignore_errors] && ignorable_errors.any?
+        end
+        !exists?
       end
-      !exists?
-    end
 
-    def exists?
-      !@id.nil?
-    end
+      def exists?
+        !@id.nil?
+      end
 
-  private
+    private
 
-    def delete_params
-      super.tap do |params|
-        params[:path] = '/youtube/v3/subscriptions'
-        params[:params] = {id: @id}
+      def delete_params
+        super.tap do |params|
+          params[:path] = '/youtube/v3/subscriptions'
+          params[:params] = {id: @id}
+        end
       end
     end
   end