social_stream-linkser 0.0.1 → 0.0.2

data/app/assets/javascripts/linkser.js.erb

@@ -0,0 +1,59 @@
+var SocialStream = SocialStream || {};
+SocialStream.Linkser = SocialStream.Linkser || {};
+SocialStream.Linkser.initiate = function() {
+  $.preloadImages("assets/loading.gif");
+  var urlDetect = function() {
+    this.currentValue = $("#input_activities").val();
+    if(this.lastValue == null)
+      this.lastValue = "";
+
+    var regexp = /(http|ftp|https):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&:\/~+#-]*[\w@?^=%&\/~+#-])?/
+    if(regexp.test($("#input_activities").val())) {
+      $("#link_url").val($("#input_activities").val());
+      $("#link_loaded").val(false);
+      $("#new_post").attr("action", "/links");
+      if(this.currentValue != this.lastValue) {
+        $("#link_preview").html($('<img>').attr('src', 'assets/loading.gif').addClass('loading'));
+        this.lastValue = this.currentValue;
+        var url = this.currentValue;
+        var urlDetect = this;
+        $.ajax({
+          type : "GET",
+          url : "/linkser_parse?url=" + url,
+          success : function(html) {
+            if($("#input_activities").val() == url) {//Only show if input value is still the same
+              $("#link_preview").html(html);
+              $("#link_loaded").val(true);
+            }
+          },
+          error : function(xhr, ajaxOptions, thrownError) {
+            if($("#input_activities").val() == url) {//Only show if input value is still the same
+              $("#link_preview").html($('<div>').addClass('loading').html("<%= I18n.t('link.errors.loading') %> " + url));
+            }
+          }
+        });
+      }
+      $("#link_preview").show();
+    } else {
+      $("#new_post").attr("action", "/posts");
+      $("#link_preview").hide();
+      $("#link_preview").html("");
+      $("#link_url").val("");
+    }
+  }
+  if($("#new_post").length) {
+    $("#input_activities").change(urlDetect).keyup(urlDetect);
+    $("#new_post").append($('<input>').attr('type', 'hidden').attr('name', 'link[owner_id]').attr('id', 'link_owner_id').val($("#post_owner_id").val()));
+    $("#new_post").append($('<input>').attr('type', 'hidden').attr('name', 'link[url]').attr('id', 'link_url'));
+    $("#new_post").append($('<input>').attr('type', 'hidden').attr('name', 'link[loaded]').attr('id', 'link_loaded').val(false));
+    $("#new_post").append($('<div>').attr('id', 'link_preview').css('display', 'none'));
+  }
+}
+
+SocialStream.Linkser.openCallback = function(id,url){
+      $("#" + id).html($('<iframe>').attr('src',url).attr('width','470').attr('height','353'));
+}
+
+$(function(){
+  SocialStream.Linkser.initiate();
+});

data/app/assets/javascripts/social_stream-linkser.js

@@ -1 +1,2 @@
-//= require_tree .
+//= require_tree .
+

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

@@ -11,16 +11,32 @@
   margin: auto;
   margin-top: 40px;
 }
+#link_preview div.loading{
+  margin: auto;
+  margin-top: 50px;
+}
 .link {
   position: relative;
   padding: 10px;
 }
 .link .thumbnail, .link .thumbnail img{
+  position: relative;
   float: left;
   max-height: 100px;
   max-width: 120px;
   margin-right:10px;
 }
+.link .thumbnail img.play_button{
+  position: absolute;
+  bottom: 2px;
+  left: 2px;
+  opacity:0.6;
+  filter:alpha(opacity=60); /* For IE8 and earlier */
+}
+.link .thumbnail img.play_button:hover{
+  opacity:0.8;
+  filter:alpha(opacity=80); /* For IE8 and earlier */
+}
 .link .info{
   float: left;
   width: 360px;
@@ -39,3 +55,6 @@
 }
 .link .info .description{
 }
+.link iframe{
+  border: 0;
+} 

data/app/controllers/linkser_controller.rb

@@ -5,14 +5,7 @@ class LinkserController < ApplicationController
       o = Linkser.parse url, {:max_images => 1}
       if o.is_a? Linkser::Objects::HTML
         link = Link.new
-        link.title = o.title if o.title
-        link.description = o.description if o.description
-        link.url = o.last_url
-        if o.ogp and o.ogp.image
-          link.image = o.ogp.image
-        elsif o.images and o.images.first
-          link.image = o.images.first.url
-        end
+        link.fill o
         render :partial => "links/link_preview", :locals => {:link => link}
         return
       end

data/app/models/link.rb

@@ -15,18 +15,26 @@ class Link < ActiveRecord::Base
     has created_at
   end
 
+  def fill linkser_object
+    self.title = linkser_object.title if linkser_object.title
+    self.description = linkser_object.description if linkser_object.description
+    self.url = linkser_object.last_url
+    r = linkser_object.resource
+    if r and r.type and r.url      
+      self.callback_url = r.url
+    end
+    if linkser_object.ogp and linkser_object.ogp.image
+      self.image = linkser_object.ogp.image
+    elsif linkser_object.images and linkser_object.images.first
+      self.image = linkser_object.images.first.url
+    end
+  end
+
   def check_loaded
-    if !self.loaded.eql?"true" and self.title.nil? and self.description.nil? and self.image.nil?
+    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.title = o.title if o.title
-        self.description = o.description if o.description
-        self.url = o.last_url
-        if o.ogp and o.ogp.image
-          self.image = o.ogp.image
-        elsif o.images and o.images.first
-          self.image = o.images.first.url
-        end
+        self.fill o
       end
     end
   end

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

@@ -1,7 +1,20 @@
 <%= div_for link, :class => 'content_size' do %>
   <% if link.image %>
     <div class="thumbnail">
-      <%= link_to image_tag(link.image),link.url %>
+      <% if link.callback_url %>
+        <%= link_to image_tag(link.image),"javascript:void(0)" %>
+        <%= link_to image_tag("btn/btn_play.png", :class => "play_button"),"javascript:void(0)" %>
+        <%= javascript_tag do %>
+          $("#link_<%= link.id.to_s %> img").each(function(){
+            $(this).click(function(){
+              SocialStream.Linkser.openCallback("link_<%= link.id.to_s %>", "<%= link.callback_url %>");       
+            });
+          });
+          
+        <% end %>
+      <% else %>
+        <%= link_to image_tag(link.image),link.url, :target => "_blank" %>
+      <% end %>
     </div>
   <% end %>
   <div class="info">
@@ -11,7 +24,7 @@
       </div>
     <% end %>
     <div class="url">
-      <%= auto_link(link.url) %>
+      <%= link_to link.url, link.url, :target => "_blank" %>
     </div>
     <% if link.description %>
       <div class="description">

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

@@ -21,5 +21,8 @@
         <%= hidden_field_tag "link[description]", link.description %>
       </div>
     <% end %>
+    <% if link.callback_url %>
+        <%= hidden_field_tag "link[callback_url]", link.callback_url %>
+    <% end %>
   </div>
 <% end %>

data/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.0.1".freeze
+    VERSION = "0.0.2".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.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.10.6')
   s.add_runtime_dependency('linkser', '~> 0.0.6')
   # 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: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Eduardo Casanova Cuesta
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-05 00:00:00 +01:00
+date: 2011-12-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 59
         segments: 
         - 0
         - 10
-        - 1
-        version: 0.10.1
+        - 6
+        version: 0.10.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -169,11 +169,9 @@ files:
 - app/models/link.rb
 - app/views/links/_link.html.erb
 - app/views/links/_link_preview.html.erb
-- app/views/links/_link_with_details.html.erb
 - app/views/links/create.js.erb
 - app/views/links/destroy.js.erb
 - app/views/links/show.html.erb
-- app/views/posts/_new_activity_fields.erb
 - config/locales/en.yml
 - config/locales/es.yml
 - config/routes.rb

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

@@ -1,4 +0,0 @@
-<%= div_for link, :class => 'content_size' do %>
-  <%= simple_format link.title %>
-<% end %>
-

data/app/views/posts/_new_activity_fields.erb

@@ -1,53 +0,0 @@
-<%= f.text_field :text, :id => "input_activities", :size => 85 %>
-<%= hidden_field_tag "link[owner_id]", Actor.normalize_id(receiver) %>
-<%= hidden_field_tag "link[url]" %>
-<%= hidden_field_tag "link[loaded]", false %>
-<div id="link_preview" style="display:none;"></div>
-
-<%= javascript_tag do %>
-  $(function() {
-    $.preloadImages ("assets/loading.gif");
-    $("#input_activities").Watermark("<%= I18n.t('post.input') %>","#666");
-    
-    var urlDetect = function(){
-      this.currentValue = $("#input_activities").val();
-      if(this.lastValue==null) this.lastValue = "";
-      
-      var regexp = /(http|ftp|https):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&amp;:\/~+#-]*[\w@?^=%&amp;\/~+#-])?/
-      if(regexp.test($("#input_activities").val())){
-        $("#link_url").val($("#input_activities").val());              
-        $("#link_loaded").val(false);
-        $("#new_post").attr("action","<%= links_path %>");
-        if(this.currentValue!=this.lastValue){
-          $("#link_preview").html("<%= escape_javascript(image_tag('loading.gif', :class => :loading)) %>");          
-          this.lastValue = this.currentValue;
-          var url = this.currentValue;
-          var urlDetect = this;
-          $.ajax({
-            type : "GET",
-            url : "<%= linkser_parse_url %>?url=" + url,
-            success : function(html) {      
-              console.log("Peticion guay a " + url);
-              if ($("#input_activities").val()==url){ //Only show if input value is still the same
-                $("#link_preview").html(html);                
-                $("#link_loaded").val(true);
-              }          
-            },
-            error: function (xhr, ajaxOptions, thrownError){ 
-              $("#link_preview").html("<span class=\"loading\"><%= escape_javascript(t("link.errors.loading"))%> " + url + "</span>");
-            }         
-          });
-        }
-        $("#link_preview").show();
-      }else{
-        $("#new_post").attr("action","<%= posts_path %>");
-        $("#link_preview").hide();
-        $("#link_preview").html("");
-        $("#link_url").val(""); 
-      }
-    }      
-    $("#input_activities").change(urlDetect).keyup(urlDetect);
-    
-  });
-  
-<% end %>