musicbrainz 0.7.1 → 0.7.2

data/spec/bindings/release_spec.rb

@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+
+require "spec_helper"
+
+describe MusicBrainz::Bindings::Release do
+  describe '.parse' do
+    describe 'attributes' do
+      describe 'format' do
+        context 'single cd' do
+          it 'returns CD' do
+            response = '<release><medium-list count="1"><medium><format>CD</format></medium></medium-list></release>'
+            xml = Nokogiri::XML.parse(response)
+            described_class.parse(xml)[:format].should == 'CD'
+          end
+        end
+        
+        context 'multiple cds' do
+          it 'returns 2xCD' do
+            response = '<release><medium-list count="2"><medium><format>CD</format><track-list count="11" /></medium><medium><title>bonus disc</title><format>CD</format></medium></medium-list></release>'
+            xml = Nokogiri::XML.parse(response)
+            described_class.parse(xml)[:format].should == '2xCD'
+          end
+        end
+        
+        context 'different formats' do
+          it 'returns DVD + CD' do
+            response = '<release><medium-list count="2"><medium><format>DVD</format></medium><medium><format>CD</format></medium></medium-list></release>'
+            xml = Nokogiri::XML.parse(response)
+            described_class.parse(xml)[:format].should == 'DVD + CD'
+          end
+        end
+        
+        context 'different formats plus multiple mediums with same format' do
+          it 'returns 2xCD + DVD' do
+            response = '<release><medium-list count="2"><medium><format>CD</format></medium><medium><format>CD</format></medium><medium><format>DVD</format></medium></medium-list></release>'
+            xml = Nokogiri::XML.parse(response)
+            described_class.parse(xml)[:format].should == '2xCD + DVD'
+          end
+        end
+      end
+    end
+  end
+end

data/spec/client_modules/cache_spec.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+
+require "ostruct"
+require "spec_helper"
+
+describe MusicBrainz::ClientModules::CachingProxy do
+  let(:old_cache_path){ File.join(File.dirname(__FILE__), '..', '..', 'tmp', 'spec_cache') }
+  let(:tmp_cache_path){ File.join(File.dirname(__FILE__), '..', '..', 'tmp', 'cache_module_spec_cache') }
+  let(:test_mbid){ "69b39eab-6577-46a4-a9f5-817839092033" }
+  let(:test_cache_file){ "#{tmp_cache_path}/03/48/ec/6c2bee685d9a96f95ed46378f624714e7a4650b0d44c1a8eee5bac2480.xml" }
+  let(:test_response_file){ File.join(File.dirname(__FILE__), "../fixtures/kasabian.xml") }
+  let(:test_response){ File.open(test_response_file).read }
+
+  before(:all) do
+    MusicBrainz.config.cache_path = tmp_cache_path
+  end
+
+  after(:all) do
+    MusicBrainz.config.cache_path = old_cache_path
+    MusicBrainz.config.perform_caching = true
+    MusicBrainz.config.query_interval = 1.5
+  end
+
+  context "with cache enabled" do
+    it "calls http only once when requesting the resource twice" do
+      MusicBrainz.config.perform_caching = true
+      File.exist?(test_cache_file).should be_false
+
+      # Stubbing
+      MusicBrainz.client.http.stub(:get).and_return(OpenStruct.new(status: 200, body: test_response))
+      MusicBrainz.client.http.should_receive(:get).once
+
+      2.times do
+        artist = MusicBrainz::Artist.find(test_mbid)
+        artist.should be_a_kind_of(MusicBrainz::Artist)
+        File.exist?(test_cache_file).should be_true
+      end
+
+      MusicBrainz.client.clear_cache
+    end
+  end
+
+  context "with cache disabled" do
+    it "calls http twice when requesting the resource twice" do
+      MusicBrainz.config.perform_caching = false
+      File.exist?(test_cache_file).should be_false
+
+      # Hacking for test performance purposes
+      MusicBrainz.config.query_interval = 0.0
+
+      # Stubbing
+      MusicBrainz.client.http.stub(:get).and_return(OpenStruct.new(status: 200, body: test_response))
+      MusicBrainz.client.http.should_receive(:get).twice
+
+      2.times do
+        artist = MusicBrainz::Artist.find(test_mbid)
+        artist.should be_a_kind_of(MusicBrainz::Artist)
+        File.exist?(test_cache_file).should be_false
+      end
+    end
+  end
+end

