social_stream-documents 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 122b8599155e8c5a2839f73929d5c3561d2fc722
-  data.tar.gz: 59a7f2110a4b2cd8e1bf1490d7f35c7bd6ac5e27
+  metadata.gz: b15ae90bffda5285fb9573d5d76e62ef6ba2441f
+  data.tar.gz: 892664124cff22b542dad9ab38875a68e7290c1c
 SHA512:
-  metadata.gz: 41947050825288120acf25833c1b68c1a1f58a4183fc9f9c4f31d824df8e80fabb91f491034ecaf09d448a59f1fc41fdd857a4e004bc1b4fb2b275cd0c915f63
-  data.tar.gz: b35de43746c5c2ac7f05ae96ad41620766e8f30bcbe24019a0792118c6c73420a0d74611b4a1c436c0829decd8f0abae74d6c7123e79dbf04b2b7e4afc451a5e
+  metadata.gz: 3b28c05002fca0ec4902fb63aa3dd66aa542264ecc339e4769e2c82c57e47f812a9c05bbdffc664fd09a7c87b662c0fd0d68dab8d01ba6edf4eb13467fe5cbe6
+  data.tar.gz: c96144ed8b81b713e8309f850d001106263160e42abe0215eefae47434420fccba554ca2c14f318e40f8db53e03ba8deac011e003b9b5dc91d43613c3a54f3c0

data/app/controllers/documents_controller.rb

@@ -11,13 +11,30 @@ class DocumentsController < ApplicationController
         render collection if request.xhr?
       }
 
-      format.json { render :json => collection }
+      format.json { render :json => collection.to_json(helper: self) }
     end
   end
-  
+
+  def show
+    respond_to do |format|
+      format.html {render :action => :show}
+      format.json {render :json => resource.to_json(helper: self) }
+      format.any {
+        path = resource.file.path(params[:style] || params[:format])
+
+        head(:not_found) and return unless File.exist?(path)
+
+        send_file path,
+                 :filename => resource.file_file_name,
+                 :disposition => "inline",
+                 :type => request.format
+      }
+    end
+  end
+
   def create
     super do |format|
-      format.json { render :json => resource }
+      format.json { render :json => resource.to_json(helper: self) }
       format.js
       format.all {
         if resource.new_record?
@@ -43,20 +60,13 @@ class DocumentsController < ApplicationController
     end
   end
 
-  def show
-    respond_to do |format|
-      format.html {render :action => :show}
-      format.json {render :json => resource }
-      format.any {
-        path = resource.file.path(params[:style] || params[:format])
-
-        head(:not_found) and return unless File.exist?(path)
-
-        send_file path,
-                 :filename => resource.file_file_name,
-                 :disposition => "inline",
-                 :type => request.format
+  def destroy
+    super do |format|
+      format.html {
+        redirect_to :home
       }
+
+      format.js
     end
   end
 

data/app/models/document.rb

@@ -62,12 +62,13 @@ class Document < ActiveRecord::Base
   end
 
  # JSON, generic version for most documents
-  def as_json(options = nil)
-    {:id => id,
+  def as_json(options)
+    {
+     :id => id,
      :title => title,
      :description => description,
      :author => author.name,
-     :src => file.to_s
+     :src => URI.join(options[:helper].root_url, file.url).to_s 
     }
   end
   

data/app/models/video.rb

@@ -16,15 +16,17 @@ class Video < Document
                       
  # JSON, special edition for video files
   def as_json(options = nil)
-    {:id => 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 }
-                 ]
+    {
+      :id => id,
+      :title => title,
+      :description => description,
+      :author => author.name,
+      :poster => URI.join(options[:helper].root_url, file.url(:poster)).to_s,
+      :sources => [
+        { type: Mime::WEBM.to_s, src: URI.join(options[:helper].root_url, file.url(:webm)).to_s },
+        { type: Mime::MP4.to_s,  src: URI.join(options[:helper].root_url, file.url(:mp4)).to_s },
+        { type: Mime::FLV.to_s,  src: URI.join(options[:helper].root_url, file.url(:flv)).to_s }
+      ]
     }
   end
   

data/app/views/audios/_audio_show.html.erb

@@ -5,7 +5,7 @@
         <%= t('audio.processing')%>
       </div>
     <% else %>
-      <%= render partial: 'player',
+      <%= render partial: 'audios/player',
                  object: audio,
                  as: :audio %>
     <% end %>

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

@@ -4,7 +4,7 @@
       <%= t('video.processing')%>
     </div>
   <% else %>
-    <%= render partial: 'player', 
+    <%= render partial: 'videos/player', 
                object: video,
                as: :video %>
   <% end %>

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "2.2.0".freeze
+    VERSION = "2.2.1".freeze
   end
 end

data/social_stream-documents.gemspec

@@ -10,9 +10,10 @@ Gem::Specification.new do |s|
   s.email = "social-stream@dit.upm.es"
   s.homepage = "http://github.com/ging/social_stream-documents"
   s.files = `git ls-files`.split("\n")
+  s.license = 'MIT'
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.2.2')
 
   s.add_runtime_dependency('paperclip','~> 3.5.1')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.11.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-documents
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Víctor Sánchez Belmar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -229,7 +229,8 @@ files:
 - vendor/assets/stylesheets/pbar-ani.gif
 - vendor/assets/swf/Jplayer.swf
 homepage: http://github.com/ging/social_stream-documents
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []