elibri_watermarking 0.8.4 → 0.9.0

data/lib/elibri_watermarking/client.rb

@@ -19,13 +19,15 @@ module ElibriWatermarking
       self.servers = servers
     end
     
-    def watermark(ident, formats, visible_watermark, title_postfix, customer_ip, client_symbol = nil, supplier = nil)
+    def watermark(ident, formats, visible_watermark, title_postfix, customer_ip, client_symbol = nil, supplier = nil, delivery_form = nil)
       ident =~ /^[0-9]+$/ ? ident_type = 'isbn' : ident_type = 'record_reference'
       raise WrongFormats.new if formats.is_a?(String) && !formats =~ /^(epub|mobi|pdf|mp3_in_zip|,)+$/
       raise WrongFormats.new if formats.is_a?(Array) && ((formats - ['epub','mobi','pdf','mp3_in_zip']) != [] || (formats & ['epub','mobi','pdf','mp3_in_zip']).count < 1)
       formats = formats.join(",") if formats.is_a?(Array)
+      raise ParametersError.new if delivery_form && formats != 'mp3_in_zip'
+      raise ParametersError.new if delivery_form && (delivery_form != 'mp3' && delivery_form != 'zip')
       data = {ident_type => ident, 'formats' => formats, 'visible_watermark' => visible_watermark,
-              'title_postfix' => title_postfix, 'client_symbol' => client_symbol}
+              'title_postfix' => title_postfix, 'client_symbol' => client_symbol, 'delivery_form' => delivery_form}
       data.merge!(:supplier => supplier) if supplier
       data.merge!(:customer_ip => customer_ip) if customer_ip
 
@@ -40,9 +42,9 @@ module ElibriWatermarking
       end
     end
 
-    def retry(trans_id)
+    def retry(trans_id, delivery_form = nil)
       try_with_different_servers('retry') do |uri|
-        return get_response_from_server(uri, {'trans_id' =>  trans_id}, Net::HTTP::Post)
+        return get_response_from_server(uri, {'trans_id' =>  trans_id, 'delivery_form' => delivery_form}, Net::HTTP::Post)
       end
     end
 

data/lib/elibri_watermarking/version.rb

@@ -1,3 +1,3 @@
 module ElibriWatermarking
-  VERSION = "0.8.4"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elibri_watermarking
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 8
-  - 4
-  version: 0.8.4
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Piotr Szmielew
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-21 00:00:00 Z
+date: 2013-01-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake