lumiere 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 402cdd95d8d122a17a2e90b334738289cd92effb
-  data.tar.gz: 629b0493becd5354a9c658924b5ef40b8a458cd9
+  metadata.gz: 181c9f99a468e59da34456795def60868712e56b
+  data.tar.gz: 47ea9aeab6778b32dea015e865a39730005938cf
 SHA512:
-  metadata.gz: ecd9905276cb5351e1fbadeae11e603226ea0f3df2c10b7ba6863735efdc2f505ee9bbfdbb39409fb8591ae4341294b5236e5a61807cfb9948558a92cd5547dd
-  data.tar.gz: a090003bbe50f509df7a74059dd19a01315c659080874d384c67ab392d9ccbd79973f3b28f95c6fafef7c4989bb53b5d173834dbe6f85714c7d0f95aa33d2e19
+  metadata.gz: b14a9fe81e877dc06954a084e256b6cb67200f555b451ebb0f073d1714dc365d17f899f50cb9f3b9855a966857c08c6bf27cd087310eab73a2f38382a93759d0
+  data.tar.gz: 5bf3581d0e13ed1a0c456a8a2f1d0d05cd7351a30cd159700dacc19cfb72a8cae792b6f494887e3913691320a2b2002ea708fafe0bbd70a01dacbd6f130e311c

data/lib/lumiere/version.rb

@@ -1,3 +1,3 @@
 module Lumiere
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

data/lib/lumiere.rb

@@ -10,6 +10,7 @@ require 'representable/json/collection'
 
 require_relative 'extended_uri'
 require_relative 'provider'
+require_relative 'playlist'
 
 class Elluminate
   extend Forwardable

data/lib/playlist.rb

@@ -0,0 +1,9 @@
+module Lumiere
+  module Playlist
+    def self.page_count(total, per_page)
+      page_count = total / per_page
+      page_count += 1 unless total % per_page == 0
+      page_count
+    end
+  end
+end

data/lib/provider/vimeo/representer.rb

@@ -3,6 +3,7 @@ module Lumiere
     include Representable::JSON
     include Representable::Coercion
 
+    property :id
     property :title
     property :description
     property :duration, type: Integer

data/lib/provider/vimeo/vimeo.rb

@@ -9,6 +9,10 @@ class Vimeo < Provider
     USEABLE.include?(uri.host)
   end
 
+  def self.new_from_video_id(video_id)
+    new("http://vimeo.com/#{video_id}")
+  end
+
   def initialize(url)
     @url = url
   end

data/lib/provider/vimeoplaylist/representer.rb

@@ -0,0 +1,14 @@
+module Lumiere
+  module VimeoPlaylistRepresenter
+    include Representable::JSON
+    include Representable::Coercion
+
+    property :title
+    property :description
+    property :upload_date, type: DateTime, as: :created_on
+    property :thumbnail_small
+    property :thumbnail_medium
+    property :thumbnail_large
+    property :total_videos, type: Integer
+  end
+end

data/lib/provider/vimeoplaylist/vimeoplaylist.rb

@@ -0,0 +1,116 @@
+module Lumiere
+class VimeoPlaylist < Provider
+  attr_accessor :url
+
+  USEABLE = ['vimeo.com', 'player.vimeo.com', 'www.vimeo.com']
+  MAX_RESULTS = 20
+
+  def self.useable?(url)
+    uri = URISchemeless.parse(url)
+    return false unless USEABLE.include?(uri.host)
+    split_path = uri.path.split('/')
+    split_path.include?('album')
+  end
+
+  def initialize(url)
+    @url = url
+  end
+
+  def provider
+    "Vimeo"
+  end
+
+  def playlist_id
+    @playlist_id ||= calculate_playlist_id
+  end
+
+  def api_url
+    "http://vimeo.com/api/v2/album/#{playlist_id}/info.json"
+  end
+
+  def embed_url
+    "http://player.vimeo.com/hubnut/album/#{playlist_id}"
+  end
+
+  def embed_code
+    "<iframe src=\"//player.vimeo.com/hubnut/album/#{playlist_id}?autoplay=0&byline=0&portrait=0&title=0\" frameborder=\"0\"></iframe>"
+  end
+
+  def title
+    fetch! unless @title
+    @title
+  end
+
+  def description
+    fetch! unless @description
+    @description
+  end
+
+  def upload_date
+    fetch! unless @upload_date
+    @upload_date
+  end
+
+  def thumbnail_small
+    fetch! unless @thumbnail_small
+    @thumbnail_small
+  end
+
+  def thumbnail_medium
+    fetch! unless @thumbnail_medium
+    @thumbnail_medium
+  end
+
+  def thumbnail_large
+    fetch! unless @thumbnail_large
+    @thumbnail_large
+  end
+
+  def total_videos
+    fetch! unless @total_videos
+    @total_videos
+  end
+
+  def videos
+    return @videos if @videos
+
+    @videos ||= []
+    page_count = Playlist.page_count(total_videos, MAX_RESULTS)
+    page_count = 3 if page_count > 3 #VIMEO CANT DEAL WITH MORE THAN 60 RESULTS ON SIMPLE API...
+
+    page_count.times.with_index(1) do |times, index|
+      @videos += fetch_videos(index)
+    end
+
+    @videos = @videos.map do |video|
+      Vimeo.new_from_video_id(video.id)
+    end
+  end
+
+  private
+
+  attr_writer :title, :description, :upload_date, :thumbnail_small, :thumbnail_medium, :thumbnail_large, :total_videos
+
+  def fetch!
+    self.extend(VimeoPlaylistRepresenter).from_json(raw_response)
+  end
+
+  def fetch_videos(page=1)
+    [].extend(VimeoVideosRepresenter).from_json(raw_response_videos(page))
+  end
+
+  def raw_response_videos(page=1)
+    url = "http://vimeo.com/api/v2/album/#{playlist_id}/videos.json?page=#{page}"
+    open(url).read
+  end
+
+  def calculate_playlist_id
+    uri = URISchemeless.parse(url)
+    uri.path.gsub!('/hubnut/album/', '')
+    uri.path.gsub!('/album/', '')
+    uri.path.delete!('/')
+    uri.path
+  end
+
+end
+end

data/lib/provider/youtube/youtube.rb

@@ -52,22 +52,29 @@ class YouTube < Provider
     @thumbnails[2].url
   end
 
-  REMOTE_ATTRIBUTES = [:title, :description, :duration, :upload_date]
+  def title
+    fetch! unless defined?(@title)
+    @title
+  end
 
-  REMOTE_ATTRIBUTES.each do |attribute|
-    define_method(attribute) do
-      fetch! unless instance_variable_get("@#{attribute}")
-      instance_variable_get("@#{attribute}")
-    end
+  def description
+    fetch! unless defined?(@description)
+    @description
   end
 
-  private
+  def duration
+    fetch! unless defined?(@duration)
+    @duration
+  end
 
-  REMOTE_ATTRIBUTES.each do |attribute|
-    attr_writer attribute
+  def upload_date
+    fetch! unless defined?(@upload_date)
+    @upload_date
   end
 
-  attr_writer :thumbnails, :video_id
+  private
+
+  attr_writer :thumbnails, :video_id, :title, :description, :duration, :upload_date
 
   def fetch!
     self.extend(YouTubeVideoEntryRepresenter).from_json(raw_response)

data/lib/provider/youtubeplaylist/youtubeplaylist.rb

@@ -3,6 +3,7 @@ class YouTubePlaylist < Provider
   attr_accessor :url
 
   USEABLE = ['www.youtube.com', 'youtube.com', 'youtu.be']
+  MAX_RESULTS = 25
 
   def self.useable?(url)
     uri = URISchemeless.parse(url)
@@ -12,7 +13,6 @@ class YouTubePlaylist < Provider
   def initialize(url, opts={})
     @url = url
     @start_index = opts[:start_index] || 1
-    @max_results = opts[:max_results] || 25
   end
 
   def provider
@@ -25,7 +25,7 @@ class YouTubePlaylist < Provider
 
   def api_url
     url = "http://gdata.youtube.com/feeds/api/playlists/#{playlist_id}"
-    url << "?max-results=#{@max_results}"
+    url << "?max-results=#{MAX_RESULTS}"
     url << "&start-index=#{@start_index}"
     url << "&v=2&alt=json"
     url
@@ -40,49 +40,59 @@ class YouTubePlaylist < Provider
   end
 
   def videos
-    fetch! unless defined?(@videos)
+    if @videos && @videos.size == total_results
+      return @videos
+    end
+
+    #take into account the first request that calling total_results will trigger through fetch!
+    #todo refactor this
+    remaining_pages = page_count - 1
 
-    while @start_index < @total_results && @videos.size < @total_results
+    remaining_pages.times do
       @start_index =+ @videos.size + 1
       fetch!
     end
 
-    @all_videos = @videos.map do |video|
-      YouTube.new_from_video_id(video.video_id)
-    end
+    @videos
   end
 
   def thumbnail_small
-    fetch! unless defined?(@thumbnails)
+    fetch! unless @thumbnails
     @thumbnails[0].url
   end
 
   def thumbnail_medium
-    fetch! unless defined?(@thumbnails)
+    fetch! unless @thumbnails
     @thumbnails[1].url
   end
 
   def thumbnail_large
-    fetch! unless defined?(@thumbnails)
+    fetch! unless @thumbnails
     @thumbnails[2].url
   end
 
-  REMOTE_ATTRIBUTES = [:title, :description, :total_results]
+  def title
+    fetch! unless @title
+    @title
+  end
 
-  REMOTE_ATTRIBUTES.each do |attribute|
-    define_method(attribute) do
-      fetch! unless instance_variable_get("@#{attribute}")
-      instance_variable_get("@#{attribute}")
-    end
+  def description
+    fetch! unless @description
+    @description
+  end
+
+  def total_results
+    fetch! unless @total_results
+    @total_results
   end
 
   private
 
-  REMOTE_ATTRIBUTES.each do |attribute|
-    attr_writer attribute
-  end
+  attr_writer :thumbnails, :title, :description, :total_results
 
-  attr_writer :thumbnails
+  def page_count
+    Playlist.page_count(total_results, MAX_RESULTS)
+  end
 
   def videos=(videos)
     @videos ||= []

data/lib/provider.rb

@@ -1,7 +1,7 @@
 module Lumiere
   class Provider
 
-    PROVIDERS = %w(YouTubePlaylist YouTube Vimeo)
+    PROVIDERS = %w(YouTubePlaylist VimeoPlaylist YouTube Vimeo)
     PROVIDERS.each do |provider|
       require_relative "provider/#{provider.downcase}/#{provider.downcase}"
       require_relative "provider/#{provider.downcase}/representer"
@@ -80,8 +80,8 @@ module Lumiere
     end
 
     def ==(other)
-      if other.respond_to?(:url)
-        url == other.url
+      if other.respond_to?(:video_id)
+        video_id == other.video_id
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lumiere
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Karl Entwistle
@@ -132,9 +132,12 @@ files:
 - lib/extended_uri.rb
 - lib/lumiere.rb
 - lib/lumiere/version.rb
+- lib/playlist.rb
 - lib/provider.rb
 - lib/provider/vimeo/representer.rb
 - lib/provider/vimeo/vimeo.rb
+- lib/provider/vimeoplaylist/representer.rb
+- lib/provider/vimeoplaylist/vimeoplaylist.rb
 - lib/provider/youtube/representer.rb
 - lib/provider/youtube/youtube.rb
 - lib/provider/youtubeplaylist/representer.rb