turntabler 0.3.4 → 0.3.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 45279f114e03b098fdbd8f69278c8e272b5f1f2d
+  data.tar.gz: 5730df669c2e6e78948e1c5c11c08debd39a4394
+SHA512:
+  metadata.gz: 6d98316eb10a12358d9d0f8cb8429c976b2f9df298ae459136370656f67d823318377b1985c8995c3d76bae0be6b7e89d8ea83c14e778dcb79d742280cd9270f
+  data.tar.gz: cfcf8132f8d6865a401b641844c58b48ef18707368f2c35c7b7ff0a4f1fc74946789022d2c543a642fdd980c99ec0a9a4b594f2b91644946d1b1d81f7fce4b8d

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # master
 
+## 0.3.5 / 2013-07-20
+
+* Fix song searches not respecting request timeouts
+* Add Song#released_on
+
 ## 0.3.4 / 2013-07-11
 
 * Fix heartbeat responses not being sent properly resulting in periodic disconnects

data/lib/turntabler/client.rb

@@ -506,12 +506,23 @@ module Turntabler
 
       api('file.search', :query => query, :page => options[:page])
 
+      conditions = {'query' => query}
+
+      # Time out if the response takes too long
+      EventMachine.add_timer(@timeout) do
+        trigger(:search_failed, conditions)
+      end if @timeout
+
       # Wait for the async callback
       songs = wait do |&resume|
-        on(:search_completed, :once => true, :if => {'query' => query}) {|songs| resume.call(songs)}
-        on(:search_failed, :once => true, :if => {'query' => query}) { resume.call }
+        on(:search_completed, :once => true, :if => conditions) {|songs| resume.call(songs)}
+        on(:search_failed, :once => true, :if => conditions) { resume.call }
       end
 
+      # Clean up any leftover handlers
+      @event_handlers[:search_completed].delete_if {|handler| handler.conditions == conditions}
+      @event_handlers[:search_failed].delete_if {|handler| handler.conditions == conditions}
+
       songs || raise(APIError, 'Search failed to complete')
     end
 

data/lib/turntabler/song.rb

@@ -1,6 +1,7 @@
 require 'turntabler/resource'
 require 'turntabler/user'
 require 'turntabler/vote'
+require 'date'
 
 module Turntabler
   # Represents a song that can be played on Turntable
@@ -29,6 +30,12 @@ module Turntabler
     # @return [String]
     attribute :label
 
+    # The date the song / album was released on
+    # @return [Date]
+    attribute :released_on, :releasedate do |value|
+      Date.parse(value)
+    end
+
     # The URL for the cover art image
     # @return [String]
     attribute :cover_art_url, :coverart

data/lib/turntabler/version.rb

@@ -3,7 +3,7 @@ module Turntabler
   module Version
     MAJOR = 0
     MINOR = 3
-    PATCH = 4
+    PATCH = 5
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end
 end

metadata

@@ -1,84 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: turntabler
 version: !ruby/object:Gem::Version
-  version: 0.3.4
-  prerelease: 
+  version: 0.3.5
 platform: ruby
 authors:
 - Aaron Pfeifer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,17 +83,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Turntable.FM API for Ruby
@@ -166,6 +153,7 @@ files:
 - turntabler.gemspec
 homepage: http://github.com/obrie/turntabler
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -177,22 +165,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Turntable.FM API for Ruby
 test_files: []
-has_rdoc: