lumiere 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e20f4a873d50e02f09619cd156bf79f2cc7cefb8
-  data.tar.gz: 7f7fe10f03c200211d4076111112d3c569112033
+  metadata.gz: 402cdd95d8d122a17a2e90b334738289cd92effb
+  data.tar.gz: 629b0493becd5354a9c658924b5ef40b8a458cd9
 SHA512:
-  metadata.gz: bfd62f901fd6c5216bcf70309604cb5c6c8f614f56d564f61be3aec64b1b89f0dbc5f273f259b8ae7fbfb2c285d42387601babe28cf6f8c25fd2995841179426
-  data.tar.gz: afe0be0945ea5f3eeac4c355041ffc821bb1cf44bdba6d7da7c449e92b80f5b0f9b345af132bd6a1c24a495ee751773f06b9196754169f1a51369f18e3b336cf
+  metadata.gz: ecd9905276cb5351e1fbadeae11e603226ea0f3df2c10b7ba6863735efdc2f505ee9bbfdbb39409fb8591ae4341294b5236e5a61807cfb9948558a92cd5547dd
+  data.tar.gz: a090003bbe50f509df7a74059dd19a01315c659080874d384c67ab392d9ccbd79973f3b28f95c6fafef7c4989bb53b5d173834dbe6f85714c7d0f95aa33d2e19

data/lib/lumiere/version.rb

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

data/lib/lumiere.rb

@@ -18,6 +18,7 @@ class Elluminate
     @provider ||= Lumiere::Provider.delegate(url)
   end
 
+  def_delegators :@provider, :video_id, :playlist_id
   def_delegators :@provider, :provider, :upload_date
   def_delegators :@provider, :title, :description, :duration
   def_delegators :@provider, :thumbnail_small, :thumbnail_medium, :thumbnail_large

data/lib/provider/vimeo/vimeo.rb

@@ -6,7 +6,7 @@ class Vimeo < Provider
 
   def self.useable?(url)
     uri = URISchemeless.parse(url)
-    USEABLE.include?(uri.host.to_s)
+    USEABLE.include?(uri.host)
   end
 
   def initialize(url)

data/lib/provider/youtube/representer.rb

@@ -1,8 +1,6 @@
 module Lumiere
   module YouTubeVideoRepresenter
     include Representable::JSON
-    self.representation_wrap = :entry
-
     nested 'title' do
       property :title, as: '$t'
     end
@@ -13,6 +11,10 @@ module Lumiere
     end
 
     nested 'media$group' do
+      nested 'yt$videoid' do
+        property :video_id, as: '$t'
+      end
+
       nested 'media$description' do
         property :description, as: '$t'
       end
@@ -27,4 +29,12 @@ module Lumiere
       end
     end
   end
+
+  module YouTubeVideoEntryRepresenter
+    include Representable::JSON
+    nested 'entry' do
+      include YouTubeVideoRepresenter
+    end
+  end
+
 end

data/lib/provider/youtube/youtube.rb

@@ -6,14 +6,14 @@ class YouTube < Provider
 
   def self.useable?(url)
     uri = URISchemeless.parse(url)
-    USEABLE.include?(uri.host.to_s)
+    USEABLE.include?(uri.host)
   end
 
   def self.new_from_video_id(video_id)
     new("http://www.youtube.com/watch?v=#{video_id}")
   end
 
-  def initialize(url)
+  def initialize(url=nil)
     @url = url
   end
 
@@ -67,10 +67,10 @@ class YouTube < Provider
     attr_writer attribute
   end
 
-  attr_writer :thumbnails
+  attr_writer :thumbnails, :video_id
 
   def fetch!
-    self.extend(YouTubeVideoRepresenter).from_json(raw_response)
+    self.extend(YouTubeVideoEntryRepresenter).from_json(raw_response)
   end
 
   def calculate_video_id

data/lib/provider/youtubeplaylist/representer.rb

@@ -1,3 +1,6 @@
+require_relative '../youtube/youtube'
+require_relative '../youtube/representer'
+
 module Lumiere
 
   module YouTubePlaylistRepresenter
@@ -23,20 +26,7 @@ module Lumiere
       end
     end
 
-    collection :videos, as: :entry, class: OpenStruct do
-
-      nested 'links' do
-        property :url, :reader => lambda { |doc, args| self.url = doc[0]['href'] }
-      end
-
-      nested 'media$group' do
-        nested 'yt$videoid' do
-          property :video_id, as: '$t'
-        end
-      end
-
-    end
-
+    collection :videos, as: :entry, extend: YouTubeVideoRepresenter, class: YouTube
   end
 
 end

data/lib/provider/youtubeplaylist/youtubeplaylist.rb

@@ -6,7 +6,7 @@ class YouTubePlaylist < Provider
 
   def self.useable?(url)
     uri = URISchemeless.parse(url)
-    USEABLE.include?(uri.host.to_s) && (uri.path == '/playlist' || uri.path == '/view_play_list')
+    USEABLE.include?(uri.host) && (uri.path == '/playlist' || uri.path == '/view_play_list')
   end
 
   def initialize(url, opts={})

data/lib/provider.rb

@@ -18,6 +18,14 @@ module Lumiere
       raise NotImplementedError
     end
 
+    def video_id
+      raise NotImplementedError
+    end
+
+    def playlist_id
+      raise NotImplementedError
+    end
+
     def api_url
       raise NotImplementedError
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lumiere
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Karl Entwistle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable