firstfm 0.1.2 → 0.2.0

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 gem "httparty"
 gem "will_paginate", "~> 3.0.pre2"
 gem "activesupport", "~> 3.0.7"
+gem "chronic"
 
 group :development do
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -2,6 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     activesupport (3.0.9)
+    chronic (0.6.1)
     crack (0.1.8)
     fakeweb (1.3.0)
     git (1.2.5)
@@ -21,6 +22,7 @@ PLATFORMS
 DEPENDENCIES
   activesupport (~> 3.0.7)
   bundler (~> 1.0.0)
+  chronic
   fakeweb
   httparty
   jeweler (~> 1.6.2)

data/VERSION.yml

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

data/firstfm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{firstfm}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aleksandr Lossenko"]
-  s.date = %q{2011-06-28}
+  s.date = %q{2011-07-27}
   s.description = %q{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 = %q{aleksandr.lossenko@gmail.com}
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "lib/firstfm/artist.rb",
     "lib/firstfm/event.rb",
     "lib/firstfm/geo.rb",
+    "lib/firstfm/image.rb",
     "lib/firstfm/location.rb",
     "lib/firstfm/track.rb",
     "lib/firstfm/venue.rb",
@@ -49,17 +50,17 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/egze/firstfm}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{A ruby wrapper for the Last.fm APIs}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.7"])
+      s.add_runtime_dependency(%q<chronic>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
@@ -68,6 +69,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
       s.add_dependency(%q<activesupport>, ["~> 3.0.7"])
+      s.add_dependency(%q<chronic>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -77,6 +79,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
     s.add_dependency(%q<activesupport>, ["~> 3.0.7"])
+    s.add_dependency(%q<chronic>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/lib/firstfm/artist.rb

@@ -12,6 +12,17 @@ module Firstfm
       @name = params[:name]
     end
     
+    def get_images(page = 1, limit = 50)
+      name_params = self.mbid.empty? ? {: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"]) || []

data/lib/firstfm/image.rb

@@ -0,0 +1,40 @@
+module Firstfm
+  
+  class Image
+    
+    attr_accessor :title, :url, :dateadded, :format, :owner_name, :owner_url, :sizes, :thumbsup, :thumbsdown, :artist
+    
+    include HTTParty
+    base_uri 'ws.audioscrobbler.com'
+    format :xml
+    
+    def self.init_from_array(array)
+      return [] unless array.is_a?(Array)
+      array.inject([]) do |arr, image|
+        arr << init_from_hash(image)
+        arr
+      end
+    end
+    
+    def self.init_from_hash(hash)
+      return nil unless hash.is_a?(Hash)
+      Image.new.tap do |image|
+        image.title = hash["title"]
+        image.url = hash["url"]
+        image.dateadded = Chronic.parse(hash["dateadded"])
+        image.format = hash["format"]
+        image.sizes = hash["sizes"]["size"]
+      end
+    end
+    
+    def original
+      self.sizes.detect {|s| s.attributes["name"] == "original"}
+    end
+    
+    def with_width(width)
+      self.sizes.detect {|s| s.attributes["width"].to_i >= width}
+    end
+    
+  end
+  
+end

data/lib/firstfm.rb

@@ -1,7 +1,9 @@
 require 'yaml'
 require 'httparty'
+require 'chronic'
 require 'will_paginate/collection'
 require 'firstfm/track'
+require 'firstfm/image'
 require 'firstfm/artist'
 require 'firstfm/event'
 require 'firstfm/location'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firstfm
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Aleksandr Lossenko
@@ -14,101 +15,130 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 +02:00
+date: 2011-07-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id001
   name: httparty
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id001
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1923831917
         segments: 
         - 3
         - 0
-        - pre2
+        - pre
+        - 2
         version: 3.0.pre2
-  requirement: *id002
   name: will_paginate
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id002
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 3
         - 0
         - 7
         version: 3.0.7
-  requirement: *id003
   name: activesupport
+  version_requirements: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: chronic
+  version_requirements: *id004
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
-  requirement: *id004
   name: bundler
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id005
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 6
         - 2
         version: 1.6.2
-  requirement: *id005
   name: jeweler
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id006
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id006
   name: rcov
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id007
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id007
   name: fakeweb
+  version_requirements: *id008
+  prerelease: false
 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.
 email: aleksandr.lossenko@gmail.com
 executables: []
@@ -130,6 +160,7 @@ files:
 - lib/firstfm/artist.rb
 - lib/firstfm/event.rb
 - lib/firstfm/geo.rb
+- lib/firstfm/image.rb
 - lib/firstfm/location.rb
 - lib/firstfm/track.rb
 - lib/firstfm/venue.rb
@@ -157,23 +188,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   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: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A ruby wrapper for the Last.fm APIs