musicbrainz_wrapper 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTk3ODcyNzkwMmVmNjFmZTYzZTIwNDdkNjRkNmY4ZTE4NzRjMWU0MQ==
+    MGE2NzQxZmUzMDI5ZGI0MzY5MTY3Nzk4N2UxM2M5OTRlYTZjNWYzYw==
   data.tar.gz: !binary |-
-    NmQxZmJjYTAzNDYwM2NlM2FlYTQ3NWY2MzQ0ZDg3OTdlMTEzYmU3MQ==
+    Y2MxODc4NzI5MzlhZjUwZDc2YzI0MDFmOGM4MDRhZmZjODY5ZTgzOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmNmZDMwMDg4NmNmOGYxZDg3ZGFlMjcxYThmNDE2NDVhMDFkZWM4MzMwOTA1
-    MTRjY2Q4NDNkYWUxZDU4YTYyNDM2OGE4MGE1YjJlMzM1YzM3ZDNhN2M0N2Mw
-    NTAxN2NjZjFiNmY3ODZjODNmOGNiNWQxMTI2NWI4OTVlZTZhZmI=
+    YTZkNzFkNTc0NjY4MDM4ZGNiNjg2ZTAzMWY4ZDAyNzA3ZjU4NGU2YzRhYmVh
+    NWZjNTNhODU5YzUyNTFlZGFjZWZjZjJkNzI2ZjE3MDdlMGJhODZlMDc2MzVh
+    NGI0MjdjNmU0NWZmZWFmYTYwZmNjZmJjZjQ1ZmUxNmMwZDRlMjA=
   data.tar.gz: !binary |-
-    MWZmNzVjN2EzOTY3MjBlNTM1YjhjYzcwNDlkZjBmMDE5ZTIzMWViZjMxNTUx
-    YTNmMjdkYmE4NTVmNTg0OWI3MjllZDkzYWQzMDg5MTQyYzYwMmQ2MzA0MTVh
-    YjY1NGUwMzVkMmMwYTc3NTg4MGE0NjE2ZDQzNGNkY2JmM2ZlODI=
+    ZWIxYjUzM2U4ZjcxMjM3ZDU4OTA1MGVlNzU2OTFlMTFkNDZlMDc1ZTljYWRk
+    ZjkzNWQ1YTE1MWUwZjZlMWQwMjA1MDNmMjRmMDdkOWIzYTVhMzBjYmE4Njc3
+    ZjljZDZkNmNiMjkxOTFkOWY3OWU5NjExYjUzYWI1NzhlN2U1NWM=

data/lib/musicbrainz_wrapper/version.rb

@@ -1,3 +1,3 @@
 module MusicbrainzWrapper
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/wrapper/wrapper.rb

@@ -127,7 +127,7 @@ class Musicbrainz::Wrapper
 	def self.create_query_string(start, params)
   	if params.is_a?(Hash) && params.count > 0
 			ending = hash_to_query_string(params)
-			"#{start}/#{ending}#{question_mark_or_ampersand(ending)}fmt=json"
+			"#{start}/#{ending}#{question_mark_or_ampersand(ending)}fmt=json&limit=#{value_or_default(params[:limit], 25)}&offset=#{value_or_default(params[:offset], 0)}"
 		else
 			"#{start}/"
   	end
@@ -146,7 +146,9 @@ class Musicbrainz::Wrapper
   def self.query_array(hash)
   	array = []
   	hash.each do |k, v|
-  		array << "#{k}:#{URI.encode(v, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}" unless k == :inc
+  		if k != :inc && k != :limit && k != :offset
+  			array << "#{k}:#{URI.encode(v, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}"
+  		end
   	end
   	array
   end
@@ -174,6 +176,14 @@ class Musicbrainz::Wrapper
   		'?'
   	end
   end
+  
+  def self.value_or_default(value, default)
+  	if value
+  		value
+  	else
+  		default
+  	end
+  end
 	
 	# Hit Musicbrainz API
 	def query(ending, type)

data/spec/wrapper/wrapper_spec.rb

@@ -28,6 +28,18 @@ describe Musicbrainz::Wrapper do
 		it "should add &fmt=json to end of string" do
 			should include('&fmt=json')
 		end
+		it "should contain &limit=25 if limit not passed" do
+			should include('&limit=25')
+		end
+		it "should set limit if passed" do
+			Musicbrainz::Wrapper.create_query_string('release', {:limit => 100}).should include('&limit=100')
+		end
+		it "should contain &offset=0 if offset not passed" do
+			should include('&offset=0')
+		end
+		it "should set offset if passed" do
+			Musicbrainz::Wrapper.create_query_string('release', {:offset => 100}).should include('&offset=100')
+		end
 		it "should return the start if passed blank hash" do
 			Musicbrainz::Wrapper.create_query_string('release', {}).should == 'release/'
 		end
@@ -98,21 +110,30 @@ describe Musicbrainz::Wrapper do
 		end
 	end
 	
+	describe "value_or_default" do
+		it "should return value if it is not nil" do
+			Musicbrainz::Wrapper.value_or_default(1, 2).should == 1
+		end
+		it "should return default if value is nil" do
+			Musicbrainz::Wrapper.value_or_default(nil, 2).should == 2
+		end
+	end
+	
 	# Hit Musicbrainz API
 	describe "query", :slow => true do
 		context "is passed a plural object" do
 			it "should return an array" do
-				wrapper.query(albums_query).should be_an_instance_of Array
+				wrapper.query(albums_query, :multiple).should be_an_instance_of Array
 			end
 		end
 		context "is passed a single object" do
 			it "should return a hash" do
-				wrapper.query(album_query).should be_an_instance_of Hash
+				wrapper.query(album_query, :single).should be_an_instance_of Hash
 			end
 		end
 		context "is passed bad data" do
 			it "should return nil" do
-				wrapper.query("something_else").should be_nil
+				wrapper.query("something_else", :single).should be_nil
 			end
 		end
 	end
@@ -143,20 +164,20 @@ describe Musicbrainz::Wrapper do
 			context "for a single object" do
 				it "should return a hash" do
 					response = wrapper.send_query(api_point + album_query)
-					Musicbrainz::Wrapper.parse_response(response).should be_an_instance_of Hash
+					Musicbrainz::Wrapper.parse_response(response, :single).should be_an_instance_of Hash
 				end
 			end
 			context "for multiple objects" do
 				it "should return an array" do
 					response = wrapper.send_query(api_point + albums_query)
-					Musicbrainz::Wrapper.parse_response(response).should be_an_instance_of Array
+					Musicbrainz::Wrapper.parse_response(response, :multiple).should be_an_instance_of Array
 				end
 			end
 		end
 		context "when passed a bad response" do
 			it "should return nil" do
 				response = wrapper.send_query(api_point + 'release/d8')
-				Musicbrainz::Wrapper.parse_response(response).should be_nil
+				Musicbrainz::Wrapper.parse_response(response, :single).should be_nil
 			end
 		end
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musicbrainz_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - tomallen400
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler