social_stream-documents 0.12.1 → 0.13.0

data/app/assets/javascripts/social_stream.video.js.erb

@@ -8,11 +8,12 @@ SocialStream.Video = (function(SS, $, undefined){
           $(this).jPlayer("setMedia", {
             webmv: $(this).closest(".video").find(".video-webm").attr("href"), // Defines the webm url
             flv: $(this).closest(".video").find(".video-flv").attr("href") // Defines the flv url
+            mp4: $(this).closest(".video").find(".video-mp4").attr("href") // Defines the mp4 url
           });
         },
       solution:"flash, html",
       preload: "none",
-      supplied: "webmv, flv",
+      supplied: "webmv, flv, mp4",
       swfPath: "<%= asset_path "" %>",
       cssSelectorAncestor: "#" + $(this).closest(".video-full").attr("id")
       })

data/app/controllers/documents_controller.rb

@@ -11,6 +11,7 @@ class DocumentsController < ApplicationController
   
   def index
     super do |format|
+      format.json { render :json => collection.map{|a| a.activity_objects.first.document.to_json} }
       if params[:no_layout].present?
         format.html { render :action => :index, :layout => false }      
       else  
@@ -21,6 +22,7 @@ class DocumentsController < ApplicationController
   
   def create
     super do |format|
+      format.json { render :json => resource }
       format.all {redirect_to request.referer || home_path}
     end
   end
@@ -34,8 +36,9 @@ class DocumentsController < ApplicationController
 
   def show
     respond_to do |format|
+      format.json {render :json => resource }
       format.html {render :action => :show}
-      format.all {
+      format.any {
         path = resource.file.path(params[:style] || params[:format])
 
         send_file path,

data/app/models/document.rb

@@ -68,6 +68,16 @@ class Document < ActiveRecord::Base
       "#{ size.to_s }/default.png"
     end
   end
+
+ # JSON, generic version for most documents
+  def to_json me=self
+    {:id => activity_object_id,
+     :title => title,
+     :description => description,
+     :author => author.name,
+     :src => file.to_s
+    }.to_json
+  end
   
   protected
 

data/app/models/video.rb

@@ -4,7 +4,9 @@ class Video < Document
                     :path => ':rails_root/documents/:class/:id_partition/:style',
                     :styles => {
                       :webm => {:format => 'webm'},
-                      :flv  => { :format => 'flv' },
+                      :flv  => {:format => 'flv'},
+                      :mp4  => {:format => 'mp4'},
+                      :poster  => {:format => 'png', :time => 5},
                       :thumb48sq  => {:geometry => "48x48" , :format => 'png', :time => 5},
                       :thumbwall => {:geometry => "130x97#", :format => 'png', :time => 5}
                     },
@@ -25,5 +27,19 @@ class Video < Document
   def thumb(size, helper)
       "#{ size.to_s }/video.png"
   end
+
+ # JSON, special edition for video files
+  def to_json me=self
+    {:id => activity_object_id,
+     :title => title,
+     :description => description,
+     :author => author.name,
+     :poster => file(:poster).to_s,
+     :sources => [ { :type => Mime::WEBM.to_s,  :src => file(:webm).to_s },
+                   { :type => Mime::MP4.to_s,   :src => file(:mp4).to_s },
+                   { :type => Mime::FLV.to_s, :src => file(:flv).to_s }
+                 ]
+    }.to_json
+  end
   
 end

data/app/views/videos/_video_processed.html.erb

@@ -20,6 +20,7 @@
   <div class="video-format-links">
     <%= link_to "WebM", video_path(video, :format => :webm), :class => "video-webm" %>
     <%= link_to "FLV",  video_path(video, :format => :flv),  :class => "video-flv" %>
+    <%= link_to "MP4",  video_path(video, :format => :mp4),  :class => "video-mp4" %>
   </div>
 </div>
 

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

@@ -54,11 +54,12 @@
         $(this).jPlayer("setMedia", {
           webmv: "<%= video_url(video, :format => 'webm' ) %>", // Defines the webm url
           flv:   "<%= video_url(video, :format => 'flv') %>"
+          mp4:   "<%= video_url(video, :format => 'mp4') %>"
         });
       },
       solution:"flash, html",
       preload: "none",
-      supplied: "webmv, flv",
+      supplied: "webmv, flv, mp4",
       swfPath: "assets",
       cssSelectorAncestor: "#jp_interface_<%=video.id%>"
     });

data/db/migrate/{20110615143707_create_social_stream_documents.rb → 20120109155431_create_social_stream_documents.rb}

@@ -1,6 +1,6 @@
 class CreateSocialStreamDocuments < ActiveRecord::Migration
-  
-  def self.up
+
+  def change
     create_table "documents", :force => true do |t|
       t.string   "type"
       t.integer  "activity_object_id"
@@ -9,16 +9,14 @@ class CreateSocialStreamDocuments < ActiveRecord::Migration
       t.string   "file_file_name"
       t.string   "file_content_type"
       t.string   "file_file_size"
+      t.boolean  "file_processing"
+      t.string   "title"
+      t.text     "description"
     end
-    
-    add_index "documents", "activity_object_id"
+
+    add_index "documents", ["activity_object_id"], :name => "index_documents_on_activity_object_id"
+
     add_foreign_key "documents", "activity_objects", :name => "documents_on_activity_object_id"
-    
+
   end
-  
-  def self.down
-    remove_foreign_key "documents", :name => "documents_on_activity_object_id"
-    drop_table :documents
-  end
-  
 end

data/lib/social_stream/documents/engine.rb

@@ -51,6 +51,7 @@ module SocialStream
         # Video
         Mime::Type.register "video/x-flv", :flv
         Mime::Type.register "video/webm", :webm
+        Mime::Type.register "video/mp4", :mp4
       end
 
       initializer "social_stream-documents.views.toolbar" do

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.12.1".freeze
+    VERSION = "0.13.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.18.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.19.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','= 2.4.5')
   s.add_runtime_dependency('delayed_paperclip','2.4.5.1')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-documents
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000Z
+date: 2012-04-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &79323420 !ruby/object:Gem::Requirement
+  requirement: &76316010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *79323420
+  version_requirements: *76316010
 - !ruby/object:Gem::Dependency
   name: paperclip-ffmpeg
-  requirement: &79322390 !ruby/object:Gem::Requirement
+  requirement: &76315650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *79322390
+  version_requirements: *76315650
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &79314790 !ruby/object:Gem::Requirement
+  requirement: &76315090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 2.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *79314790
+  version_requirements: *76315090
 - !ruby/object:Gem::Dependency
   name: delayed_paperclip
-  requirement: &79180400 !ruby/object:Gem::Requirement
+  requirement: &76314400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 2.4.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *79180400
+  version_requirements: *76314400
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &78348460 !ruby/object:Gem::Requirement
+  requirement: &76313960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78348460
+  version_requirements: *76313960
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &78332420 !ruby/object:Gem::Requirement
+  requirement: &76313300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *78332420
+  version_requirements: *76313300
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &78331350 !ruby/object:Gem::Requirement
+  requirement: &76312700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *78331350
+  version_requirements: *76312700
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &78330170 !ruby/object:Gem::Requirement
+  requirement: &76311960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *78330170
+  version_requirements: *76311960
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &78328590 !ruby/object:Gem::Requirement
+  requirement: &76311140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *78328590
+  version_requirements: *76311140
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -228,10 +228,7 @@ files:
 - config/locales/en.yml
 - config/locales/es.yml
 - config/routes.rb
-- 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
+- db/migrate/20120109155431_create_social_stream_documents.rb
 - db/migrate/20120208143721_documents_group_title_and_description_in_activity_object.rb
 - lib/delayed_paperclip/social_stream-documents.rb
 - lib/generators/social_stream/documents/install_generator.rb

data/db/migrate/20110922173707_add_file_processing_to_document.rb

@@ -1,9 +0,0 @@
-class AddFileProcessingToDocument < ActiveRecord::Migration
-    def self.up
-      add_column :documents, :file_processing, :boolean
-    end
-    
-    def self.down
-      remove_column :documents, :file_processing
-    end
-end

data/db/migrate/20111005112707_add_title_and_description_to_document.rb

@@ -1,11 +0,0 @@
-class AddTitleAndDescriptionToDocument < ActiveRecord::Migration
-    def self.up
-      add_column :documents, :title, :string
-      add_column :documents, :description, :text
-    end
-    
-    def self.down
-      remove_column :documents, :title
-      remove_column :documents, :description
-    end
-end

data/db/migrate/20120109155431_document_object_type.rb

@@ -1,16 +0,0 @@
-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