lumiere 0.1.8 → 0.1.10

data/lib/embed_code/embed_code.rb

@@ -0,0 +1,44 @@
+require_relative 'src'
+require_relative 'html_object_properties'
+
+module Lumiere
+  module EmbedCode
+    extend self
+
+    def embed_code(opts = {})
+      src = generate_src(opts)
+      object_properties = generate_object_properties(opts)
+
+      generate_iframe(src, object_properties)
+    end
+
+    private
+
+    def generate_src(opts = {})
+      url_attributes = opts.fetch(:url_attributes, {})
+      default_url_attributes = default_attributes.fetch(:url_attributes, {})
+      url_properties = default_url_attributes.merge(url_attributes)
+      src_encoder.(embed_url, url_properties)
+    end
+
+    def src_encoder
+      SRC
+    end
+
+    def generate_object_properties(opts = {})
+      iframe_attributes = opts.fetch(:iframe_attributes, {})
+      default_iframe_attributes = default_attributes.fetch(:iframe_attributes, {})
+      default_iframe_attributes.merge(iframe_attributes)
+    end
+
+    def generate_iframe(src, opts)
+      opts = {src: src}.merge(opts)
+      html_options = html_object_properties.(opts)
+      "<iframe #{html_options}></iframe>"
+    end
+
+    def html_object_properties
+      HTMLObjectProperties
+    end
+  end
+end

data/lib/embed_code/html_object_properties.rb

@@ -0,0 +1,22 @@
+module Lumiere
+  module HTMLObjectProperties
+    extend self
+
+    def generate(opts={})
+      opts.map do |key, value|
+        generate_object_property(key, value)
+      end.join(' ')
+    end
+    alias_method :call, :generate
+
+    private
+
+    def generate_object_property(key, value)
+      if value.is_a?(TrueClass)
+        key #set as 'option' rather than 'option=true'
+      else
+        "#{key}=\"#{value}\""
+      end
+    end
+  end
+end

data/lib/embed_code/src.rb

@@ -0,0 +1,23 @@
+require 'open-uri'
+
+module Lumiere
+  module SRC
+    extend self
+
+    def encode(src, opts={})
+      src += www_form(opts) unless opts.empty?
+      src
+    end
+    alias_method :call, :encode
+
+    private
+
+    def www_form(opts)
+      "?" + uri.encode_www_form(opts)
+    end
+
+    def uri
+      URI
+    end
+  end
+end

data/lib/extended_uri.rb

@@ -1,3 +1,5 @@
+require 'open-uri'
+
 module Lumiere
   module URISchemeless
     def self.parse(url)

data/lib/fetcher.rb

@@ -1,33 +1,24 @@
 require 'open-uri'
 
 module Lumiere
-class Fetcher
+  module Fetcher
+    extend self
 
-  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
+    def remote_attributes(api_url, unpack_into)
+      body = scrape(api_url)
+      unpack(body, unpack_into)
     end
-    request_hash[@api_url]
-  end
 
-  private
+    private
 
-  def request_hash
-    @request_hash ||= {}
-  end
+    def unpack(body, unpack_into)
+      unpack_into.from_json(body)
+    end
 
-  def unpack
-    @unpack_into.from_json(raw_response)
-  end
+    def scrape(url)
+      body = open(url).read
+      body
+    end
 
-  def raw_response
-    open(@api_url).read
   end
-
-end
 end

data/lib/lumiere.rb

@@ -1,12 +1,5 @@
 require "lumiere/version"
-require 'open-uri'
 require 'forwardable'
-require 'net/http'
-require 'json'
-require 'representable'
-require 'representable/coercion'
-require 'representable/json'
-require 'representable/json/collection'
 
 require_relative 'provider'
 

data/lib/lumiere/version.rb

@@ -1,3 +1,3 @@
 module Lumiere
-  VERSION = "0.1.8"
+  VERSION = "0.1.10"
 end

data/lib/provider.rb

@@ -1,7 +1,9 @@
+require 'net/http'
+
 require_relative 'extended_uri'
 require_relative 'playlist'
 require_relative 'fetcher'
-require_relative 'embed_code'
+require_relative 'embed_code/embed_code'
 
 module Lumiere
   class Provider
@@ -9,7 +11,6 @@ module Lumiere
     PROVIDERS = %w(YouTubePlaylist VimeoPlaylist YouTube Vimeo Dailymotion)
     PROVIDERS.each do |provider|
       require_relative "provider/#{provider.downcase}/#{provider.downcase}"
-      require_relative "provider/#{provider.downcase}/representer"
     end
 
     def self.delegate(url)

data/lib/provider/dailymotion/dailymotion.rb

@@ -1,3 +1,6 @@
+require_relative 'representer'
+require_relative '../../provider'
+
 module Lumiere
 class Dailymotion < Provider
   attr_accessor :url
@@ -75,7 +78,7 @@ class Dailymotion < Provider
   private
 
   def fetch
-    @fetch ||= Fetcher.new(self).remote_attributes
+    @fetch ||= Fetcher.remote_attributes(api_url, unpack_into)
   end
 
   def calculate_video_id

data/lib/provider/dailymotion/representer.rb

@@ -1,3 +1,7 @@
+require 'representable'
+require 'representable/coercion'
+require 'representable/json'
+
 module Lumiere
   module DailymotionVideoRepresenter
     include Representable::JSON

data/lib/provider/vimeo/representer.rb

@@ -1,3 +1,8 @@
+require 'representable'
+require 'representable/coercion'
+require 'representable/json'
+require 'representable/json/collection'
+
 module Lumiere
   module VimeoVideoRepresenter
     include Representable::JSON

data/lib/provider/vimeo/vimeo.rb

@@ -1,3 +1,6 @@
+require_relative 'representer'
+require_relative '../../provider'
+
 module Lumiere
 class Vimeo < Provider
   attr_accessor :url
@@ -82,7 +85,7 @@ class Vimeo < Provider
   private
 
   def fetch
-    @fetch ||= Fetcher.new(self).remote_attributes[0]
+    @fetch ||= Fetcher.remote_attributes(api_url, unpack_into)[0]
   end
 
   def calculate_video_id

data/lib/provider/vimeoplaylist/representer.rb

@@ -1,3 +1,7 @@
+require 'representable'
+require 'representable/coercion'
+require 'representable/json'
+
 module Lumiere
   module VimeoPlaylistRepresenter
     include Representable::JSON

data/lib/provider/vimeoplaylist/vimeoplaylist.rb

@@ -1,3 +1,6 @@
+require_relative 'representer'
+require_relative '../../provider'
+
 module Lumiere
 class VimeoPlaylist < Provider
   attr_accessor :url
@@ -80,7 +83,7 @@ class VimeoPlaylist < Provider
   private
 
   def fetch
-    @fetch ||= Fetcher.new(self).remote_attributes
+    @fetch ||= Fetcher.remote_attributes(api_url, unpack_into)
   end
 
   def calculate_playlist_id
@@ -128,7 +131,7 @@ class VimeoPlaylist < Provider
     end
 
     def fetch
-      Fetcher.new(self).remote_attributes
+      Fetcher.remote_attributes(api_url, unpack_into)
     end
 
     def page_count

data/lib/provider/youtube/representer.rb

@@ -1,3 +1,8 @@
+require 'representable'
+require 'representable/coercion'
+require 'representable/json'
+require 'representable/json/collection'
+
 module Lumiere
   module YouTubeVideoRepresenter
     include Representable::JSON

data/lib/provider/youtube/youtube.rb

@@ -1,3 +1,6 @@
+require_relative 'representer'
+require_relative '../../provider'
+
 module Lumiere
 class YouTube < Provider
   attr_accessor :url
@@ -80,7 +83,7 @@ class YouTube < Provider
   private
 
   def fetch
-    @fetch ||= Fetcher.new(self).remote_attributes
+    @fetch ||= Fetcher.remote_attributes(api_url, unpack_into)
   end
 
   def calculate_video_id

data/lib/provider/youtubeplaylist/representer.rb

@@ -1,3 +1,8 @@
+require 'representable'
+require 'representable/coercion'
+require 'representable/json'
+require 'representable/json/collection'
+
 require_relative '../youtube/youtube'
 require_relative '../youtube/representer'
 

data/lib/provider/youtubeplaylist/youtubeplaylist.rb

@@ -1,3 +1,6 @@
+require_relative 'representer'
+require_relative '../../provider'
+
 module Lumiere
 class YouTubePlaylist < Provider
   attr_accessor :url
@@ -104,7 +107,7 @@ class YouTubePlaylist < Provider
   end
 
   def fetch!
-    Fetcher.new(self).remote_attributes
+    Fetcher.remote_attributes(api_url, unpack_into)
   end
 
   def calculate_playlist_id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lumiere
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.5
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
@@ -64,33 +64,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
-- lib/embed_code.rb
+- lib/embed_code/embed_code.rb
+- lib/embed_code/html_object_properties.rb
+- lib/embed_code/src.rb
 - lib/extended_uri.rb
 - lib/fetcher.rb
 - lib/lumiere/version.rb

data/lib/embed_code.rb

@@ -1,55 +0,0 @@
-require 'open-uri'
-
-module Lumiere
-  module EmbedCode
-    extend self
-
-    def embed_code(opts = {})
-      iframe_attributes = opts.fetch(:iframe_attributes, {})
-      url_attributes = opts.fetch(:url_attributes, {})
-
-      default_iframe_attributes = default_attributes.fetch(:iframe_attributes, {})
-      default_url_attributes = default_attributes.fetch(:url_attributes, {})
-
-      object_properties = default_iframe_attributes.merge(iframe_attributes)
-      url_properties = default_url_attributes.merge(url_attributes)
-
-      generate(embed_url, url_properties, object_properties)
-    end
-
-    private
-
-    def generate(src, url_properties={}, object_properties={})
-      src = generate_src(src, url_properties)
-      object_properties = {src: src}.merge(object_properties)
-      generate_html_object('iframe', object_properties)
-    end
-
-    def generate_src(src, url_properties)
-      if !url_properties.empty?
-        src += "?" + URI.encode_www_form(url_properties)
-      else
-        src
-      end
-    end
-
-    def generate_html_object(object_name, opts)
-      html_options = generate_object_properties(opts)
-      "<#{object_name} #{html_options}></#{object_name}>"
-    end
-
-    def generate_object_properties(opts={})
-      opts.map do |key, value|
-        generate_object_property(key, value)
-      end.join(' ')
-    end
-
-    def generate_object_property(key, value)
-      if value.is_a?(TrueClass)
-        key #set as 'option' rather than 'option=true'
-      else
-        "#{key}=\"#{value}\""
-      end
-    end
-  end
-end