firstfm 0.2.2 → 0.2.3

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.3@firstfm --create
+rvm use 1.9.3@firstfm --create

data/Gemfile

@@ -1,14 +1,13 @@
 source "http://rubygems.org"
 
-gem "httparty", "0.7.8"
-gem "will_paginate"
-gem "activesupport", "~> 3.0.10"
-gem "chronic"
+gem "httparty", '~> 0.8'
+gem "crack", '~> 0.3'
+gem 'will_paginate', '~> 3.0'
+gem "chronic", '~> 0.6'
 
 group :development do
   gem "rake"
   gem "bundler"
   gem "jeweler"
-  gem "rcov", ">= 0"
   gem "fakeweb"
 end

data/Gemfile.lock

@@ -1,31 +1,35 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.10)
-    chronic (0.6.5)
-    crack (0.1.8)
+    chronic (0.6.7)
+    crack (0.3.1)
     fakeweb (1.3.0)
     git (1.2.5)
-    httparty (0.7.8)
-      crack (= 0.1.8)
-    jeweler (1.6.4)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
+    jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+      rdoc
+    json (1.6.5)
+    multi_json (1.0.4)
+    multi_xml (0.4.1)
     rake (0.9.2.2)
-    rcov (0.9.11)
-    will_paginate (3.0.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    will_paginate (3.0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 3.0.10)
   bundler
-  chronic
+  chronic (~> 0.6)
+  crack (~> 0.3)
   fakeweb
-  httparty (= 0.7.8)
+  httparty (~> 0.8)
   jeweler
   rake
-  rcov
-  will_paginate
+  will_paginate (~> 3.0)

data/Rakefile

@@ -32,17 +32,9 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 0
 :minor: 2
-:patch: 2
+:patch: 3
 :build: 

data/firstfm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "firstfm"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aleksandr Lossenko"]
-  s.date = "2012-02-02"
+  s.date = "2012-02-04"
   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 = [
@@ -52,42 +52,39 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/egze/firstfm"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.15"
   s.summary = "A ruby wrapper for the Last.fm APIs"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, ["= 0.7.8"])
-      s.add_runtime_dependency(%q<will_paginate>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.10"])
-      s.add_runtime_dependency(%q<chronic>, [">= 0"])
+      s.add_runtime_dependency(%q<httparty>, ["~> 0.8"])
+      s.add_runtime_dependency(%q<crack>, ["~> 0.3"])
+      s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<chronic>, ["~> 0.6"])
       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<rcov>, [">= 0"])
       s.add_development_dependency(%q<fakeweb>, [">= 0"])
     else
-      s.add_dependency(%q<httparty>, ["= 0.7.8"])
-      s.add_dependency(%q<will_paginate>, [">= 0"])
-      s.add_dependency(%q<activesupport>, ["~> 3.0.10"])
-      s.add_dependency(%q<chronic>, [">= 0"])
+      s.add_dependency(%q<httparty>, ["~> 0.8"])
+      s.add_dependency(%q<crack>, ["~> 0.3"])
+      s.add_dependency(%q<will_paginate>, ["~> 3.0"])
+      s.add_dependency(%q<chronic>, ["~> 0.6"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<fakeweb>, [">= 0"])
     end
   else
-    s.add_dependency(%q<httparty>, ["= 0.7.8"])
-    s.add_dependency(%q<will_paginate>, [">= 0"])
-    s.add_dependency(%q<activesupport>, ["~> 3.0.10"])
-    s.add_dependency(%q<chronic>, [">= 0"])
+    s.add_dependency(%q<httparty>, ["~> 0.8"])
+    s.add_dependency(%q<crack>, ["~> 0.3"])
+    s.add_dependency(%q<will_paginate>, ["~> 3.0"])
+    s.add_dependency(%q<chronic>, ["~> 0.6"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<fakeweb>, [">= 0"])
   end
 end

data/lib/firstfm/artist.rb

@@ -8,6 +8,12 @@ module Firstfm
     base_uri 'ws.audioscrobbler.com'
     format :xml
     
+    parser(
+        Proc.new do |body, format|
+          Crack::XML.parse(body)
+        end
+      )
+    
     def initialize(params = {})
       @name = params[:name]
     end

data/lib/firstfm/image.rb

@@ -3,18 +3,7 @@ module Firstfm
   class Image
     
     attr_accessor :title, :url, :dateadded, :format, :owner_name, :owner_url, :sizes, :thumbsup, :thumbsdown, :artist
-    
-    include HTTParty
-    
-    parser(
-        Proc.new do |body, format|
-          Nokogiri::XML.parse(body)
-        end
-      )
-    
-    base_uri 'ws.audioscrobbler.com'
-    format :xml
-    
+        
     def self.init_from_array(array)
       return [] unless array.is_a?(Array)
       array.inject([]) do |arr, image|

data/lib/firstfm/location.rb

@@ -12,8 +12,8 @@ module Firstfm
       location.country      = hash["country"]
       location.postalcode   = hash["postalcode"]
       location.street       = hash["street"]
-      location.lat          = hash["geo:point"]["geo:lat"] if hash["geo:point"]
-      location.long         = hash["geo:point"]["geo:lat"] if hash["geo:point"]
+      location.lat          = hash["point"]["lat"] if hash["point"]
+      location.long         = hash["point"]["long"] if hash["point"]
       location
     end
     

data/lib/firstfm/track.rb

@@ -14,7 +14,7 @@ module Firstfm
       tracks = Track.init_from_array(tracks_array)
       WillPaginate::Collection.create(page, limit) do |pager|
         pager.replace tracks
-        pager.total_entries = response['lfm']['results']['opensearch:totalResults'].to_i
+        pager.total_entries = response['lfm']['results']['totalResults'].to_i
       end
     end
     

data/lib/firstfm.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'crack'
 require 'httparty'
 require 'chronic'
 require 'will_paginate/collection'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firstfm
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,55 +9,55 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000 Z
+date: 2012-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2164521100 !ruby/object:Gem::Requirement
+  requirement: &70316559616040 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.8
+        version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *2164521100
+  version_requirements: *70316559616040
 - !ruby/object:Gem::Dependency
-  name: will_paginate
-  requirement: &2164520040 !ruby/object:Gem::Requirement
+  name: crack
+  requirement: &70316559615440 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2164520040
+  version_requirements: *70316559615440
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &2164518260 !ruby/object:Gem::Requirement
+  name: will_paginate
+  requirement: &70316559614840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164518260
+  version_requirements: *70316559614840
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &2164515540 !ruby/object:Gem::Requirement
+  requirement: &70316559614300 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *2164515540
+  version_requirements: *70316559614300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164513740 !ruby/object:Gem::Requirement
+  requirement: &70316559613740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164513740
+  version_requirements: *70316559613740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164554840 !ruby/object:Gem::Requirement
+  requirement: &70316559629560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,21 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164554840
+  version_requirements: *70316559629560
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2164550880 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2164550880
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2164549500 !ruby/object:Gem::Requirement
+  requirement: &70316559629000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164549500
+  version_requirements: *70316559629000
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2164547380 !ruby/object:Gem::Requirement
+  requirement: &70316559628480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164547380
+  version_requirements: *70316559628480
 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.
@@ -166,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1294038751200914685
+      hash: -1914032172643315318
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A ruby wrapper for the Last.fm APIs