social_stream-base 0.14.3 → 0.15.0

data/app/views/toolbar/_home.html.erb

@@ -8,7 +8,7 @@
 </div>
 
 <% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
-  <%= render :partial => 'chat/index' , :locals => {:flow => true} %>
+  <%= render :partial => 'chat/index' , :locals => {:flow => false} %>
 <% end %>
 
 <div class="block space_center">

data/app/views/toolbar/_messages.html.erb

@@ -9,3 +9,7 @@
 
 <div class="block space_center">
 </div>
+
+<% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
+  <%= render :partial => 'chat/index' , :locals => {:flow => true} %>
+<% end %>

data/app/views/toolbar/_profile.html.erb

@@ -22,3 +22,7 @@
 <div class="block space_center">
 </div>
 
+<% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
+  <%= render :partial => 'chat/index' , :locals => {:flow => true} %>
+<% end %>
+

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.14.3".freeze
+    VERSION = "0.15.0".freeze
   end
 end

data/social_stream-base.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   # Avatar attachments
   s.add_runtime_dependency('avatars_for_rails', '~> 0.2.2')
   # jQuery
-  s.add_runtime_dependency('jquery-rails', '~> 1.0.9')
+  s.add_runtime_dependency('jquery-rails', '>= 1.0.9')
   # Authorization
   s.add_runtime_dependency('cancan', '~> 1.6.4')
   # Pagination

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.15.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000Z
+date: 2012-02-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &72404110 !ruby/object:Gem::Requirement
+  requirement: &81617000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *72404110
+  version_requirements: *81617000
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &72403860 !ruby/object:Gem::Requirement
+  requirement: &81616500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *72403860
+  version_requirements: *81616500
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &72403600 !ruby/object:Gem::Requirement
+  requirement: &81616270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *72403600
+  version_requirements: *81616270
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &72403350 !ruby/object:Gem::Requirement
+  requirement: &81616030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *72403350
+  version_requirements: *81616030
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &72403070 !ruby/object:Gem::Requirement
+  requirement: &81615700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *72403070
+  version_requirements: *81615700
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &72402760 !ruby/object:Gem::Requirement
+  requirement: &81615350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *72402760
+  version_requirements: *81615350
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &72402220 !ruby/object:Gem::Requirement
+  requirement: &81615050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,21 +88,21 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *72402220
+  version_requirements: *81615050
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &72401970 !ruby/object:Gem::Requirement
+  requirement: &81614820 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *72401970
+  version_requirements: *81614820
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &72401740 !ruby/object:Gem::Requirement
+  requirement: &81614560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *72401740
+  version_requirements: *81614560
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &72391510 !ruby/object:Gem::Requirement
+  requirement: &81614310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *72391510
+  version_requirements: *81614310
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &72391260 !ruby/object:Gem::Requirement
+  requirement: &81614080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *72391260
+  version_requirements: *81614080
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &72390990 !ruby/object:Gem::Requirement
+  requirement: &81613850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *72390990
+  version_requirements: *81613850
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &72390680 !ruby/object:Gem::Requirement
+  requirement: &81613620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *72390680
+  version_requirements: *81613620
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &72390360 !ruby/object:Gem::Requirement
+  requirement: &81613390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *72390360
+  version_requirements: *81613390
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &72390120 !ruby/object:Gem::Requirement
+  requirement: &81613160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *72390120
+  version_requirements: *81613160
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &72389890 !ruby/object:Gem::Requirement
+  requirement: &81612930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *72389890
+  version_requirements: *81612930
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &72389660 !ruby/object:Gem::Requirement
+  requirement: &81612690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *72389660
+  version_requirements: *81612690
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &72389420 !ruby/object:Gem::Requirement
+  requirement: &81612440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *72389420
+  version_requirements: *81612440
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &72389180 !ruby/object:Gem::Requirement
+  requirement: &81612140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *72389180
+  version_requirements: *81612140
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &72388950 !ruby/object:Gem::Requirement
+  requirement: &81611850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -231,10 +231,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *72388950
+  version_requirements: *81611850
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &72388720 !ruby/object:Gem::Requirement
+  requirement: &81611500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -242,10 +242,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *72388720
+  version_requirements: *81611500
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &72388490 !ruby/object:Gem::Requirement
+  requirement: &81599560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,10 +253,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *72388490
+  version_requirements: *81599560
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &72388230 !ruby/object:Gem::Requirement
+  requirement: &81599330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -264,10 +264,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *72388230
+  version_requirements: *81599330
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &72387990 !ruby/object:Gem::Requirement
+  requirement: &81599100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -275,10 +275,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *72387990
+  version_requirements: *81599100
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &72387710 !ruby/object:Gem::Requirement
+  requirement: &81598870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -286,10 +286,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *72387710
+  version_requirements: *81598870
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &72387500 !ruby/object:Gem::Requirement
+  requirement: &81598680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -297,10 +297,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72387500
+  version_requirements: *81598680
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &72387130 !ruby/object:Gem::Requirement
+  requirement: &81598440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -308,10 +308,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72387130
+  version_requirements: *81598440
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &72386430 !ruby/object:Gem::Requirement
+  requirement: &81598190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +319,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *72386430
+  version_requirements: *81598190
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &72386180 !ruby/object:Gem::Requirement
+  requirement: &81597940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,10 +330,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *72386180
+  version_requirements: *81597940
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &72385910 !ruby/object:Gem::Requirement
+  requirement: &81597710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -341,10 +341,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *72385910
+  version_requirements: *81597710
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &72385550 !ruby/object:Gem::Requirement
+  requirement: &81597480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -352,10 +352,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *72385550
+  version_requirements: *81597480
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &72385190 !ruby/object:Gem::Requirement
+  requirement: &81597220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -363,7 +363,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *72385190
+  version_requirements: *81597220
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.