discogs-wrapper 1.1.3 → 1.1.4

data/README.markdown

@@ -75,4 +75,4 @@ USAGE
 LICENSE
 -----
 
-See the LICENCE file. Copyright (c) Andrew Buntine 2011
+See the LICENCE file. Copyright (c) Andrew Buntine

data/Rakefile

@@ -1,27 +1,26 @@
 require 'rake'
-require 'spec'
-require 'spec/rake/spectask'
-require 'rake/gempackagetask'
+require 'rspec'
+require 'rspec/core/rake_task'
+require 'rubygems/package_task'
+
 
-task :default => :spec
 
 desc "Run all specs in spec directory"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ["--colour", "--format progress", "--loadby mtime", "--reverse"]
-  t.spec_files = FileList[ 'spec/**/*_spec.rb' ]
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ["--colour"]
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
-desc "Run all specs and generate RCov report"
-Spec::Rake::SpecTask.new('cov') do |t|
-  t.spec_files = FileList['spec/**/*.rb']
-  t.spec_opts = ["--colour"]
-  t.rcov = true
-  t.rcov_opts = ['-T --no-html --exclude', 'spec\/,gems\/']
+desc "Run all specs and generate simplecov report"
+task :cov do |t|
+  ENV['COVERAGE'] = 'true'
+  Rake::Task["spec"].execute
+  `open coverage/index.html`
 end
 
 spec = eval(File.read("discogs.gemspec"))
  
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   # pkg.need_zip = true
   # pkg.need_tar = true
 end

data/discogs.gemspec

@@ -1,19 +1,22 @@
 Gem::Specification.new do |s|
   
   s.name = "discogs-wrapper"
-  s.version = "1.1.3"
-  s.date = "2012-07-04"
+  s.version = "1.1.4"
+  s.date = "2013-08-13"
   s.summary = "Discogs::Wrapper is a full wrapper for the http://www.discogs.com API V2"
   s.homepage = "http://www.github.com/buntine/discogs"
   s.email = "info@andrewbuntine.com"
-  s.authors = ["Andrew Buntine"]
+  s.authors = ["Andrew Buntine", "Many more contributors"]
   
   s.description = "Discogs::Wrapper is a full wrapper for the http://www.discogs.com API V2"
   
-  s.files = ["lib/wrapper", "lib/wrapper/resource_mappings.rb", "lib/wrapper/wrapper.rb", "lib/wrapper/resource.rb", "lib/wrapper/resources", "lib/wrapper/resources/format.rb", "lib/wrapper/resources/search.rb", "lib/wrapper/resources/label_release.rb", "lib/wrapper/resources/artist.rb", "lib/wrapper/resources/release_artist.rb", "lib/wrapper/resources/artist_release.rb", "lib/wrapper/resources/release_label.rb", "lib/wrapper/resources/generic_list.rb", "lib/wrapper/resources/search_result.rb", "lib/wrapper/resources/label.rb", "lib/wrapper/resources/image.rb", "lib/wrapper/resources/track.rb", "lib/wrapper/resources/release.rb", "lib/wrapper/resources/master_release.rb", "lib/wrapper/resources/master_release_version.rb", "lib/wrapper/resources/video.rb", "lib/discogs.rb", "Rakefile", "README.markdown", "discogs.gemspec"]
+  s.files = ["lib/wrapper", "lib/wrapper/resource_mappings.rb", "lib/wrapper/wrapper.rb", "lib/wrapper/resource.rb", "lib/wrapper/resources", "lib/wrapper/resources/format.rb", "lib/wrapper/resources/search.rb", "lib/wrapper/resources/label_release.rb", "lib/wrapper/resources/artist.rb", "lib/wrapper/resources/release_artist.rb", "lib/wrapper/resources/artist_release.rb", "lib/wrapper/resources/release_label.rb", "lib/wrapper/resources/generic_list.rb", "lib/wrapper/resources/search_result.rb", "lib/wrapper/resources/label.rb", "lib/wrapper/resources/image.rb", "lib/wrapper/resources/track.rb", "lib/wrapper/resources/release.rb", "lib/wrapper/resources/master_release.rb", "lib/wrapper/resources/master_release_version.rb", "lib/wrapper/resources/video.rb", "./lib/wrapper/resources/user.rb", "lib/discogs.rb", "Rakefile", "README.markdown", "discogs.gemspec"]
 
   s.test_files = ["spec/wrapper_methods/get_release_spec.rb", "spec/wrapper_methods/get_master_release_spec.rb", "spec/wrapper_methods/search_spec.rb", "spec/wrapper_methods/get_artist_spec.rb", "spec/wrapper_methods/get_label_spec.rb", "spec/resource_spec.rb", "spec/resources/label_spec.rb", "spec/resources/generic_list_spec.rb", "spec/resources/artist_release_spec.rb", "spec/resources/artist_spec.rb", "spec/resources/release_artist_spec.rb", "spec/resources/search_spec.rb", "spec/resources/label_release_spec.rb", "spec/resources/release_label_spec.rb", "spec/resources/release_spec.rb", "spec/resources/master_release_spec.rb", "spec/resources/master_release_version_spec.rb", "spec/resources/video_spec.rb", "spec/resources/search_result_spec.rb", "spec/resources/image_spec.rb", "spec/resources/track_spec.rb", "spec/resources/format_spec.rb", "spec/wrapper_spec.rb", "spec/spec_helper.rb"]
 
   s.platform = Gem::Platform::RUBY
