lumiere 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 181c9f99a468e59da34456795def60868712e56b
-  data.tar.gz: 47ea9aeab6778b32dea015e865a39730005938cf
+  metadata.gz: 62fa0f81be349c04c0c59893fa3933f82d96b802
+  data.tar.gz: 6cef7cfa92eb369e2400b529ff041f6fb209642e
 SHA512:
-  metadata.gz: b14a9fe81e877dc06954a084e256b6cb67200f555b451ebb0f073d1714dc365d17f899f50cb9f3b9855a966857c08c6bf27cd087310eab73a2f38382a93759d0
-  data.tar.gz: 5bf3581d0e13ed1a0c456a8a2f1d0d05cd7351a30cd159700dacc19cfb72a8cae792b6f494887e3913691320a2b2002ea708fafe0bbd70a01dacbd6f130e311c
+  metadata.gz: 9047d106b199f42e6b98c47801219421d9207df90914807f55d2c1a12a90ba2ea476461ddced51c6af279c001bb373ef42796f5d51e2d989ccc1fd289576491e
+  data.tar.gz: 4b8ccafdef4ee51c51374fa0211719b323e9a152ab09726ab9003c199bfa5d6d7b2b2c703bdb1e077a9ad6e8703aad8344d3543fbd42a7d18c33528d3d0dc166

data/lib/fetcher.rb

@@ -0,0 +1,33 @@
+require 'open-uri'
+
+module Lumiere
+class Fetcher
+
+  def initialize(context)
+    @api_url = context.api_url
+    @unpack_into = context.unpack_into
+  end
+
+  def remote_attributes
+    unless request_hash[@api_url]
+      request_hash[@api_url] = unpack
+    end
+    request_hash[@api_url]
+  end
+
+  private
+
+  def request_hash
+    @request_hash ||= {}
+  end
+
+  def unpack
+    @unpack_into.from_json(raw_response)
+  end
+
+  def raw_response
+    open(@api_url).read
+  end
+
+end
+end

data/lib/lumiere/version.rb

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

data/lib/lumiere.rb

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

data/lib/playlist.rb

@@ -1,9 +1,8 @@
 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
+      mid_point = total.to_f / per_page.to_f
+      mid_point.ceil
     end
   end
 end

data/lib/provider/dailymotion/dailymotion.rb

@@ -0,0 +1,84 @@
+module Lumiere
+class Dailymotion < Provider
+  attr_accessor :url
+
+  USEABLE = ['www.dailymotion.com', 'dailymotion.com']
+
+  def self.useable?(url)
+    uri = URISchemeless.parse(url)
+    USEABLE.include?(uri.host)
+  end
+
+  def initialize(url)
+    @url = url
+  end
+
+  def provider
+    "Dailymotion"
+  end
+
+  def video_id
+    @video_id ||= calculate_video_id
+  end
+
+  def api_url
+    "https://api.dailymotion.com/video/#{video_id}?fields=id,title,description,duration,created_time,url,thumbnail_720_url,thumbnail_240_url,thumbnail_60_url"
+  end
+
+  def embed_url
+    "http://www.dailymotion.com/embed/video/#{video_id}"
+  end
+
+  def embed_code
+    "<iframe frameborder=\"0\" src=\"//www.dailymotion.com/embed/video/#{video_id}\" allowfullscreen></iframe>"
+  end
+
+  def title
+    fetch.title
+  end
+
+  def description
+    fetch.description
+  end
+
+  def duration
+    fetch.duration
+  end
+
+  def upload_date
+    fetch.upload_date
+  end
+
+  def thumbnail_small
+    fetch.thumbnail_small
+  end
+
+  def thumbnail_medium
+    fetch.thumbnail_medium
+  end
+
+  def thumbnail_large
+    fetch.thumbnail_large
+  end
+
+  def unpack_into
+    struct = OpenStruct.new
+    struct.extend(DailymotionVideoRepresenter)
+  end
+
+  private
+
+  def fetch
+    @fetch ||= Fetcher.new(self).remote_attributes
+  end
+
+  def calculate_video_id
+    uri = URISchemeless.parse(url)
+    uri.path.gsub!('/embed/video/', '')
+    uri.path.gsub!('/video/', '')
+    uri.path.delete!('/')
+    uri.path.split('_')[0]
+  end
+
+end
+end

data/lib/provider/dailymotion/representer.rb

@@ -0,0 +1,16 @@
+module Lumiere
+  module DailymotionVideoRepresenter
+    include Representable::JSON
+    include Representable::Coercion
+
+    property :video_id, as: :id, type: String
+    property :title
+    property :description
+    property :duration, type: Integer
+    property :upload_date, as: :created_time, type: DateTime
+    property :thumbnail_small, as: :thumbnail_60_url
+    property :thumbnail_medium, as: :thumbnail_240_url
+    property :thumbnail_large, as: :thumbnail_720_url
+  end
+
+end

data/lib/provider/vimeo/representer.rb

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

data/lib/provider/vimeo/vimeo.rb

@@ -9,12 +9,13 @@ class Vimeo < Provider
     USEABLE.include?(uri.host)
   end
 
-  def self.new_from_video_id(video_id)
-    new("http://vimeo.com/#{video_id}")
+  def self.new_from_video_id(video_id, fetched=nil)
+    new("http://vimeo.com/#{video_id}", fetched)
   end
 
-  def initialize(url)
+  def initialize(url, fetched=nil)
     @url = url
+    @fetched = fetched
   end
 
   def provider
@@ -65,10 +66,15 @@ class Vimeo < Provider
     fetch.thumbnail_large
   end
 
+  def unpack_into
+    struct = []
+    struct.extend(VimeoVideosRepresenter)
+  end
+
   private
 
   def fetch
-    @fetch ||= [].extend(VimeoVideosRepresenter).from_json(raw_response)[0]
+    @fetch ||= Fetcher.new(self).remote_attributes[0]
   end
 
   def calculate_video_id

data/lib/provider/vimeoplaylist/vimeoplaylist.rb

@@ -3,7 +3,7 @@ class VimeoPlaylist < Provider
   attr_accessor :url
 
   USEABLE = ['vimeo.com', 'player.vimeo.com', 'www.vimeo.com']
-  MAX_RESULTS = 20
+  RESULTS_PER_REQUEST = 20
 
   def self.useable?(url)
     uri = URISchemeless.parse(url)
@@ -37,71 +37,46 @@ class VimeoPlaylist < Provider
   end
 
   def title
-    fetch! unless @title
-    @title
+    fetch.title
   end
 
   def description
-    fetch! unless @description
-    @description
+    fetch.description
   end
 
   def upload_date
-    fetch! unless @upload_date
-    @upload_date
+    fetch.upload_date
   end
 
   def thumbnail_small
-    fetch! unless @thumbnail_small
-    @thumbnail_small
+    fetch.thumbnail_small
   end
 
   def thumbnail_medium
-    fetch! unless @thumbnail_medium
-    @thumbnail_medium
+    fetch.thumbnail_medium
   end
 
   def thumbnail_large
-    fetch! unless @thumbnail_large
-    @thumbnail_large
+    fetch.thumbnail_large
   end
 
   def total_videos
-    fetch! unless @total_videos
-    @total_videos
+    fetch.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
+  def unpack_into
+    struct = OpenStruct.new
+    struct.extend(VimeoPlaylistRepresenter)
   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)
+  def videos
+    @videos ||= VideoFetcher.new(playlist_id, total_videos).videos
   end
 
-  def fetch_videos(page=1)
-    [].extend(VimeoVideosRepresenter).from_json(raw_response_videos(page))
-  end
+  private
 
