lilyplaying 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDc3MzFiZGVjNWI0NzcwY2Y0ZmEwYzIyOWI1N2EwYjhjZWVjYWY4OA==
+    ZTU4MTUwNjcxMmNjM2IzNTAwZjFmOGExOTY0YjE3Y2Y2NjY1MTI1OQ==
   data.tar.gz: !binary |-
-    NGRjMjgyNDcwMzg1NGFiZGQzMDFlYzJiMjE4ZDZhM2M4N2ExMDM1Mg==
+    OTQ1ZjM2ZDUwMWFkZWU2MWFlMzhjZTk2N2Y3OTgxMjRkZDFkZDM3Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjE5NmM3MzdhNmNiZjkzODVlYjk4ODJkODhhZWM4ODFmMjhkMmE5OTMwYjM5
-    NjY1ZjNmNGYxZTE0MmY4YjBkNTRmYjQyYTE0NjVhZDdlODVjOWIxMDRjMzI4
-    OTAwMjEyNGY1OTMwZWRiNGY5MTAyOGQ3NmVkZTQ1NWU3YjIwMzU=
+    NDM2NjUzZDVjOTEwNDdmZWVmYjZkNGJmZTQ2ZWJlZTIxODU2NmRiYjg4Yjg2
+    MmMwYzVkZTEyMmI3YzVhY2IxODNjN2NhZWJmMGNhZjRlNzM4MGNhYjc5ZmM1
+    YWY1YjI1OTQyODhkNDE1ZjJkZjcyMjExOTMxYTFjNDMzZTI4ZWM=
   data.tar.gz: !binary |-
-    ZDg0MzczZDk0NjY0N2Q0MDNmNmFiNzkxNjk3NTZiMDMxMWFhOTYzYzBjOWRm
-    MTdjNDk2YmU1MmFhZWU3ODVlZDY1NGRlYjliMjY1MGI4OWY1OGE2NzQ2Zjkx
-    ODBiYmFkMjZiMTlmYTNmNDQxOGRkZmU1YTE4YWRkOTBkYWJkYzQ=
+    ZGQ4NThhYTYyOWM1MTA0ZmRhMjA0MDI4NWJhYjUxOGRjNTVhMmFiOThlMTI4
+    NTVjZDU0N2ZkMTc0MjQ3MDQwNzAxNGUzODBjOWM4NDMwNGUzZjZiNGVhMGM2
+    MGY0ZDEyOWYzYWZhMGI4OTQ1YmFhMjI5NjlkM2VkZDgyZTA0OWQ=

data/bin/lilyplaying

@@ -49,7 +49,7 @@ command :run do |c|
       current = user.current
       string = current.to_s
       puts "Updating: #{string}"
-      File.write(File.expand_path(file), string)
+      File.write(File.expand_path(file), "#{string} ")
       sleep 15
     end
 

data/lib/lilyplaying.rb

@@ -1,5 +1,6 @@
 require 'lilyplaying/version'
-require 'lastfm'
+require 'rubygems'
+require 'rdio'
 require 'safe_yaml'
 
 require 'lilyplaying/user'
@@ -11,14 +12,10 @@ module LilyPlaying
   end
   
   def self.client
-    @@client ||= Lastfm.new(config['api']['key'], config['api']['secret'])
-  end
-  
-  def self.session
-    @@session = client.auth.get_session(:token => config['api']['token'])['key']
+    @@client ||= Rdio.new([config['consumer']['key'], config['consumer']['secret']], [config['access']['token'], config['access']['secret']])
   end
   
   def self.user
-    LilyPlaying::User.new(config['user'])
+    LilyPlaying::User.new
   end
 end

data/lib/lilyplaying/current.rb

@@ -3,19 +3,11 @@ module LilyPlaying
     attr_reader :data
 
     def initialize(data)
-      @data = data[0]
-    end
-
-    def playing?
-      @data["nowplaying"]
-    end
-
-    def album
-      (@data['album']['content'] || artist) if @data
+      @data = data
     end
 
     def method_missing(meth, *args, &block)
-      (@data[meth.to_s]['content'] || @data[meth.to_s]) if @data
+      @data[meth.to_s]
     end
 
     def to_s

data/lib/lilyplaying/user.rb

@@ -2,14 +2,14 @@ require 'lilyplaying/current'
 
 module LilyPlaying
   class User
-    attr_reader :name
+    attr_reader :data
 
-    def initialize(name)
-      @name = name
+    def initialize()
+      @data = LilyPlaying.client.call("currentUser", :extras => "lastSongPlayed")['result']
     end
 
     def current
-      LilyPlaying::Current.new(LilyPlaying.client.user.get_recent_tracks(:user => name))
+      LilyPlaying::Current.new(@data["lastSongPlayed"])
     end
   end
 end

data/lib/lilyplaying/version.rb

@@ -1,4 +1,4 @@
-module LilyPlaying
-  DESCRIPTION = "Outputs the currently playing last.fm song to a text file for use while streaming"
-  VERSION = "0.0.1"
-end
+module LilyPlaying
+  DESCRIPTION = "Outputs the currently playing rdio song to a text file for use while streaming"
+  VERSION = "0.0.2"
+end

data/lib/om.rb

@@ -0,0 +1,160 @@
+# om is oauth-mini - a simple implementation of a useful subset of OAuth.
+# It's designed to be useful and reusable but not general purpose.
+#
+# (c) 2011 Rdio Inc
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# A simple OAuth client implementation. Do less better.
+# Here are the restrictions:
+#   - only HMAC-SHA1 is supported
+#   - only WWW-Authentiate form signatures are generated
+#
+# To sign a request:
+#   auth = om([consumer_key,consumer_secret], url, params)
+#     send Authorization: <auth>
+#     when POSTing <params> to <url>
+# Optional additional arguments are:
+#   token = [oauth_token, oauth_token_secret]
+#   method = "POST"
+#   realm = "Realm-for-authorization-header"
+
+require 'uri'
+require 'cgi'
+require 'digest'
+require 'digest/sha1'
+
+if not "".respond_to?(:encoding)
+  # ruby 1.8 doesn't know about unicode :(
+  require 'iconv'
+  # we will just check that bytes are valid UTF-8
+  $__om_utf8_checker = Iconv.new("UTF-8", "UTF-8")
+end
+
+def om(consumer, url, post_params, token=nil, method='POST', realm=nil, timestamp=nil, nonce=nil)
+  # A one-shot simple OAuth signature generator
+
+  # the method must be upper-case
+  method = method.upcase
+
+  # we want params as an Array of name / value pairs
+  if post_params.is_a?(Array)
+    params = post_params
+  else
+    params = post_params.collect { |x| x }
+  end
+  
+  # we want those pairs to be strings
+  params = params.collect { |k,v| [k.to_s, v.to_s]} 
+
+  # normalize the URL
+  url = URI.parse(url)
+  # scheme is lower-case
+  url.scheme = url.scheme.downcase
+  # remove username & password
+  url.user = url.password = nil
+  # host is lowercase
+  url.host = url.host.downcase
+
+  # add URL params to the params
+  if url.query
+    CGI.parse(url.query).each { |k,vs| vs.each { |v| params.push([k,v]) } }
+  end
+
+  # remove the params and fragment
+  url.query = nil
+  url.fragment = nil
+
+  # add OAuth params
+  params = params + [
+    ['oauth_version', '1.0'],
+    ['oauth_timestamp', timestamp || Time.now.to_i.to_s],
+    ['oauth_nonce', nonce || rand(1000000).to_s],
+    ['oauth_signature_method', 'HMAC-SHA1'],
+    ['oauth_consumer_key', consumer[0]],
+  ]
+
+  # the consumer secret is the first half of the HMAC-SHA1 key
+  hmac_key = consumer[1] + '&'
+
+  if token != nil
+    # include a token in params
+    params.push ['oauth_token', token[0]]
+    # and the token secret in the HMAC-SHA1 key
+    hmac_key += token[1]
+  end
+  
+  def percent_encode(s)
+    if s.respond_to?(:encoding)
+      # Ruby 1.9 knows about encodings, convert the string to UTF-8
+      s = s.encode(Encoding::UTF_8)
+    else
+      # Ruby 1.8 does not, just check that it's valid UTF-8
+      begin
+        $__om_utf8_checker.iconv(s)
+      rescue Iconv::IllegalSequence => exception
+        throw ArgumentError.new("Non-UTF-8 string: "+s.inspect)
+      end
+    end
+    chars = s.bytes.map do |b|
+      c = b.chr
+      if ((c >= '0' and c <= '9') or
+          (c >= 'A' and c <= 'Z') or
+          (c >= 'a' and c <= 'z') or
+          c == '-' or c == '.' or c == '_' or c == '~')
+        c
+      else
+        '%%%02X' % b
+      end
+    end
+    chars.join
+  end
+
+  # Sort lexicographically, first after key, then after value.
+  params.sort!
+  # escape the key/value pairs and combine them into a string
+  normalized_params = (params.collect {|p| percent_encode(p[0])+'='+percent_encode(p[1])}).join '&'
+
+  # build the signature base string
+  signature_base_string = (percent_encode(method) +
+                           '&' + percent_encode(url.to_s) +
+                           '&' + percent_encode(normalized_params))
+  
+  # HMAC-SHA1
+  hmac = Digest::HMAC.new(hmac_key, Digest::SHA1)
+  hmac.update(signature_base_string)
+
+  # Calculate the digest base 64. Drop the trailing \n
+  oauth_signature = [hmac.digest].pack('m0').strip
+
+  # Build the Authorization header
+  if realm
+    authorization_params = [['realm', realm]]
+  else
+    authorization_params = []
+  end
+  authorization_params.push(['oauth_signature', oauth_signature])
+
+  # we only want certain params in the auth header
+  oauth_params = ['oauth_version', 'oauth_timestamp', 'oauth_nonce',
+                  'oauth_signature_method', 'oauth_signature',
+                  'oauth_consumer_key', 'oauth_token']
+  authorization_params.concat(params.select { |param| nil != oauth_params.index(param[0]) })
+
+  return 'OAuth ' + (authorization_params.collect {|param| '%s="%s"' % param}).join(', ')
+end

data/lib/rdio.rb

@@ -0,0 +1,82 @@
+# (c) 2011 Rdio Inc
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'om'
+require 'uri'
+require 'net/http'
+require 'cgi'
+require 'json'
+
+class Rdio
+  # the consumer and token can be accessed
+  attr_accessor :consumer, :token
+
+  def initialize(consumer, token=nil)
+    @consumer = consumer
+    @token = token
+  end
+
+  def begin_authentication(callback_url)
+    # request a request token from the server
+    response = signed_post('http://api.rdio.com/oauth/request_token',
+                           {'oauth_callback' => callback_url})
+    # parse the response
+    parsed = CGI.parse(response)
+    # save the token
+    @token = [parsed['oauth_token'][0], parsed['oauth_token_secret'][0]]
+    # return an URL that the user can use to authorize this application
+    return parsed['login_url'][0] + '?oauth_token=' + parsed['oauth_token'][0]
+  end
+
+  def complete_authentication(verifier)
+    # request an access token
+    response = signed_post('http://api.rdio.com/oauth/access_token',
+                           {'oauth_verifier' => verifier})
+    # parse the response
+    parsed = CGI.parse(response)
+    # save the token
+    @token = [parsed['oauth_token'][0], parsed['oauth_token_secret'][0]]
+  end
+
+  def call(method, params={})
+    # make a copy of the dict
+    params = params.clone
+    # put the method in the dict
+    params['method'] = method
+    # call to the server and parse the response
+    return JSON.load(signed_post('http://api.rdio.com/1/', params))
+  end
+
+  private
+
+  def signed_post(url, params)
+    auth = om(@consumer, url, params, @token)
+    url = URI.parse(url)
+    http = Net::HTTP.new(url.host, url.port)
+    req = Net::HTTP::Post.new(url.path, {'Authorization' => auth})
+    req.set_form_data(params)
+    res = http.request(req)
+    return res.body
+  end
+  
+  def method_missing(method, *params)
+    call(method.to_s, params[0])
+  end
+
+end

data/lilyplaying.gemspec

@@ -1,27 +1,26 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'lilyplaying/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "lilyplaying"
-  spec.version       = LilyPlaying::VERSION
-  spec.authors       = ["Christopher Giroir"]
-  spec.email         = ["kelsin@valefor.com"]
-  spec.description   = LilyPlaying::DESCRIPTION
-  spec.summary       = LilyPlaying::DESCRIPTION
-  spec.homepage      = "https://github.com/Kelsin/lilyplaying"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency('commander', "~> 4.1.3")
-  spec.add_runtime_dependency('lastfm', "~> 1.21.0")
-  spec.add_runtime_dependency('safe_yaml', "~> 0.7.0")
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'lilyplaying/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "lilyplaying"
+  spec.version       = LilyPlaying::VERSION
+  spec.authors       = ["Christopher Giroir"]
+  spec.email         = ["kelsin@valefor.com"]
+  spec.description   = LilyPlaying::DESCRIPTION
+  spec.summary       = LilyPlaying::DESCRIPTION
+  spec.homepage      = "https://github.com/Kelsin/lilyplaying"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_runtime_dependency('commander', "~> 4.1.3")
+  spec.add_runtime_dependency('safe_yaml', "~> 0.7.0")
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lilyplaying
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Christopher Giroir
@@ -24,20 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.1.3
-- !ruby/object:Gem::Dependency
-  name: lastfm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.21.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +66,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Outputs the currently playing last.fm song to a text file for use while
+description: Outputs the currently playing rdio song to a text file for use while
   streaming
 email:
 - kelsin@valefor.com
@@ -99,6 +85,8 @@ files:
 - lib/lilyplaying/current.rb
 - lib/lilyplaying/user.rb
 - lib/lilyplaying/version.rb
+- lib/om.rb
+- lib/rdio.rb
 - lilyplaying.gemspec
 homepage: https://github.com/Kelsin/lilyplaying
 licenses:
@@ -123,5 +111,5 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Outputs the currently playing last.fm song to a text file for use while streaming
+summary: Outputs the currently playing rdio song to a text file for use while streaming
 test_files: []