rpdf 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50be1e0c93dd395d2694176cb7715e6e52a77e944c414788d4d7ed6227239bd5
-  data.tar.gz: ef5dc4f7a92b213397424001eb9dc7787d5ff0cbd8d3fafa5683ede16f486cc8
+  metadata.gz: 135ad5d6942ca6a2a4d9269bad24b0c077c383dda6e4462ed8ac68ebef84ed9b
+  data.tar.gz: 201496f5efa2dd9958ffe32bfe6e257eb025ab93e32e21f9e1613ecb657a7b85
 SHA512:
-  metadata.gz: ebaf0d3eb698a1d42a913e4094bccb2403c13bea7593b87dd4eb9262444781d85cf4c3201e56f69ce2dc85910ca1b8431f4b2142cc1c60c3e20a74706b64322a
-  data.tar.gz: 8fe753248f784f04e298fc39f047c7952c448444012559548a3a0d47464bcf65d6b9430182f9eb4e0fef61cb33a6f24be43616fd584d05a049593e4daa036f65
+  metadata.gz: 39aabcbe2ed5d10e53a5673fcfa5997848157fe2bfd3e3132f14ab4a80efc2be20821355e806d3d72f036f034e39f742b8ade1f1bc343a7cd1b0ab142f3a0686
+  data.tar.gz: c10b1f9778923cce13a5d897b9a63fa2b48c0f820ef42a60d2486c89103361deb1bf860bcee4c0e904614e821a34ddb3677a997fa1820a663ef6b9d0e69e9597

data/.byebug_history

@@ -0,0 +1,54 @@
+c
+tags.array
+c
+tags.array
+continue
+c
+tags.array
+c
+tags.array
+c
+tags.array
+c
+continue
+tags.array
+continue
+@node.children.first
+@node.children.first.children
+@node.children.first
+tags.array
+c
+n
+c
+n
+c
+n
+continue
+@node.name
+@node
+@node.children.count
+@node.children.first.children.first.name
+@node.children.first.children.count
+@node.children.first.has_children?
+@node.children.first.name
+@node.children.first
+@node.children.count
+@node.children.has_children?
+@node.children
+continue
+@node.as_json
+@node.children.children
+@node.children
+@node[1]
+@node[0]
+@node.name
+@node.children
+@node.methods
+@node.to_h
+@node.hash
+@node.has
+@node.tag_node
+@node.tags
+@node.tag
+@node.count
+@node

data/.gitignore

@@ -1,9 +1,7 @@
 *.gem
 *.rbc
-.bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/Dockerfile

@@ -0,0 +1,20 @@
+FROM ruby:2.4
+
+RUN mkdir /app
+RUN mkdir -p /app/lib/rpdf
+
+COPY Gemfile* /app/
+COPY *.gemspec /app
+COPY lib/rpdf/version.rb /app/lib/rpdf/
+WORKDIR /app
+
+RUN bundle install
+
+COPY . /app
+
+RUN echo "IRB.conf[:SAVE_HISTORY] = 200" > /.irbrc
+RUN echo "IRB.conf[:HISTORY_FILE] = '/app/tmp/.irb-history'" >> /.irbrc
+
+EXPOSE 3000
+
+CMD ["bundle", "exec", "rspec"]

data/Gemfile.lock

