elibri_watermarking 0.9.8 → 0.9.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 6e4394f2e780277a4f1af2f3b7f300eb1d2f227bbd8754f119fdd703d6579ad3
+  data.tar.gz: 181e49e2706b89a0d4e91a0c62e5e6dee253abb091643d0779843d95463a0903
+SHA512:
+  metadata.gz: c5dd5582b26c565803ea05503c070dff608aa115eac3d875c30c183117ebd64fc2e3060665f0b1a2081be5a028f71df6c8f31d8f0fa6d72c022c15d4a9cd95aa
+  data.tar.gz: 30945672795695797bbe608d8da37a2b27f82729ca20497b0f605d659bd8d45ed786a8aa269c65b3115cf50a4fd006f4200e383c5c913be92d11d5e274e2a251

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 eLibri
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/lib/elibri_watermarking/client.rb

@@ -10,16 +10,16 @@ require 'json'
 
 module ElibriWatermarking
   class Client
-    
+
     attr_accessor :token, :secret, :logger, :servers
-    
+
     def initialize(token, secret, servers = nil)
       self.token = token
       self.secret = secret
       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, price = nil, promotion_id = nil, low_priority = false)
       if ident =~ /^[0-9]+$/ && ident.size == 13
         ident_type = 'isbn'
@@ -40,7 +40,7 @@ module ElibriWatermarking
       data.merge!(:low_priority => low_priority) if low_priority
       try_with_different_servers('watermark') do |uri|
         return get_response_from_server(uri, data, Net::HTTP::Post)
-      end  
+      end
     end
 
     def deliver(trans_id, low_priority = false)
@@ -70,7 +70,7 @@ module ElibriWatermarking
         return JSON.parse(get_response_from_server(uri, {}, Net::HTTP::Get))
       end
     end
-    
+
     def soon_unavailable_files
       try_with_different_servers('soon_unavailable_files.json') do |uri|
         return JSON.parse(get_response_from_server(uri, {}, Net::HTTP::Get))
@@ -85,22 +85,30 @@ module ElibriWatermarking
     end
 
     def get_supplier(id)
-      get_response_from_server(URI('https://www.elibri.com.pl/watermarking/get_supplier'), {:id => id}, Net::HTTP::Get)
+      get_response_from_server(construct_main_server_url('/watermarking/get_supplier'), {:id => id}, Net::HTTP::Get)
       #to chyba moze byc tylko z glownego serwera?
     end
-    
+
     def check_api
       try_with_different_servers('ver') do |uri|
         return get_response_from_server(uri, {}, Net::HTTP::Get)
       end
     end
-    
+
     def new_complaint(trans_id, reason)
-      get_response_from_server(URI('https://www.elibri.com.pl/api_complaints'), {:trans_id => trans_id, :reason => reason}, Net::HTTP::Post)
+      get_response_from_server(construct_main_server_url('/api_complaints'), {:trans_id => trans_id, :reason => reason}, Net::HTTP::Post)
     end
 
     protected
 
+    def construct_main_server_url(path)
+      if server.starts_with?("https:")
+        URI("#{server}#{path}")
+      else
+        URI("https://www.elibri.com.pl#{path}")
+      end
+    end
+
     def get_response_from_server(uri, data, request_class)
       logger.info("doing #{uri}") if logger
       timestamp = Time.now.to_i.to_s
@@ -118,7 +126,11 @@ module ElibriWatermarking
       txt_record = self.servers || Net::DNS::Resolver.start("transactional-servers.elibri.com.pl", Net::DNS::TXT).answer.first.txt
       servers = txt_record.split(",").sort_by { rand }.map(&:strip)
       servers.each do |server|
-        uri = URI("https://#{server}.elibri.com.pl/watermarking/#{action}")
+        if server.starts_with?("https:")
+          uri = URI("#{server}/watermarking/#{action}")
+        else
+          uri = URI("https://#{server}.elibri.com.pl/watermarking/#{action}")
+        end
         logger.info("trying #{uri}") if logger
         begin
           yield uri
@@ -145,8 +157,9 @@ module ElibriWatermarking
         raise RequestExpired.new(res.body)
       when "Net::HTTPOK"
         return res.body
+      else
+        raise ServerException.new(res.body)
       end
-      return res.body
     end
   end
 end

data/lib/elibri_watermarking/version.rb

@@ -1,3 +1,3 @@
 module ElibriWatermarking
-  VERSION = "0.9.8"
+  VERSION = "0.9.11"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elibri_watermarking
 version: !ruby/object:Gem::Version
-  version: 0.9.8
-  prerelease: 
+  version: 0.9.11
 platform: ruby
 authors:
 - Piotr Szmielew
@@ -10,38 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-dns
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Gem designed to help in use of Elibri watermarking API.
@@ -52,8 +47,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - elibri_watermarking.gemspec
@@ -63,27 +59,24 @@ files:
 - lib/elibri_watermarking/version.rb
 homepage: http://elibri.com.pl
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: elibri_watermarking
-rubygems_version: 1.8.23
+rubygems_version: 3.1.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Gem designed to help in use of Elibri watermarking API.
 test_files: []
-has_rdoc: