scrobbler-ng 2.0.3 → 2.0.4

data/.gitignore

@@ -9,7 +9,6 @@ coverage
 spec.html
 catalog.xml
 .yardoc
-scrobbler-ng.gemspec
 tmp
 .project
 .loadpath

data/VERSION.yml

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

data/lib/scrobbler/base.rb

@@ -1,7 +1,13 @@
+# encoding: utf-8
+
 require 'digest/md5'
 require 'nokogiri'
 
-$KCODE = 'u'
+# Only set KCODE in Ruby 1.8.X, not in 1.9.X as it is deprecated
+if RUBY_VERSION =~ /1\.8\.[0-9]/ then
+  $KCODE = 'u' 
+end
+
 
 module Scrobbler
  
@@ -28,13 +34,6 @@ module Scrobbler
       @@secret = secret
     end
   
-    # Get a HTTP/REST connection to the webservice.
-    #
-    # @return [REST::Connection]
-    def Base.connection
-      @connection ||= REST::Connection.new(API_URL)
-    end
-    
     # Clean up a URL parameter.
     #
     # @param [String, Symbol] param The parameter which needs cleanup.
@@ -107,9 +106,24 @@ module Scrobbler
           paramlist << "#{sanitize(key)}=#{sanitize(value)}"
         end
       end
-      url = "/2.0/?#{paramlist.join('&')}"
-      xml = self.connection.send(request_method, url)
-      doc = Nokogiri::XML(xml) do |config|
+      
+      # TODO Caching!
+      
+      url = URI.join(API_URL, "/2.0/?#{paramlist.join('&')}")
+
+      # Fetch the http answer
+      case request_method
+        when "get"
+          req = Net::HTTP::Get.new(url.request_uri)
+        when "post"
+          req = Net::HTTP::Post.new(url.request_uri)
+      end
+      http = Net::HTTP.new(url.host, url.port)
+      http.use_ssl = (url.port == 443)
+      
+      # Process it
+      res = http.start() { |conn| conn.request(req) }
+      doc = Nokogiri::XML(res.body) do |config|
         config.noent.noblanks.nonet
       end
       doc

data/lib/scrobbler.rb

@@ -7,7 +7,8 @@ require 'time'
 $: << File.expand_path(File.dirname(__FILE__))
 
 # Load base class
-require File.expand_path('scrobbler/base.rb', File.dirname(__FILE__))
+#require File.expand_path('scrobbler/base.rb', File.dirname(__FILE__))
+require 'scrobbler/base'
 
 # Load helper modules
 require 'scrobbler/helper/image'
@@ -28,5 +29,4 @@ require 'scrobbler/library'
 require 'scrobbler/playlist'
 require 'scrobbler/radio'
 
-require 'scrobbler/rest'
 require 'scrobbler/authentication'

data/scrobbler-ng.gemspec

@@ -0,0 +1,110 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{scrobbler-ng}
+  s.version = "2.0.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["John Nunemaker", "Jonathan Rudenberg", "Uwe L. Korn"]
+  s.date = %q{2010-07-28}
+  s.description = %q{A ruby library for accessing the Last.fm 2.0 API. It is higly optimized so that it uses less memory and parses XML (through Nokogiri) than other implementations.}
+  s.email = %q{uwelk@xhochy.org}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "MIT-LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "examples/album.rb",
+     "examples/artist.rb",
+     "examples/scrobble.rb",
+     "examples/tag.rb",
+     "examples/track.rb",
+     "examples/user.rb",
+     "lib/scrobbler.rb",
+     "lib/scrobbler/album.rb",
+     "lib/scrobbler/artist.rb",
+     "lib/scrobbler/authentication.rb",
+     "lib/scrobbler/base.rb",
+     "lib/scrobbler/basexml.rb",
+     "lib/scrobbler/basexmlinfo.rb",
+     "lib/scrobbler/event.rb",
+     "lib/scrobbler/geo.rb",
+     "lib/scrobbler/helper/image.rb",
+     "lib/scrobbler/helper/streamable.rb",
+     "lib/scrobbler/library.rb",
+     "lib/scrobbler/playlist.rb",
+     "lib/scrobbler/radio.rb",
+     "lib/scrobbler/session.rb",
+     "lib/scrobbler/shout.rb",
+     "lib/scrobbler/tag.rb",
+     "lib/scrobbler/track.rb",
+     "lib/scrobbler/user.rb",
+     "lib/scrobbler/venue.rb",
+     "scrobbler-ng.gemspec",
+     "tasks/jeweler.rake",
+     "tasks/rdoc.rake",
+     "tasks/tests.rake",
+     "tasks/yardoc.rake"
+  ]
+  s.homepage = %q{http://github.com/xhochy/scrobbler}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{A ruby library for accessing the last.fm v2 webservices}
+  s.test_files = [
+    "test/unit/tag_spec.rb",
+     "test/unit/playlist_spec.rb",
+     "test/unit/album_spec.rb",
+     "test/unit/radio_spec.rb",
+     "test/unit/event_spec.rb",
+     "test/unit/venue_spec.rb",
+     "test/unit/user_spec.rb",
+     "test/unit/artist_spec.rb",
+     "test/unit/playing_test.rb",
+     "test/unit/simpleauth_test.rb",
+     "test/unit/geo_spec.rb",
+     "test/unit/library_spec.rb",
+     "test/unit/track_spec.rb",
+     "test/unit/authentication_spec.rb",
+     "test/spec_helper.rb",
+     "test/test_helper.rb",
+     "test/mocks/library.rb",
+     "test/mocks/rest.rb",
+     "examples/tag.rb",
+     "examples/track.rb",
+     "examples/user.rb",
+     "examples/artist.rb",
+     "examples/scrobble.rb",
+     "examples/album.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<fakeweb>, [">= 0"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.2"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<fakeweb>, [">= 0"])
+      s.add_dependency(%q<nokogiri>, [">= 1.4.2"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<fakeweb>, [">= 0"])
+    s.add_dependency(%q<nokogiri>, [">= 1.4.2"])
+  end
+end
+

data/tasks/jeweler.rake

@@ -11,7 +11,7 @@ begin
     s.add_development_dependency "rspec", ">= 1.2.9"
     s.add_development_dependency "yard", ">= 0"
     s.add_development_dependency "fakeweb", ">= 0"
-    s.add_dependency 'nokogiri'
+    s.add_dependency 'nokogiri', ">= 1.4.2"
 
     s.files.exclude 'test/**/*'
   end

data/test/mocks/rest.rb

@@ -2,7 +2,6 @@
 
 require 'rubygems'
 require 'fakeweb'
-require File.expand_path('../../lib/scrobbler/rest', File.dirname(__FILE__))
 
 FIXTURES_BASE = File.join([File.dirname(__FILE__), '..', 'fixtures', 'xml'])
 WEB_BASE = 'http://ws.audioscrobbler.com:80/2.0/?'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scrobbler-ng
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 2
   - 0
-  - 3
-  version: 2.0.3
+  - 4
+  version: 2.0.4
 platform: ruby
 authors: 
 - John Nunemaker
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 +02:00
+date: 2010-07-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,8 +74,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 4
+        - 2
+        version: 1.4.2
   type: :runtime
   version_requirements: *id004
 description: A ruby library for accessing the Last.fm 2.0 API. It is higly optimized so that it uses less memory and parses XML (through Nokogiri) than other implementations.
@@ -112,13 +114,13 @@ files:
 - lib/scrobbler/library.rb
 - lib/scrobbler/playlist.rb
 - lib/scrobbler/radio.rb
-- lib/scrobbler/rest.rb
 - lib/scrobbler/session.rb
 - lib/scrobbler/shout.rb
 - lib/scrobbler/tag.rb
 - lib/scrobbler/track.rb
 - lib/scrobbler/user.rb
 - lib/scrobbler/venue.rb
+- scrobbler-ng.gemspec
 - tasks/jeweler.rake
 - tasks/rdoc.rake
 - tasks/tests.rake

data/lib/scrobbler/rest.rb

@@ -1,47 +0,0 @@
-require 'net/https'
-
-module Scrobbler
-  module REST
-  	class Connection
-  		def initialize(base_url, args = {})
-  			@base_url = base_url
-  			@username = args[:username]
-  			@password = args[:password]
-  		end
-
-  		def get(resource, args = nil)
-  			request(resource, "get", args)
-  		end
-
-  		def post(resource, args = nil)
-  			request(resource, "post", args)
-  		end
-
-  		def request(resource, method = "get", args = nil)
-  			url = URI.join(@base_url, resource)
-
-  			if args
-  				# TODO: What about keys without value?
-  				url.query = args.map { |k,v| "%s=%s" % [URI.encode(k.to_s), URI.encode(v.to_s)] }.join("&")
-  			end
-
-  			case method
-  			when "get"
-  				req = Net::HTTP::Get.new(url.request_uri)
-  			when "post"
-  				req = Net::HTTP::Post.new(url.request_uri)
-  			end
-
-  			if @username and @password
-  				req.basic_auth(@username, @password)
-  			end
-
-  			http = Net::HTTP.new(url.host, url.port)
-  			http.use_ssl = (url.port == 443)
-
-  			res = http.start() { |conn| conn.request(req) }
-  			res.body
-  		end
-  	end
-  end
-end