docraptor 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfd3d5b8d3364bd02c04b712136686d4a714f6cd3ab3fced0c7efae7e9709ee0
-  data.tar.gz: 89d4fb74883b56c49a71eef45487534474a8f9fa0ae8fc065a592e6a1ae7340c
+  metadata.gz: e59619a7e4c76658472337dcfedf6ecbb1a6e4cbc6bedfcb7aa80adc4fe33ae9
+  data.tar.gz: 69095f9007180960bdae69017a5a6dedf48ad1d475b0d87db92951c8a8525a14
 SHA512:
-  metadata.gz: 964a77fd28bb343dd5410b01e5b6981f631fd5c0ed047225b2dc048b8070249d9d704bb7a4bd289d154b406e8b794a2ac71e7d031af047bb8c47a0500c86b29d
-  data.tar.gz: 90787b9656e2455038833d260caf62b7aa48ce833d3de5e1483c1a9893feed6e0deb5d4cb995ee565510c0c3bfabe7e851decdf5cae00fd0389dc07d8319ff90
+  metadata.gz: 45931088e15d3312c18b7f55b51f07c263796ee90d5942c246a60b026ac6eea0f3fae14e3b2e1dba1f2335ff9596f5152005891033e5f01602a22558488d532e
+  data.tar.gz: 945ffc6a58c560588f05c4d8252046250af740e6804978b956f2e04785d9aa4cbc41c059b695ad656248dae3968fc2f766a12e6bf6f153cdeda925a038bb48d1

data/.docker_env.list

@@ -0,0 +1,3 @@
+TRACE
+TEST_OUTPUT_DIR=/app/tmp/test_output
+BUNDLE_PATH=/app/tmp/cache/bundle

data/.generator-language-identifier

@@ -0,0 +1 @@
+ruby

data/.generator-revision

@@ -0,0 +1 @@
+v6.0.1

data/.github/pull_request_template.txt

@@ -0,0 +1,17 @@
+Why is this change needed?
+--------------------------
+
+How does it address the issue?
+------------------------------
+
+Any links to any relevant tickets, articles, or other resources?
+---------------------------------------------------------------
+
+Any screenshots?
+----------------
+
+Did you complete all of the following?
+--------------------------------------
+- Run test suite?
+- Add new tests?
+- Consider security implications and practices?

data/.gitignore

@@ -1,3 +1,6 @@
+# Generated by: https://openapi-generator.tech
+#
+
 *.gem
 *.rbc
 /.config
@@ -25,21 +28,24 @@ build/
 /.bundle/
 /vendor/bundle
 /lib/bundler/man/
-Gemfile.lock
-.ruby-version
-.ruby-gemset
-.rvmrc
-.rubocop.yml
 
-## Ignore dumb OSX files
-.DS_Store
-Thumbs.db
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
 
-## Ignore baked in swagger generator
-swagger-codegen
 
-## Ignore dumb emacs files
-*~
+# EB Customizations
 
-## Ignore files that contain special keys
-.docraptor_key
+# Ignore this so we don't see a git modified status on each test run. Currently
+# the tests copy a different file into place for each ruby version, because the
+# same lock file won't work with every ruby version. We want those lock files
+# committed because it helps ensure the tests pass on this repo by ensuring a
+# static set of dependencies is used for each ruby version. A future improvement
+# could be to use docker to mount the correct lock file over top of the top
+# level lock file on each docker run, but that's a future exercise.
+Gemfile.lock

data/.gitlab-ci.yml

@@ -0,0 +1,26 @@
+.ruby: &ruby
+  variables:
+    LANG: "C.UTF-8"
+  before_script:
+    - ruby -v
+    - bundle config set --local deployment true
+    - bundle install -j $(nproc)
+  parallel:
+    matrix:
+      - RUBY_VERSION: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0']
+  image: "ruby:$RUBY_VERSION"
+  cache:
+    paths:
+      - vendor/ruby
+    key: 'ruby-$RUBY_VERSION'
+
+gem:
+  extends: .ruby
+  script:
+    - bundle exec rspec
+    - bundle exec rake build
+    - bundle exec rake install
+  artifacts:
+    paths:
+      - pkg/*.gem
+

data/.openapi-generator/FILES

@@ -0,0 +1,27 @@
+.gitignore
+.gitlab-ci.yml
+.rspec
+.rubocop.yml
+.travis.yml
+Gemfile
+README.md
+Rakefile
+docraptor.gemspec
+lib/docraptor.rb
+lib/docraptor/api/doc_api.rb
+lib/docraptor/api_client.rb
+lib/docraptor/api_error.rb
+lib/docraptor/configuration.rb
+lib/docraptor/models/async_doc.rb
+lib/docraptor/models/doc.rb
+lib/docraptor/models/doc_status.rb
+lib/docraptor/models/prince_options.rb
+lib/docraptor/version.rb
+spec/api/doc_api_spec.rb
+spec/api_client_spec.rb
+spec/configuration_spec.rb
+spec/models/async_doc_spec.rb
+spec/models/doc_spec.rb
+spec/models/doc_status_spec.rb
+spec/models/prince_options_spec.rb
+spec/spec_helper.rb

data/.openapi-generator/VERSION

@@ -0,0 +1 @@
+6.1.0-SNAPSHOT

data/{.swagger-codegen-ignore → .openapi-generator-ignore}

@@ -22,11 +22,27 @@
 # Then explicitly reverse the ignore rule for a single file:
 #!docs/README.md
 
-# Can't Touch This. Dun-dun-dun-dun. Dun dun. Dun dun.
-README.md
-CHANGELOG.md
-git_push.sh
+
+# These are autogenerated and aren't exactly what we want. We rely on the
+# readme, and website documentation.
+# TODO: Ideally, when updating the agent, it would be nice to see the
+# differences between when the previous version and the new version generated.
+# This would help make it more obvious when the agent supported a newer usage
+# pattern that we might prefer.
+# TODO: Consider if it's possible to make the generated docs more useful so we
+# might actually want to use them.
 docs/
-.gitignore
-LICENSE
-Rakefile
+
+# This seems to be a script related to developing openapi-generator and making
+# new test APIs.
+git_push.sh
+
+# Don't ignore this because we want to review the generated content to see if we
+# should update our own readme similarly. The most common example is an update
+# to the supported runtime versions, but it could also be an update to the
+# recommended usage that we would want to use.
+!README.md
+
+# Don't ignore this because we want to know about new files that the generator
+# ignores.
+!.gitignore

data/.review/README.md

@@ -0,0 +1,16 @@
+# Review newly generated files
+
+This directory helps with review of generated files where we lagely want
+the content to be custom.
+
+The project `README.md` is a good example. We heavily custimize
+`README.md` based on our particular use case. There are also important
+changes to the generated `README.md` that should be reviewed when it is
+updated. These include things like new minimum language versions, or
+client API changes.
+
+If you add the `README.md` to the `.openapi-generator-ignore` list then
+you never see the updates, making it easy to miss things. If you don't
+add it to the `.openapi-generator-ignore` list then any uncommitted
+updates to the `README.md` are lost when running
+`script/generate_language`.

data/.review/generated_files/.gitignore

@@ -0,0 +1,39 @@
+# Generated by: https://openapi-generator.tech
+#
+
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc

data/.review/generated_files/README.md

@@ -0,0 +1,107 @@
+# docraptor
+
+DocRaptor - the Ruby gem for the DocRaptor
+
+A native client library for the DocRaptor HTML to PDF/XLS service.
+
+This SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
+
+- API version: 2.0.0
+- Package version: 3.0.0
+- Build package: org.openapitools.codegen.languages.RubyClientCodegen
+
+## Installation
+
+### Build a gem
+
+To build the Ruby code into a gem:
+
+```shell
+gem build docraptor.gemspec
+```
+
+Then either install the gem locally:
+
+```shell
+gem install ./docraptor-3.0.0.gem
+```
+
+(for development, run `gem install --dev ./docraptor-3.0.0.gem` to install the development dependencies)
+
+or publish the gem to a gem hosting service, e.g. [RubyGems](https://rubygems.org/).
+
+Finally add this to the Gemfile:
+
+    gem 'docraptor', '~> 3.0.0'
+
+### Install from Git
+
+If the Ruby gem is hosted at a git repository: https://github.com/GIT_USER_ID/GIT_REPO_ID, then add the following in the Gemfile:
+
+    gem 'docraptor', :git => 'https://github.com/GIT_USER_ID/GIT_REPO_ID.git'
+
+### Include the Ruby code directly
+
+Include the Ruby code directly using `-I` as follows:
+
+```shell
+ruby -Ilib script.rb
+```
+
+## Getting Started
+
+Please follow the [installation](#installation) procedure and then run the following code:
+
+```ruby
+# Load the gem
+require 'docraptor'
+
+# Setup authorization
+DocRaptor.configure do |config|
+  # Configure HTTP basic authorization: basicAuth
+  config.username = 'YOUR_USERNAME'
+  config.password = 'YOUR_PASSWORD'
+end
+
+api_instance = DocRaptor::DocApi.new
+doc = DocRaptor::Doc.new({name: 'name_example', document_type: 'pdf', document_content: 'document_content_example'}) # Doc | The document to be created.
+
+begin
+  result = api_instance.create_async_doc(doc)
+  p result
+rescue DocRaptor::ApiError => e
+  puts "Exception when calling DocApi->create_async_doc: #{e}"
+end
+
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *https://api.docraptor.com*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*DocRaptor::DocApi* | [**create_async_doc**](docs/DocApi.md#create_async_doc) | **POST** /async_docs | 
+*DocRaptor::DocApi* | [**create_doc**](docs/DocApi.md#create_doc) | **POST** /docs | 
+*DocRaptor::DocApi* | [**create_hosted_async_doc**](docs/DocApi.md#create_hosted_async_doc) | **POST** /hosted_async_docs | 
+*DocRaptor::DocApi* | [**create_hosted_doc**](docs/DocApi.md#create_hosted_doc) | **POST** /hosted_docs | 
+*DocRaptor::DocApi* | [**expire**](docs/DocApi.md#expire) | **PATCH** /expire/{id} | 
+*DocRaptor::DocApi* | [**get_async_doc**](docs/DocApi.md#get_async_doc) | **GET** /download/{id} | 
+*DocRaptor::DocApi* | [**get_async_doc_status**](docs/DocApi.md#get_async_doc_status) | **GET** /status/{id} | 
+
+
+## Documentation for Models
+
+ - [DocRaptor::AsyncDoc](docs/AsyncDoc.md)
+ - [DocRaptor::Doc](docs/Doc.md)
+ - [DocRaptor::DocStatus](docs/DocStatus.md)
+ - [DocRaptor::PrinceOptions](docs/PrinceOptions.md)
+
+
+## Documentation for Authorization
+
+
+### basicAuth
+
+- **Type**: HTTP basic authentication
+

data/.rubocop.yml

@@ -0,0 +1,148 @@
+# This file is based on https://github.com/rails/rails/blob/master/.rubocop.yml (MIT license)
+# Automatically generated by OpenAPI Generator (https://openapi-generator.tech)
+AllCops:
+  TargetRubyVersion: 2.4
+  # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
+  # to ignore them, so only the ones explicitly set in this file are enabled.
+  DisabledByDefault: true
+  Exclude:
+    - '**/templates/**/*'
+    - '**/vendor/**/*'
+    - 'actionpack/lib/action_dispatch/journey/parser.rb'
+
+# Prefer &&/|| over and/or.
+Style/AndOr:
+  Enabled: true
+
+# Align `when` with `case`.
+Layout/CaseIndentation:
+  Enabled: true
+
+# Align comments with method definitions.
+Layout/CommentIndentation:
+  Enabled: true
+
+Layout/ElseAlignment:
+  Enabled: true
+
+Layout/EmptyLineAfterMagicComment:
+  Enabled: true
+
+# In a regular class definition, no empty lines around the body.
+Layout/EmptyLinesAroundClassBody:
+  Enabled: true
+
+# In a regular method definition, no empty lines around the body.
+Layout/EmptyLinesAroundMethodBody:
+  Enabled: true
+
+# In a regular module definition, no empty lines around the body.
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: true
+
+Layout/FirstArgumentIndentation:
+  Enabled: true
+
+# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
+Style/HashSyntax:
+  Enabled: false
+
+# Method definitions after `private` or `protected` isolated calls need one
+# extra level of indentation.
+Layout/IndentationConsistency:
+  Enabled: true
+  EnforcedStyle: indented_internal_methods
+
+# Two spaces, no tabs (for indentation).
+Layout/IndentationWidth:
+  Enabled: true
+
+Layout/LeadingCommentSpace:
+  Enabled: true
+
+Layout/SpaceAfterColon:
+  Enabled: true
+
+Layout/SpaceAfterComma:
+  Enabled: true
+
+Layout/SpaceAroundEqualsInParameterDefault:
+  Enabled: true
+
+Layout/SpaceAroundKeyword:
+  Enabled: true
+
+Layout/SpaceAroundOperators:
+  Enabled: true
+
+Layout/SpaceBeforeComma:
+    Enabled: true
+
+Layout/SpaceBeforeFirstArg:
+    Enabled: true
+
+Style/DefWithParentheses:
+  Enabled: true
+
+# Defining a method with parameters needs parentheses.
+Style/MethodDefParentheses:
+  Enabled: true
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+  EnforcedStyle: always
+
+# Use `foo {}` not `foo{}`.
+Layout/SpaceBeforeBlockBraces:
+  Enabled: true
+
+# Use `foo { bar }` not `foo {bar}`.
+Layout/SpaceInsideBlockBraces:
+  Enabled: true
+
+# Use `{ a: 1 }` not `{a:1}`.
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: true
+
+Layout/SpaceInsideParens:
+  Enabled: true
+
+# Check quotes usage according to lint rule below.
+#Style/StringLiterals:
+#  Enabled: true
+#  EnforcedStyle: single_quotes
+
+# Detect hard tabs, no hard tabs.
+Layout/IndentationStyle:
+  Enabled: true
+
+# Blank lines should not have any spaces.
+Layout/TrailingEmptyLines:
+  Enabled: true
+
+# No trailing whitespace.
+Layout/TrailingWhitespace:
+  Enabled: false
+
+# Use quotes for string literals when they are enough.
+Style/RedundantPercentQ:
+  Enabled: true
+
+# Align `end` with the matching keyword or starting expression except for
+# assignments, where it should be aligned with the LHS.
+Layout/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: variable
+  AutoCorrect: true
+
+# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
+Lint/RequireParentheses:
+  Enabled: true
+
+Style/RedundantReturn:
+  Enabled: true
+  AllowMultipleReturnValues: true
+
+Style/Semicolon:
+  Enabled: true
+  AllowAsExpressionSeparator: true

data/.runtime-environments

@@ -0,0 +1,10 @@
+# Versions without patch numbers will test the latest patch version. We include
+# specific patch versions to provide consistency. We include version numbers
+# without the patch version in order to automatically test the latest patch
+# version of each minor version.
+# DR gem itself requires >= 2.4, so 2.3 is out
+# 2.4: /app/lib/docraptor/models/async_doc.rb:111:in `build_from_hash': undefined method `transform_keys'
+ruby:2.5
+ruby:2.6
+ruby:2.7
+ruby:3.0

data/.travis.yml

@@ -1,9 +1,14 @@
-sudo: false
 language: ruby
+cache: bundler
 rvm:
-  - 2.3.8
-  - 2.4.10
-  - 2.5.9
-  - 2.6.7
-  - 2.7.3
-  - 3.0.1
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - 3.0
+script:
+  - bundle install --path vendor/bundle
+  - bundle exec rspec
+  - gem build docraptor.gemspec
+  - gem install ./docraptor-3.0.0.gem

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 3.0.0 [November 15, 2022]
+* Switch API host to more secure api.docraptor.com (dropping old TLS)
+* Remove support for rubies <2.5
+* Switch from swagger v2.4.19 to openapi-generator v6.0.1 (better maintained)
+
 ### 2.0.0 [June 1, 2021]
 * Add support for ruby 3.x (remove `URI.encode`)
 * Remove support for rubies <2.3

data/Gemfile

@@ -3,5 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'rake', '~> 12.3.3'
+  gem 'rake', '~> 13.0.1'
+  gem 'pry-byebug'
+  gem 'rubocop', '~> 0.66.0'
 end

data/README.md

@@ -55,7 +55,7 @@ Stuck? We're experts at turning HTML into PDFs so please [email us](mailto:suppo
 
 ## Development
 
-The majority of the code in this repo is generated using swagger-codegen on [docraptor.yaml](docraptor.yaml). You can modify this file and regenerate the client using `script/generate_language ruby`.
+The majority of the code in this repo is generated using openapi-generator on [docraptor.yaml](docraptor.yaml). You can modify this file and regenerate the client using `script/generate_language`.
 
 
 ## Release Process
@@ -63,14 +63,14 @@ The majority of the code in this repo is generated using swagger-codegen on [doc
 1. Pull latest master
 2. Merge feature branch(es) into master
 3. `script/test`
-4. Increment version in code:
-  - `swagger-config.json`
+4. Increment version: `generator-config.json`
+5. Run `script/generate_language` to update generated version numbers:
   - `lib/docraptor/version.rb`
-5. Update [CHANGELOG.md](CHANGELOG.md)
-6. Commit "Release version vX.Y.Z"
-7. `rake release`
-8. Verify package release at https://rubygems.org/gems/docraptor
-9. Refresh documentation on docraptor.com
+6. Update [CHANGELOG.md](CHANGELOG.md)
+7. Commit "Release version vX.Y.Z"
+8. `rake release[<name of your git remote corresponding to DocRaptor/docraptor-ruby>]`
+9. Verify package release at https://rubygems.org/gems/docraptor
+10. Refresh documentation on docraptor.com
 
 
 ## Version Policy

data/Rakefile

@@ -1,5 +1,4 @@
-require 'bundler/setup'
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 
 begin
   require 'rspec/core/rake_task'

data/docraptor.gemspec

@@ -5,10 +5,10 @@
 
 #A native client library for the DocRaptor HTML to PDF/XLS service.
 
-OpenAPI spec version: 1.4.0
+The version of the OpenAPI document: 2.0.0
 
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.19
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 6.1.0-SNAPSHOT
 
 =end
 
@@ -24,26 +24,12 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/docraptor/docraptor-ruby"
   s.summary     = "A wrapper for the DocRaptor HTML to PDF/XLS service."
   s.description = "A native client library for the DocRaptor HTML to PDF/XLS service."
-  s.license     = 'MIT'
-  s.required_ruby_version = ">= 2.3"
+  s.license     = "MIT"
+  s.required_ruby_version = ">= 2.5"
 
   s.add_runtime_dependency 'typhoeus', '~> 1.0', '>= 1.0.1'
-  s.add_runtime_dependency 'json', '~> 2.1', '>= 2.1.0'
-  s.add_runtime_dependency 'addressable', '~> 2.3', '>= 2.3.0'
 
   s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0'
-  s.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.1'
-  s.add_development_dependency 'webmock', '~> 1.24', '>= 1.24.3'
-  s.add_development_dependency 'autotest', '~> 4.4', '>= 4.4.6'
-  s.add_development_dependency 'autotest-rails-pure', '~> 4.1', '>= 4.1.2'
-  s.add_development_dependency 'autotest-growl', '~> 0.2', '>= 0.2.16'
-  s.add_development_dependency 'autotest-fsevent', '~> 0.2', '>= 0.2.12'
-
-  # added by script/fix_gemspec.rb.
-  s.add_development_dependency 'rake', '~>11.2', '>= 11.2.2'
-  s.add_development_dependency 'pry', '~>0.10', '>= 0.10.4'
-  # </added> : if the above lines are missing in the gemspec, then
-  # the matcher for autotest is probably broken
 
   s.files         = `git ls-files`.split("\n").uniq.sort.select { |f| !f.empty? }
   s.test_files    = `git ls-files spec test`.split("\n")

data/docraptor.yaml

@@ -1,7 +1,7 @@
 swagger: '2.0'
 
 info: # https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#info-object
-  version: "1.4.0"
+  version: "2.0.0"
   title: DocRaptor
   description: "A native client library for the DocRaptor HTML to PDF/XLS service."
   termsOfService: "https://docraptor.com/tos"
@@ -9,7 +9,7 @@ info: # https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md
     name: "MIT"
     url: "https://mit-license.org/"
 
-host: docraptor.com
+host: api.docraptor.com
 basePath: /
 schemes: [https]
 securityDefinitions:
@@ -44,7 +44,7 @@ paths:
           description: Successful response
           schema:
             type: string
-            format: binary
+            format: byte
         400:
           description: Bad Request
         401:
@@ -198,7 +198,7 @@ paths:
           description: Successful response
           schema:
             type: string
-            format: binary
+            format: byte
         400:
           description: Bad Request
         403:
@@ -457,3 +457,4 @@ definitions:
       validation_errors:
         type: string
         description: Error information.
+