opds 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/opds/entry.rb

@@ -85,6 +85,8 @@ module OPDS
 				price=nil
 				currency=nil
 				@namespaces['opds']||='http://opds-spec.org/2010/catalog'
+				types=n.search('.//opds:indirectAcquisition',@namespaces).map{|b| b['type']}
+				type=[type,types].flatten.compact unless types.nil? || types.empty?
 				oprice=n.at('./opds:price',@namespaces)
 				if oprice
 					price=text(oprice)
@@ -151,10 +153,14 @@ module OPDS
 		
 		# @return [Array] acquisition link subset
 		def acquisition_links
+			acq=[]
 			rel_start='http://opds-spec.org/acquisition'
-			[*links.by(:rel).reject do |k,_|
-				k[0,rel_start.size]!=rel_start unless k.nil?
-			end.values]
+			links.by(:rel).each do |k,lnk|
+				if !k.nil? && k[0,rel_start.size]==rel_start 
+					lnk.each {|l| acq.push l}
+				end
+			end
+			acq
 		end
 		
 		def inspect

data/opds.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{opds}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benoit Larroque"]

data/spec/opdsparser_opds_1_1_spec.rb

@@ -70,6 +70,10 @@ describe OPDS::OPDSParser do
 	it  do 
 		subject.parse(sample(feed_type)).should have_at_least(1).active_facets
 	end
+	
+	it "should have indirect acquisition types" do
+		subject.parse(sample(feed_type)).entries.last.acquisition_links.last.type.size.should == 3
+	end
 		
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: opds
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Benoit Larroque