social_stream 0.18.2 → 0.19.0

data/base/lib/social_stream/models/subject.rb

@@ -1,5 +1,3 @@
-require 'active_support/concern'
-
 module SocialStream
   module Models
     # {Subject Subjects} are subtypes of {Actor Actors}. {SocialStream Social Stream} provides two
@@ -75,12 +73,6 @@ module SocialStream
         end
       end
       
-      module InstanceMethods
-        def to_param
-          slug
-        end
-      end
-      
       module ClassMethods
         def find_by_slug(perm)
           includes(:actor).where('actors.slug' => perm).first
@@ -91,6 +83,10 @@ module SocialStream
             raise(ActiveRecord::RecordNotFound)
         end 
       end
+
+      def to_param
+        slug
+      end
     end
   end
 end

data/base/lib/social_stream/models/subtype.rb

@@ -1,9 +1,21 @@
-require 'active_support/concern'
-
 module SocialStream #:nodoc:
   module Models
     # Common methods for models that have a {SocialStream::Models::Supertype}
     module Subtype
+      # Add the class method {#subtype_of} to ActiveRecord::Base
+      module ActiveRecord
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          # This class is a subtype. Its supertype class is name
+          def subtype_of name, options = {}
+            @supertype_name = name
+            @supertype_options = options
+            include SocialStream::Models::Subtype
+          end
+        end
+      end
+
       extend ActiveSupport::Concern
 
       included do
@@ -37,43 +49,33 @@ module SocialStream #:nodoc:
         end 
       end
 
-      module InstanceMethods
-        # Delegate missing methods to supertype, if they exist there
-        def method_missing(method, *args, &block)
-          super
-        rescue NameError => subtype_error
-          # These methods must be raised to avoid loops
-          # (the @supertype_name association (i.e. :actor) calls here again)
-          exceptions = [ "_#{ self.class.supertype_foreign_key }".to_sym ] # [ :_actor_id ]
-          raise subtype_error if exceptions.include?(method)
+      # Delegate missing methods to supertype, if they exist there
+      def method_missing(method, *args, &block)
+        super
+      rescue NameError => subtype_error
+        raise subtype_error unless _delegate_to_supertype?(:method)
 
-          begin
-            supertype!.__send__ method, *args, &block
-          # We rescue supertype's NameErrors so methods not defined are raised from
-          # the subtype. Example: user.foo should raise "foo is not defined in user"
-          # and not "in actor"
-          rescue NameError => supertype_error
-            raise subtype_error
-          end
+        begin
+          supertype!.__send__ method, *args, &block
+        # We rescue supertype's NameErrors so methods not defined are raised from
+        # the subtype. Example: user.foo should raise "foo is not defined in user"
+        # and not "in actor"
+        rescue NameError => supertype_error
+          raise subtype_error
         end
-
-        # {SocialStream::Models::Supertype} handles some methods
-        def respond_to? *args
-          super || supertype!.respond_to?(*args)
-        end 
       end
 
-      module ActiveRecord
-        extend ActiveSupport::Concern
+      # {SocialStream::Models::Supertype} handles some methods
+      def respond_to? *args
+        super || _delegate_to_supertype?(:method) && supertype!.respond_to?(*args)
+      end 
 
-        module ClassMethods
-          # This class is a subtype. Its supertype class is name
-          def subtype_of name, options = {}
-            @supertype_name = name
-            @supertype_options = options
-            include SocialStream::Models::Subtype
-          end
-        end
+      def _delegate_to_supertype?(method)
+        # These methods must not be delegated to avoid loops
+        # (the @supertype_name association (e.g. :actor) calls here again)
+        exceptions = [ "_#{ self.class.supertype_foreign_key }".to_sym ] # [ :_actor_id ]
+
+        ! exceptions.include?(method)
       end
     end
   end

data/base/lib/social_stream/models/supertype.rb

@@ -1,5 +1,3 @@
-require 'active_support/concern'
-
 module SocialStream #:nodoc:
   module Models
     # Common methods for models having many {SocialStream::Models::Subtype subtypes}.
@@ -7,6 +5,18 @@ module SocialStream #:nodoc:
     # * {Actor}: participates in the social network and has {Tie Ties} with other actors. Its subtypes are {SocialStream::Models::Subject subjects}, such as {User} or {Group}
     # * {ActivityObject}: created and managed by {Actor Actors} in {Activity Activities}. Its subtypes are {SocialStream::Models::Object objects}, like {Post} or {Comment}
     module Supertype
+      # Include the class method {#supertype_of} to ActiveRecord::Base
+      module ActiveRecord
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          # This class is a supertype. Subtype classes are known as name
+          def supertype_of name
+            @subtypes_name = name
+            include SocialStream::Models::Supertype
+          end
+        end
+      end
       extend ActiveSupport::Concern
 
       included do
@@ -25,25 +35,11 @@ module SocialStream #:nodoc:
         end
       end 
 
