social_stream-documents 0.6.1 → 0.7.0

data/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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
 

data/spec/dummy/config/environments/test.rb

@@ -7,7 +7,11 @@ Dummy::Application.configure do
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
 
   # Show full error reports and disable caching
@@ -32,6 +36,4 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
-
-  config.assets.enabled = true
 end

data/spec/dummy/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = 'a85ff3866549e818069e088bed435487038449bae9d3a31ca266f7b2670751908ea358d3120c787b2b86d9de39bb833b10a108b7b3d3460c4469e75f58be0259'
+Dummy::Application.config.secret_token = '64ac9e68eea7ea0f6e41cd784aee79f12fa53b11e86b46e04d7e38cfb460df7156d5fbc09626fe621c9b3a0bd40b53f74404060639a71d630edf538f638026d4'

data/spec/dummy/config/initializers/wrap_parameters.rb

@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json]
+end
+
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end

data/spec/dummy/config/locales/en.yml

@@ -1,5 +1,5 @@
 # Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
   hello: "Hello world"

data/spec/dummy/config/routes.rb

@@ -50,7 +50,7 @@ Dummy::Application.routes.draw do
 
   # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
-  # root :to => "welcome#index"
+  # root :to => 'welcome#index'
 
   # See how all your routes lay out with "rake routes"
 

data/spec/dummy/db/schema.rb

@@ -0,0 +1,6 @@
+require 'social_stream/migrations/documents'
+
+ActiveRecord::Schema.define(:version => 0) do
+  SocialStream::Migrations::Base.new.up
+  SocialStream::Migrations::Documents.new.up
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-documents
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000Z
+date: 2012-01-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &83246290 !ruby/object:Gem::Requirement
+  requirement: &70784500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *83246290
+  version_requirements: *70784500
 - !ruby/object:Gem::Dependency
   name: paperclip-ffmpeg
-  requirement: &83245710 !ruby/object:Gem::Requirement
+  requirement: &70783900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *83245710
+  version_requirements: *70783900
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &83235780 !ruby/object:Gem::Requirement
+  requirement: &70783600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 2.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *83235780
+  version_requirements: *70783600
 - !ruby/object:Gem::Dependency
   name: delayed_paperclip
-  requirement: &83235460 !ruby/object:Gem::Requirement
+  requirement: &70783320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 0.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *83235460
+  version_requirements: *70783320
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &83234990 !ruby/object:Gem::Requirement
+  requirement: &70783090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83234990
+  version_requirements: *70783090
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &83234550 !ruby/object:Gem::Requirement
+  requirement: &70782730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *83234550
+  version_requirements: *70782730
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &83234060 !ruby/object:Gem::Requirement
+  requirement: &70782400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,21 +88,21 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *83234060
+  version_requirements: *70782400
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &83233680 !ruby/object:Gem::Requirement
+  requirement: &70782100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *83233680
+  version_requirements: *70782100
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &83233350 !ruby/object:Gem::Requirement
+  requirement: &70781840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *83233350
+  version_requirements: *70781840
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -229,6 +229,7 @@ files:
 - db/migrate/20110615143707_create_social_stream_documents.rb
 - db/migrate/20110922173707_add_file_processing_to_document.rb
 - db/migrate/20111005112707_add_title_and_description_to_document.rb
+- db/migrate/20120109155431_document_object_type.rb
 - lib/generators/social_stream/documents/install_generator.rb
 - lib/social_stream-documents.rb
 - lib/social_stream/documents/engine.rb
@@ -240,6 +241,8 @@ files:
 - spec/controllers/pictures_controller_spec.rb
 - spec/dummy/.gitignore
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -257,11 +260,13 @@ files:
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/navigation.rb
 - spec/dummy/config/relations.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/.gitkeep
+- spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html