social_stream-base 0.17.2 → 0.17.3

data/Rakefile

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 require 'rubygems'
 

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.17.2".freeze
+    VERSION = "0.17.3".freeze
   end
 end

data/lib/social_stream/controllers/i18n_integration.rb

@@ -10,7 +10,7 @@ module SocialStream
 
       # Set locale as per params, user preference or default
       def set_locale
-        I18n.locale = params[:locale] || user_preferred_locale || extract_locale_from_accept_language_header || I18n.default_locale
+        I18n.locale = params[:locale] || user_preferred_locale || session[:locale] || extract_locale_from_accept_language_header || I18n.default_locale
       end
 
       private

data/social_stream-base.gemspec

@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   # Simple navigation for menu
   s.add_runtime_dependency('simple-navigation', '~> 3.5.1')
   # Background jobs
-  s.add_runtime_dependency('resque','~> 1.19.0')
+  s.add_runtime_dependency('resque','~> 1.20.0')
   # Modernizr.js javascript library
   s.add_runtime_dependency('modernizr-rails', '~> 2.0.6')
   # Sphinx search engine

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000Z
+date: 2012-03-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &73996770 !ruby/object:Gem::Requirement
+  requirement: &79141040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *73996770
+  version_requirements: *79141040
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &73996210 !ruby/object:Gem::Requirement
+  requirement: &79140240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *73996210
+  version_requirements: *79140240
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &73995510 !ruby/object:Gem::Requirement
+  requirement: &79139670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *73995510
+  version_requirements: *79139670
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &73994640 !ruby/object:Gem::Requirement
+  requirement: &79139300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *73994640
+  version_requirements: *79139300
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &73993470 !ruby/object:Gem::Requirement
+  requirement: &79138900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *73993470
+  version_requirements: *79138900
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &73992940 !ruby/object:Gem::Requirement
+  requirement: &79138540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *73992940
+  version_requirements: *79138540
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &73992090 !ruby/object:Gem::Requirement
+  requirement: &79138140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *73992090
+  version_requirements: *79138140
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &73991590 !ruby/object:Gem::Requirement
+  requirement: &79137790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *73991590
+  version_requirements: *79137790
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &73991050 !ruby/object:Gem::Requirement
+  requirement: &79137410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *73991050
+  version_requirements: *79137410
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &73990470 !ruby/object:Gem::Requirement
+  requirement: &79137050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *73990470
+  version_requirements: *79137050
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &73987100 !ruby/object:Gem::Requirement
+  requirement: &79136800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *73987100
+  version_requirements: *79136800
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &73986560 !ruby/object:Gem::Requirement
+  requirement: &79136470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *73986560
+  version_requirements: *79136470
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &73986050 !ruby/object:Gem::Requirement
+  requirement: &79136100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *73986050
+  version_requirements: *79136100
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &73985530 !ruby/object:Gem::Requirement
+  requirement: &79135620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *73985530
+  version_requirements: *79135620
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &73985000 !ruby/object:Gem::Requirement
+  requirement: &79124280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *73985000
+  version_requirements: *79124280
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &73984580 !ruby/object:Gem::Requirement
+  requirement: &79123910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *73984580
+  version_requirements: *79123910
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &73984140 !ruby/object:Gem::Requirement
+  requirement: &79123680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,21 +198,21 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *73984140
+  version_requirements: *79123680
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &73983710 !ruby/object:Gem::Requirement
+  requirement: &79123440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.20.0
   type: :runtime
   prerelease: false
-  version_requirements: *73983710
+  version_requirements: *79123440
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &73983050 !ruby/object:Gem::Requirement
+  requirement: &79123100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *73983050
+  version_requirements: *79123100
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &73982570 !ruby/object:Gem::Requirement
+  requirement: &79122720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -231,10 +231,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *73982570
+  version_requirements: *79122720
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &73981710 !ruby/object:Gem::Requirement
+  requirement: &79122370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -242,10 +242,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *73981710
+  version_requirements: *79122370
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &73980800 !ruby/object:Gem::Requirement
+  requirement: &79121960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,10 +253,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *73980800
+  version_requirements: *79121960
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &73979930 !ruby/object:Gem::Requirement
+  requirement: &79121650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -264,10 +264,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *73979930
+  version_requirements: *79121650
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &73979430 !ruby/object:Gem::Requirement
+  requirement: &79121220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -275,10 +275,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *73979430
+  version_requirements: *79121220
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &73975840 !ruby/object:Gem::Requirement
+  requirement: &79120840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -286,10 +286,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *73975840
+  version_requirements: *79120840
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &73975480 !ruby/object:Gem::Requirement
+  requirement: &79120530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -297,10 +297,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73975480
+  version_requirements: *79120530
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &73975030 !ruby/object:Gem::Requirement
+  requirement: &79119930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -308,10 +308,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73975030
+  version_requirements: *79119930
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &73974540 !ruby/object:Gem::Requirement
+  requirement: &79119150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +319,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *73974540
+  version_requirements: *79119150
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &73974160 !ruby/object:Gem::Requirement
+  requirement: &79118400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,10 +330,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *73974160
+  version_requirements: *79118400
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &73973800 !ruby/object:Gem::Requirement
+  requirement: &79117550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -341,10 +341,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *73973800
+  version_requirements: *79117550
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &73973410 !ruby/object:Gem::Requirement
+  requirement: &79117020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -352,10 +352,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *73973410
+  version_requirements: *79117020
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &73972990 !ruby/object:Gem::Requirement
+  requirement: &79116570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -363,7 +363,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *73972990
+  version_requirements: *79116570
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.