spot 0.1.2 → 0.1.3

data/lib/spot.rb

@@ -91,8 +91,9 @@ class Spot
   end
   
   def result
-    @prime ? results.map do |r|
-      
+    @prime ? results.sort_by do |res|
+      res.popularity
+    end.reverse[0..4].map do |r|
       song, artist = type_of(r)
       
       match = "#{song} #{artist}".split(" ")
@@ -116,7 +117,7 @@ class Spot
       
       [res - r.popularity/@config[:popularity], r]
     end.reject do |distance, value|
-      exclude?(value.to_s)
+      exclude?(value.to_s) or not value.valid?
     end.sort_by do |distance, _|
       distance
     end.map(&:last).first : results.first
@@ -183,7 +184,7 @@ class Spot
       
       @cache[@type] = []; content[@methods[@type][:selector].to_s].each do |item|
         item = @methods[@type][:class].new(item.merge(@options)) 
-        @cache[@type] << item if item.valid?
+        @cache[@type] << item if item.valid? or @prime
       end
       @cache[@type]
     end

data/spot.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "spot"
-  s.version     = "0.1.2"
+  s.version     = "0.1.3"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Linus Oleander"]
   s.email       = ["linus@oleander.nu"]

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: spot
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Linus Oleander
@@ -26,9 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -40,9 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -54,9 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -68,9 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -82,9 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
@@ -96,9 +76,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -110,9 +87,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -162,23 +136,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: spot
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Ruby implementation of the Spotify Meta API