removed ads

mikesea · Jul 7, 2012 · bf5538e · bf5538e
1 parent cf75e0f
commit bf5538e
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 125 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,6 @@ gem 'rails', '3.2.3'
 gem 'jquery-rails'
 gem 'spine-rails'
 gem 'thin'
-gem 'mongoid'
 gem 'nestling'
 gem 'hashie'
 gem 'ripple', git: 'https://github.com/seancribbs/ripple.git'
@@ -29,6 +28,5 @@ group :test, :development do
   gem 'rspec-rails'
   gem "rack-test", require: "rack/test"
   gem "factory_girl"
-  gem "konacha"
   gem 'simplecov'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -58,15 +58,6 @@ GEM
     bson_ext (1.6.4)
       bson (~> 1.6.4)
     builder (3.0.0)
-    capybara (1.1.2)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.3)
-      ffi (~> 1.0.6)
     chronic (0.6.7)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -89,7 +80,6 @@ GEM
       rack (>= 1.1.0, < 2)
     faraday_middleware (0.6.5)
       faraday (~> 0.6.0)
-    ffi (1.0.11)
     handlebars_assets (0.4.4)
       execjs (>= 1.2.9)
       sprockets (>= 2.0.3)
@@ -105,30 +95,16 @@ GEM
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
     json (1.7.3)
-    konacha (1.3.1)
-      actionpack (~> 3.1)
-      capybara
-      railties (~> 3.1)
-      sprockets
-    libwebsocket (0.1.3)
-      addressable
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    mongo (1.6.2)
-      bson (~> 1.6.2)
-    mongoid (2.4.11)
-      activemodel (~> 3.1)
-      mongo (<= 1.6.2)
-      tzinfo (~> 0.3.22)
     multi_json (1.0.4)
     multipart-post (1.1.5)
     nestling (0.1.2)
       multi_json (~> 1.0.3)
     newrelic_rpm (3.4.0.1)
-    nokogiri (1.5.5)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -173,17 +149,11 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.10.0)
-    rubyzip (0.9.9)
     sass (3.1.20)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.24.0)
-      childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
-      multi_json (~> 1.0)
-      rubyzip
     simple_oauth (0.1.8)
     simplecov (0.6.4)
       multi_json (~> 1.0)
@@ -208,8 +178,6 @@ GEM
     uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
-    xpath (0.1.4)
-      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
@@ -224,8 +192,6 @@ DEPENDENCIES
   hashie
   jbuilder
   jquery-rails
-  konacha
-  mongoid
   nestling
   newrelic_rpm
   rack-test

diff --git a/app/assets/javascripts/app/controllers/dealer.js.coffee b/app/assets/javascripts/app/controllers/dealer.js.coffee
diff --git a/app/assets/javascripts/app/controllers/player.js.coffee b/app/assets/javascripts/app/controllers/player.js.coffee
@@ -5,9 +5,6 @@ class Player extends Spine.Controller
 
   events:
     "click .playlist-item"  : "playFromPlaylist"
-    # "click #play"           : "playFromPlayer"
-    # "click #pause"          : "pauseTrack"
-    # "click #next"           : "nextTrack"
     "click #previous"       : "previousTrack"
 
   elements:
@@ -57,15 +54,8 @@ class Player extends Spine.Controller
         $("#play").hide()
         $("#pause").show()
 
-    # localhost
-    # @api.rdio "GAlNi78J_____zlyYWs5ZG02N2pkaHlhcWsyOWJtYjkyN2xvY2FsaG9zdEbwl7EHvbylWSWFWYMZwfc="
-
-    # party.dev
     @api.rdio @playbackToken()
 
-    # For prod
-    # @api.rdio "GBdP8ion_____zczYXZ3Z3BmMmNhazRqemNnbmR2bmZoZnBhcnR5dGltZS5oZXJva3VhcHAuY29t6-jOKAYwfsJNHth-UzvDag=="
-
     $("#play").click ->
       $("#api").rdio().play()
 
@@ -85,10 +75,6 @@ class Player extends Spine.Controller
     Player.bind "ready.player", =>
       @api.rdio().queue(Track.first().id)
 
-  playFromPlaylist: (e) =>
-    console.log "hi"
-    console.log $(e.target)
-
   nextTrack: =>
     currentTrack = $(".playlist-item.playing")
     nextTrack = $(".playlist-item.playing").next()

diff --git a/app/assets/javascripts/app/index.js.coffee b/app/assets/javascripts/app/index.js.coffee
@@ -35,7 +35,6 @@ class Recommender extends Spine.Controller
 
   constructor: ->
     super
-    @dealer = new Dealer({ el: @modalEl })
 
   recommendPlaylist: =>
     return false unless $(".artist-items :input").val()

diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee
diff --git a/app/assets/javascripts/playlists.js.coffee b/app/assets/javascripts/playlists.js.coffee
diff --git a/app/models/living_social_deal.rb b/app/models/living_social_deal.rb
diff --git a/coverage/.resultset.json b/coverage/.resultset.json
@@ -243,6 +243,6 @@
         null
       ]
     },
-    "timestamp": 1341497392
+    "timestamp": 1341589242
   }
 }
diff --git a/coverage/index.html b/coverage/index.html
@@ -23,7 +23,7 @@
       <img src="./assets/0.5.3/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2012-07-05T10:09:52-04:00">2012-07-05T10:09:52-04:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2012-07-06T11:40:42-04:00">2012-07-06T11:40:42-04:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">

diff --git a/spec/models/recommender_spec.rb b/spec/models/recommender_spec.rb
@@ -12,7 +12,8 @@
     :artist_id=>"AR633SY1187B9AC3B9", 
     :id=>"SOWQDGD12A58291894", 
     :artist_name=>"Weezer", 
-    :title=>"The Girl Got Hot"}] }
+    :title=>"The Girl Got Hot"}]
+  }
 
   context "recommending a tracklist from artists" do