From 08a56739334017ee028c6eb37b60efd3120c464a Mon Sep 17 00:00:00 2001 From: Gregory Eremin Date: Sun, 26 Aug 2012 08:36:26 +0400 Subject: [PATCH] Fixes --- README.md | 4 ++-- lib/robbie.rb | 1 + lib/robbie/models/album.rb | 6 +++++- lib/robbie/models/artist.rb | 2 +- lib/robbie/models/base_model.rb | 4 +--- lib/robbie/models/track.rb | 6 ++++++ 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 153f9e6..dd51788 100644 --- a/README.md +++ b/README.md @@ -28,14 +28,14 @@ Robbie.setup(api_key: "your api key", api_secret: "your api secret") foo = Robbie::Artist.find_by_name("foo fighters") # ] # > # ...or directly by id -foo = Robbie::Artist.find("MA0000002613") +foo = Robbie::Artist.find("MN0000184043") foo.albums.last # diff --git a/lib/robbie.rb b/lib/robbie.rb index 8919f25..65a61c6 100644 --- a/lib/robbie.rb +++ b/lib/robbie.rb @@ -18,6 +18,7 @@ require "robbie/autocomplete" module Robbie @@cache_enabled = false + class << self def setup(params) const_set(:API_KEY, params[:api_key]) diff --git a/lib/robbie/models/album.rb b/lib/robbie/models/album.rb index 74b2985..97fdf49 100644 --- a/lib/robbie/models/album.rb +++ b/lib/robbie/models/album.rb @@ -4,7 +4,11 @@ module Robbie class << self def search(q) - Parsers::Search.search(q).keep_if { |item| item.instance_of?(Robbie::Album) } + Parsers::Search.search(q).keep_if{ |item| item.instance_of?(Robbie::Album) } + end + + def find(id) + Parsers::Album.find(id) end end diff --git a/lib/robbie/models/artist.rb b/lib/robbie/models/artist.rb index c384dc0..0fa5a6b 100644 --- a/lib/robbie/models/artist.rb +++ b/lib/robbie/models/artist.rb @@ -4,7 +4,7 @@ module Robbie class << self def search(q) - Parsers::Search.search(q).keep_if { |item| item.instance_of?(Robbie::Artist) } + Parsers::Search.search(q).keep_if{ |item| item.instance_of?(Robbie::Artist) } end def find_by_name(name) diff --git a/lib/robbie/models/base_model.rb b/lib/robbie/models/base_model.rb index fc45d0b..1ea909c 100644 --- a/lib/robbie/models/base_model.rb +++ b/lib/robbie/models/base_model.rb @@ -1,9 +1,7 @@ module Robbie class BaseModel def initialize(values) - values.each do |key, val| - send(:"#{key}=", val) - end + values.each{ |key, val| send(:"#{key}=", val) } end end end diff --git a/lib/robbie/models/track.rb b/lib/robbie/models/track.rb index dba5391..ca2f0b8 100644 --- a/lib/robbie/models/track.rb +++ b/lib/robbie/models/track.rb @@ -1,5 +1,11 @@ module Robbie class Track < BaseModel attr_accessor :id, :disc_id, :position, :artists, :title, :duration + + class << self + def find(id) + Parsers::Track.find(id) + end + end end end