lastfm 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/lastfm/method_category/track.rb

@@ -6,7 +6,7 @@ class Lastfm
       write_method :ban, [:artist, :track]
       write_method :love, [:artist, :track]
       write_method :share, [:artist, :track, :recipient], [[:message, nil]]
-      write_method :scrobble, [:artist, :track], [[:timestamp, Time.now.utc.to_i], [:album, nil], [:trackNumber, nil], [:mbid, nil], [:duration, nil], [:albumArtist, nil]]
+      write_method :scrobble, [:artist, :track], [[:timestamp, Proc.new { Time.now.utc.to_i }], [:album, nil], [:trackNumber, nil], [:mbid, nil], [:duration, nil], [:albumArtist, nil]]
       write_method :update_now_playing, [:artist, :track], [[:album, nil], [:trackNumber, nil], [:mbid, nil], [:duration, nil], [:albumArtist, nil]]
 
       regular_method :get_info, [:artist, :track], [[:username, nil]] do |response|

data/lib/lastfm/util.rb

@@ -13,7 +13,11 @@ class Lastfm
       end
 
       optional.each_with_index do |name, index|
-        options[name[0]] = args[index + mandatory.size] || name[1]
+        value = name[1]
+        if value.kind_of?(Proc)
+          value = value.call
+        end
+        options[name[0]] = args[index + mandatory.size] || value
       end
 
       options

data/spec/util_spec.rb

@@ -0,0 +1,32 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Lastfm::Util do
+  subject do
+    Lastfm::Util
+  end
+
+  describe '.build_options' do
+    it 'should build options' do
+      subject.build_options(
+        ['foo', nil],
+        [:foo],
+        [[:bar, 'xxx'], [:baz, nil]
+        ]).should eql({
+          :foo => 'foo',
+          :bar => 'xxx',
+          :baz => nil,
+        })
+    end
+
+    it 'should use proc object to set optional value' do
+      subject.build_options(
+        ['foo', nil],
+        [:foo],
+        [[:bar, Proc.new { 'xxx' }]
+        ]).should eql({
+          :foo => 'foo',
+          :bar => 'xxx',
+        })
+    end
+  end
+end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
+  - 1
   segments_generated: true
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - youpy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-23 00:00:00 +09:00
+date: 2012-01-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -156,6 +156,7 @@ files:
 - spec/method_category_spec.rb
 - spec/response_spec.rb
 - spec/spec_helper.rb
+- spec/util_spec.rb
 has_rdoc: true
 homepage: http://github.com/youpy/ruby-lastfm
 licenses: []