social_stream 0.16.3 → 0.17.0

data/base/lib/social_stream/models/supertype.rb

@@ -2,9 +2,10 @@ require 'active_support/concern'
 
 module SocialStream #:nodoc:
   module Models
-    # Common methods for models that have subtypes. Currently, there are two supertypes:
-    # * Actor: participates in the social network and has ties with other actors. Its subtypes are subjects, like user or group
-    # * ActivityObject: created and managed by actors in activities. Its subtypes are objects, like post or comment
+    # Common methods for models having many {SocialStream::Models::Subtype subtypes}.
+    # Currently, there are two {SocialStream::Models::Supertype supertypes}:
+    # * {Actor}: participates in the social network and has {Tie Ties} with other actors. Its subtypes are {SocialStream::Models::Subject subjects}, such as {User} or {Group}
+    # * {ActivityObject}: created and managed by {Actor Actors} in {Activity Activities}. Its subtypes are {SocialStream::Models::Object objects}, like {Post} or {Comment}
     module Supertype
       extend ActiveSupport::Concern
 
@@ -32,6 +33,18 @@ module SocialStream #:nodoc:
                        end                                                # end
         end
       end
+
+      module ActiveRecord
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          # This class is a supertype. Subtype classes are known as name
+          def supertype_of name
+            @subtypes_name = name
+            include SocialStream::Models::Supertype
+          end
+        end
+      end
     end
   end
 end

data/base/lib/social_stream/views/settings/base.rb

@@ -15,6 +15,11 @@ module SocialStream
               }
             end
 
+            items << {
+              :key  => 'language',
+              :html => render(:partial => "language")
+            }
+
             items << {
               :key  => 'notifications',
               :html => render(:partial => "notifications")

data/base/lib/tasks/db/populate.rake

@@ -9,6 +9,7 @@ namespace :db do
 
     desc "Create populate data"
     task :create => :environment do
+      require 'forgery'
 
       LOGOS_PATH = File.join(Rails.root, 'lib', 'logos')
       USERS = (ENV["USERS"] || 9).to_i

data/base/spec/controllers/settings_controller_spec.rb

@@ -17,7 +17,7 @@ describe SettingsController do
 
   it "should render index after update_all" do
     put :update_all
-    assert_response :success
+    response.should redirect_to(:settings)
   end
 
   describe "Notification settings" do

data/base/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] ||= "test"
 
+# Do not check ImageMagick<=>Rmagick versions
+RMAGICK_BYPASS_VERSION_TEST = true
+
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rspec/rails"
 

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

@@ -57,6 +57,15 @@
 	text-align: left;
 }
 
+#new_document_title_wrapper {
+  margin-top: 5px;
+}
+
+#new_document_title_wrapper input[type="text"] {
+	display: inline;
+        width: 30%;
+}
+
 .attachment_tile{
 	margin: 5px;
 	width: 90px;

data/documents/app/controllers/documents_controller.rb

@@ -39,8 +39,9 @@ class DocumentsController < ApplicationController
         path = resource.file.path(params[:style] || params[:format])
 
         send_file path,
-        :filename => resource.file_file_name,
-        :disposition => "inline"
+                 :filename => resource.file_file_name,
+                 :disposition => "inline",
+                 :type => request.format
       }
     end
   end

data/documents/app/models/document.rb

@@ -72,7 +72,7 @@ class Document < ActiveRecord::Base
   protected
   
   def set_title
-    self.title = self.file_file_name
+    self.title ||= self.file_file_name
   end
     
 end

data/documents/app/views/documents/_new_activity_fields.html.erb

@@ -1 +1,15 @@
 <%= f.file_field :file %>
+
+<div id="new_document_title_wrapper">
+<%= f.label :title %> <%= f.text_field :title %>
+</div>
+
+<%= javascript_tag do %>
+  $(function() {
+    $('#new_document_title_wrapper').hide();
+    $('#document_file').change(function(){
+      $('#new_document_title_wrapper').show();
+      $("#document_title").val($(this).val().replace(/C:\\fakepath\\/i, ''));
+    });
+  });
+<% end %>

data/documents/app/views/videos/_video_show.html.erb

@@ -1,21 +1,3 @@
-<% content_for :javascript do %>
-
-  $("#jpId<%=video.id%>").jPlayer( {
-    ready: function () {
-      $(this).jPlayer("setMedia", {
-        webmv: "<%= video_url(video, :format => 'webm' ) %>", // Defines the webm url
-        flv:   "<%= video_url(video, :format => 'flv') %>"
-      });
-    },
-  solution:"flash, html",
-  preload: "none",
-  supplied: "webmv, flv",
-  swfPath: "assets",
-  cssSelectorAncestor: "#jp_interface_<%=video.id%>"
-  });
-  
-<% end %>
-
 <%= div_for video, :class => 'content_size' do %>
 <div class="video_show">
   <% if video.file_processing %>
@@ -58,7 +40,29 @@
       </div>
       <div id="jp_playlist_<%= video.id%>" class="jp-playlist"></div>
     </div>
+<div id="inspector"></div>
   </div>
   <% end %>
 </div>
-<% end %> 
+<% end %> 
+
+<%= javascript_tag do %>
+  $(function() {
+  <% unless video.file_processing %>
+    $("#jpId<%=video.id%>").jPlayer( {
+      ready: function () {
+        $(this).jPlayer("setMedia", {
+          webmv: "<%= video_url(video, :format => 'webm' ) %>", // Defines the webm url
+          flv:   "<%= video_url(video, :format => 'flv') %>"
+        });
+      },
+      solution:"flash, html",
+      preload: "none",
+      supplied: "webmv, flv",
+      swfPath: "assets",
+      cssSelectorAncestor: "#jp_interface_<%=video.id%>"
+    });
+  <% end %>
+  });
+<% end %>
+

data/documents/config/locales/en.yml

@@ -1,4 +1,8 @@
 en:
+  activerecord:
+    attributes:
+      document:
+        title: "Title"
   audio:
     confirm_delete: "Delete audio?"
     title: "Audios"
@@ -7,7 +11,7 @@ en:
     name: "audio"
     not_mine: "Audios"
     one: "an audio"
-    processing: "Processing audio clip"
+    processing: "Processing audio clip. Please wait..."
   document:
     actions:
       delete: "Delete"
@@ -64,4 +68,4 @@ en:
     name: "video" 
     not_mine: "Videos"
     one: "a video"
-    processing: "Processing video"
+    processing: "Processing video. Please, wait..."

data/documents/config/locales/es.yml

@@ -1,4 +1,8 @@
 es:
+  activerecord:
+    attributes:
+      document:
+        title: "Título"
   audio:
     confirm_delete: "¿Borrar audios?"
     title: "Audios"
@@ -7,7 +11,7 @@ es:
     name: "archivo de audio"
     not_mine: "Audios"
     one: "un archivo de audio"
-    processing: "Procesando fichero de audio..."
+    processing: "Procesando fichero de audio. Espere, por favor..."
   document:
     actions:
       delete: "Borrar"
@@ -64,4 +68,4 @@ es:
     name: "vídeo"
     not_mine: "Vídeos"
     one: "un vídeo"
-    processing: "Procesando vídeo..."
+    processing: "Procesando vídeo. Espere, por favor..."

data/documents/db/migrate/20120109155431_document_object_type.rb

@@ -0,0 +1,16 @@
+class DocumentObjectType < ActiveRecord::Migration
+  class ActivityObjectMigration < ActiveRecord::Base
+    self.record_timestamps = false
+    set_table_name "activity_objects"
+  end
+
+  def up
+    ActivityObjectMigration.where(:object_type => %w( Picture Audio Video )).each do |a|
+      a.object_type = "Document"
+      a.save!
+    end
+  end
+
+  def down
+  end
+end

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.6.1".freeze
+    VERSION = "0.7.0".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', '~> 0.11.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.12.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   # Waiting for version > 2.4.5, which fixes:
   # https://github.com/thoughtbot/paperclip/issues/293
@@ -25,6 +25,6 @@ Gem::Specification.new do |s|
   end
   s.add_development_dependency('rspec-rails', '~> 2.6.0')
   s.add_development_dependency('factory_girl', '~> 1.3.2')
-  s.add_development_dependency('forgery', '~> 0.3.6')
+  s.add_development_dependency('forgery', '~> 0.4.2')
   s.add_development_dependency('capybara', '~> 0.3.9')
 end

data/documents/spec/dummy/Rakefile

@@ -1,7 +1,7 @@
+#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
-require 'rake'
 
 Dummy::Application.load_tasks

data/documents/spec/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,9 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/documents/spec/dummy/app/assets/stylesheets/application.css

@@ -0,0 +1,7 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require_tree . 
+*/

data/documents/spec/dummy/app/views/layouts/application.html.erb

@@ -2,9 +2,9 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag :all %>
-  <%= javascript_include_tag :defaults %>
-  <%= csrf_meta_tag %>
+  <%= stylesheet_link_tag    "application" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
 </head>
 <body>
 

data/documents/spec/dummy/config/application.rb

@@ -1,10 +1,6 @@
 require File.expand_path('../boot', __FILE__)
 
-require "active_model/railtie"
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_view/railtie"
-require "action_mailer/railtie"
+require 'rails/all'
 
 Bundler.require
 require "social_stream-documents"
@@ -33,13 +29,17 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
-
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
   end
 end
+

data/documents/spec/dummy/config/database.yml

@@ -1,5 +1,8 @@
 # SQLite version 3.x
 #   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
 development:
   adapter: sqlite3
   database: db/development.sqlite3

data/documents/spec/dummy/config/environments/development.rb

@@ -3,7 +3,7 @@ Dummy::Application.configure do
 
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
@@ -21,5 +21,10 @@ Dummy::Application.configure do
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
-end
 
+  # Do not compress assets
+  config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
+end

data/documents/spec/dummy/config/environments/production.rb

@@ -1,7 +1,6 @@
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
-  # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true
 
@@ -9,14 +8,27 @@ Dummy::Application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_assets = false
+
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+
+  # Generate digests for assets URLs
+  config.assets.digest = true
 
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+  # Defaults to Rails.root.join("public/assets")
+  # config.assets.manifest = YOUR_PATH
 
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
+  # Specifies the header that your server uses for sending files
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
 
   # See everything in the log (default is :info)
   # config.log_level = :debug
@@ -27,13 +39,12 @@ Dummy::Application.configure do
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
 
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
-
-  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
 
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
+
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false