-      module InstanceMethods
-        def subtype_instance
-          if __send__("#{ self.class.subtypes_name }_type").present?      # if object_type.present?
-            object_class = __send__("#{ self.class.subtypes_name }_type") #   object_class = object_type # => "Video"
-            __send__ object_class.constantize.base_class.to_s.underscore  #   __send__ "document"
-                       end                                                # end
-        end
-      end
-
-      module ActiveRecord
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-          # This class is a supertype. Subtype classes are known as name
-          def supertype_of name
-            @subtypes_name = name
-            include SocialStream::Models::Supertype
-          end
-        end
+      def subtype_instance
+        if __send__("#{ self.class.subtypes_name }_type").present?      # if object_type.present?
+          object_class = __send__("#{ self.class.subtypes_name }_type") #   object_class = object_type # => "Video"
+          __send__ object_class.constantize.base_class.to_s.underscore  #   __send__ "document"
+                     end                                                # end
       end
     end
   end

data/base/lib/tasks/db/populate.rake

@@ -131,13 +131,21 @@ namespace :db do
           actor = Actor.first
           unless a==actor
             puts a.name + " connecting with " + actor.name
-            a.contact_to!(actor).relation_ids = Array(Forgery::Extensions::Array.new(a.relation_customs).random.id)
-            actor.contact_to!(a).relation_ids = Array(Forgery::Extensions::Array.new(actor.relation_customs).random.id)
+            # DRY! :-S
+            contact = a.contact_to!(actor)
+            contact.user_author = a.user_author if a.subject_type != "User"
+            contact.relation_ids = Array(Forgery::Extensions::Array.new(a.relation_customs).random.id)
+
+            contact = actor.contact_to!(a)
+            contact.user_author = actor.user_author if actor.subject_type != "User"
+            contact.relation_ids = Array(Forgery::Extensions::Array.new(actor.relation_customs).random.id)
           end
         else
           Forgery::Basic.number(:at_most => actors.size).times do
             actor = actors.delete_at((rand * actors.size).to_i)          
-            a.contact_to!(actor).relation_ids = Array(Forgery::Extensions::Array.new(relations).random.id) unless a==actor
+            contact = a.contact_to!(actor)
+            contact.user_author = a.user_author if a.subject_type != "User"
+            contact.relation_ids = Array(Forgery::Extensions::Array.new(relations).random.id) unless a==actor
           end
         end
       end

data/base/social_stream-base.gemspec

@@ -16,13 +16,13 @@ Gem::Specification.new do |s|
   # Do not forget to require the file at lib/social_stream/base/dependencies !
   #
   # Rails
-  s.add_runtime_dependency('rails', '~> 3.1.0')
+  s.add_runtime_dependency('rails', '>= 3.1.0')
   # Activity and Relation hierarchies
   s.add_runtime_dependency('ancestry', '~> 1.2.3')
   # SQL foreign keys
   s.add_runtime_dependency('foreigner', '~> 1.1.1')
   # Authentication
-  s.add_runtime_dependency('devise', '~> 1.4.5')
+  s.add_runtime_dependency('devise', '~> 1.5.3')
   # CRUD controllers
   s.add_runtime_dependency('inherited_resources', '~> 1.3.0')
   # Slug generation
@@ -36,11 +36,13 @@ Gem::Specification.new do |s|
   # Pagination
   s.add_runtime_dependency('kaminari', '~> 0.13.0')
   # OAuth client
-  s.add_runtime_dependency('omniauth','~> 0.2.6')
+  s.add_runtime_dependency('omniauth','~> 1.0.2')
+  s.add_runtime_dependency('omniauth-facebook','~> 1.2.0')
+  s.add_runtime_dependency('omniauth-linkedin','~> 0.0.6')
   # Messages
   s.add_runtime_dependency('mailboxer','~> 0.6.0')
   # Tagging
-  s.add_runtime_dependency('acts-as-taggable-on','~> 2.0.6')
+  s.add_runtime_dependency('acts-as-taggable-on','~> 2.2.2')
   # HTML Forms
   s.add_runtime_dependency('formtastic','~> 1.2.3')
   # Simple navigation for menu
@@ -52,11 +54,13 @@ Gem::Specification.new do |s|
   # Sphinx search engine
   s.add_runtime_dependency('thinking-sphinx', '~> 2.0.8')
   # Syntactically Awesome Stylesheets
-  s.add_runtime_dependency('sass-rails', '~> 3.1.0')
+  s.add_runtime_dependency('sass-rails', '>= 3.1.0')
   # Autolink text blocks
   s.add_runtime_dependency('rails_autolink', '~> 1.0.4')
   # SocialCheesecake
   s.add_runtime_dependency('social_cheesecake','~> 0.2.0')
+  # I18n-js
+  s.add_runtime_dependency('i18n-js','~>2.1.2')
 
   # Development gem dependencies
   #

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

@@ -198,7 +198,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"
                       

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