data/spec/deprecated/cache_config_spec.rb

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+
+require "spec_helper"
+
+describe MusicBrainz::Deprecated::CacheConfig do
+  before(:all) {
+    @old_cache_path = MusicBrainz.config.cache_path
+  }
+
+  before(:each) {
+    MusicBrainz.config.cache_path = nil
+  }
+
+  after(:all) {
+    MusicBrainz.config.cache_path = @old_cache_path
+  }
+
+  it "allows deprecated use of cache_path" do
+    MusicBrainz.config.cache_path = "test1"
+
+    MusicBrainz::Tools::Cache.cache_path.should == "test1"
+    MusicBrainz.cache_path.should == "test1"
+  end
+
+  it "allows deprecated use of cache_path=" do
+    MusicBrainz::Tools::Cache.cache_path = "test2"
+    MusicBrainz.config.cache_path.should == "test2"
+
+    MusicBrainz.cache_path = "test3"
+    MusicBrainz.config.cache_path.should == "test3"
+  end
+end

data/spec/deprecated/proxy_config_spec.rb

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+
+require "spec_helper"
+
+describe MusicBrainz::Deprecated::ProxyConfig do
+  before(:all) {
+    @old_query_interval = MusicBrainz.config.query_interval
+  }
+
+  before(:each) {
+    MusicBrainz.config.query_interval = nil
+  }
+
+  after(:all) {
+    MusicBrainz.config.query_interval = @old_query_interval
+  }
+
+  it "allows deprecated use of query_interval" do
+    MusicBrainz.config.query_interval = 2
+
+    MusicBrainz::Tools::Proxy.query_interval.should == 2
+    MusicBrainz.query_interval.should == 2
+  end
+
+  it "allows deprecated use of query_interval=" do
+    MusicBrainz::Tools::Proxy.query_interval = 3
+    MusicBrainz.config.query_interval.should == 3
+
+    MusicBrainz.query_interval = 4
+    MusicBrainz.config.query_interval.should == 4
+  end
+end

data/spec/{requests → models}/artist_spec.rb

@@ -24,15 +24,9 @@ describe MusicBrainz::Artist do
     matches = MusicBrainz::Artist.search('Chris Martin')
 
     matches[0][:score].should == 100
-    matches[0][:mbid].should == "98d1ec5a-dd97-4c0b-9c83-7928aac89bca"
+    matches[0][:id].should == "98d1ec5a-dd97-4c0b-9c83-7928aac89bca"
     matches[1][:score].should == 100
-    matches[1][:mbid].should == "af2ab893-3212-4226-9e73-73a1660b6952"
-    matches[2][:score].should == 95
-    matches[2][:mbid].should == "444d1b63-534b-4ea6-89f0-0af6ab2e20c3"
-    matches[3][:score].should == 95
-    matches[3][:mbid].should == "b732a912-af95-472c-be52-b14610734c64"
-    matches[4][:score].should == 95
-    matches[4][:mbid].should == "90fff570-a4ef-4cd4-ba21-e00c7261b05a"
+    matches[1][:id].should == "af2ab893-3212-4226-9e73-73a1660b6952"
   end
 
   it "finds name first than alias" do
@@ -61,6 +55,6 @@ describe MusicBrainz::Artist do
     release_groups.first.id.should == "533cbc5f-ec7e-32ab-95f3-8d1f804a5176"
     release_groups.first.type.should == "Single"
     release_groups.first.title.should == "Club Foot"
-    release_groups.first.first_release_date.should == Time.utc(2004, 5, 10)
+    release_groups.first.first_release_date.should == Date.new(2004, 5, 10)
   end
 end

data/spec/{requests → models}/release_group_spec.rb

@@ -19,7 +19,7 @@ describe MusicBrainz::ReleaseGroup do
     release_group.id.should == "6f33e0f0-cde2-38f9-9aee-2c60af8d1a61"
     release_group.type.should == "Album"
     release_group.title.should == "Empire"
-    release_group.first_release_date.should == Time.utc(2006, 8, 28)
+    release_group.first_release_date.should == Date.new(2006, 8, 28)
   end
 
   it "gets correct release group's releases" do
@@ -28,7 +28,7 @@ describe MusicBrainz::ReleaseGroup do
     releases.first.id.should == "2225dd4c-ae9a-403b-8ea0-9e05014c778f"
     releases.first.status.should == "Official"
     releases.first.title.should == "Empire"
-    releases.first.date.should == Time.utc(2006, 8, 28)
+    releases.first.date.should == Date.new(2006, 8, 28)
     releases.first.country.should == "GB"
   end
 end

data/spec/{requests → models}/release_spec.rb

@@ -19,7 +19,7 @@ describe MusicBrainz::Release do
     release.id.should == "2225dd4c-ae9a-403b-8ea0-9e05014c778f"
     release.title.should == "Empire"
     release.status.should == "Official"
-    release.date.should == Time.utc(2006, 8, 28)
+    release.date.should == Date.new(2006, 8, 28)
     release.country.should == "GB"
   end
 

data/spec/spec_helper.rb

@@ -1,13 +1,19 @@
-# -*- encoding: utf-8 -*-
-
 require "rubygems"
 require "bundler/setup"
-require "ap"
-
 require "musicbrainz"
 
-MusicBrainz::Tools::Cache.cache_path = "tmp/cache"
+RSpec.configure do |c|
+  c.order = 'random'
+end
+
+MusicBrainz.configure do |c|
+  test_email = `git config user.email`.chomp
+  test_email = "magnolia_fan@me.com" if test_email.empty?
+
+  c.app_name = "MusicBrainzGemTestSuite"
+  c.app_version = MusicBrainz::VERSION
+  c.contact = test_email
 
-RSpec.configure do |config|
-  # Configuration is not currently necessary
+  c.cache_path = File.join(File.dirname(__FILE__), '..', 'tmp', 'spec_cache')
+  c.perform_caching = true
 end

metadata

@@ -1,80 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: musicbrainz
 version: !ruby/object:Gem::Version
-  version: 0.7.1
   prerelease: 
+  version: 0.7.2
 platform: ruby
 authors:
 - Gregory Eremin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: faraday
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  name: nokogiri
+  type: :runtime
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: rspec
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: awesome_print
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: 
 email:
 - magnolia_fan@me.com
@@ -89,31 +89,40 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- lib/deprecated.rb
+- lib/mb.rb
 - lib/musicbrainz.rb
-- lib/musicbrainz/artist.rb
-- lib/musicbrainz/base.rb
-- lib/musicbrainz/release.rb
-- lib/musicbrainz/release_group.rb
-- lib/musicbrainz/track.rb
-- lib/parsers/artist.rb
-- lib/parsers/base.rb
-- lib/parsers/release.rb
-- lib/parsers/release_group.rb
-- lib/parsers/track.rb
-- lib/tools/cache.rb
-- lib/tools/proxy.rb
-- lib/version.rb
+- lib/musicbrainz/bindings/artist.rb
+- lib/musicbrainz/bindings/artist_release_groups.rb
+- lib/musicbrainz/bindings/artist_search.rb
+- lib/musicbrainz/bindings/release.rb
+- lib/musicbrainz/bindings/release_group.rb
+- lib/musicbrainz/bindings/release_group_releases.rb
+- lib/musicbrainz/bindings/release_tracks.rb
+- lib/musicbrainz/bindings/track.rb
+- lib/musicbrainz/client.rb
+- lib/musicbrainz/client_modules/caching_proxy.rb
+- lib/musicbrainz/client_modules/failsafe_proxy.rb
+- lib/musicbrainz/client_modules/transparent_proxy.rb
+- lib/musicbrainz/configuration.rb
+- lib/musicbrainz/deprecated.rb
+- lib/musicbrainz/middleware.rb
+- lib/musicbrainz/models/artist.rb
+- lib/musicbrainz/models/base_model.rb
+- lib/musicbrainz/models/release.rb
+- lib/musicbrainz/models/release_group.rb
+- lib/musicbrainz/models/track.rb
+- lib/musicbrainz/version.rb
 - musicbrainz.gemspec
+- spec/bindings/release_spec.rb
+- spec/client_modules/cache_spec.rb
+- spec/deprecated/cache_config_spec.rb
+- spec/deprecated/proxy_config_spec.rb
 - spec/fixtures/kasabian.xml
-- spec/misc/deprecated_spec.rb
-- spec/requests/artist_spec.rb
-- spec/requests/release_group_spec.rb
-- spec/requests/release_spec.rb
-- spec/requests/track_spec.rb
+- spec/models/artist_spec.rb
+- spec/models/release_group_spec.rb
+- spec/models/release_spec.rb
+- spec/models/track_spec.rb
 - spec/spec_helper.rb
-- spec/tools/cache_spec.rb
 homepage: http://github.com/magnolia-fan/musicbrainz
 licenses:
 - MIT
@@ -122,23 +131,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4552071205810046641
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4552071205810046641
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -146,11 +149,13 @@ signing_key:
 specification_version: 3
 summary: MusicBrainz Web Service wrapper with ActiveRecord-style models
 test_files:
+- spec/bindings/release_spec.rb
+- spec/client_modules/cache_spec.rb
+- spec/deprecated/cache_config_spec.rb
+- spec/deprecated/proxy_config_spec.rb
 - spec/fixtures/kasabian.xml
-- spec/misc/deprecated_spec.rb
-- spec/requests/artist_spec.rb
-- spec/requests/release_group_spec.rb
-- spec/requests/release_spec.rb
-- spec/requests/track_spec.rb
+- spec/models/artist_spec.rb
+- spec/models/release_group_spec.rb
+- spec/models/release_spec.rb
+- spec/models/track_spec.rb
 - spec/spec_helper.rb
-- spec/tools/cache_spec.rb