social_stream-linkser 0.0.4 → 0.0.5

data/app/assets/stylesheets/linkser.css.scss

@@ -15,6 +15,14 @@
   margin: auto;
   margin-top: 50px;
 }
+#link_preview img.link_error{
+  margin: auto;
+  margin-top: 40px;
+}
+#link_preview div.link_error{
+  margin: auto;
+  margin-top: 5px;
+}
 .link {
   position: relative;
   padding: 10px;

data/app/controllers/linkser_controller.rb

@@ -2,14 +2,19 @@ class LinkserController < ApplicationController
   def index
     if params[:url].present?
       url = params[:url]
-      o = Linkser.parse url, {:max_images => 1}
-      if o.is_a? Linkser::Objects::HTML
-        link = Link.new
-        link.fill o
-        render :partial => "links/link_preview", :locals => {:link => link}
-        return
+      begin
+        o = Linkser.parse url, {:max_images => 1}
+        if o.is_a? Linkser::Objects::HTML
+          link = Link.new
+          link.fill o
+          render :partial => "links/link_preview", :locals => {:link => link}
+          return
+        end
+      rescue
+        render :partial => "links/error", :locals => {:message => I18n.t("link.errors.loading") + " " + url.to_s}     
+        return   
       end
     end    
-        render :text => I18n.t("link.errors.only_web")
+    render :partial => "links/error", :locals => {:message => I18n.t("link.errors.only_webs")}
   end
 end

data/app/models/link.rb

@@ -32,9 +32,12 @@ class Link < ActiveRecord::Base
 
   def check_loaded
     if !self.loaded.eql? "true" and self.title.nil? and self.description.nil? and self.image.nil?
-      o = Linkser.parse self.url, {:max_images => 1}
-      if o.is_a? Linkser::Objects::HTML
-        self.fill o
+      begin
+        o = Linkser.parse self.url, {:max_images => 1}
+        if o.is_a? Linkser::Objects::HTML
+          self.fill o
+        end
+      rescue
       end
     end
   end

data/app/views/links/_error.html.erb

@@ -0,0 +1,4 @@
+<%= image_tag "btn/error.png", :class => "link_error" %>   
+<div class="link_error">
+  <%= message %>
+</div>

data/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.0.4".freeze
+    VERSION = "0.0.5".freeze
   end
 end

data/social_stream-linkser.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.10.7')
+  s.add_runtime_dependency('social_stream-base', '~> 0.10.8')
   s.add_runtime_dependency('linkser', '~> 0.0.7')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-linkser
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Eduardo Casanova Cuesta
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-09 00:00:00 +01:00
+date: 2011-12-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 39
         segments: 
         - 0
         - 10
-        - 7
-        version: 0.10.7
+        - 8
+        version: 0.10.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -167,6 +167,7 @@ files:
 - app/controllers/links_controller.rb
 - app/controllers/linkser_controller.rb
 - app/models/link.rb
+- app/views/links/_error.html.erb
 - app/views/links/_link.html.erb
 - app/views/links/_link_preview.html.erb
 - app/views/links/create.js.erb