spot 2.0.1 → 2.0.4

data/lib/spot.rb

@@ -2,10 +2,10 @@
 require "spot/song"
 require "spot/artist"
 require "spot/album"
+require "spot/prime"
 require "spot/clean"
 require "json"
 require "rest-client"
-require "levenshteinish"
 require "charlock_holmes/string"
 require "yaml"
 require "uri"
@@ -96,53 +96,15 @@ module Spot
     end
     
     def result
-      @prime ? results.sort_by do |res|
-        res.popularity
-      end.reverse[0..6].map do |r|
-        song, artist = type_of(r)
-        
-        match = clean!([song, artist].join(" ")).split(/\s+/)
-        raw = clean!(search).split(/\s+/)
-
-        if raw.length < match.length
-          diff = match - raw
-          res = diff.length.to_f/match.length
-        else
-          diff = raw - match
-          res = diff.length.to_f/raw.length
-        end
-
-        if diff.length > 1 and not match.map{ |m| diff.include?(m) }.all?
-          res =+ diff.map do |value|
-            match.map do |m|
-              Levenshtein.distance(value, m)
-            end.inject(:+)
-          end.inject(:+) / @config[:offset]
-        end
-        
-        [res - r.popularity/@config[:popularity], r]
-      end.reject do |distance, song|
-        exclude?(song.to_s) or not song.valid?
-      end.sort_by do |distance, _|
-        distance
-      end.map(&:last).first : results.select(&:valid?).first
-    end
-    
-    def type_of(r)
-      if @type == :songs
-        return r.name.to_s.downcase, r.artist.name.to_s.downcase
-      elsif @type == :artists
-        return r.song.title.to_s.downcase, r.name.to_s.downcase
+      if @prime
+        Spot::Prime.new(results.sort_by(&:popularity).reverse[0..6], search).
+          results.
+          select(&:valid?).
+          first
       else
-        return "", r.artist.to_s.downcase
+        results.select(&:valid?).first
       end
     end
-    
-    def exclude?(compare)
-      @exclude.
-        reject{ |value| @search.to_s.match(/#{value}/i) }.
-        map{ |value| compare.match(/#{value}/i) }.any?
-    end
 
     #
     # @value String To be cleaned

data/lib/spot/clean.rb

@@ -26,11 +26,11 @@ module Spot
         /\.[a-z0-9]{2,3}$/, 
         /\[[^\]]*\]/, 
         /".*"/,  
-        /'.*'[^s]/,
+        /(\s+|^)'.*'(\s+|$)/,
         /[&|\/|\+][^\z]*/, 
         /^(\d+.*?[^a-z]+?)/i
       ].each do |reg|
-        string = string.gsub(reg, '').strip
+        string = string.gsub(reg, ' ').strip
       end
       
       [

data/lib/spot/prime.rb

@@ -0,0 +1,73 @@
+require "levenshtein"
+require_relative "clean"
+
+module Spot
+  class Prime
+    @@ignore = YAML.load(File.read("#{File.dirname(__FILE__)}/ignore.yml"))
+
+    #
+    # @results Array<Object>
+    # @compare String
+    # @options Hash
+    #
+    def initialize(results, compare, options = {})
+      @options = {
+        popularity: 7,
+        exclude: 2,
+        limit: 0.7,
+        offset: 10
+      }.merge(options)
+
+      @results, @compare = results, compare
+    end
+
+    #
+    # @return Array<Object>
+    #
+    def results
+      @results.sort_by(&:popularity).map do |result|
+        match = clean(result.to_s).split(/\s+/).sort
+        raw = clean(@compare).split(/\s+/).sort
+
+        if raw.length < match.length
+          diff = (match - raw)
+          res = diff.length.to_f / match.length
+        else
+          diff = (raw - match)
+          res = diff.length.to_f / raw.length
+        end
+
+        if diff.length > 1 and not match.map{ |m| diff.include?(m) }.all?
+          res =+ diff.map do |value|
+            match.map { |m| Levenshtein.normalized_distance(value, m) }.inject(:+)
+          end.inject(:+) / @options[:offset]
+        end
+        
+        [res - result.popularity / @options[:popularity], result]
+      end.reject do |_, result|
+        Spot::Prime.ignore?(result.to_s, @compare)
+      end.sort_by do |distance, _|
+        distance
+      end.map(&:last)
+    end
+
+    #
+    # @value String To be cleaned
+    # @return String A cleaned string
+    #
+    def clean(value)
+      Spot::Clean.new(value).process
+    end
+
+    #
+    # @this String
+    # @compare String
+    # @return Boolean
+    #
+    def self.ignore?(this, compare = nil)
+      @@ignore.
+        reject{ |value| compare.to_s.match(/#{value}/i) }.
+        map{ |value| this.match(/#{value}/i) }.any?
+    end
+  end
+end

data/spec/clean_spec.rb

@@ -20,6 +20,10 @@ describe Spot::Clean do
     Spot::Clean.new("Song A \"abc def\"").process.should eq("song a")
   end
   
+  it "Sweet Child O' Mine by Guns N' Roses => sweet child o' mine by guns n' roses" do
+    Spot::Clean.new("Sweet Child O' Mine by Guns N' Roses").process.should eq("sweet child o' mine by guns n' roses")
+  end
+  
   it "Song - A [B + C] => Song - A" do
     Spot::Clean.new("Song - A [B + C]").process.should eq("song a")
   end
@@ -103,6 +107,10 @@ describe Spot::Clean do
     Spot::Clean.new("Knockin' On Heaven's Door").process.should eq("knockin' on heaven's door")
   end
 
+  it "I Love Rock'n'roll => i love rock'n'roll" do
+    Spot::Clean.new("I Love Rock'n'roll").process.should eq("i love rock'n'roll")
+  end
+
   it "Jason Derulo - Undefeated" do
     Spot::Clean.new("Undefeated").process.should eq("undefeated")
   end

data/spec/prime_spec.rb

@@ -0,0 +1,31 @@
+describe Spot::Prime do
+  context "exclude" do    
+    it "should have a working exclude? method" do
+      {
+        "tribute"                          => true,
+        "cover random"                     => true, 
+        "live"                             => true,
+        "club mix random"                  => true,
+        "LIVE"                             => true,
+        "karaoKE"                          => true,
+        "instrumental"                     => true,
+        "Karaoke - Won't Get Fooled Again" => true,
+        "club version"                     => true,
+        "instrumentals"                    => true,
+        "demo"                             => true,
+        "made famous by"                   => true,
+        "remixes"                          => true,
+        "ringtone"                         => true,
+        "ringtones"                        => true,
+        "riingtonerandom"                  => false,
+        "club random mix"                  => false,
+        "random"                           => false,
+        "oliver"                           => false,
+        "acoustic"                         => true,
+        "aacoustic"                        => false
+      }.each do |comp, outcome|
+        Spot::Prime.ignore?(comp).should eq(outcome)
+      end
+    end
+  end
+end

data/spec/spot_spec.rb

@@ -130,36 +130,6 @@ describe Spot::Search do
     end
   end
   
-  context "exclude" do    
-    it "should have a working exclude? method" do
-      {
-        "tribute"                          => true,
-        "cover random"                     => true, 
-        "live"                             => true,
-        "club mix random"                  => true,
-        "LIVE"                             => true,
-        "karaoKE"                          => true,
-        "instrumental"                     => true,
-        "Karaoke - Won't Get Fooled Again" => true,
-        "club version"                     => true,
-        "instrumentals"                    => true,
-        "demo"                             => true,
-        "made famous by"                   => true,
-        "remixes"                          => true,
-        "ringtone"                         => true,
-        "ringtones"                        => true,
-        "riingtonerandom"                  => false,
-        "club random mix"                  => false,
-        "random"                           => false,
-        "oliver"                           => false,
-        "acoustic"                         => true,
-        "aacoustic"                        => false
-      }.each do |comp, outcome|
-        @spot.exclude?(comp).should eq(outcome)
-      end
-    end
-  end
-  
   context "territory" do
     it "should not find any songs when using a non valid territory" do
       @spot.territory("RANDOM").find_all_songs("search").results.should be_empty

data/spot.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "spot"
-  s.version     = "2.0.1"
+  s.version     = "2.0.4"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Linus Oleander"]
   s.email       = ["linus@oleander.nu"]
@@ -17,13 +17,13 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   s.add_dependency("json_pure")
   s.add_dependency("rest-client")
   s.add_dependency("abstract")
-  s.add_dependency("levenshteinish")
+  s.add_dependency("levenshtein", "~> 0.2.2")
   s.add_dependency("charlock_holmes")
-  
+
   s.add_development_dependency("rspec")
   s.add_development_dependency("vcr")
   s.add_development_dependency("webmock", "~> 1.8.0")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spot
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000Z
+date: 2012-06-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70287100095840 !ruby/object:Gem::Requirement
+  requirement: &70221274908280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287100095840
+  version_requirements: *70221274908280
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70287100095400 !ruby/object:Gem::Requirement
+  requirement: &70221274907840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287100095400
+  version_requirements: *70221274907840
 - !ruby/object:Gem::Dependency
   name: abstract
-  requirement: &70287100094980 !ruby/object:Gem::Requirement
+  requirement: &70221274907420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287100094980
+  version_requirements: *70221274907420
 - !ruby/object:Gem::Dependency
-  name: levenshteinish
-  requirement: &70287100094560 !ruby/object:Gem::Requirement
+  name: levenshtein
+  requirement: &70221274906920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70287100094560
+  version_requirements: *70221274906920
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
-  requirement: &70287100094140 !ruby/object:Gem::Requirement
+  requirement: &70221274906500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287100094140
+  version_requirements: *70221274906500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70287100093720 !ruby/object:Gem::Requirement
+  requirement: &70221274906040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287100093720
+  version_requirements: *70221274906040
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70287100093300 !ruby/object:Gem::Requirement
+  requirement: &70221274905620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287100093300
+  version_requirements: *70221274905620
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70287100092800 !ruby/object:Gem::Requirement
+  requirement: &70221274905120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70287100092800
+  version_requirements: *70221274905120
 description: A Ruby implementation of the Spotify Meta API.
 email:
 - linus@oleander.nu
@@ -118,6 +118,7 @@ files:
 - lib/spot/clean.rb
 - lib/spot/exclude.yml
 - lib/spot/ignore.yml
+- lib/spot/prime.rb
 - lib/spot/song.rb
 - spec/album_spec.rb
 - spec/artist_spec.rb
@@ -128,6 +129,7 @@ files:
 - spec/fixtures/exclude.tribute.json
 - spec/fixtures/track.json
 - spec/fixtures/vcr_cassettes/spotify.yml
+- spec/prime_spec.rb
 - spec/song_spec.rb
 - spec/spec_helper.rb
 - spec/spot_spec.rb
@@ -166,6 +168,7 @@ test_files:
 - spec/fixtures/exclude.tribute.json
 - spec/fixtures/track.json
 - spec/fixtures/vcr_cassettes/spotify.yml
+- spec/prime_spec.rb
 - spec/song_spec.rb
 - spec/spec_helper.rb
 - spec/spot_spec.rb