social_stream-linkser 1.1.2 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b091772880bd736561f95b768fb6cb9916fd0aaa
-  data.tar.gz: 5ac6d346988eb31990b909717192457b1f6f705b
+  metadata.gz: 6e81202e3b1f8e17ad5a375ab065279fd6de2cb7
+  data.tar.gz: ee84dc147dda1da36e2a48d48dedc116ee7f56f4
 SHA512:
-  metadata.gz: d9a147fc7182da3417cfcfa7ac92e59ad87937b23c93929d5c7903f52fb3c2e7d70e3193fcd4dd701b49daef4b10eea2fc326ec5ae4253a3a1e6482f3c8d4634
-  data.tar.gz: 62ea29ca6943211c6cbb990868315266636badb56f400a336c827ec042cd233e4916cd695fffbee31d6d00cfdac4542a300d89e317ad2a329430ef336bccdb76
+  metadata.gz: 7d1b2cac8fd26b282d19736b56ee0fc8171251507fd900623ae81b059fd14a053634e7e230f4766d230455b7206a0bce8b0cef41ff87c5f680bcc352c90445a2
+  data.tar.gz: 3df3e6ae878a3aa5572a31d584bcea8062c9622776701c9fd0b19a02952dd32b4f645e8b4465d70b16494c35ee4b91f63dcb5eb9dba27cc64973f827e17f632e

data/app/assets/javascripts/social_stream/link.js

@@ -0,0 +1,30 @@
+//= require social_stream/callback
+
+SocialStream.Link = (function(SS, $) {
+  var callback = new SS.Callback();
+
+  var bindOpenCallback = function() {
+    $('.link .play_over').click(openCallback);
+  };
+
+  var openCallback = function(){
+    var url = $(this).attr('data-url'),
+        h   = $(this).attr('data-height'),
+        w   = $(this).attr('data-width'),
+        height = '353';
+
+    if(w>0 && h>0) {
+      height=470*h/w;
+    }
+
+    $(this).closest('.link').html($('<iframe>').attr('src',url).attr('width','470').attr('height',height));
+  };
+
+  callback.register('index', bindOpenCallback);
+
+  callback.register('show', bindOpenCallback);
+
+  return callback.extend({
+  });
+  
+})(SocialStream, jQuery);

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

@@ -0,0 +1,6 @@
+//= require social_stream/timeline
+//= require social_stream/link
+
+SocialStream.Timeline.callbackRegister('show', SocialStream.Link.index);
+
+SocialStream.Timeline.callbackRegister('update', SocialStream.Link.index);

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

@@ -0,0 +1,91 @@
+//= require social_stream/wall
+
+SocialStream.Linkser.Wall = (function(SS, $) {
+  var regexp = /^(http|ftp|https):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&;:\/~+#-]*[\w@?^=%&;\/~+#-])?$/
+
+  var urlDetect = function() {
+    this.currentValue = $("#post_text").val();
+
+    if (this.lastValue === null) {
+      this.lastValue = "";
+    }
+
+    if (regexp.test($("#post_text").val())) {
+      $("#link_url").val($("#post_text").val());
+      $("#link_loaded").val(false);
+      SS.Wall.changeAction($('#link_preview_loading').attr('data-link_path'));
+      SS.Wall.changeRelationSelect('link');
+
+      if(this.currentValue != this.lastValue) {
+        showLoading();
+
+        this.lastValue = this.currentValue;
+        var url = this.currentValue;
+        var urlDetect = this;
+
+        $.ajax({
+          type : "GET",
+          url : "/linkser_parse?url=" + url,
+          dataType: 'html',
+          success : function(html) {
+            if($("#post_text").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($("#post_text").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 {
+      resetWallInput({ postText: false });
+    }
+  }
+
+  var resetWallInput = function(options) {
+    $("#new_post").attr("action", "/posts");
+    $("#link_preview").hide().html('');
+    $("#link_url").val("");
+    SS.Wall.changeAction();
+    SS.Wall.changeRelationSelect('post');
+
+    if (options.postText) {
+      $('#post_text').val('');
+    }
+  };
+
+  var showLoading = function() {
+    $('#link_preview').html($('#link_preview_loading').html());
+  }
+
+  var init = function(){
+    $('#link_preview_loading').hide();
+
+    if ($("#new_post").length) {
+      $("#post_text").change(urlDetect).keyup(urlDetect);
+
+      $("#post_text").after(
+        $('<div>', {
+          id: 'link_preview'
+        }).css('display', 'none')
+      );
+    }
+  }
+
+
+  var create = function() {
+    resetWallInput({ postText: true });
+  };
+
+  SocialStream.Wall.callbackRegister('show', init);
+
+  return {
+    create: create
+  }
+
+})(SocialStream, jQuery);

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

@@ -1,6 +1,6 @@
 //= require social_stream-base
 //
 //= require_self
-//= require_tree .
+//= require_tree ./social_stream
 
 SocialStream.Linkser = SocialStream.Linkser || {};

data/app/assets/stylesheets/social_stream/linkser/explore/search/layout/_search-result.css.sass

@@ -0,0 +1,13 @@
+#search-result
+  .link
+    display: inline-block
+    @include makeColumn(3, 0)
+    .thumbnail
+      @include makeColumnoMargin(1, 0)
+      display: inline
+    .info
+      @include makeColumnoMargin(2, 0)
+      display: inline-block
+      title
+        margin-bottom: 2px
+      .description

data/app/assets/stylesheets/social_stream/linkser/explore/timeline/layout/_timeline-result.css.sass

@@ -0,0 +1,15 @@
+.objects
+  .link
+    display: inline-block
+    margin-left: 0px
+    .thumbnail
+      @include makeColumnoMargin(1, 0)
+      display: inline
+    .text
+      width: 50%
+      display: inline-block
+    h6
+      margin: 1px 0 3px
+    .url
+      margin-bottom: 6px
+      .description

data/app/assets/stylesheets/social_stream/linkser/repository/_repository.css.sass

@@ -0,0 +1,15 @@
+/////////////////////////////////////// EXPLORE SEARCH
+///////////// 
+
+#repository
+
+  .link
+    .brifing
+      .h5
+        a
+          font-size: 12px
+      .author
+        @include ellipsis
+        font-size: 12px
+        color: #888
+  

data/app/assets/stylesheets/social_stream/linkser/repository/layout/_repository.css.sass

@@ -0,0 +1,27 @@
+/////////////////////////////////////// EXPLORE SEARCH
+///////////// 
+
+#repository
+
+  .link
+    width: 240px
+    float: left
+    margin-left: 19px
+    min-height: 81px
+    margin-bottom: 14px
+    .thumb
+      float: left
+      margin-left: 0px
+      width: 60px
+      display: inline
+      margin-top: 14px
+    .brifing
+      float: left
+      margin-left: 0px
+      width: 175px
+      display: inline-block
+      h5
+        margin-bottom: 0px
+        @include ellipsis
+      a
+        @include ellipsis

data/app/assets/stylesheets/social_stream/linkser/timeline/_timeline-link.css.sass

@@ -0,0 +1,26 @@
+#link_preview
+  background-color: #f4f4f4
+  @include border-bottom-radius(5px)
+  .info
+    .title,
+    .description 
+      
+      input,
+      textarea
+        @include border-radius(5px)
+
+  .link_error
+    color: #9d261d
+  
+#link_description
+  @include border-radius(5px)
+  resize: none
+
+.link_height
+  background-color: $black
+
+.activity_objects
+  .attachment_thumb
+    background: black
+    .attachment_text_link
+      font-size: 14px

data/app/assets/stylesheets/social_stream/linkser/timeline/layout/_timeline-link.css.sass

@@ -0,0 +1,44 @@
+#link_preview
+  padding: 9px
+  img
+    display: inline
+    margin-right: 2px
+  .info
+    .title,
+    .description 
+      input,
+      textarea
+        padding: 5px
+    .description
+      p
+        a
+          display: block
+
+  .link_error
+    display: inline-block
+
+
+
+.activity_objects
+  margin-left: 56px
+  .attachment_thumb
+    @include makeColumnoMargin(1, 0)
+    .attachment_text_link
+      font-size: 14px
+      .post 
+        p 
+          margin: 0 0 4px
+
+.link
+  display: inline
+  margin-left: 19px
+  .thumb
+    @include makeColumnoMargin(1, 0)
+    display: inline
+  .text
+    width: 97%
+    display: inline-block
+    .description
+      p
+        a
+          display: block 

data/app/assets/stylesheets/social_stream-linkser.css.sass

@@ -0,0 +1,20 @@
+@import "social_stream/linkser/timeline/timeline-link"
+
+@import "social_stream/linkser/timeline/layout/timeline-link"
+
+
+
+
+@import "social_stream/linkser/explore/search/layout/search-result"
+
+
+
+
+@import "social_stream/linkser/explore/timeline/layout/timeline-result"
+
+
+
+
+@import "social_stream/linkser/repository/repository"
+
+@import "social_stream/linkser/repository/layout/repository"

data/app/controllers/links_controller.rb

@@ -12,6 +12,6 @@ class LinksController < ApplicationController
   private
 
   def allowed_params
-    [ :url, :image ]
+    [ :url, :image, :callback, :width, :height ]
   end
 end

data/app/models/link.rb

@@ -31,15 +31,22 @@ class Link < ActiveRecord::Base
   end
 
   def check_loaded
-    if !self.loaded.eql? "true" and self.title.nil? and self.description.nil? and self.image.nil?
-      begin
-        o = Linkser.parse self.url, {:max_images => 1}
-        if o.is_a? Linkser::Objects::HTML
-          self.fill o
-        end
-      rescue
+    return if loaded.present?
+    begin
+      o = Linkser.parse self.url, {:max_images => 1}
+
+      if o.is_a? Linkser::Objects::HTML
+        self.fill o
       end
+    rescue
     end
   end
 
+  def improved_callback_url
+    if callback_url =~ /youtube\.com\/v\/.+/
+      callback_url + '&autoplay=1'
+    else
+      callback_url
+    end
+  end
 end

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

@@ -1,37 +1,16 @@
-<%= div_for link, :class => 'content_size' do %>
-  <% if link.image %>
-    <div class="thumbnail">
-      <% 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.Wall.openCallback("link_<%= link.id.to_s %>", "<%= link.callback_url %>", "<%= link.width %>", "<%= link.height %>");
-            });
-          });
-          
-        <% end %>
-      <% else %>
-        <%= link_to image_tag(link.image),link.url, :target => "_blank" %>
-      <% end %>
-    </div>
-  <% end %>
-  <div class="info">
-    <% if link.title %>
-      <div class="title">
-        <%= link.title %>
-      </div>
-    <% end %>
-    <div class="url">
-      <%= link_to link.url, link.url, :target => "_blank" %>
-    </div>
-    <% if link.description %>
-      <div class="description">
-        <%= auto_link(link.description) %>
-      </div>
-    <% end %>
+<div class="link">
+  <div class="thumb">
+    <i class='icon_file_50-link'></i>
   </div>
-<% end %>
+  <div class="brifing">
+    <h5>
+      <%= link_to truncate(link.title), link.url %>
+    </h5>
+
+    <%= link_to truncate(link.url), link.url %>
 
-<br class="clearfloat">
+    <div class="author">
+      <%= raw t('link.by', author: link_to(link.author.name, link.author_subject)) %>
+    </div>
+  </div>
+</div>

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

@@ -1,4 +1,4 @@
-<%= div_for link, :class => 'content_size' do %>
+<%= div_for link do %>
   <% if link.image %>
     <div class="thumbnail">
       <%= image_tag(link.image)%>

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

@@ -0,0 +1,6 @@
+<%= 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_loading" data-link_path="<%= links_path %>">
+  <%= render partial: 'layouts/loading' %>
+</div>

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

@@ -0,0 +1,7 @@
+<div class="link">
+  <div class="brifing">
+    <h5>
+      <%= link_to truncate(link.title), link.url %>
+    </h5>
+  </div>
+</div>

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

@@ -0,0 +1 @@
+<%= render link %>

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

@@ -0,0 +1,26 @@
+<%= div_for link do %>
+  <% if link.image %>
+    <div class="thumb">
+      <% if link.callback_url %>
+        <%= image_tag(link.image) %>
+        <div class="play_over" data-url="<%= link.improved_callback_url %>" data-width="<%= link.width %>" data-height="<%= link.height %>"></div>
+      <% else %>
+        <%= link_to image_tag(link.image),link.url, :target => "_blank" %>
+      <% end %>
+    </div>
+  <% end %>
+  <div class="text">
+    <% if link.title %>
+      <h6>
+        <%= link.title %>
+      </h6>
+    <% end %>
+    <div class="url">
+      <%= link_to link.url, link.url, :target => "_blank" %>
+    </div>
+
+    <%= render partial: 'objects/timeline_description',
+               object: link,
+               as: :obj %>
+  </div>
+<% end %>

data/app/views/links/create.js.erb

@@ -1,13 +1,6 @@
 //Display the new post
-$("#wall").prepend("<%= escape_javascript(render @link.post_activity) %>");
-
-SocialStream.Timeline.create("<%= escape_javascript dom_id(@link.post_activity) %>");
-
-$("#link_preview").hide();
-$("#link_preview").html("");          
-$("#link_loaded").val(false);
-$("#link_preview").html("");
-$("#link_url").val("");
-
+$(".timeline").prepend("<%= escape_javascript(render @link.post_activity) %>");
 
+SocialStream.Timeline.update();
 
+SocialStream.Linkser.Wall.create();

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

@@ -1,4 +1,6 @@
-<%= render :partial => 'objects/show',
-           :locals  => { :object => @link } %>
+<section id="link">
+  <%= render :partial => 'objects/show',
+             :locals  => { :object => @link } %>
 
-<%= render @link.post_activity %>
+  <%= render @link.post_activity %>
+</section>

data/config/locales/en.yml

@@ -2,6 +2,7 @@ en:
   linkser:
     title: "Linkser"
   link:
+    by: "by %{author}"
     confirm_delete: "Delete link?"
     errors:
       loading: "Error loading"
@@ -11,4 +12,5 @@ en:
     input: "Write the web address"
     name: "link"
     one: "a link"
-    title: "Links"  
+    other: "links"
+    title: "Links"  

data/config/locales/es.yml

@@ -2,6 +2,7 @@ es:
   linkser:
     title: "Linkser"
   link:
+    by: "por %{author}"
     confirm_delete: "¿Borrar enlace?"
     errors:
       loading: "Error cargando"
@@ -10,5 +11,6 @@ es:
       title: "Enlace"
     input: "Escribe una dirección"
     name: "enlace"
-    one: "una enlace"
-    title: "Enlaces"
+    one: "un enlace"
+    other: "enlaces"
+    title: "Enlaces"

data/lib/generators/social_stream/linkser/install_generator.rb

@@ -17,8 +17,7 @@ class SocialStream::Linkser::InstallGenerator < Rails::Generators::Base
   end
 
   def require_stylesheets
-    inject_into_file 'app/assets/stylesheets/application.css',
-                     " *= require social_stream-linkser\n",
-                     :before => ' *= require_tree .'
+    append_file 'app/assets/stylesheets/social_stream.css.sass',
+                "@import social_stream-linkser\n"
   end
 end

data/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "1.1.2".freeze
+    VERSION = "2.0.0.beta1".freeze
   end
 end

data/lib/social_stream-linkser.rb

@@ -1,15 +1,14 @@
 require 'social_stream-base'
+
 require 'linkser'
 
 module SocialStream
   module Linkser
-    # Add :link to SocialStream.objects and SocialStream.activity_forms by default
+    # Add :link to SocialStream.objects and others by default
     # It can be configured by users at application's config/initializers/social_stream.rb
-    #%w(objects activity_forms).each do |m|
-    %w(objects).each do |m|
+    %w(objects activity_forms quick_search_models extended_search_models repository_models).each do |m|
       SocialStream.__send__(m).push(:link) unless SocialStream.__send__(m).include?(:link)
     end
-    
   end
 end
 

data/lib/tasks/db/populate.rake

@@ -0,0 +1,20 @@
+namespace :db do
+  namespace :populate do
+
+    desc "Create populate data with links"
+    task :create => 'create:links'
+
+    namespace :create do
+      desc "Add links to populate data"
+      task :links => :read_environment do
+        SocialStream::Population::ActivityObject.new Link do |l|
+          l.loaded = true
+          l.title = Forgery::LoremIpsum.words(1+rand(4),:random => true)
+          l.description = Forgery::LoremIpsum.sentences(1+rand(4), :random => true)
+
+          l.url = "http://#{ Forgery::Internet.domain_name }"
+        end
+      end
+    end
+  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', '~> 1.1.11')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta1')
   s.add_runtime_dependency('linkser', '~> 0.0.12')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')