musicbrainz 0.5.0 → 0.5.1

data/.travis.yml

@@ -1,3 +1,4 @@
 rvm:
   - 1.8.7
-  - 1.9.2
+  - 1.9.2
+  - 1.9.3

data/Gemfile

@@ -1,16 +1,15 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
   gem "rdoc", ">= 0"
+  gem "shoulda"
+  
+  gem "rspec"
+  gem "vcr"
+  gem "webmock"
 end
 
 gem "nokogiri", ">= 0"

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/models/music_brainz/artist.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module MusicBrainz
   class Artist < MusicBrainz::Base
     attr_accessor :id, :type, :name, :country, :date_begin, :date_end, :urls
@@ -23,7 +25,7 @@ module MusicBrainz
       @artist = MusicBrainz::Artist.new
       @artist.id = self.safe_get_attr(xml, 'artist', 'id')
       @artist.type = self.safe_get_attr(xml, 'artist', 'type')
-      @artist.name = self.safe_get_value(xml, 'artist > name')
+      @artist.name = self.safe_get_value(xml, 'artist > name').gsub(/[`’]/, "'")
       @artist.country = self.safe_get_value(xml, 'artist > country')
       @artist.date_begin = self.safe_get_value(xml, 'artist > life-span > begin')
       @artist.date_end = self.safe_get_value(xml, 'artist > life-span > end')
@@ -50,7 +52,8 @@ module MusicBrainz
       xml = Nokogiri::XML(MusicBrainz.load(:artist, :query => CGI.escape(name).gsub(/\!/, '') + '~', :limit => 50))
       xml.css('artist-list > artist').each do |a|
         artist = {
-          :name => a.first_element_child.text,
+          :name => a.first_element_child.text.gsub(/[`’]/, "'"),
+          :sort_name => self.safe_get_value(a, 'sort-name').gsub(/[`’]/, "'"),
           :weight => 0,
           :desc => self.safe_get_value(a, 'disambiguation'),
           :type => self.safe_get_attr(a, nil, 'type'),

data/musicbrainz.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{musicbrainz}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Gregory Eremin}]
-  s.date = %q{2011-10-06}
+  s.authors = ["Gregory Eremin"]
+  s.date = %q{2011-11-15}
   s.description = %q{MusicBrainz Web Service wrapper with ActiveRecord-style models}
   s.email = %q{magnolia_fan@me.com}
   s.extra_rdoc_files = [
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
     ".document",
     ".travis.yml",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
@@ -33,6 +32,9 @@ Gem::Specification.new do |s|
     "lib/models/music_brainz/track.rb",
     "lib/musicbrainz.rb",
     "musicbrainz.gemspec",
+    "spec/requests/artist_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/vcr.rb",
     "test/helper.rb",
     "test/test_musicbrainz_artist.rb",
     "test/test_musicbrainz_release.rb",
@@ -40,9 +42,9 @@ Gem::Specification.new do |s|
     "test/test_musicbrainz_track.rb"
   ]
   s.homepage = %q{http://github.com/magnolia-fan/musicbrainz}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.8}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{MusicBrainz Web Service wrapper}
 
   if s.respond_to? :specification_version then
@@ -50,26 +52,35 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<vcr>, [">= 0"])
+      s.add_development_dependency(%q<webmock>, [">= 0"])
     else
       s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<vcr>, [">= 0"])
+      s.add_dependency(%q<webmock>, [">= 0"])
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<vcr>, [">= 0"])
+    s.add_dependency(%q<webmock>, [">= 0"])
   end
 end
 

data/spec/requests/artist_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe "artist" do
+  it "return valid instance", :vcr do
+    artist = MusicBrainz::Artist.find('69b39eab-6577-46a4-a9f5-817839092033')
+    artist.should be_a_kind_of(MusicBrainz::Artist)
+  end
+  
+  it "search by name", :vcr do
+    matches = MusicBrainz::Artist.search('Kasabian')
+    matches.should have_at_least(1).item
+    matches.first[:name].should eql('Kasabian')
+  end
+  # 
+  # should "get correct result by name" do
+  #   @artist = MusicBrainz::Artist.find_by_name('Kasabian')
+  #   assert_equal("69b39eab-6577-46a4-a9f5-817839092033", @artist.id)
+  # end
+  # 
+  # setup do
+  #   @artist = MusicBrainz::Artist.find('69b39eab-6577-46a4-a9f5-817839092033')
+  # end
+  # 
+  # should "return valid instance" do
+  #   assert_instance_of(MusicBrainz::Artist, @artist)
+  # end
+  # 
+  # should "contain correct data" do
+  #   assert_equal("69b39eab-6577-46a4-a9f5-817839092033", @artist.id)
+  #   assert_equal("Group", @artist.type)
+  #   assert_equal("Kasabian", @artist.name)
+  #   assert_equal("GB", @artist.country)
+  #   assert_equal("1999", @artist.date_begin)
+  # end
+  # 
+  # should "load release groups" do
+  #   release_groups = @artist.release_groups
+  #   assert_operator(16, :<=, release_groups.length)
+  #   assert_equal('533cbc5f-ec7e-32ab-95f3-8d1f804a5176', release_groups.first.id)
+  #   assert_equal('Single', release_groups.first.type)
+  #   assert_equal('Club Foot', release_groups.first.title)
+  #   assert_equal(Time.utc(2004, 5, 10), release_groups.first.first_release_date)
+  # end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require "vcr"
+require "musicbrainz"
+
+# HTTPI.log = false
+Dir[File.dirname(__FILE__)+"/../lib/*.rb"].each{ |f| require f }
+Dir[File.dirname(__FILE__)+"/../spec/support/*.rb"].each{ |f| require f }
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+end

data/spec/support/vcr.rb

@@ -0,0 +1,13 @@
+VCR.config do |c|
+  c.cassette_library_dir = File.join(File.dirname(__FILE__), '..', '..', 'tmp', 'vcr')
+  c.stub_with :webmock
+  c.default_cassette_options = { :record => :new_episodes }
+end
+
+RSpec.configure do |c|
+  c.treat_symbols_as_metadata_keys_with_true_values = true
+  c.around(:each, :vcr) do |example|
+    name = example.metadata[:full_description].gsub(/\s/, '_')
+    VCR.use_cassette(name) { example.call }
+  end
+end

data/test/helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'bundler'
 begin
-  Bundler.setup(:default, :development)
+  Bundler.setup(:default, :test)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts "Run `bundle install` to install missing gems"

metadata

@@ -1,94 +1,130 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: musicbrainz
-version: !ruby/object:Gem::Version
-  version: 0.5.0
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.5.1
 platform: ruby
-authors:
+authors: 
 - Gregory Eremin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-06 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-11-15 00:00:00 +04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &2156435880 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2156435880
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &2156435060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2156435060
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &2156434280 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156434280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &2156211980 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2156211980
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &2156211280 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2156211280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &2156210560 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: vcr
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2156210560
+  version_requirements: *id009
 description: MusicBrainz Web Service wrapper with ActiveRecord-style models
 email: magnolia_fan@me.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - .document
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -101,37 +137,44 @@ files:
 - lib/models/music_brainz/track.rb
 - lib/musicbrainz.rb
 - musicbrainz.gemspec
+- spec/requests/artist_spec.rb
+- spec/spec_helper.rb
+- spec/support/vcr.rb
 - test/helper.rb
 - test/test_musicbrainz_artist.rb
 - test/test_musicbrainz_release.rb
 - test/test_musicbrainz_release_group.rb
 - test/test_musicbrainz_track.rb
+has_rdoc: true
 homepage: http://github.com/magnolia-fan/musicbrainz
-licenses:
+licenses: 
 - MIT
 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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -1300131029082120688
+      segments: 
       - 0
-      hash: 1738320966711740487
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: MusicBrainz Web Service wrapper
 test_files: []
+

data/Gemfile.lock

@@ -1,24 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    nokogiri (1.5.0)
-    rake (0.9.2)
-    rcov (0.9.9)
-    rdoc (3.8)
-    shoulda (2.11.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.6.4)
-  nokogiri
-  rcov
-  rdoc
-  shoulda