social_stream-documents 0.8.2 → 0.9.0

data/app/assets/javascripts/documents.js.erb

@@ -34,7 +34,7 @@ $(document).ready(function(){
     var comments = $(this).children(".subactivity");    
     if (comments.size() > 5){
       $(this).prepend("<div class='hide_show_comments'><a href='#' onclick='showAllDocumentComments(\""+ 
-                       $(this).attr('id') +"\"); return false;'><%= I18n.t('comment.view_all') %> (" + 
+                       $(this).attr('id') +"\"); return false;'>" + I18n.t('comment.view_all') + "(" + 
                       comments.size() + ")</a></div><div class='space_comments'></div>");
       comments.slice(0,comments.size()-5).hide();
       //hide alto space_comments

data/lib/delayed_paperclip/social_stream-documents.rb

@@ -0,0 +1,18 @@
+# Monkey-patch https://github.com/jstorimer/delayed_paperclip/commit/3e0e3451147e96f378cda4695546d9633944cc5c
+#
+# Remove with delayed_paperclip > 2.4.5.1
+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
+  end
+end

data/lib/paperclip/social_stream-documents.rb

@@ -0,0 +1,48 @@
+# Monkey patch https://github.com/thoughtbot/paperclip/issues/293#issuecomment-2484541
+#
+# 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
+end

data/lib/social_stream-documents.rb

@@ -1,5 +1,4 @@
-require 'social_stream-base'
-require 'delayed_paperclip'
+require 'social_stream/documents/dependencies'
 
 module SocialStream
   module ToolbarConfig
@@ -20,6 +19,4 @@ module SocialStream
   end
 end
 
-#require 'paperclip_processors/ffmpeg'
-require 'paperclip-ffmpeg'
 require 'social_stream/documents/engine'

data/lib/social_stream/documents/dependencies.rb

@@ -0,0 +1,6 @@
+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/engine.rb

@@ -5,9 +5,7 @@ module SocialStream
       initializer "social_stream-documents.register_mime_types" do
         # Documents
         Mime::Type.register "text/plain", :txt
-        Mime::Type.register "application/zip", :zip
         Mime::Type.register "application/x-rar", :rar
-        Mime::Type.register "application/pdf", :pdf
         Mime::Type.register "application/postscript", :ps, [ "application/ps" ]
         Mime::Type.register "application/vnd.oasis.opendocument.text", :odt
         Mime::Type.register "application/vnd.oasis.opendocument.presentation", :odp
@@ -17,19 +15,38 @@ module SocialStream
         Mime::Type.register "application/vnd.ms-excel", :xls, [ "application/msexcel" ]
         Mime::Type.register "application/rtf", :rtf
         Mime::Type.register "application/vnd.scribus", :sla
+        # These are already defined in Rails 3.2
+        unless defined? Mime::ZIP
+          Mime::Type.register "application/zip", :zip
+        end
+        unless defined? Mime::PDF
+          Mime::Type.register "application/pdf", :pdf
+        end
 
         # Picture
-        Mime::Type.register "image/jpeg", :jpeg, ["image/pjpeg","image/jpg"]
-        Mime::Type.register "image/gif",  :gif
-        Mime::Type.register "image/png",  :png,  [ "image/x-png" ]
-        Mime::Type.register "image/bmp",  :bmp
         Mime::Type.register "image/x-xcf", :xcf
+        # These are already defined in Rails 3.2
+        unless defined? Mime::JPEG
+          Mime::Type.register "image/jpeg", :jpeg, ["image/pjpeg","image/jpg"]
+        end
+        unless defined? Mime::GIF
+          Mime::Type.register "image/gif",  :gif
+        end
+        unless defined? Mime::PNG
+          Mime::Type.register "image/png",  :png,  [ "image/x-png" ]
+        end
+        unless defined? Mime::BMP
+          Mime::Type.register "image/bmp",  :bmp
+        end
 
         # Audio
         Mime::Type.register "audio/x-wav", :wav, [ "audio/wav" ]
-        Mime::Type.register "audio/mpeg", :mpeg
         Mime::Type.register "audio/x-vorbis+ogg", :ogg, [ "application/ogg" ]
         Mime::Type.register "audio/webm", :webma
+        # These are already defined in Rails 3.2
+        unless defined? Mime::MPEG
+          Mime::Type.register "audio/mpeg", :mpeg
+        end
 
         # Video
         Mime::Type.register "video/x-flv", :flv

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.8.2".freeze
+    VERSION = "0.9.0".freeze
   end
 end

data/social_stream-documents.gemspec

@@ -12,12 +12,10 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.13.2')
+  s.add_runtime_dependency('social_stream-base', '~> 0.14.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
-  s.add_runtime_dependency('paperclip','2.3.11')
-  s.add_runtime_dependency('delayed_paperclip','0.7.2')
+  s.add_runtime_dependency('paperclip','= 2.4.5')
+  s.add_runtime_dependency('delayed_paperclip','2.4.5.1')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')
   if RUBY_VERSION < '1.9'

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

@@ -160,7 +160,7 @@ Devise.setup do |config|
   # Add a new OmniAuth provider. Check the wiki for more information on setting
   # up on your models and hooks.
   # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
-  config.omniauth :linked_in, "ekxfXU8nueVSMQ9fc5KJAryBkyztUlCBYMW3DoQPzbE79WhivvzhQloRNHCHgPeB", "WYiHFT-KKFgjd45W3-pEAficmXRHmN6_6DGwj1C_ZILJlSO1gBvv6VNYXU9tybGY"
+  config.omniauth :linkedin, "ekxfXU8nueVSMQ9fc5KJAryBkyztUlCBYMW3DoQPzbE79WhivvzhQloRNHCHgPeB", "WYiHFT-KKFgjd45W3-pEAficmXRHmN6_6DGwj1C_ZILJlSO1gBvv6VNYXU9tybGY"
                       
   config.omniauth :facebook, "129571360447856","eef39dce5e20e76f77495c59623bdb38"
  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-documents
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000Z
+date: 2012-01-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &74585590 !ruby/object:Gem::Requirement
+  requirement: &88799830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *74585590
+  version_requirements: *88799830
 - !ruby/object:Gem::Dependency
   name: paperclip-ffmpeg
-  requirement: &74585340 !ruby/object:Gem::Requirement
+  requirement: &88799580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,32 +33,32 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *74585340
+  version_requirements: *88799580
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &74585110 !ruby/object:Gem::Requirement
+  requirement: &88799350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 2.3.11
+        version: 2.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *74585110
+  version_requirements: *88799350
 - !ruby/object:Gem::Dependency
   name: delayed_paperclip
-  requirement: &74584880 !ruby/object:Gem::Requirement
+  requirement: &88799120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 2.4.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *74584880
+  version_requirements: *88799120
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &74584690 !ruby/object:Gem::Requirement
+  requirement: &88798930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74584690
+  version_requirements: *88798930
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &74584410 !ruby/object:Gem::Requirement
+  requirement: &88798650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *74584410
+  version_requirements: *88798650
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &74584160 !ruby/object:Gem::Requirement
+  requirement: &88798400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *74584160
+  version_requirements: *88798400
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &74583930 !ruby/object:Gem::Requirement
+  requirement: &88798170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *74583930
+  version_requirements: *88798170
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &74583700 !ruby/object:Gem::Requirement
+  requirement: &88797940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *74583700
+  version_requirements: *88797940
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -230,8 +230,11 @@ files:
 - 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/delayed_paperclip/social_stream-documents.rb
 - lib/generators/social_stream/documents/install_generator.rb
+- lib/paperclip/social_stream-documents.rb
 - lib/social_stream-documents.rb
+- lib/social_stream/documents/dependencies.rb
 - lib/social_stream/documents/engine.rb
 - lib/social_stream/documents/version.rb
 - lib/social_stream/migrations/documents.rb