social_stream 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4533fdc4bdc68a8fcfc7ceecbd27e9484745ea0e
-  data.tar.gz: c6dc95d6224d4c4a4a15aeca3f0f06f0e9a0e1f9
+  metadata.gz: 4c1cc6d62a122d099dba6c5743271633208a5e07
+  data.tar.gz: b2acfe7e532951befbccc464524e07427cdf0702
 SHA512:
-  metadata.gz: 8fbfd2b71fdc1dbed2391075ced6b95e4ef514a295ea25426d72fc369d4d3ea09c630bf50cb45eab2eea69a10acf2f7948e26e79e0a29b0af5ddfea83c175608
-  data.tar.gz: a027af86f4eb436bc0a63a19847ef0560e687d2b35dba4169fe1fcda9097cc89c9a9a5bc733089f8870dfd8dbdf407f44db4994cc837a6e1d6c4c79e71c9c0d7
+  metadata.gz: 00e5e5daf756380879d06155fa693fa4eefac5419e83500d7b465bc3dd66e7c5c14211a0a614523be82f44188bc368aafe9e39a5ae01dbd42d16badf5a6f19ae
+  data.tar.gz: fd69a6a5d90fef0ab82d36a5c52b22d4abf5d15a1eea124da2f62791bbd251a451d803a19f61a5a3e99f31e8fc4fe78f1178da72232638cdf12f292962deb88f

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

@@ -1,6 +1,6 @@
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui
+//= require jquery.ui.all
 //= require modernizr
 //= require bootstrap
 //= require bootstrap-multiselect

data/base/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass

@@ -33,6 +33,11 @@
         input
           &[type="submit"]
             @include btn-secundary
+    .personal
+      form.edit_profile
+        h6 
+          label
+            display: inline
     .avatar
       form.edit_actor
         background-color: $white
@@ -46,5 +51,4 @@
     h5
       color: $grayLighter
       font-size: 17px
-      font-weight: bold
-    
+      font-weight: bold

data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass

@@ -65,12 +65,6 @@
 
 
 
-  #site_clients
-    #toolbar
-      background-color: $black
-
-
-
 
     #sidebar
       @include grid-core-span(3, $fluidGridColumnWidth, $fluidGridGutterWidth)

data/base/app/assets/stylesheets/social_stream/base/sidebar/responsive/_responsive-1200px-min.css.sass

@@ -8,6 +8,8 @@
   #sidebar
     #suggestions,
     #pendings
+      @include makeColumn(3,0)
+      margin-left: 0
       .data
         .info
           font-size: 14px

data/base/app/assets/stylesheets/social_stream/fonts/fonts.css

@@ -21,12 +21,12 @@
   font-family: "Josefin OSP";
   font-weight: normal;
   font-style: normal;
-  src: url(social_stream/fonts/josefinslab/JosefinSlabRegular.ttf);
+  src: url(social_stream/fonts/josefinSlab/JosefinSlabRegular.ttf);
 }
 
 @font-face{
   font-family: 'Josefin Overlay';
   font-weight: normal;
   font-style: normal;
-  src: url(social_stream/fonts/josefinslab/JosefinSlabOverlay.ttf);
-}
+  src: url(social_stream/fonts/josefinSlab/JosefinSlabOverlay.ttf);
+}

data/base/config/locales/en.yml

@@ -224,8 +224,7 @@ en:
     passwords:
       confirm: Confirm password
       forgot: Forgot your password?
-      instructions: 'Type the email address bound to your account and we will sent
-        you instructions to change it:'
+      instructions: 'Enter your email address and we will send you instructions to change it:'
       update: Change your password
   dropdown:
     notifications: Notifications

data/base/lib/social_stream/base/ability.rb

@@ -90,7 +90,7 @@ module SocialStream
         end
 
         # Privacy
-        can [:create, :read, :update, :destroy], Relation::Custom, :actor_id => subject.try(:actor_id)
+        can [:create, :read, :update, :destroy], ::Relation::Custom, :actor_id => subject.try(:actor_id)
       end
     end
   end

data/base/lib/social_stream/base/dependencies.rb

@@ -8,6 +8,8 @@ require 'rails_engine_decorators'
 require 'foreigner'
 # jQuery
 require 'jquery-rails'
+# jQuery UI
+require 'jquery-ui-rails'
 # Select2 javascript library
 require 'select2-rails'
 # Permalinks:

data/base/lib/social_stream/base/engine.rb

@@ -58,6 +58,10 @@ module SocialStream
 
       config.to_prepare do
         ApplicationController.rescue_handlers += [["CanCan::AccessDenied", :rescue_from_access_denied]]
+
+        # Load Relation::Public, so it is registered as descendant of Relation::Single
+        # and used in ActivityObject#allowed_relations
+        Relation::Public
       end
     end
   end

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "2.0.2".freeze
+    VERSION = "2.0.3".freeze
   end
 end

data/base/social_stream-base.gemspec

@@ -31,9 +31,11 @@ Gem::Specification.new do |s|
   # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.5.1')
   # Avatar attachments
-  s.add_runtime_dependency('avatars_for_rails', '~> 1.0.7')
+  s.add_runtime_dependency('avatars_for_rails', '~> 1.1.0')
   # jQuery
-  s.add_runtime_dependency('jquery-rails', '>= 1.0.9')
+  s.add_runtime_dependency('jquery-rails', '>= 3.0.0')
+  # jQuery UI
+  s.add_runtime_dependency('jquery-ui-rails', '>= 4.0.3')
   # Select2 javascript library
   s.add_runtime_dependency('select2-rails', '~> 3.3.0')
   # Authorization
@@ -65,7 +67,7 @@ Gem::Specification.new do |s|
   # I18n-js
   s.add_runtime_dependency('i18n-js','~>2.1.2')
   # Strong Parameters
-  s.add_runtime_dependency('strong_parameters','~> 0.1.5')
+  s.add_runtime_dependency('strong_parameters','~> 0.2.1')
   # Flash messages
   s.add_runtime_dependency('flashy','~> 0.0.1')
 

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

@@ -28,22 +28,37 @@ SocialStream.Documents.Wall = (function(SS, $, undefined) {
     $('.wall_input button.new_document').click(function(event){
       event.preventDefault();
 
-      $('label[for="new_document_title"]').show();
+      $('.wall_input input[type=file]').trigger('click');
+    });
 
-      $('#post_text').
-        attr('name', 'document[title]').
-        attr('placeholder', I18n.t('document.title.input'));
+    $('.wall_input input[type=file]').change(function(){
+      if ($(this).val()) {
+        $('label[for="new_document_title"]').show();
 
-      $('#new_document_description').show().val($('#post_text').val());
+        $('#post_text').
+          attr('name', 'document[title]').
+          attr('placeholder', I18n.t('document.title.input'));
 
-      SocialStream.Wall.changeAction($(this).attr('data-path'));
-      SocialStream.Wall.changeParams('document');
+        $('#new_document_description').show().val($('#post_text').val());
 
-      $('.wall_input input[type=file]').trigger('click');
-    });
+        SocialStream.Wall.changeAction($(this).closest('form').find('button.new_document').attr('data-path'));
+        SocialStream.Wall.changeParams('document');
 
-    $('.wall_input input[type=file]').change(function(){
-      $("#post_text").val($(this).val().replace(/C:\\fakepath\\/i, ''));
+        $("#post_text").val($(this).val().replace(/C:\\fakepath\\/i, ''));
+      } else {
+        $('label[for="new_document_title"]').hide();
+
+        $('#post_text').
+          attr('name', 'post[text]').
+          attr('placeholder', I18n.t('post.input'));
+
+        $('#new_document_description').hide();
+
+        SocialStream.Wall.changeAction();
+        SocialStream.Wall.changeParams();
+
+        $("#post_text").val($('#new_document_description').val());
+      }
     });
   };
 

data/documents/lib/social_stream/documents/engine.rb

@@ -36,7 +36,11 @@ module SocialStream
           Mime::Type.register "image/png",  :png,  [ "image/x-png" ]
         end
         unless defined? Mime::BMP
-          Mime::Type.register "image/bmp",  :bmp
+          Mime::Type.register "image/bmp",  :bmp, [ "image/x-ms-bmp" ]
+        else
+          # Manually register synonym
+          Mime::BMP.instance_variable_get("@synonyms") << "image/x-ms-bmp"
+          Mime::LOOKUP["image/x-ms-bmp"] = Mime::BMP
         end
 
         # Audio

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "2.0.2".freeze
+    VERSION = "2.0.3".freeze
   end
 end

data/documents/social_stream-documents.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.2')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.3')
 
   s.add_runtime_dependency('paperclip','~> 3.3.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.9.0')

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "2.0.2".freeze
+  VERSION = "2.0.3".freeze
 end

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

@@ -1,9 +1,9 @@
 #site_clients
   @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-  #toolbar
-    display: none !important
   .site_clients
-    @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+    @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
+    float: left
+    margin-left: 2.5%
     header
       a
         float: right

data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/create/layout/_create-oauth2server.css.sass

@@ -1,3 +1,7 @@
+.new_site_client
+  @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
+  float: left
+  margin-left: 2.5%
 #content
   .box
     padding: 14px 20px 74px 20px

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Oauth2Server
-    VERSION = "2.0.1".freeze
+    VERSION = "2.0.2".freeze
   end
 end

data/oauth2_server/social_stream-oauth2_server.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.2')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.3')
   s.add_runtime_dependency('rack-oauth2', '~> 1.0.0')
 
   s.add_development_dependency('rspec-rails', '~> 2.8.0')

data/places/app/assets/stylesheets/social_stream/places/explore/_explore-places.css.sass

@@ -0,0 +1,9 @@
+#search-results,
+.repository-list-net,
+.repository-list
+  .place
+    .author
+      font-size: 13px
+  .actions
+    color: $gray
+    font-size: 12px

data/places/app/assets/stylesheets/social_stream/places/explore/layout/_explore-places.css.sass

@@ -0,0 +1,17 @@
+#search-results,
+.repository-list-net,
+.repository-list
+  .place
+    display: inline
+    @include makeColumn(3, 0)
+    margin-left: 19px
+    margin-bottom: 14px
+    .thumb
+      @include makeColumnoMargin(1, 0)
+      display: inline
+      margin-top: 14px
+    .brifing
+      @include makeColumnoMargin(2, 0)
+      display: inline-block
+    .author
+      margin-top: -10px

data/places/app/assets/stylesheets/social_stream/places/search/_header.css.sass

@@ -0,0 +1,22 @@
+header
+  .search-nav
+    .mat
+      .results
+        ul
+          li
+            background-color: #f9f9f9
+            &:hover
+              background-color: #fff
+            .place
+              &:hover
+                .thumb,
+                .brifing
+                  @include opacity(100)
+              .thumb
+                @include opacity(70) 
+              .brifing
+                @include opacity(70)
+                .author
+                  @include ellipsis
+                .counters
+                  font-size: 9px

data/places/app/assets/stylesheets/social_stream/places/search/layout/_header.css.sass

@@ -0,0 +1,30 @@
+header
+  .search-nav
+    .mat
+      .results
+        ul
+          li
+            .place
+              min-height: 80px
+              .thumb
+                @include opacity(70)
+                width: 38%
+                float: left
+                margin-top: 6px
+                .icon_file_50-default
+                  background-size: 315px 
+              .brifing
+                @include opacity(70)
+                width: 62%
+                float: left
+                h5
+                  @include ellipsis
+                  margin: 4px 0 0 0
+                  font-size: 13px
+                .author
+                  @include ellipsis
+                  font-size: 11px
+                .counters
+                  font-size: 9px
+                  .counter
+                    color: $blue

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

@@ -1,4 +1,12 @@
 @import "social_stream/places/icons/places_icon"
 @import "social_stream/places/maps"
 @import "social_stream/places/carousel"
-@import "social_stream/places/places"
+@import "social_stream/places/places"
+
+@import "social_stream/places/search/header"
+
+@import "social_stream/places/search/layout/header"
+
+@import "social_stream/places/explore/explore-places"
+
+@import "social_stream/places/explore/layout/explore-places"

data/places/app/models/place.rb

@@ -14,6 +14,10 @@ class Place < ActiveRecord::Base
   validates :latitude, :presence => true
   validates :longitude, :presence => true
 
+  define_index do
+    activity_object_index
+  end
+
   def photos
     pictures
   end

data/places/app/views/places/_place.html.erb

@@ -1,14 +1,14 @@
 <%= div_for place do %>
-
   <div class="thumb">
     <%= link_to(raw("<i class='icon_place_70-default'></i> "), place)%>
   </div>
 
-  <div class="text">
-    <h6>
-      <%= link_to place.title, place %>
-    </h6>
+  <div class="brifing">
+    <h5>
+      <%= link_to truncate(place.title, :length => 15), place %>
+    </h5>
+
+    <%= render partial: 'objects/counters', locals: { object: place } %>
     
   </div>
-
 <% end %> 

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

@@ -0,0 +1,17 @@
+<%= div_for place do %>
+  <div class="thumb">
+    <%#= link_to icon(document, 40), document, :title => document.file_file_name %>
+    <%= link_to raw("<i class='icon_place_70-default'></i> "), place, :title => place.title %>
+    <%#= link_to(raw("<i class='icon_place_70-default'></i> "), place)%>
+  </div>
+  <div class="brifing">
+    <h5>
+      <%= link_to truncate(place.title, :length => 15), place %>
+    </h5>
+
+    <%= render partial: 'objects/counters', locals: { object: place } %>
+
+  </div>
+<% end %>
+
+

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

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

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

@@ -0,0 +1,11 @@
+<%= div_for place do %>
+  <div class="thumb">
+    <%= link_to(raw("<i class='icon_place_70-default'></i> "), place)%>
+  </div>
+
+  <div class="text">
+    <h6>
+      <%= link_to place.title, place %>
+    </h6>
+  </div>
+<% end %>

data/places/config/locales/en.yml

@@ -28,6 +28,8 @@ en:
     mine: My places
     name: place
     name_title: Place name
+    one: a place
+    other: places
     phone_title: Phone number
     photo:
       button: Upload

data/places/config/locales/es.yml

@@ -26,6 +26,7 @@ es:
     mine: Mis lugares
     name: lugar
     name_title: Nombre del lugar
+    one:
     phone_title: Teléfono
     photo:
       button: Subir
@@ -39,6 +40,7 @@ es:
       country: País
     not_mine: Lugares
     one: un lugar
+    other: lugares
     simple_all: Todos
     title: Lugares
     like:

data/places/lib/social_stream-places.rb

@@ -9,7 +9,10 @@ module SocialStream
       autoload  :ActivityObject,  'social_stream/places/models/activity_object'
     end
     
-    SocialStream.objects.push(:place) unless SocialStream.objects.include?(:place)
+    %w( objects quick_search_models extended_search_models repository_models ).each do |m|
+      SocialStream.__send__(m).push(:place) unless SocialStream.__send__(m).include?(:place)
+    end
+
   end
 end
 

data/social_stream.gemspec

@@ -10,13 +10,13 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.0.2')
-  s.add_runtime_dependency('social_stream-documents', '~> 2.0.2')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.3')
+  s.add_runtime_dependency('social_stream-documents', '~> 2.0.3')
   s.add_runtime_dependency('social_stream-events', '~> 2.0.1')
   s.add_runtime_dependency('social_stream-linkser', '~> 2.0.0')
   s.add_runtime_dependency('social_stream-presence', '~> 2.0.1')
   s.add_runtime_dependency('social_stream-ostatus', '~> 2.0.0')
-  s.add_runtime_dependency('social_stream-oauth2_server', '~> 2.0.1')
+  s.add_runtime_dependency('social_stream-oauth2_server', '~> 2.0.2')
  
   # Development Gem dependencies
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - GING - DIT - UPM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: social_stream-events
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -1405,7 +1405,11 @@ files:
 - places/app/assets/stylesheets/social_stream/places/_carousel.css.sass
 - places/app/assets/stylesheets/social_stream/places/_maps.css.sass
 - places/app/assets/stylesheets/social_stream/places/_places.css.sass
+- places/app/assets/stylesheets/social_stream/places/explore/_explore-places.css.sass
+- places/app/assets/stylesheets/social_stream/places/explore/layout/_explore-places.css.sass
 - places/app/assets/stylesheets/social_stream/places/icons/places_icon.css.css
+- places/app/assets/stylesheets/social_stream/places/search/_header.css.sass
+- places/app/assets/stylesheets/social_stream/places/search/layout/_header.css.sass
 - places/app/controllers/places_controller.rb
 - places/app/decorators/social_stream/base/activity_object_decorator.rb
 - places/app/helpers/places_helper.rb
@@ -1420,6 +1424,9 @@ files:
 - places/app/views/places/_map_form.html.erb
 - places/app/views/places/_place.html.erb
 - places/app/views/places/_place_info.html.erb
+- places/app/views/places/_quick_search_result.html.erb
+- places/app/views/places/_search_result.html.erb
+- places/app/views/places/_timeline.html.erb
 - places/app/views/places/index.html.erb
 - places/app/views/places/new.html.erb
 - places/app/views/places/show.html.erb