Upgraded gems, and ruby 1.9.3

Build is broken on acceptance for some reason, it still seems to actually work though.
dam5s · Aug 21, 2012 · 861ffd4 · 861ffd4
1 parent 161417a
commit 861ffd4
Show file tree

Hide file tree

Showing 28 changed files with 231 additions and 326 deletions.
diff --git a/.rvmrc b/.rvmrc
@@ -1 +1 @@
-rvm use --create ruby-1.9.2@somanyfeeds
+rvm use --create ruby-1.9.3-p194-perf@somanyfeeds
diff --git a/Gemfile b/Gemfile
@@ -1,16 +1,16 @@
 source :rubygems
 
 gem 'rake'
-gem 'unicorn', '~> 3.3.1'
-gem 'activesupport', '~> 3.0.0'
-gem 'sinatra', '~> 1.2.0'
-gem 'haml', '~> 3.0.0'
-gem 'mongoid', '~> 2.0.0'
+gem 'unicorn'
+gem 'activesupport'
+gem 'sinatra'
+gem 'haml'
+gem 'sass'
+gem 'mongoid'
 gem 'bson_ext'
-gem 'jammit', '~> 0.5.4'
-gem 'rack-flash', '~> 0.1.1'
+gem 'jammit'
 gem 'nokogiri'
-gem 'amqp', '~> 0.7.1'
+gem 'amqp'
 gem 'bunny'
 gem 'mime'
 
@@ -19,11 +19,12 @@ group :development, :test do
   gem 'rspec', '>= 2.2.0'
   gem 'mongoid-rspec', '>= 1.3.2'
   gem 'machinist_mongo', '>= 1.1.1'
+  gem 'database_cleaner'
   gem 'forgery', '>= 0.3.6'
   gem 'capybara', '>= 1.0.0.beta1'
   gem 'selenium-client'
   gem 'autotest'
-  gem 'ruby-debug19'
+  gem 'debugger'
   gem 'awesome_print', :require => 'ap'
   gem 'shotgun'
   gem 'racksh'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -5,135 +5,141 @@ GEM
       Platform (>= 0.4.0)
       open4
     Platform (0.4.0)
-    ZenTest (4.5.0)
-    activemodel (3.0.8)
-      activesupport (= 3.0.8)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.8)
-    amqp (0.7.1)
-      eventmachine (>= 0.12.4)
-    archive-tar-minitar (0.5.2)
+    ZenTest (4.8.2)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    addressable (2.3.2)
+    amq-client (0.9.4)
+      amq-protocol (>= 0.9.4)
+      eventmachine
+    amq-protocol (0.9.4)
+    amqp (0.9.7)
+      amq-client (~> 0.9.4)
+      amq-protocol (>= 0.9.4)
+      eventmachine
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
-    awesome_print (0.4.0)
-    backports (2.2.1)
-    bson (1.3.1)
-    bson_ext (1.3.1)
-    builder (2.1.2)
-    bunny (0.6.0)
-    capistrano (2.6.0)
+    awesome_print (1.0.2)
+    backports (2.6.3)
+    bson (1.6.4)
+    bson_ext (1.6.4)
+      bson (~> 1.6.4)
+    builder (3.0.0)
+    bunny (0.8.0)
+    capistrano (2.13.0)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    capybara (1.0.0)
+    capybara (2.0.0.beta2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 0.2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.1.9)
-      ffi (~> 1.0.6)
-    closure-compiler (1.1.1)
-    columnize (0.3.3)
-    diff-lcs (1.1.2)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 1.0.0.beta1)
+    childprocess (0.3.5)
+      ffi (~> 1.0, >= 1.0.6)
+    columnize (0.3.6)
+    database_cleaner (0.8.0)
+    debugger (1.2.0)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.3)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.3)
+    diff-lcs (1.1.3)
     eventmachine (0.12.10)
-    ffi (1.0.9)
-    forgery (0.3.8)
-      nokogiri (~> 1.4)
-    haml (3.0.25)
-    highline (1.6.2)
-    i18n (0.5.0)
-    jammit (0.5.4)
-      closure-compiler (>= 0.1.0)
-      yui-compressor (>= 0.9.1)
-    json_pure (1.5.3)
-    kgio (2.4.1)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
+    ffi (1.1.5)
+    forgery (0.5.0)
+    haml (3.1.7)
+    highline (1.6.13)
+    i18n (0.6.0)
+    jammit (0.6.5)
+      yui-compressor (>= 0.9.3)
+    kgio (2.7.4)
+    libwebsocket (0.1.5)
+      addressable
     machinist (1.0.6)
     machinist_mongo (1.2.0)
       machinist (~> 1.0.6)
     mime (0.1)
