social_stream 2.0.0.beta2 → 2.0.0.beta3

data/lib/social_stream/components.rb

@@ -0,0 +1,4 @@
+module SocialStream
+  RELEASED_COMPONENTS = %w( base documents events linkser presence ostatus oauth2_server )
+  ALL_COMPONENTS = RELEASED_COMPONENTS + %w( places )
+end

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "2.0.0.beta2".freeze
+  VERSION = "2.0.0.beta3".freeze
 end

data/lib/tasks/i18n.rake

@@ -0,0 +1,55 @@
+namespace :i18n do
+  desc "Synchronize i18n files"
+  task "sync" do
+    require 'yaml'
+    require 'social_stream/components'
+
+    Hash.class_eval do
+      def sync(h)
+        en_hash = h.dup
+
+        each_key do |self_key|
+#          require 'debugger'; debugger
+          en_val = en_hash.delete(self_key)
+
+          case en_val
+          when NilClass
+            delete(self_key)
+          when Hash
+            if self[self_key].is_a?(Hash)
+              self[self_key].sync(en_val)
+            else
+              self[self_key] = en_val
+            end
+          when String
+            if self[self_key].nil?
+              self[self_key] = en_val
+            end
+          else
+            raise "Unkown key type #{ en_val.inspect }"
+          end
+        end
+
+        merge! en_hash
+      end
+    end
+
+    SocialStream::ALL_COMPONENTS.each do |c|
+      path = "#{ c }/config/locales/"
+      files = Dir[path + '*'].select{ |f| f =~ /\/\w+\.yml$/ }
+      en = files.find{ |f| f =~ /\/en.yml$/ }
+      files.delete(en)
+      en_h = Psych.load_file(en)
+
+      files.each do |f|
+        h = Psych.load_file(f)
+
+        h.first.last.sync en_h.first.last
+
+        Psych.dump h, File.open(f, 'w')
+      end
+
+      Psych.dump en_h, File.open(en, 'w')
+    end
+  end
+end

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

@@ -11,9 +11,12 @@ SocialStream.Linkser.Wall = (function(SS, $) {
     }
 
     if (regexp.test($("#post_text").val())) {
+      $('#post_text').data('link', true);
+
       $("#link_url").val($("#post_text").val());
       $("#link_loaded").val(false);
       SS.Wall.changeAction($('#link_preview_loading').attr('data-link_path'));
+      SS.Wall.changeOwner('link');
       SS.Wall.changeRelationSelect('link');
 
       if(this.currentValue != this.lastValue) {
@@ -43,15 +46,18 @@ SocialStream.Linkser.Wall = (function(SS, $) {
 
       $("#link_preview").show();
     } else {
-      resetWallInput({ postText: false });
+      if ($('#post_text').data('link')) {
+        $('#post_text').data('link', false);
+        resetWallInput({ postText: false });
+      }
     }
-  }
+  };
 
   var resetWallInput = function(options) {
-    $("#new_post").attr("action", "/posts");
     $("#link_preview").hide().html('');
     $("#link_url").val("");
     SS.Wall.changeAction();
+    SS.Wall.changeOwner('post');
     SS.Wall.changeRelationSelect('post');
 
     if (options.postText) {
@@ -61,7 +67,7 @@ SocialStream.Linkser.Wall = (function(SS, $) {
 
   var showLoading = function() {
     $('#link_preview').html($('#link_preview_loading').html());
-  }
+  };
 
   var init = function(){
     $('#link_preview_loading').hide();
@@ -75,7 +81,7 @@ SocialStream.Linkser.Wall = (function(SS, $) {
         }).css('display', 'none')
       );
     }
-  }
+  };
 
 
   var create = function() {
@@ -86,6 +92,6 @@ SocialStream.Linkser.Wall = (function(SS, $) {
 
   return {
     create: create
-  }
+  };
 
 })(SocialStream, jQuery);

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

@@ -25,3 +25,4 @@
         @include ellipsis
       a
         @include ellipsis
+        font-size: 14px

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

@@ -35,9 +35,12 @@
     margin-left: 19px
     width: 100%
     .thumb
-      @include makeColumnoMargin(2, 0)
+      width: 170px
       display: inline
       margin-right: 16px
+      float: left
+      img
+        float: left
     .text
       width: 54%
       display: inline-block
@@ -45,6 +48,8 @@
         p
           a
             display: block 
+    iframe
+      width: 100%
   .actions
     width: 100%
     display: inline-block

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

@@ -1,4 +1,3 @@
-<%= 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 %>">

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

@@ -1,6 +1,6 @@
 <%= div_for link do %>
   <% if link.image %>
-    <div class="thumb">
+    <div class="thumb <%= 'thumb-play' if link.callback_url %>">
       <% 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>

data/linkser/config/locales/en.yml

@@ -1,16 +1,17 @@
+---
 en:
   linkser:
-    title: "Linkser"
+    title: Linkser
   link:
-    by: "by %{author}"
-    confirm_delete: "Delete link?"
+    by: by %{author}
+    confirm_delete: Delete link?
     errors:
-      loading: "Error loading"
-      only_webs: "Only webpages are supported"
+      loading: Error loading
+      only_webs: Only webpages are supported
     form:
-      title: "Link"
-    input: "Write the web address"
-    name: "link"
-    one: "a link"
-    other: "links"
-    title: "Links"  
+      title: Link
+    input: Write the web address
+    name: link
+    one: a link
+    other: links
+    title: Links

data/linkser/config/locales/es.yml

@@ -1,16 +1,17 @@
+---
 es:
   linkser:
-    title: "Linkser"
+    title: Linkser
   link:
-    by: "por %{author}"
-    confirm_delete: "¿Borrar enlace?"
+    by: por %{author}
+    confirm_delete: ¿Borrar enlace?
     errors:
-      loading: "Error cargando"
-      only_webs: "Solo puedes compartir págnas web"
+      loading: Error cargando
+      only_webs: Solo puedes compartir págnas web
     form:
-      title: "Enlace"
-    input: "Escribe una dirección"
-    name: "enlace"
-    one: "un enlace"
-    other: "enlaces"
-    title: "Enlaces"
+      title: Enlace
+    input: Escribe una dirección
+    name: enlace
+    one: un enlace
+    other: enlaces
+    title: Enlaces

data/linkser/config/locales/zh.yml

@@ -0,0 +1,17 @@
+---
+zh:
+  linkser:
+    title: Linkser
+  link:
+    by: by %{author}
+    confirm_delete: Delete link?
+    errors:
+      loading: Error loading
+      only_webs: Only webpages are supported
+    form:
+      title: Link
+    input: Write the web address
+    name: link
+    one: a link
+    other: links
+    title: Links

data/linkser/lib/social_stream/linkser/version.rb

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

data/linkser/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', '~> 2.0.0.beta2')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta3')
   s.add_runtime_dependency('linkser', '~> 0.0.12')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/applications/_applications-oauth2server.css.sass

@@ -43,4 +43,4 @@
 
 #new_application
   .btn
-    @extend .btn-blue
+    @include btn-primary

data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/_show-oauth2server.css.sass

@@ -31,7 +31,7 @@
       .result,
       .client_secret
         background-color: #f9f9f9
-        @extend border-radius-5
+        @include border-radius(5px)
         font-size: 15px
 
       .client_secret

data/oauth2_server/app/views/site/clients/show.html.erb

@@ -10,7 +10,11 @@
   <hr class="soften">
   <div class="content">
     <a class="pull-left" href="#">
-        <img class="media-object" alt="application image" style="width: 100px; height: 100px;" src="assets/images/logos/app-default.png">
+
+      <%= image_tag('logos/app-default.png', class: "media-object") %>
+
+
+      
     </a>
     <article  class="media box">
       <div class="media-body">

data/oauth2_server/config/locales/en.yml

@@ -1,29 +1,30 @@
+---
 en:
   account:
-    applications: "Applications"
+    applications: Applications
   activerecord:
     attributes:
       site/client:
-        callback_url: "Callback URL"
-        id: "Client ID"
-        name: "Name"
-        secret: "Client Secret"
-        url: "URL"
+        callback_url: Callback URL
+        id: Client ID
+        name: Name
+        secret: Client Secret
+        url: URL
   authorization:
     form:
-      accept: "Accept"
-      cancel: "Cancel"
+      accept: Accept
+      cancel: Cancel
     new:
-      title: "Authorize %{client}?"
+      title: Authorize %{client}?
       permission:
-        title: "The site %{client} will be able to:"
+        title: 'The site %{client} will be able to:'
   permission:
-    public_info: "Read your public information"
+    public_info: Read your public information
   site:
     client:
-      added: "Added sites"
+      added: Added sites
       index:
-        title: "Client sites"
+        title: Client sites
       new:
-        link: "Add site"
-        title: "Register new client site"
+        link: Add site
+        title: Register new client site

data/oauth2_server/config/locales/es.yml

@@ -1,29 +1,30 @@
+---
 es:
   account:
-    applications: "Aplicaciones"
+    applications: Aplicaciones
   activerecord:
     attributes:
       site/client:
-        callback_url: "Callback URL"
-        id: "Client ID"
-        name: "Nombre"
-        secret: "Client Secret"
-        url: "URL"
-  authorizations:
-    form:
-      accept: "Aceptar"
-      cancel: "Cancelar"
-    new:
-      title: "¿Autorizar %{client}?"
-      permission:
-        title: "El sitio %{client} será capaz de:"
+        callback_url: Callback URL
+        id: Client ID
+        name: Nombre
+        secret: Client Secret
+        url: URL
   permission:
-    public_info: "Acceder a tu información pública"
+    public_info: Acceder a tu información pública
   site:
     client:
-      added: "Sitios añadidos"
+      added: Sitios añadidos
       index:
-        title: "Sitios"
+        title: Sitios
       new:
-        link: "Añadir sitio"
-        title: "Registrar nuevo sitio"
+        link: Añadir sitio
+        title: Registrar nuevo sitio
+  authorization:
+    form:
+      accept: Accept
+      cancel: Cancel
+    new:
+      title: Authorize %{client}?
+      permission:
+        title: 'The site %{client} will be able to:'

data/oauth2_server/config/locales/zh.yml

@@ -0,0 +1,30 @@
+---
+zh:
+  account:
+    applications: Applications
+  activerecord:
+    attributes:
+      site/client:
+        callback_url: Callback URL
+        id: Client ID
+        name: Name
+        secret: Client Secret
+        url: URL
+  authorization:
+    form:
+      accept: Accept
+      cancel: Cancel
+    new:
+      title: Authorize %{client}?
+      permission:
+        title: 'The site %{client} will be able to:'
+  permission:
+    public_info: Read your public information
+  site:
+    client:
+      added: Added sites
+      index:
+        title: Client sites
+      new:
+        link: Add site
+        title: Register new client site

data/oauth2_server/lib/social_stream/oauth2_server/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Oauth2Server
-    VERSION = "2.0.0.beta2".freeze
+    VERSION = "2.0.0.beta3".freeze
   end
 end