social_stream-base 0.20.0 → 0.20.1

data/lib/social_stream/{populate.rb → population/power_law.rb}

@@ -1,14 +1,13 @@
 module SocialStream
-  module Populate
-
-    class << self
+  module Population
+    class PowerLaw
       # Yields each element of array y times given by 
       # {power law distribution}[http://en.wikipedia.org/wiki/Power_law]
       # y = ax**k + e
       # 
       # Options: Each constant in the function
       #
-      def power_law(array, options = {})
+      def initialize(array, options = {})
         options[:a] ||= array.size
         options[:k] ||= -2.5
         options[:e] ||= 1

data/lib/social_stream/population/timestamps.rb

@@ -0,0 +1,12 @@
+module SocialStream
+  module Population
+    class Timestamps
+      attr_reader :created, :updated
+
+      def initialize
+        @updated = Time.at(rand(Time.now.to_i))
+        @created = Time.at(rand(@updated.to_i))
+      end
+    end
+  end
+end

data/lib/social_stream/search.rb

@@ -0,0 +1,107 @@
+module SocialStream
+  module Search
+    class << self
+      def keys(search_type)
+        case search_type
+        when :quick
+          SocialStream.quick_search_models
+        when :extended
+          extended_search_models.keys
+        end
+      end
+
+      def models(search_type, key = nil)
+        case search_type
+        when :quick
+          quick_search_models
+        when :extended
+          if key.present?
+            if extended_search_models.keys.include?(key.to_sym)
+              extended_search_models[key.to_sym]
+            else
+              if extended_search_models.values.flatten.map{ |k| k.to_s }.include?(key.to_s.classify)
+                [key.to_s.classify.constantize]
+              else
+                raise "Unknown search key #{ key }"
+              end
+            end
+          else
+            extended_search_models.values.flatten
+          end
+        else
+          raise "Unknown search type #{ search_type }"
+        end
+      end
+
+      def search(query, subject, options = {})
+        ThinkingSphinx.search *args_for_search(query, subject, options)
+      end
+
+      def count(query, subject, options = {})
+        ThinkingSphinx.count *args_for_search(query, subject, options)
+      end
+
+
+      private
+
+      def quick_search_models
+        @quick_search_models ||=
+          parse_quick_search_models
+      end
+
+      def parse_quick_search_models
+        SocialStream.quick_search_models.map{ |m|
+          m.to_s.classify.constantize
+        }
+      end
+
+      def extended_search_models
+        @extended_search_models ||=
+          parse_extended_search_models 
+      end
+
+      # Get a normalized hash from the configuration. Converts this:
+      #
+      #   [ :excursion, :user, { :resource => [ :post, :comment, :picture ] }
+      #
+      # into this:
+      #
+      #   {
+      #     :excursion => [ Excursion ],
+      #     :user => [ User ],
+      #     :resource => [ Post, Comment, Picture ]
+      #   }
+      #
+      def parse_extended_search_models
+          SocialStream.extended_search_models.inject({}) do |hash, entry|
+            case entry
+            when Hash
+              hash.update entry.inject({}){ |h, e|
+                h[e.first] = Array.wrap(e.last).map{ |f| f.to_s.classify.constantize }
+                h
+              }
+            when Symbol
+              hash[entry] = Array.wrap(entry.to_s.classify.constantize)
+            else
+              raise "Unknown entry in config.extended_search_models #{ entry }"
+            end
+
+            hash
+          end
+      end
+
+      def args_for_search(query, subject, options = {})
+        options[:mode] ||= :extended
+
+        models = models(options[:mode], options[:key])
+        relation_ids = Relation.ids_shared_with(subject)
+
+        [
+          query,
+          :classes => models,
+          :with => { :relation_ids => relation_ids }
+        ]
+      end
+    end
+  end
+end

data/lib/tasks/db/populate.rake

@@ -17,8 +17,9 @@ namespace :db do
     task :read_environment => :environment do
       require 'forgery'
 
-      @LOGOS_PATH = File.join(Rails.root, 'lib', 'logos')
-      @LOGOS_TOTAL = (ENV["LOGOS_TOTAL"] || 10).to_i
+      @SS_BASE_PATH = Gem::Specification.find_by_name('social_stream-base').full_gem_path
+      @LOGOS_PATH = File.join(@SS_BASE_PATH, 'lib', 'logos')
+      @LOGOS_TOTAL = (ENV["LOGOS_TOTAL"] || 12).to_i
       @USERS = (ENV["USERS"] || 9).to_i
       @GROUPS = (ENV["GROUPS"] || 10).to_i
       if ENV["HARDCORE"].present?
@@ -122,6 +123,13 @@ namespace :db do
         end
       end
 
+      Activity.includes(:activity_verb).merge(ActivityVerb.verb_name(["follow", "make-friend"])).each do |a|
+        t = SocialStream::Population::Timestamps.new
+
+        a.update_attributes :created_at => t.created,
+                            :updated_at => t.updated
+      end
+
       ties_end = Time.now
       puts '   -> ' +  (ties_end - ties_start).round(4).to_s + 's'
     end