-    mime-types (1.16)
-    mongo (1.3.1)
-      bson (>= 1.3.1)
-    mongoid (2.0.2)
-      activemodel (~> 3.0)
-      mongo (~> 1.3)
+    mime-types (1.19)
+    mongoid (3.0.4)
+      activemodel (~> 3.1)
+      moped (~> 1.1)
+      origin (~> 1.0)
       tzinfo (~> 0.3.22)
-    mongoid-rspec (1.4.2)
-      mongoid (~> 2.0)
-      rspec (~> 2)
-    monkey-lib (0.5.4)
-      backports
+    mongoid-rspec (1.5.4)
+      mongoid (>= 3.0.1)
+      rake
+      rspec (>= 2.9)
+    moped (1.2.0)
+    multi_json (1.3.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.1.4)
+    net-ssh (2.5.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    nokogiri (1.4.6)
-    open4 (1.0.1)
-    rack (1.3.0)
-    rack-flash (0.1.1)
+    nokogiri (1.5.5)
+    open4 (1.3.0)
+    origin (1.0.6)
+    rack (1.4.1)
+    rack-protection (1.2.0)
       rack
-    rack-test (0.6.0)
+    rack-test (0.6.1)
       rack (>= 1.0)
-    racksh (0.9.8)
+    racksh (0.9.11)
       rack (>= 1.0)
       rack-test (>= 0.5)
-    rake (0.8.7)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    rubyzip (0.9.4)
+    raindrops (0.10.0)
+    rake (0.9.2.2)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
+    rubyzip (0.9.9)
+    sass (3.2.1)
     selenium-client (1.2.18)
-    selenium-webdriver (0.2.1)
-      childprocess (>= 0.1.7)
-      ffi (>= 1.0.7)
-      json_pure
+    selenium-webdriver (2.25.0)
+      childprocess (>= 0.2.5)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
       rubyzip
     shotgun (0.9)
       rack (>= 1.0)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
-    sinatra-advanced-routes (0.5.1)
-      monkey-lib (~> 0.5.0)
-      sinatra (~> 1.0)
-      sinatra-sugar (~> 0.5.0)
-    sinatra-reloader (0.5.0)
-      sinatra (~> 1.0)
-      sinatra-advanced-routes (~> 0.5.0)
-    sinatra-sugar (0.5.1)
-      monkey-lib (~> 0.5.0)
-      sinatra (~> 1.0)
-    tilt (1.3.2)
-    tzinfo (0.3.28)
-    unicorn (3.3.1)
-      kgio (~> 2.1)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    sinatra-contrib (1.3.1)
+      backports (>= 2.0)
+      eventmachine
+      rack-protection
+      rack-test
+      sinatra (~> 1.3.0)
+      tilt (~> 1.3)
+    sinatra-reloader (1.0)
+      sinatra-contrib
+    tilt (1.3.3)
+    tzinfo (0.3.33)
+    unicorn (4.3.1)
+      kgio (~> 2.6)
       rack
-    xpath (0.1.4)
+      raindrops (~> 0.7)
+    xpath (1.0.0.beta1)
       nokogiri (~> 1.3)
     yui-compressor (0.9.6)
       POpen4 (>= 0.1.4)
@@ -142,29 +148,30 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 3.0.0)
-  amqp (~> 0.7.1)
+  activesupport
+  amqp
   autotest
   awesome_print
   bson_ext
   bunny
   capistrano
   capybara (>= 1.0.0.beta1)
+  database_cleaner
+  debugger
   forgery (>= 0.3.6)
-  haml (~> 3.0.0)
-  jammit (~> 0.5.4)
+  haml
+  jammit
   machinist_mongo (>= 1.1.1)
   mime
-  mongoid (~> 2.0.0)
+  mongoid
   mongoid-rspec (>= 1.3.2)
   nokogiri
-  rack-flash (~> 0.1.1)
   racksh
   rake
   rspec (>= 2.2.0)
-  ruby-debug19
+  sass
   selenium-client
   shotgun
-  sinatra (~> 1.2.0)
+  sinatra
   sinatra-reloader
-  unicorn (~> 3.3.1)
+  unicorn
diff --git a/app/controllers/aggregator.rb b/app/controllers/aggregator.rb
@@ -33,7 +33,7 @@ class Aggregator < Sinatra::Base
 
       @sources =
         if sources.present? && sources != 'index'
-          (sources.split(/\s+/).flatten & @user.all_sources).sort
+          (sources.split('+').flatten & @user.all_sources).sort
         elsif @user.all_sources.size <= 1
           @user.all_sources
         else