-  def raw_response_videos(page=1)
-    url = "http://vimeo.com/api/v2/album/#{playlist_id}/videos.json?page=#{page}"
-    open(url).read
+  def fetch
+    @fetch ||= Fetcher.new(self).remote_attributes
   end
 
   def calculate_playlist_id
@@ -112,5 +87,53 @@ class VimeoPlaylist < Provider
     uri.path
   end
 
+  class VideoFetcher
+    RESULTS_PER_REQUEST = 20
+
+    def initialize(playlist_id, total_videos)
+      @playlist_id = playlist_id
+      @total_videos = total_videos
+      @page = 1
+    end
+
+    def videos
+      videos = []
+      page_count.times do
+        videos += fetched_videos
+        @page += 1
+      end
+
+      videos.map do |video|
+        Vimeo.new_from_video_id(video.video_id, video)
+      end
+    end
+
+    def api_url
+      "http://vimeo.com/api/v2/album/#{@playlist_id}/videos.json?page=#{@page}"
+    end
+
+    def unpack_into
+      struct = []
+      struct.extend(VimeoVideosRepresenter)
+    end
+
+    private
+
+    def fetched_videos
+      fetch
+    end
+
+    def fetch
+      Fetcher.new(self).remote_attributes
+    end
+
+    def page_count
+      page_count = Playlist.page_count(@total_videos, RESULTS_PER_REQUEST)
+      #VIMEO CANT DEAL WITH MORE THAN 60 RESULTS ON SIMPLE API...
+      page_count = 3 if page_count > 3
+      page_count
+    end
+  end
+
 end
 end

data/lib/provider/youtube/youtube.rb

@@ -9,12 +9,13 @@ class YouTube < Provider
     USEABLE.include?(uri.host)
   end
 
-  def self.new_from_video_id(video_id)
+  def self.new_from_video_id(video_id, fetched=nil)
     new("http://www.youtube.com/watch?v=#{video_id}")
   end
 
-  def initialize(url=nil)
+  def initialize(url, fetched=nil)
     @url = url
+    @fetched = fetched
   end
 
   def provider
@@ -38,46 +39,42 @@ class YouTube < Provider
   end
 
   def thumbnail_small
-    fetch! unless defined?(@thumbnails)
-    @thumbnails[0].url
+    fetch.thumbnails[0].url
   end
 
   def thumbnail_medium
-    fetch! unless defined?(@thumbnails)
-    @thumbnails[1].url
+    fetch.thumbnails[1].url
   end
 
   def thumbnail_large
-    fetch! unless defined?(@thumbnails)
-    @thumbnails[2].url
+    fetch.thumbnails[2].url
   end
 
   def title
-    fetch! unless defined?(@title)
-    @title
+    fetch.title
   end
 
   def description
-    fetch! unless defined?(@description)
-    @description
+    fetch.description
   end
 
   def duration
-    fetch! unless defined?(@duration)
-    @duration
+    fetch.duration
   end
 
   def upload_date
-    fetch! unless defined?(@upload_date)
-    @upload_date
+    fetch.upload_date
   end
 
-  private
+  def unpack_into
+    struct = OpenStruct.new
+    struct.extend(YouTubeVideoEntryRepresenter)
+  end
 
-  attr_writer :thumbnails, :video_id, :title, :description, :duration, :upload_date
+  private
 
-  def fetch!
-    self.extend(YouTubeVideoEntryRepresenter).from_json(raw_response)
+  def fetch
+    @fetch ||= Fetcher.new(self).remote_attributes
   end
 
   def calculate_video_id
@@ -93,6 +90,5 @@ class YouTube < Provider
       uri.path
     end
   end
-
 end
 end

data/lib/provider/youtubeplaylist/representer.rb

@@ -26,7 +26,7 @@ module Lumiere
       end
     end
 
-    collection :videos, as: :entry, extend: YouTubeVideoRepresenter, class: YouTube
+    collection :videos, as: :entry, extend: YouTubeVideoRepresenter, class: OpenStruct
   end
 
 end

data/lib/provider/youtubeplaylist/youtubeplaylist.rb

@@ -3,7 +3,7 @@ class YouTubePlaylist < Provider
   attr_accessor :url
 
   USEABLE = ['www.youtube.com', 'youtube.com', 'youtu.be']
-  MAX_RESULTS = 25
+  RESULTS_PER_REQUEST = 25
 
   def self.useable?(url)
     uri = URISchemeless.parse(url)
@@ -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=#{RESULTS_PER_REQUEST}"
     url << "&start-index=#{@start_index}"
     url << "&v=2&alt=json"
     url
@@ -44,63 +44,61 @@ class YouTubePlaylist < Provider
       return @videos
     end
 
+    @videos = fetch.videos
     #take into account the first request that calling total_results will trigger through fetch!
     #todo refactor this
     remaining_pages = page_count - 1
-
     remaining_pages.times do
       @start_index =+ @videos.size + 1
-      fetch!
+      @videos += fetch!.videos
+    end
+
+    @videos.map do |video|
+      YouTube.new_from_video_id(video.video_id, video)
     end
+  end
 
-    @videos
+  def page_count
+    Playlist.page_count(total_results, RESULTS_PER_REQUEST)
   end
 
   def thumbnail_small
-    fetch! unless @thumbnails
-    @thumbnails[0].url
+    fetch.thumbnails[0].url
   end
 
   def thumbnail_medium
-    fetch! unless @thumbnails
-    @thumbnails[1].url
+    fetch.thumbnails[1].url
   end
 
   def thumbnail_large
-    fetch! unless @thumbnails
-    @thumbnails[2].url
+    fetch.thumbnails[2].url
   end
 
   def title
-    fetch! unless @title
-    @title
+    fetch.title
   end
 
   def description
-    fetch! unless @description
-    @description
+    fetch.description
   end
 
   def total_results
-    fetch! unless @total_results
-    @total_results
+    fetch.total_results
   end
 
-  private
-
-  attr_writer :thumbnails, :title, :description, :total_results
-
-  def page_count
-    Playlist.page_count(total_results, MAX_RESULTS)
+  def unpack_into
+    struct = OpenStruct.new
+    struct.extend(YouTubePlaylistRepresenter)
   end
 
-  def videos=(videos)
-    @videos ||= []
-    @videos += videos
+  private
+
+  def fetch
+    @fetch ||= fetch!
   end
 
   def fetch!
-    self.extend(YouTubePlaylistRepresenter).from_json(raw_response)
+    Fetcher.new(self).remote_attributes
   end
 
   def calculate_playlist_id

data/lib/provider.rb

@@ -1,7 +1,7 @@
 module Lumiere
   class Provider
 
-    PROVIDERS = %w(YouTubePlaylist VimeoPlaylist YouTube Vimeo)
+    PROVIDERS = %w(YouTubePlaylist VimeoPlaylist YouTube Vimeo Dailymotion)
     PROVIDERS.each do |provider|
       require_relative "provider/#{provider.downcase}/#{provider.downcase}"
       require_relative "provider/#{provider.downcase}/representer"
@@ -84,11 +84,5 @@ module Lumiere
         video_id == other.video_id
       end
     end
-
-    private
-
-    def raw_response
-      open(api_url).read
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lumiere
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Karl Entwistle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
@@ -130,10 +130,13 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - lib/extended_uri.rb
+- lib/fetcher.rb
 - lib/lumiere.rb
 - lib/lumiere/version.rb
 - lib/playlist.rb
 - lib/provider.rb
+- lib/provider/dailymotion/dailymotion.rb
+- lib/provider/dailymotion/representer.rb
 - lib/provider/vimeo/representer.rb
 - lib/provider/vimeo/vimeo.rb
 - lib/provider/vimeoplaylist/representer.rb