firstfm 0.7.0 → 0.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b74e40001b6370a1f7e2a54cb30bb12e635633d0
+  data.tar.gz: ea17aa4e6090b6061df859813053ab77ed6d37f2
+SHA512:
+  metadata.gz: cfd13a5eb3c14ad0d8e7fdb880f7e168ab0b17f0b7d278489ce7b6f9923a4310d371362ee2917e6faceb5a65dbe46a15bcb2c1c2c1b4bc529504b72efd3a9e07
+  data.tar.gz: 77e5d13c044e46ce0b258cf523cd2cb88b36902d4b260feedb77e4ca457745b6587a7c81850c7ca046e24a92392dd09c2b7b568f69fb2f5edf4d367609d8a25e

data/Gemfile

@@ -1,13 +1,13 @@
 source "http://rubygems.org"
 
-gem "httparty", '~> 0.10.0'
-gem "crack", '~> 0.3.2'
-gem 'will_paginate', '~> 3.0.4'
-gem "chronic", '~> 0.9.0'
+gem "httparty", '~> 0.13.5'
+gem 'will_paginate', '~> 3.0.7'
+gem "chronic", '~> 0.10.2'
 
 group :development do
   gem "rake"
   gem "bundler"
   gem "jeweler"
   gem "fakeweb"
+
 end

data/Gemfile.lock

@@ -1,35 +1,66 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    chronic (0.9.0)
-    crack (0.3.2)
+    addressable (2.3.8)
+    builder (3.2.2)
+    chronic (0.10.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     fakeweb (1.3.0)
-    git (1.2.5)
-    httparty (0.10.0)
-      multi_json (~> 1.0)
-      multi_xml
-    jeweler (1.8.4)
-      bundler (~> 1.0)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.9.1)
+    github_api (0.12.4)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.6)
+      oauth2
+    hashie (3.4.2)
+    highline (1.7.3)
+    httparty (0.13.5)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.7.6)
-    multi_json (1.5.0)
-    multi_xml (0.5.2)
-    rake (10.0.3)
-    rdoc (3.12)
+    json (1.8.3)
+    jwt (1.5.1)
+    mini_portile (0.6.2)
+    multi_json (1.11.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.6.4)
+    rake (10.4.2)
+    rdoc (4.2.0)
       json (~> 1.4)
-    will_paginate (3.0.4)
+    thread_safe (0.3.5)
+    will_paginate (3.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler
-  chronic (~> 0.9.0)
-  crack (~> 0.3.2)
+  chronic (~> 0.10.2)
   fakeweb
-  httparty (~> 0.10.0)
+  httparty (~> 0.13.5)
   jeweler
   rake
-  will_paginate (~> 3.0.4)
+  will_paginate (~> 3.0.7)

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 0
-:minor: 7
+:minor: 8
 :patch: 0
 :build: 

data/firstfm.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: firstfm 0.8.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "firstfm"
-  s.version = "0.7.0"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Aleksandr Lossenko"]
-  s.date = "2013-07-14"
+  s.date = "2015-08-16"
   s.description = "Firstfm is a ruby wrapper for the Last.fm APIs ( http://www.last.fm/api ). My main focus is to import events from Last.FM, but with time I will try to add support for all API methods."
   s.email = "aleksandr.lossenko@gmail.com"
   s.extra_rdoc_files = [
@@ -35,21 +37,18 @@ Gem::Specification.new do |s|
     "lib/firstfm/track.rb",
     "lib/firstfm/user.rb",
     "lib/firstfm/venue.rb",
-    "test/fixtures/artist.xml",
-    "test/fixtures/artists.xml",
-    "test/fixtures/event.xml",
-    "test/fixtures/events.xml",
-    "test/fixtures/geo_event.xml",
-    "test/fixtures/geo_events.xml",
-    "test/fixtures/geo_get_metro_artist_chart.xml",
-    "test/fixtures/get_correction.xml",
-    "test/fixtures/get_correction_blank.xml",
-    "test/fixtures/get_images.xml",
-    "test/fixtures/top_tracks.xml",
-    "test/fixtures/tracks.xml",
-    "test/fixtures/user_artists.xml",
-    "test/fixtures/venue.xml",
-    "test/fixtures/venues.xml",
+    "test/fixtures/artist.json",
+    "test/fixtures/artists.json",
+    "test/fixtures/events.json",
+    "test/fixtures/geo_event.json",
+    "test/fixtures/geo_events.json",
+    "test/fixtures/geo_get_metro_artist_chart.json",
+    "test/fixtures/get_correction.json",
+    "test/fixtures/get_correction_blank.json",
+    "test/fixtures/top_tracks.json",
+    "test/fixtures/tracks.json",
+    "test/fixtures/user_artists.json",
+    "test/fixtures/venues.json",
     "test/helper.rb",
     "test/test_artist.rb",
     "test/test_geo.rb",
@@ -59,37 +58,33 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/egze/firstfm"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.2.2"
   s.summary = "A ruby wrapper for the Last.fm APIs"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, ["~> 0.10.0"])
-      s.add_runtime_dependency(%q<crack>, ["~> 0.3.2"])
-      s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0.4"])
-      s.add_runtime_dependency(%q<chronic>, ["~> 0.9.0"])
+      s.add_runtime_dependency(%q<httparty>, ["~> 0.13.5"])
+      s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0.7"])
+      s.add_runtime_dependency(%q<chronic>, ["~> 0.10.2"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<fakeweb>, [">= 0"])
     else
-      s.add_dependency(%q<httparty>, ["~> 0.10.0"])
-      s.add_dependency(%q<crack>, ["~> 0.3.2"])
-      s.add_dependency(%q<will_paginate>, ["~> 3.0.4"])
-      s.add_dependency(%q<chronic>, ["~> 0.9.0"])
+      s.add_dependency(%q<httparty>, ["~> 0.13.5"])
+      s.add_dependency(%q<will_paginate>, ["~> 3.0.7"])
+      s.add_dependency(%q<chronic>, ["~> 0.10.2"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<fakeweb>, [">= 0"])
     end
   else
-    s.add_dependency(%q<httparty>, ["~> 0.10.0"])
-    s.add_dependency(%q<crack>, ["~> 0.3.2"])
-    s.add_dependency(%q<will_paginate>, ["~> 3.0.4"])
-    s.add_dependency(%q<chronic>, ["~> 0.9.0"])
+    s.add_dependency(%q<httparty>, ["~> 0.13.5"])
+    s.add_dependency(%q<will_paginate>, ["~> 3.0.7"])
+    s.add_dependency(%q<chronic>, ["~> 0.10.2"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/lib/firstfm.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'crack'
 require 'httparty'
 require 'chronic'
 require 'will_paginate/collection'
@@ -14,7 +13,7 @@ require 'firstfm/geo'
 require 'firstfm/user'
 
 module Firstfm
-  
+
   GH_PAGE_URL = "https://github.com/egze/firstfm"
-  
+
 end

data/lib/firstfm/artist.rb

@@ -1,76 +1,57 @@
 module Firstfm
-  
+
   class Artist
-    
+
     attr_accessor :name, :mbid, :url, :listeners, :streamable, :images, :playcount
-   
+
     include HTTParty
     base_uri 'ws.audioscrobbler.com'
-    format :xml
-    
-    parser(
-        Proc.new do |body, format|
-          Crack::XML.parse(body)
-        end
-      )
-    
+    format :json
+
     def initialize(params = {})
       @name = params[:name]
     end
 
     def get_tags
       name_params = self.mbid.nil? ? {:artist => self.name} : {:mbid => self.mbid}
-      response = self.class.get("/2.0/", {:query => {:method => 'artist.getInfo', :api_key => Firstfm.config.api_key}.merge(name_params)})
-      tags_array = (response["lfm"] and response["lfm"]["artist"] and response["lfm"]["artist"]["tags"] and response["lfm"]["artist"]["tags"]["tag"]) || []
+      response = self.class.get("/2.0/", {:query => {:method => 'artist.getInfo', :api_key => Firstfm.config.api_key, :format => :json}.merge(name_params)})
+      tags_array = (response and response["artist"] and response["artist"]["tags"] and response["artist"]["tags"]["tag"]) || []
       tags_array.is_a?(Array) ? tags_array.map {|t| t["name"] } : []
     end
 
     def self.get_tags(artist)
       self.new(name: artist).get_tags
     end
-    
-    def get_images(page = 1, limit = 50)
-      name_params = self.mbid.nil? ? {:artist => self.name} : {:mbid => self.mbid}
-      response = self.class.get("/2.0/", {:query => {:method => 'artist.getImages', :page => page, :limit => limit, :api_key => Firstfm.config.api_key}.merge(name_params)})
-      images_array = (response["lfm"] and response["lfm"]["images"] and response["lfm"]["images"]["image"]) || []
-      images = Image.init_from_array(images_array)
-      WillPaginate::Collection.create(page, limit) do |pager|
-        pager.replace images
-        pager.total_entries = response["lfm"]["images"]["total"].to_i rescue 0
-      end
-    end
-    
+
     def self.search(artist, page = 1, limit = 50)
-      response = get("/2.0/", {:query => {:method => 'artist.search', :artist => artist, :page => page, :limit => limit, :api_key => Firstfm.config.api_key}})
-      artists_array = (response and response["lfm"] and response["lfm"]["results"] and response["lfm"]["results"]["artistmatches"] and response["lfm"]["results"]["artistmatches"]["artist"]) || []
+      response = get("/2.0/", {:query => {:method => 'artist.search', :artist => artist, :page => page, :limit => limit, :api_key => Firstfm.config.api_key, :format => :json}})
+      artists_array = (response and response["results"] and response["results"]["artistmatches"] and response["results"]["artistmatches"]["artist"]) || []
       artists = Artist.init_from_array(artists_array)
       WillPaginate::Collection.create(page, limit) do |pager|
         pager.replace artists
-        pager.total_entries = response['lfm']['results']['opensearch:totalResults'].to_i rescue 0
+        pager.total_entries = response['results']['opensearch:totalResults'].to_i rescue 0
       end
     end
-    
+
     def self.get_top_tracks(artist, page = 1, limit = 50)
-      response = get("/2.0/", {:query => {:method => 'artist.getTopTracks', :artist => artist, :page => page, :limit => limit, :api_key => Firstfm.config.api_key}})
-      tracks_array = (response and response["lfm"] and response["lfm"]["toptracks"] and response["lfm"]["toptracks"]["track"]) || []
+      response = get("/2.0/", {:query => {:method => 'artist.getTopTracks', :artist => artist, :page => page, :limit => limit, :api_key => Firstfm.config.api_key, :format => :json}})
+      tracks_array = (response and response and response["toptracks"] and response["toptracks"]["track"]) || []
       tracks = Track.init_from_array(tracks_array)
       WillPaginate::Collection.create(page, limit) do |pager|
         pager.replace tracks
-        pager.total_entries = response["lfm"]["toptracks"]["total"].to_i rescue 0
+        pager.total_entries = response["toptracks"]["@attr"]["total"].to_i rescue 0
       end
     end
-    
+
     def self.get_correction(artist)
-      response = get("/2.0/", {:query => {:method => 'artist.getcorrection', :artist => artist, :api_key => Firstfm.config.api_key}})
-      if response && response["lfm"] && response["lfm"] && response["lfm"]["status"] == "ok"
-        if response["lfm"]["corrections"] && response["lfm"]["corrections"]["correction"]
-          init_from_hash(response["lfm"]["corrections"]["correction"]["artist"]) rescue nil
-        elsif response["lfm"].key?("corrections")
-          init_from_hash({"name" => artist})
-        end
+      response = get("/2.0/", {:query => {:method => 'artist.getcorrection', :artist => artist, :api_key => Firstfm.config.api_key, :format => :json}})
+      if response["corrections"] && response["corrections"]["correction"]
+        init_from_hash(response["corrections"]["correction"]["artist"]) rescue nil
+      elsif response.key?("corrections")
+        init_from_hash({"name" => artist})
       end
     end
-    
+
     def self.init_from_array(array)
       return [] unless array.is_a?(Array)
       array.inject([]) do |arr, artist|
@@ -78,7 +59,7 @@ module Firstfm
         arr
       end
     end
-    
+
     def self.init_from_hash(hash)
       return nil unless hash.is_a?(Hash)
       Artist.new.tap do |artist|
@@ -91,7 +72,7 @@ module Firstfm
         artist.playcount = hash["playcount"].to_i
       end
     end
-    
+
   end
-  
+
 end

data/lib/firstfm/geo.rb

@@ -1,61 +1,60 @@
 module Firstfm
-  
+
   class Geo
-    
+
     include HTTParty
     base_uri 'ws.audioscrobbler.com'
-    format :xml
-    
+    format :json
+
     def self.get_events(params = {})
       location = params.delete(:location)
       lat = params.delete(:lat)
       lng = params.delete(:lng)
       page = params.delete(:page) || 1
       distance = params.delete(:distance)
-      
-      response = get("/2.0/", {:query => {:method => 'geo.getevents', :location => location, :page => page, :lat => lat, :lng => lng, :distance => distance, :api_key => Firstfm.config.api_key}})
-      events = response && response['lfm'] ? Event.init_events_from_hash(response['lfm']) : []
-      
+
+      response = get("/2.0/", {:query => {:method => 'geo.getevents', :location => location, :page => page, :lat => lat, :lng => lng, :distance => distance, :api_key => Firstfm.config.api_key, :format => :json}})
+      events = response ? Event.init_events_from_hash(response) : []
       collection = WillPaginate::Collection.create(page, 10) do |pager|
         pager.replace events
-        pager.total_entries = response['lfm']['events']['total'].to_i
+        pager.total_entries = response['events']['@attr']['total'].to_i
       end
-      
+
     end
-    
+
     def self.get_top_artists(params = {})
       country = params[:country]
       page = params[:page] || 1
       limit = params[:limit] || 50
-      
+
       response = get("/2.0/", {:query => {
-        :method => 'geo.gettopartists', 
+        :method => 'geo.gettopartists',
         :country => country,
-        :page => page, 
-        :limit => limit, 
-        :api_key => Firstfm.config.api_key
+        :page => page,
+        :limit => limit,
+        :api_key => Firstfm.config.api_key, :format => :json
       }})
-      
-      artists_array = (response and response['lfm'] and response['lfm']['topartists'] and response['lfm']['topartists']['artist']) || []
+
+      artists_array = (response and response['topartists'] and response['topartists']['artist']) || []
       artists = Artist.init_from_array(artists_array)
       WillPaginate::Collection.create(page, limit) do |pager|
         pager.replace artists
-        pager.total_entries = response['lfm']['topartists']['total'].to_i rescue 0
+        pager.total_entries = response['topartists']['@attr']['total'].to_i rescue 0
       end
     end
-    
+
     def self.get_metro_artist_chart(params = {})
       get_generic_artist_chart 'geo.getmetroartistchart', params
     end
-    
+
     def self.get_metro_hype_artist_chart(params = {})
       get_generic_artist_chart 'geo.getmetrohypeartistchart', params
     end
-    
+
     def self.get_metro_unique_artist_chart(params = {})
       get_generic_artist_chart 'geo.getmetrouniqueartistchart', params
     end
-    
+
     def self.get_generic_artist_chart(method, params = {})
       metro = params[:metro]
       country = params[:country]
@@ -63,26 +62,26 @@ module Firstfm
       end_timestamp = params[:end]
       page = params[:page] || 1
       limit = params[:limit] || 50
-      
+
       response = get("/2.0/", {:query => {
-        :method => method, 
+        :method => method,
         :country => country,
         :metro => metro,
         :start => start_timestamp,
         :end => end_timestamp,
-        :page => page, 
-        :limit => limit, 
-        :api_key => Firstfm.config.api_key }.reject {|k,v| v.nil?}
+        :page => page,
+        :limit => limit,
+        :api_key => Firstfm.config.api_key, :format => :json }.reject {|k,v| v.nil?}
       })
-      
-      artists_array = (response and response['lfm'] and response['lfm']['topartists'] and response['lfm']['topartists']['artist']) || []
+
+      artists_array = (response and response['topartists'] and response['topartists']['artist']) || []
       artists = Artist.init_from_array(artists_array)
       WillPaginate::Collection.create(page, limit) do |pager|
         pager.replace artists
-        pager.total_entries = response['lfm']['topartists']['total'].to_i rescue 0
+        pager.total_entries = response['topartists']['@attr']['total'].to_i rescue 0
       end
     end
-    
+
   end
-  
+
 end