+  
+  s.add_development_dependency "rspec", "= 2.12.0"
+  s.add_development_dependency "simplecov", "= 0.7.1"
 
 end

data/lib/discogs.rb

@@ -1,8 +1,8 @@
 
 ## Discogs::Wrapper
-##   by Andrew Buntine, 2009
+##   Copyright Andrew Buntine
 ##   
-##   This library provides full access to the Discogs.com API v1.0
+##   This library provides full access to the Discogs.com API v2.0
 ##
 ##   Please file all bug reports at http://www.github.com/buntine/discogs, or
 ##   email me at info@andrewbuntine.com.

data/lib/wrapper/resources/artist.rb

@@ -4,14 +4,17 @@ class Discogs::Artist < Discogs::Resource
 
   no_mapping
 
-  attr_accessor :name,
+  attr_accessor :id,
+                :name,
                 :realname,
                 :images,
                 :urls,
                 :namevariations,
                 :aliases,
                 :members,
-                :releases
+                :releases,
+                :profile,
+                :data_quality
 
   def main_releases
     filter_releases("Main")

data/lib/wrapper/resources/release.rb

@@ -19,6 +19,7 @@ class Discogs::Release < Discogs::Resource
                 :formats,
                 :styles,
                 :genres,
-                :tracklist
+                :tracklist,
+                :identifiers
 
 end

data/lib/wrapper/resources/user.rb

@@ -0,0 +1,11 @@
+# Represents an user in the Discogs API.
+
+class Discogs::User < Discogs::Resource
+
+  no_mapping
+
+  attr_accessor :username,
+                :uri,
+                :name
+
+end

data/lib/wrapper/resources/video.rb

@@ -2,10 +2,10 @@
 
 class Discogs::Video < Discogs::Resource
 
-  attr_accessor :uri,
-                :duration,
+  attr_accessor :duration,
                 :embed,
                 :description,
-                :title
+                :title,
+                :src
 
 end

data/lib/wrapper/wrapper.rb

@@ -34,6 +34,10 @@ class Discogs::Wrapper
     query_and_build "label/#{name}", Discogs::Label, {:releases => 1}
   end
 
+  def get_user(username)
+    query_and_build "users/#{username}", Discogs::User
+  end
+
   def search(term, options={})
     opts = { :type => :all, :page => 1 }.merge(options)
     params = { :q => term, :type => opts[:type], :page => opts[:page] }
@@ -68,7 +72,7 @@ class Discogs::Wrapper
     rescue Zlib::GzipFile::Error
         response_body = response.body
     end
-    
+
     response_body
   end
 
@@ -90,7 +94,7 @@ class Discogs::Wrapper
     parameters = { :f => "xml" }.merge(params)
     querystring = "?" + parameters.map { |key, value| "#{key}=#{value}" }.sort.join("&")
 
-    URI.parse(File.join(@@root_host, sanitize_path(path, querystring)))
+    URI.parse(File.join(@@root_host, URI.encode(sanitize_path(path, URI.escape(querystring)))))
   end
 
   def sanitize_path(*path_parts)

data/spec/resource_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require 'spec_helper'
 
 describe Discogs::Resource do
 

data/spec/resources/artist_release_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Artist::Release do
 

data/spec/resources/artist_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Artist do
 

data/spec/resources/format_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Release::Format do
 

data/spec/resources/generic_list_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::GenericList do
 

data/spec/resources/image_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Image do
 

data/spec/resources/label_release_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Label::Release do
 

data/spec/resources/label_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Label do
 

data/spec/resources/master_release_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::MasterRelease do
 

data/spec/resources/master_release_version_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::MasterRelease::Version do
 

data/spec/resources/release_artist_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Release::Artist do
 

data/spec/resources/release_label_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Release::Label do
 

data/spec/resources/release_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Release do
 

data/spec/resources/search_result_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Search::Result do
 

data/spec/resources/search_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Search do
 

data/spec/resources/track_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Release::Track do
 

data/spec/resources/video_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Video do
 
@@ -30,13 +30,13 @@ describe Discogs::Video do
       @video.description.should == "The Persuader-Stockholm-Sodermalm"
     end
  
-    it "should have a uri attribute" do
-      @video.uri.should == "http://www.youtube.com/watch?v=QVdDhOnoR8k"
-    end
- 
     it "should have a title attribute" do
       @video.title.should == "The Persuader"
     end
+    
+    it "should have a src attribute" do
+      @video.src.should == "http://www.youtube.com/watch?v=QVdDhOnoR8k"
+    end
  
   end
 

data/spec/spec_helper.rb

@@ -1,5 +1,9 @@
+if ENV["COVERAGE"]
+  require 'simplecov'
+  SimpleCov.start 
+end
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require File.dirname(__FILE__) + '/../lib/discogs'
 
 def valid_release_xml

data/spec/wrapper_methods/get_artist_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Wrapper do
 
@@ -25,11 +25,23 @@ describe Discogs::Wrapper do
       it "should have a name attribute" do
         @artist.name.should == "Root"
       end
+
+      it "should have an id attribute" do
+        @artist.id.should == "123"
+      end
   
       it "should have a realname attribute" do
         @artist.realname.should == "Rootan"
       end
 
+      it "should have a profile attribute" do
+        @artist.profile.should == "Richard David James was born to Welsh parents"
+      end
+
+      it "should have a data_quality attribute" do
+        @artist.data_quality.should == "Needs Vote"
+      end
+
       it "should have one or more aliases" do
         @artist.aliases.should be_instance_of(Array)
         @artist.aliases[0].should == "Roooot"

data/spec/wrapper_methods/get_label_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Wrapper do
 

data/spec/wrapper_methods/get_master_release_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Wrapper do
 

data/spec/wrapper_methods/get_release_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Wrapper do
 
@@ -87,7 +87,7 @@ describe Discogs::Wrapper do
         @release.videos.each_with_index do |video, index|
           video.duration.should == specs[index][0]
           video.embed.should == specs[index][1]
-          video.uri.should == specs[index][2]
+          video.src.should == specs[index][2]
         end
       end
 

data/spec/wrapper_methods/search_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe Discogs::Wrapper do
 

data/spec/wrapper_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require 'spec_helper'
 
 describe Discogs::Wrapper do
 

metadata

@@ -1,33 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: discogs-wrapper
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 3
-  version: 1.1.3
+version: !ruby/object:Gem::Version
+  version: 1.1.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Andrew Buntine
+- Many more contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-04 00:00:00 +10:00
-default_executable: 
-dependencies: []
-
-description: Discogs::Wrapper is a full wrapper for the http://www.discogs.com API V2
+date: 2013-08-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+description: Discogs::Wrapper is a full wrapper for the http://www.discogs.com API
+  V2
 email: info@andrewbuntine.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/wrapper/resource_mappings.rb
 - lib/wrapper/wrapper.rb
 - lib/wrapper/resource.rb
@@ -47,6 +70,7 @@ files:
 - lib/wrapper/resources/master_release.rb
 - lib/wrapper/resources/master_release_version.rb
 - lib/wrapper/resources/video.rb
+- ./lib/wrapper/resources/user.rb
 - lib/discogs.rb
 - Rakefile
 - README.markdown
@@ -75,41 +99,31 @@ files:
 - spec/resources/format_spec.rb
 - spec/wrapper_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://www.github.com/buntine/discogs
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Discogs::Wrapper is a full wrapper for the http://www.discogs.com API V2
-test_files: 
+test_files:
 - spec/wrapper_methods/get_release_spec.rb
 - spec/wrapper_methods/get_master_release_spec.rb
 - spec/wrapper_methods/search_spec.rb