@@ -159,31 +167,10 @@ namespace :db do
     # POSTS
     desc "Create posts"
     task :create_posts => :read_environment do
-      puts 'Post population'
-      posts_start = Time.now
-
-      SocialStream::Populate.power_law(Tie.positive.all) do |t|
-        updated = Time.at(rand(Time.now.to_i))
-
-        author = t.sender
-        owner  = t.receiver
-        user_author = ( t.sender.subject_type == "User" ? t.sender : t.sender.user_author )
-
-        p = Post.create :text =>
-                      "This post should be for #{ t.relation.name } of #{ t.sender.name }.\n#{ Forgery::LoremIpsum.paragraph(:random => true) }",
-                        :created_at => Time.at(rand(updated.to_i)),
-                        :updated_at => updated,
-                        :author_id  => author.id,
-                        :owner_id   => owner.id,
-                        :user_author_id => user_author.id,
-                        :relation_ids => Array(t.relation_id)
-
-        p.post_activity.update_attributes(:created_at => p.created_at,
-                                          :updated_at => p.updated_at)
+      SocialStream::Population::ActivityObject.new Post do |p|
+        p.text =
+          "This post should be for #{ p.relations.map(&:name).join(", ") } of #{ p.owner.name }.\n#{ Forgery::LoremIpsum.paragraph(:random => true) }"
       end
-
-      posts_end = Time.now
-      puts '   -> ' +  (posts_end - posts_start).round(4).to_s + 's'
     end
 
 

data/social_stream-base.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |s|
   #
   # Do not forget to require the file at lib/social_stream/base/dependencies !
   #
+  # Deep Merge support for Hashes
+  s.add_runtime_dependency('deep_merge')
   # Rails
   s.add_runtime_dependency('rails', '>= 3.1.0')
   # Activity and Relation hierarchies
@@ -70,7 +72,7 @@ Gem::Specification.new do |s|
   if RUBY_VERSION < '1.9'
     s.add_development_dependency('ruby-debug')
   else
-    s.add_development_dependency('ruby-debug19')
+    s.add_development_dependency('debugger')
   end
   # Specs
   s.add_development_dependency('rspec-rails', '~> 2.6.1')

data/spec/models/post_spec.rb

@@ -104,6 +104,18 @@ describe Post do
         post.post_activity.relations.should include(tie.relation)
       end
     end
+
+    describe "a new post" do
+      before do
+        @user = Factory(:user)
+        @post = Post.create!(:text => "test",
+                             :author_id => @user.actor_id)
+      end
+
+      it "should be shared with user relations" do
+        @post.relation_ids.sort.should eq(@user.relation_ids.sort)
+      end
+    end
   end
 
   describe "authored_by" do
@@ -113,4 +125,6 @@ describe Post do
       Post.authored_by(post.author).should include(post)
     end
   end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000Z
+date: 2012-05-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: &76563270 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *76563270
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &90062230 !ruby/object:Gem::Requirement
+  requirement: &76563000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +33,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *90062230
+  version_requirements: *76563000
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &90061980 !ruby/object:Gem::Requirement
+  requirement: &76562720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +44,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *90061980
+  version_requirements: *76562720
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &90061750 !ruby/object:Gem::Requirement
+  requirement: &76562420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +55,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *90061750
+  version_requirements: *76562420
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &90061520 !ruby/object:Gem::Requirement
+  requirement: &76562100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +66,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *90061520
+  version_requirements: *76562100
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &90061290 !ruby/object:Gem::Requirement
+  requirement: &76561740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *90061290
+  version_requirements: *76561740
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &90061060 !ruby/object:Gem::Requirement
+  requirement: &76560960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +88,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *90061060
+  version_requirements: *76560960
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &90060830 !ruby/object:Gem::Requirement
+  requirement: &76560510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +99,10 @@ dependencies:
         version: 0.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *90060830
+  version_requirements: *76560510
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &90060600 !ruby/object:Gem::Requirement
+  requirement: &76560110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +110,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *90060600
+  version_requirements: *76560110
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &90060370 !ruby/object:Gem::Requirement
+  requirement: &76576230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +121,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *90060370
+  version_requirements: *76576230
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &90060140 !ruby/object:Gem::Requirement
+  requirement: &76575770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +132,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *90060140
+  version_requirements: *76575770
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &90059910 !ruby/object:Gem::Requirement
+  requirement: &76575140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +143,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *90059910
+  version_requirements: *76575140
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &90059680 !ruby/object:Gem::Requirement
+  requirement: &76574800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +154,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *90059680
+  version_requirements: *76574800
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &90059450 !ruby/object:Gem::Requirement
+  requirement: &76574450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +165,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *90059450
+  version_requirements: *76574450
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &90059220 !ruby/object:Gem::Requirement
+  requirement: &76574010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +176,10 @@ dependencies:
         version: 0.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *90059220
+  version_requirements: *76574010
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &90058990 !ruby/object:Gem::Requirement
+  requirement: &76573630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +187,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *90058990
+  version_requirements: *76573630
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &90058760 !ruby/object:Gem::Requirement
+  requirement: &76573380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +198,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *90058760
+  version_requirements: *76573380
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &90058530 !ruby/object:Gem::Requirement
+  requirement: &76573110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +209,10 @@ dependencies:
         version: 1.20.0
   type: :runtime
   prerelease: false
-  version_requirements: *90058530
+  version_requirements: *76573110
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &90058300 !ruby/object:Gem::Requirement
+  requirement: &76572830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +220,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *90058300
+  version_requirements: *76572830
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &90058070 !ruby/object:Gem::Requirement
+  requirement: &76572570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +231,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *90058070
+  version_requirements: *76572570
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &90057840 !ruby/object:Gem::Requirement
+  requirement: &76572310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,10 +242,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *90057840
+  version_requirements: *76572310
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &90073990 !ruby/object:Gem::Requirement
+  requirement: &76572050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -242,10 +253,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *90073990
+  version_requirements: *76572050
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &90073760 !ruby/object:Gem::Requirement
+  requirement: &76571790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,10 +264,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *90073760
+  version_requirements: *76571790
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &90073530 !ruby/object:Gem::Requirement
+  requirement: &76571530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -264,10 +275,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *90073530
+  version_requirements: *76571530
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &90073300 !ruby/object:Gem::Requirement
+  requirement: &76571270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -275,10 +286,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *90073300
+  version_requirements: *76571270
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &90073110 !ruby/object:Gem::Requirement
+  requirement: &76571070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -286,10 +297,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *90073110
+  version_requirements: *76571070
 - !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &90072870 !ruby/object:Gem::Requirement
+  name: debugger
+  requirement: &76570800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -297,10 +308,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *90072870
+  version_requirements: *76570800
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &90072620 !ruby/object:Gem::Requirement
+  requirement: &76570530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -308,10 +319,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *90072620
+  version_requirements: *76570530
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &90072370 !ruby/object:Gem::Requirement
+  requirement: &76570200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +330,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *90072370
+  version_requirements: *76570200
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &90072140 !ruby/object:Gem::Requirement
+  requirement: &76569330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,10 +341,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *90072140
+  version_requirements: *76569330
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &90071910 !ruby/object:Gem::Requirement
+  requirement: &76568700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -341,10 +352,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *90071910
+  version_requirements: *76568700
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &90071680 !ruby/object:Gem::Requirement
+  requirement: &76568320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -352,7 +363,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *90071680
+  version_requirements: *76568320
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -835,6 +846,7 @@ files:
 - app/views/relation/customs/index.html.erb
 - app/views/relation/customs/update.js.erb
 - app/views/search/_extended_search.html.erb
+- app/views/search/_extended_tab.html.erb
 - app/views/search/_form.html.erb
 - app/views/search/_header_search.html.erb
 - app/views/search/_index.html.erb
@@ -891,6 +903,34 @@ files:
 - lib/generators/social_stream/base/templates/sphinx.yml
 - lib/i18n-js/social_stream-base.rb
 - lib/inherited_resources/social_stream.rb
+- lib/logos/groups/1.jpg
+- lib/logos/groups/10.jpg
+- lib/logos/groups/11.jpg
+- lib/logos/groups/12.jpg
+- lib/logos/groups/2.jpg
+- lib/logos/groups/3.jpg
+- lib/logos/groups/4.jpg
+- lib/logos/groups/5.jpg
+- lib/logos/groups/6.jpg
+- lib/logos/groups/7.jpg
+- lib/logos/groups/8.jpg
+- lib/logos/groups/9.jpg
+- lib/logos/partners/1.jpg
+- lib/logos/partners/1.png
+- lib/logos/partners/2.jpg
+- lib/logos/partners/2.png
+- lib/logos/users/1.jpg
+- lib/logos/users/10.jpg
+- lib/logos/users/11.jpg
+- lib/logos/users/12.jpg
+- lib/logos/users/2.jpg
+- lib/logos/users/3.jpg
+- lib/logos/users/4.jpg
+- lib/logos/users/5.jpg
+- lib/logos/users/6.jpg
+- lib/logos/users/7.jpg
+- lib/logos/users/8.jpg
+- lib/logos/users/9.jpg
 - lib/paperclip/social_stream.rb
 - lib/rails/social_stream.rb
 - lib/social_stream-base.rb
@@ -914,10 +954,13 @@ files:
 - lib/social_stream/models/subject.rb
 - lib/social_stream/models/subtype.rb
 - lib/social_stream/models/supertype.rb
-- lib/social_stream/populate.rb
+- lib/social_stream/population/activity_object.rb
+- lib/social_stream/population/power_law.rb
+- lib/social_stream/population/timestamps.rb
 - lib/social_stream/routing/constraints/custom.rb
 - lib/social_stream/routing/constraints/follow.rb
 - lib/social_stream/routing/constraints/resque.rb
+- lib/social_stream/search.rb
 - lib/social_stream/test_helpers.rb
 - lib/social_stream/test_helpers/controllers.rb
 - lib/social_stream/views/list.rb
@@ -1071,9 +1114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Basic features for Social Stream, the core for building social network websites
 test_files: []
-has_rdoc: