social_stream-documents 0.17.0 → 0.18.0

data/app/controllers/documents_controller.rb

@@ -20,6 +20,7 @@ class DocumentsController < ApplicationController
   def create
     super do |format|
       format.json { render :json => resource }
+      format.js
       format.all {redirect_to request.referer || home_path}
     end
   end

data/app/models/audio.rb

@@ -1,9 +1,9 @@
 class Audio < Document  
   has_attached_file :file, 
-                    :url => '/:class/:id.:extension',
+                    :url => '/:class/:id.:content_type_extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style',
-                    :styles => {:webma => {:format => 'webm'}                                
-                    },:processors => [:ffmpeg]
+                    :styles => SocialStream::Documents.audio_styles,
+                    :processors => [ :ffmpeg ]
   
   process_in_background :file    
   

data/app/models/document.rb

@@ -4,7 +4,7 @@ class Document < ActiveRecord::Base
   IMAGE_FORMATS = ["doc","ppt","xls","rar","zip","mpeg","plain","pdf"]
 
   has_attached_file :file, 
-                    :url => '/:class/:id.:extension',
+                    :url => '/:class/:id.:content_type_extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style/:filename.:extension'
 
   paginates_per 20
@@ -82,5 +82,3 @@ class Document < ActiveRecord::Base
     self.title = file_file_name if self.title.blank?
   end
 end
-
-ActiveSupport.run_load_hooks(:document, Document) 

data/app/models/picture.rb

@@ -1,13 +1,8 @@
 class Picture < Document
   has_attached_file :file, 
-                    :url => '/:class/:id.:extension',
+                    :url => '/:class/:id.:content_type_extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style',
-                    :styles => {:thumb48sq  => ["48x48"],
-                                :thumbwall => ["130x97#"],
-                                # midwall preserves A4 proportion: 210x297
-                                :midwall => ["80x113#"],
-                                :preview => ["500>"]
-                               }                              
+                    :styles => SocialStream::Documents.picture_styles
                                
   define_index do
     activity_object_index
@@ -28,6 +23,8 @@ class Picture < Document
         helper.picture_path self, :format => format, :style => 'thumbwall'
       when 500
         helper.picture_path self, :format => format, :style => 'preview'
+      when 1000
+        helper.picture_path self, :format => format, :style => 'original'
     end
   end
       

data/app/models/video.rb

@@ -1,16 +1,9 @@
 class Video < Document  
   has_attached_file :file, 
-                    :url => '/:class/:id.:extension',
+                    :url => '/:class/:id.:content_type_extension',
                     :default_url => 'missing_:style.png',
                     :path => ':rails_root/documents/:class/:id_partition/:style',
-                    :styles => {
-                      :webm => {:format => 'webm'},
-                      :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}
-                    },
+                    :styles => SocialStream::Documents.video_styles,
                     :processors => [:ffmpeg]
                     
   process_in_background :file

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

@@ -53,7 +53,7 @@
       ready: function () {
         $(this).jPlayer("setMedia", {
           webmv: "<%= video_url(video, :format => 'webm' ) %>", // Defines the webm url
-          flv:   "<%= video_url(video, :format => 'flv') %>"
+          flv:   "<%= video_url(video, :format => 'flv') %>",
           mp4:   "<%= video_url(video, :format => 'mp4') %>"
         });
       },

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

@@ -10,8 +10,6 @@ class CreateSocialStreamDocuments < ActiveRecord::Migration
       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"], :name => "index_documents_on_activity_object_id"

data/lib/delayed_paperclip/social_stream-documents.rb

@@ -1,18 +1,13 @@
-# Monkey-patch https://github.com/jstorimer/delayed_paperclip/commit/3e0e3451147e96f378cda4695546d9633944cc5c
+# Monkey-patch https://github.com/jstorimer/delayed_paperclip/issues/67
 #
-# Remove with delayed_paperclip > 2.4.5.1
+# Remove with delayed_paperclip > 2.4.5.2 ???
 require 'delayed_paperclip'
 
 module DelayedPaperclip::Attachment::InstanceMethods
-  def post_process_styles_with_processing(*args)
-    post_process_styles_without_processing(*args)
-
-    # update_column is available in rails 3.1 instead we can do this to update the attribute without callbacks
-
-    #instance.update_column("#{name}_processing", false) if instance.respond_to?(:"#{name}_processing?")
-    if instance.respond_to?(:"#{name}_processing?")
-      instance.send("#{name}_processing=", false)
-      instance.class.update_all({ "#{name}_processing" => false }, instance.class.primary_key => instance.id)
-    end
+  def process_delayed!
+    self.job_is_processing = true
+    self.post_processing = true
+    reprocess!
+    self.job_is_processing = false
   end
 end

data/lib/generators/social_stream/documents/install_generator.rb

@@ -3,6 +3,10 @@ class SocialStream::Documents::InstallGenerator < Rails::Generators::Base
   
   source_root File.expand_path('../templates', __FILE__)
 
+  def create_initializer_file
+    template 'initializer.rb', 'config/initializers/social_stream-documents.rb'
+  end
+
   def create_migration_file
     require 'rake'
     Rails.application.load_tasks

data/lib/generators/social_stream/documents/templates/initializer.rb

@@ -0,0 +1,26 @@
+SocialStream::Documents.setup do |config| 
+  # Configure picture thumbnails
+  #
+  # config.picture_styles = {
+  #    :thumb48sq  => ["48x48"],
+  #    :thumbwall => ["130x97#"],
+  #    # midwall preserves A4 proportion: 210x297
+  #    :midwall => ["80x113#"],
+  #    :preview => ["500>"]
+  #  }
+
+  # Configure audio thumbnails
+  #
+  # config.audio_styles = { :webma => {:format => 'webm'} }
+
+  # Configure video thumbnails
+  #
+  #  @@video_styles = {
+  #    :webm => { :format => 'webm' },
+  #    :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 }
+  #  }
+end

data/lib/social_stream-documents.rb

@@ -8,6 +8,35 @@ module SocialStream
   end
 
   module Documents
+    # Picture thumbnails
+    mattr_accessor :picture_styles
+    @@picture_styles = {
+      :thumb48sq  => ["48x48"],
+      :thumbwall => ["130x97#"],
+      # midwall preserves A4 proportion: 210x297
+      :midwall => ["80x113#"],
+      :preview => ["500>"]
+    }
+
+    mattr_accessor :audio_styles
+    @@audio_styles = { :webma => {:format => 'webm'} }
+
+    mattr_accessor :video_styles
+    @@video_styles = {
+      :webm => { :format => 'webm' },
+      :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 }
+    }
+
+    class << self
+      def setup
+        yield self
+      end
+    end
+
     # Add :document to SocialStream.objects and SocialStream.activity_forms by default
     # It can be configured by users at application's config/initializers/social_stream.rb
     [ :picture, :video, :audio, :document].each do |o|

data/lib/social_stream/documents/dependencies.rb

@@ -1,6 +1,5 @@
 require 'social_stream-base'
 require 'paperclip'
-require 'paperclip/social_stream-documents'
 require 'paperclip-ffmpeg'
 require 'delayed_paperclip'
 require 'delayed_paperclip/social_stream-documents'

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.17.0".freeze
+    VERSION = "0.18.0".freeze
   end
 end

data/social_stream-documents.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.23.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')
+  s.add_runtime_dependency('social_stream-base', '~> 0.24.0')
+  s.add_runtime_dependency('paperclip','~> 3.3.0')
+  s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.9.0')
+  s.add_runtime_dependency('delayed_paperclip','>= 2.4.5.2')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')
   if RUBY_VERSION < '1.9'

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

@@ -72,10 +72,6 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # ==> Configuration for :validatable
   # Range for password length. Default is 6..20.
   # config.password_length = 6..20
@@ -163,6 +159,10 @@ Devise.setup do |config|
   config.omniauth :linkedin, "ekxfXU8nueVSMQ9fc5KJAryBkyztUlCBYMW3DoQPzbE79WhivvzhQloRNHCHgPeB", "WYiHFT-KKFgjd45W3-pEAficmXRHmN6_6DGwj1C_ZILJlSO1gBvv6VNYXU9tybGY"
                       
   config.omniauth :facebook, "129571360447856","eef39dce5e20e76f77495c59623bdb38"
+
+  #re state_less token removal 
+  #https://github.com/plataformatec/devise/issues/1499
+  config.skip_session_storage << :token_auth
  
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-documents
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,15 +27,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
-  name: paperclip-ffmpeg
+  name: paperclip
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,39 +43,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
-  name: paperclip
+  name: paperclip-ffmpeg
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.5
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.5
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: delayed_paperclip
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.5.1
+        version: 2.4.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.5.1
+        version: 2.4.5.2
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -275,11 +275,10 @@ files:
 - config/locales/en.yml
 - config/locales/es.yml
 - config/routes.rb
-- db/migrate/20120109155431_create_social_stream_documents.rb
-- db/migrate/20120208143721_documents_group_title_and_description_in_activity_object.rb
+- db/migrate/20120208143721_create_social_stream_documents.rb
 - lib/delayed_paperclip/social_stream-documents.rb
 - lib/generators/social_stream/documents/install_generator.rb
-- lib/paperclip/social_stream-documents.rb
+- lib/generators/social_stream/documents/templates/initializer.rb
 - lib/samples/car.jpg
 - lib/samples/house.jpg
 - lib/samples/loremipsum.odt
@@ -383,3 +382,4 @@ specification_version: 3
 summary: File capabilities for Social Stream, the core for building social network
   websites
 test_files: []
+has_rdoc: 

data/db/migrate/20120208143721_documents_group_title_and_description_in_activity_object.rb

@@ -1,28 +0,0 @@
-class DocumentsGroupTitleAndDescriptionInActivityObject < ActiveRecord::Migration
-  def up
-    ao_ts = ActivityObject.record_timestamps
-    ActivityObject.record_timestamps = false
-
-    # Fix 'documents' table
-    d_ts = Document.record_timestamps
-    Document.record_timestamps = false
-
-    Document.all.each do |d|
-      d.activity_object.title = d.read_attribute(:title)
-      d.activity_object.description = d.read_attribute(:description)
-      d.save!
-    end
-    change_table :documents do |t|
-      t.remove :title
-      t.remove :description
-    end
-    Document.reset_column_information
-    Document.record_timestamps = d_ts
-
-    ActivityObject.record_timestamps = ao_ts
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration # Due to trans-gem oddities
-  end
-end

data/lib/paperclip/social_stream-documents.rb

@@ -1,62 +0,0 @@
-# Monkey patch https://github.com/thoughtbot/paperclip/issues/293#issuecomment-2484541
-# Monkey patch https://github.com/thoughtbot/paperclip/commit/2583a27df497e72ec7a200b6aa707948e88fd166
-#
-# Remove with paperclip > 2.5.0
-require 'paperclip'
-
-module Paperclip::ClassMethods
-  def has_attached_file name, options = {}
-    include Paperclip::InstanceMethods
-
-    if attachment_definitions.nil?
-      if respond_to?(:class_attribute)
-        self.attachment_definitions = {}
-      else
-        write_inheritable_attribute(:attachment_definitions, {})
-      end
-    else
-      self.attachment_definitions = self.attachment_definitions.dup
-    end
-
-    attachment_definitions[name] = {:validations => []}.merge(options)
-    Paperclip.classes_with_attachments << self.name
-    Paperclip.check_for_url_clash(name,attachment_definitions[name][:url],self.name)
-
-    after_save :save_attached_files
-    before_destroy :prepare_for_destroy
-    after_destroy :destroy_attached_files
-
-    define_paperclip_callbacks :post_process, :"#{name}_post_process"
-
-    define_method name do |*args|
-      a = attachment_for(name)
-      (args.length > 0) ? a.to_s(args.first) : a
-    end
-
-    define_method "#{name}=" do |file|
-      attachment_for(name).assign(file)
-    end
-
-    define_method "#{name}?" do
-      attachment_for(name).file?
-    end
-
-    validates_each(name) do |record, attr, value|
-      attachment = record.attachment_for(name)
-      attachment.send(:flush_errors)
-    end
-  end
-
-  def validates_attachment_presence name, options = {}
-    message = options[:message] || :empty
-    validates_each :"#{name}_file_name" do |record, attr, value|
-      if_clause_passed = options[:if].nil? || (options[:if].respond_to?(:call) ? options[:if].call(record) != false : record.send(options[:if]))
-      unless_clause_passed = options[:unless].nil? || (options[:unless].respond_to?(:call) ? !!options[:unless].call(record) == false : !record.send(options[:unless]))
-
-      if if_clause_passed && unless_clause_passed && value.blank?
-        record.errors.add(name, message)
-        record.errors.add("#{name}_file_name", message)
-      end
-    end
-  end
-end