@@ -0,0 +1,151 @@
+PATH
+  remote: .
+  specs:
+    rpdf (0.9.7)
+      savon (~> 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.11.1)
+      actionview (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      builder (~> 3.1)
+    activerecord (4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      arel (~> 6.0)
+    activesupport (4.2.11.1)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    akami (1.3.1)
+      gyoku (>= 0.4.0)
+      nokogiri
+    arel (6.0.4)
+    builder (3.2.4)
+    byebug (11.1.1)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
+    diff-lcs (1.3)
+    erubis (2.7.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    gyoku (1.3.1)
+      builder (>= 2.1.2)
+    httpi (2.4.4)
+      rack
+      socksify
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    loofah (2.4.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.0)
+    nokogiri (1.10.8)
+      mini_portile2 (~> 2.4.0)
+    nori (2.6.0)
+    rack (1.6.13)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.11.1)
+      actionmailer (= 4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activerecord (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.11.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (0.9.6)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    savon (2.12.0)
+      akami (~> 1.2)
+      builder (>= 2.1.2)
+      gyoku (~> 1.2)
+      httpi (~> 2.3)
+      nokogiri (>= 1.8.1)
+      nori (~> 2.4)
+      wasabi (~> 3.4)
+    socksify (1.7.1)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.6)
+      thread_safe (~> 0.1)
+    wasabi (3.5.0)
+      httpi (~> 2.0)
+      nokogiri (>= 1.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.6)
+  byebug
+  rails (~> 4)
+  rake (~> 0)
+  rpdf!
+  rspec
+
+BUNDLED WITH
+   1.17.3

data/docker-compose.yml

@@ -0,0 +1,9 @@
+version: '3'
+
+services:
+  app:
+    build: .
+    volumes:
+      - ".:/app:cached"
+    stdin_open: true
+    tty: true

data/lib/rpdf.rb

@@ -1,4 +1,5 @@
 require "rpdf/version"
 require 'rpdf/concerns/models/xml_serializable'
 require 'rpdf/models/node'
+require 'rpdf/models/tag_array'
 require 'rpdf/services/zap_pdf_client'

data/lib/rpdf/models/tag_array.rb

@@ -0,0 +1,28 @@
+module Intersail
+  module Rpdf
+    class TagArray
+      attr_reader :array
+
+      def initialize(node)
+        @array = []
+        build_array(node) if(node.respond_to?(:has_children?) && node.has_children?)
+      end
+
+      private
+
+      def build_array(node, basename = '')
+        if node.name.present?
+          basename =  basename.empty? ? node.name : "#{basename}.#{node.name}"
+        end
+
+        node.children.each do |child|
+          if(child.has_children?)
+            build_array(child, basename)
+          else
+            @array.append(basename.empty? ? child.name : "#{basename}.#{child.name}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rpdf/services/zap_pdf_client.rb

@@ -3,6 +3,9 @@ require "savon"
 module Intersail
   module Rpdf
     class ZapPdfClient
+      cattr_accessor(:max_tries) { 1 }
+      cattr_accessor(:min_try_delay) { 1000 }
+      cattr_accessor(:max_try_delay) { 5000 }
 
       def initialize(address)
         @url = address
@@ -14,27 +17,56 @@ module Intersail
       end
 
       def make_pdf_with_local_file(templateFile, data, options = {})
+        max_tries = options.delete(:max_tries) || self.class.max_tries
+
         templateData = Base64.encode64(File.read(templateFile))
 
-        response = @ws.call(:make_pdf_with_xml, message: { data: templateData, xmlTags: data.to_xml(options) })
+        try = 1
+        loop do
+          response = @ws.call(:make_pdf_with_xml, message: { data: templateData, xmlTags: data.to_xml(options) })
+
+          pdfData = response.nil? ? nil : response.body[:make_pdf_with_xml_response][:make_pdf_with_xml_result]
 
-        return nil unless response
+          return  Base64.decode64(pdfData) unless pdfData.nil?
 
-        pdfData = response.body[:make_pdf_with_xml_response][:make_pdf_with_xml_result]
+          if try < max_tries
+            try += 1
+            sleep delay
+          else
+            break
+          end
+        end
 
-        Base64.decode64(pdfData)
+        nil
       end
 
-      def get_template_tags(templateFile)
+      def get_template_tags(templateFile, options = {})
+        max_tries = options.delete(:max_tries) || self.class.max_tries
+
         templateData = Base64.encode64(File.read(templateFile))
 
-        response = @ws.call(:get_template_tags, message: { data: templateData })
+        try = 1
+        loop do
+
+          response = @ws.call(:get_template_tags, message: { data: templateData })
 
-        return nil unless response
+          tags = response.nil? ? nil : response.body[:get_template_tags_response][:get_template_tags_result]
 
-        tags = response.body[:get_template_tags_response][:get_template_tags_result]
+          return Intersail::Rpdf::Node.new(tags) unless tags.nil?
+
+          if try < max_tries
+            try += 1
+            sleep delay
+          else
+            break
+          end
+        end
+
+        nil
+      end
 
-        Intersail::Rpdf::Node.new(tags) unless tags.nil?
+      def delay
+        rand(self.class.min_try_delay...self.class.max_try_delay) / 1000.0
       end
     end
   end

data/lib/rpdf/version.rb

@@ -1,3 +1,3 @@
 module Rpdf
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

data/rpdf.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rails", "~> 4"
   spec.add_development_dependency "rake", '~> 0'
   spec.add_development_dependency "rspec"
-  
+  spec.add_development_dependency "byebug"
+
   spec.add_runtime_dependency "savon", "~> 2.0"
 end

data/spec/intersail/rpdf/zap_pdf_client_spec.rb

@@ -1,15 +1,33 @@
 require 'spec_helper'
 
 require 'active_model'
+require 'byebug'
 
 describe Intersail::Rpdf::ZapPdfClient do
   before(:all) do
-    @url = 'http://ced-sisi/WSZapPdf/ZapPdfService.asmx'
+    @url = ENV.fetch('ZAPPDF_URL', 'http://srvtestzml.sail.local/WSZapPdf/ZapPdfService.asmx')
     @client = Intersail::Rpdf::ZapPdfClient.new(@url)
     @template1 = 'spec/template1.odt'
     @template2 = 'spec/template2.odt'
   end
 
+  it 'should have 1 try by default' do
+    expect(described_class.max_tries).to eq(1)
+  end
+
+  it 'should set max_tries' do
+    described_class.max_tries = 3
+    expect(described_class.max_tries).to eq(3)
+  end
+
+  it 'should try 3 times before fail' do
+    described_class.max_tries = 3
+
+    expect_any_instance_of(Savon::Client).to receive(:call).exactly(3).times.and_return(nil)
+
+    @client.get_template_tags(@template1)
+  end
+
   it 'should set url' do
     expect(@client.url).to eq(@url)
   end
@@ -51,15 +69,9 @@ describe Intersail::Rpdf::ZapPdfClient do
     it 'should create tags array' do
       expect(@node).to_not be nil
 
-      tags = TagArray.new(@node)
-
-      expect(tags.array.length).to eq 4
+      tags = Intersail::Rpdf::TagArray.new(@node)
 
-      expect(tags.array[0]).to eq 'amounts.value'cd ..
-
-      expect(tags.array[1]).to eq 'amounts.currency'
-      expect(tags.array[2]).to eq 'name'
-      expect(tags.array[3]).to eq 'surname'
+      expect(tags.array).to eq ['amounts.currency', 'name', 'surname']
     end
 
     it 'should read node' do
@@ -73,14 +85,11 @@ describe Intersail::Rpdf::ZapPdfClient do
         expect(@node.children[0].name).to eq 'amounts'
         expect(@node.children[0]).to have_children
 
-        expect(@node.children[0].children.length).to eq 2
+        expect(@node.children[0].children.length).to eq 1
 
-        expect(@node.children[0].children[0].name).to eq 'value'
+        expect(@node.children[0].children[0].name).to eq 'currency'
         expect(@node.children[0].children[0]).to_not have_children
 
-        expect(@node.children[0].children[1].name).to eq 'currency'
-        expect(@node.children[0].children[1]).to_not have_children
-
         expect(@node.children[1].name).to eq 'name'
         expect(@node.children[1]).to_not have_children
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpdf
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - INTERSAIL
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +101,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".byebug_history"
 - ".gitignore"
+- Dockerfile
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- docker-compose.yml
 - lib/rpdf.rb
 - lib/rpdf/concerns/models/xml_serializable.rb
 - lib/rpdf/models/node.rb
+- lib/rpdf/models/tag_array.rb
 - lib/rpdf/services/zap_pdf_client.rb
 - lib/rpdf/version.rb
 - rpdf.gemspec