concerto_remote_video 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aab3b8075e04c908c8d1bf42f470500d2e46cb3
-  data.tar.gz: 1f57acecf847a89146474c546ddd804d65ff4bf8
+  metadata.gz: 668a7869c8c3e2fc077921b8ccdb429e0c190cb6
+  data.tar.gz: 53a607f86828229695bd1183260d7c2cf35b14f4
 SHA512:
-  metadata.gz: 833b63f0ff0eabd8a230c086b27f2e21e49705268c9d2e4216158ee099bf18192ab6a4cfbdacdcbc66ac36f8661a028ee06054747e5146ab9fda218b05d43f48
-  data.tar.gz: 5b48a286e376a729791c6e0779dcd6a5efa77fc5886194cdbd51da33fe109f8e5283d22e61a3b60ffa657bd4332afb18ec83539acc173043fda3000ded5cee49
+  metadata.gz: 7d417af2d9efd7f60457768d738e7f45cf2526a5304278dc19f63b84301638809b69d8e5492534cc48f6835d3b450819e9cec2799a87a64da67bb0a3910a0e71
+  data.tar.gz: e275f1124329f43ef59c9f88156843c75a4fa11c6e0a56d44b453c219b185f97c21fc8eb6dce53f2c0f408a2510071762220a282adf2c42aa4875cc5ec1a9173

data/app/models/remote_video.rb

@@ -1,7 +1,9 @@
 class RemoteVideo < Content
-  after_initialize :set_kind, :create_config, :load_info
+  after_initialize :set_kind, :create_config#, :load_info
 
   after_find :load_config
+
+  before_validation :load_info
   before_validation :save_config
 
   validate :video_id_must_exist
@@ -55,20 +57,26 @@ class RemoteVideo < Content
   def load_info
     # dont abort if there is a duration specified
     return if self.config['video_id'].nil? #|| !self.duration.nil?
+    return if !self.new_record?
+
     require 'net/http'
     if self.config['video_vendor'] == VIDEO_VENDORS[:YouTube][:id]
-      #begin
+      begin
         video_id = URI.escape(self.config['video_id'])
         url = "http://gdata.youtube.com/feeds/api/videos?q=#{video_id}&v=2&max-results=1&format=5&alt=jsonc"
         json = Net::HTTP.get_response(URI.parse(url)).body
         data = ActiveSupport::JSON.decode(json)
-      #rescue
-      #  Rails.logger.debug("YouTube not reachable @ #{url}.")
-      #  config['video_id'] = ''
-      #  return
-      #end
+      rescue MultiJson::ParseError => e
+        Rails.logger.error("Could not parse results from YouTube @ #{url}: #{e.message}: #{json}")
+        errors.add(:video_id, "Could not parse results from YouTube")
+        return
+      rescue
+        Rails.logger.error("YouTube not reachable @ #{url}.")
+        errors.add(:video_id, "Could not get information about video from YouTube")
+        return
+      end
       if data['data']['totalItems'].to_i <= 0
-        Rails.logger.debug('No video found from ' + url)
+        Rails.logger.error('No video found from ' + url)
         self.config['video_id'] = ''
         return
       end
@@ -80,10 +88,8 @@ class RemoteVideo < Content
       self.config['title'] = video_data['title']
       self.config['description'] = video_data['description']
     elsif self.config['video_vendor'] == VIDEO_VENDORS[:Vimeo][:id]
-      #todo: put these info urls in the VV constant
-      #http://vimeo.com/api/v2/video/video_id.json
       data=[]
-      #begin
+      begin
         video_id = URI.escape(self.config['video_id'])
         url = "http://vimeo.com/api/v2/video/#{video_id}.json"
         uri = URI.parse(url)
@@ -94,11 +100,11 @@ class RemoteVideo < Content
           json = response.body
           data = ActiveSupport::JSON.decode(json)
         end
-      #rescue
-      #  Rails.logger.debug("YouTube not reachable @ #{url}.")
-      #  config['video_id'] = ''
-      #  return
-      #end
+      rescue => e
+        Rails.logger.error("Could not get information about video from Vimeo @ #{url}: #{e.message}")
+        config['video_id'] = ''
+        return
+      end
       if data.empty?
         Rails.logger.debug('No video found from ' + url)
         self.config['video_id'] = ''

data/app/views/contents/remote_video/_form_middle.html.erb

@@ -9,12 +9,3 @@
 
   <%= render :partial => 'contents/form_elements/dates', :locals => {:form => form} %>
 </fieldset>
-
-<fieldset>
-  <legend><span><%=t('contents.submit_to_feeds')%></span></legend>
-  <div class="clearfix">
-    <% if @content.new_record? %>
-      <%= render :partial => 'contents/form_elements/feeds' %>
-    <% end %>
-  </div>
-</fieldset>

data/lib/concerto_remote_video/version.rb

@@ -1,3 +1,3 @@
 module ConcertoRemoteVideo
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerto_remote_video
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Brian Michalski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails