ooyala-rails 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab721a5ab07f725f1d7b42d7642a59410fa78d03
-  data.tar.gz: fe1723e84b0c71965398df34bfd678abffa8756c
+  metadata.gz: 8271fc78f88ca0445e95108705d34e21a2ee7a2f
+  data.tar.gz: 4ecb824ad782e3188522034e5c94b82dc4c1a973
 SHA512:
-  metadata.gz: 416845241a4e4e986935ca5a2876b1b3d722ddd1312bfc0ab2bf70e6066b5903b84ba380fee98f3ca274bdc1c805113f9db9f6766014ceb6c0a68e3d9937346d
-  data.tar.gz: 1fe12a1b22592bfbe25b65ffab20cf14b9ebfb73eecedd5adad2b0feeecd4b8f914558233edd3781479a788ae003b6e36989bf26c87a36faa1d3fa259f577fe8
+  metadata.gz: 6529597444b4508e4d90f00970c393388702baef26f365090b1d6e2c6cb06e490ca5879969f1583c7d55648bc63fef28f021866991d36a39894909ba316b0a6a
+  data.tar.gz: 65ff9b19b174aa66f9859e590741ddefed0428008343761488305cb8caa9bd6c6ac513d35d25303e9553de4f209d10594b65cce3e3861d5ad10ff7daa1730b36

data/README.md

@@ -30,25 +30,25 @@ Ideally, use ENV variables instead of storing your credentials in version contro
 
 ## Usage
 
-To render a player:
+First, render the JS:
 
-    ```erb
-    <%= ooyala_player 'your_embed_code' %>
-    ```
+```erb
+<!-- using configured player_id -->
+<%= ooyala_js %>
 
-This only works when `player_id` is configured.
-
-To specify `player_id`:
+<!-- specifying player_id -->
+<%= ooyala_js player_id: 'PLAYER_ID_GOES_HERE' %>
+```
 
-    ```erb
-    <%= ooyala_player 'your_embed_code', player_id: 'PLAYER_ID_GOES_HERE' %>
-    ```
+Next, render your player(s):
 
-To add/override player options:
+```erb
+<!-- using configured player_id and default player options -->
+<%= ooyala_player 'your_embed_code' %>
 
-    ```erb
-    <%= ooyala_player 'your_embed_code', options: {autoplay: true} %>
-    ```
+<!-- specifying player_id and player options  -->
+<%= ooyala_player 'your_embed_code', player_id: 'PLAYER_ID_GOES_HERE', options: {autoplay: true} %>
+```
 
 The generated container `<div>` will require some basic CSS, eg:
 

data/app/helpers/ooyala_helper.rb

@@ -1,16 +1,21 @@
 module OoyalaHelper
+  # Generates Ooyala player JS
+  def ooyala_js(player_id: default_ooyala_player_id)
+    javascript_include_tag "//player.ooyala.com/v3/#{player_id}"
+  end
+
   # Renders Ooyala player
-  def ooyala_player(embed_code,
-                    div_id: embed_code,
-                    player_id: Ooyala::Rails.config.player_id,
-                    options: Ooyala::Rails.config.player_options || {})
-    @loaded_ooyala_js ||= Set.new
-    render('ooyala_player',
-           embed_code: embed_code,
-           div_id: div_id,
-           player_id: player_id,
-           options: options).tap do |_|
-      @loaded_ooyala_js << player_id
-    end
+  def ooyala_player(embed_code, div_id: embed_code, options: default_ooyala_player_options)
+    render 'ooyala_player', embed_code: embed_code, div_id: div_id, options: options.to_json.html_safe
+  end
+
+  private
+
+  def default_ooyala_player_id
+    Ooyala::Rails.config.player_id
+  end
+
+  def default_ooyala_player_options
+    Ooyala::Rails.config.player_options || {}
   end
 end

data/app/views/application/_ooyala_player.html.erb

@@ -1,9 +1,6 @@
-<% unless @loaded_ooyala_js.include?(player_id) %>
-<script src="http://player.ooyala.com/v3/<%= player_id %>"></script>
-<% end %>
 <div class="ooyala-player" id="<%= div_id %>"></div>
 <script type="text/javascript" charset="utf-8">
   OO.ready(function() {
-    window.player = OO.Player.create('<%= div_id %>', '<%= embed_code %>', <%= raw options.to_json %>);
+    window.player = OO.Player.create('<%= div_id %>', '<%= embed_code %>', <%= options %>);
   });
 </script>

data/lib/ooyala/rails/version.rb

@@ -1,5 +1,5 @@
 module Ooyala
   module Rails
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ooyala-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Zubin Henner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails