docraptor 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cf8121ad1c5f8911cba244d047a3fed94092fce
-  data.tar.gz: a32b83320f951539542a1c6f8a65f8c26b342704
+  metadata.gz: 097e035caf9f22488252db9ec59987938d16fc54
+  data.tar.gz: 44c9f2a187ec1076951e5450d6d88d30fae3c7ef
 SHA512:
-  metadata.gz: 36a53a768c5db547c22dccc043b5d9cd53aaef8fc9cfe6e3ec787219276c86a2d95362c2c93f0d56cc1ba40bfa8027df42f98ed9a117112631042214e0ee7032
-  data.tar.gz: 428af8015465729bf1de1ceca4cf2f8baf584c417b804a4a449b6fcc40645be188ec5a6344177c15bad8b07743f709efffcee4899a1db220e7b23ba3824cd3ea
+  metadata.gz: 0ebf83bb3a49ca1a7f54176260552d45d1c923fa622bc3aab278cf5ba8dc4d5be6b39d2ee31e546bcade0db082562e831e3a2ea6475234b0c6dfc521bf6538cb
+  data.tar.gz: d6d8473f1fe408d0ea83405335215dda62699e87838b1864217832c776a5c64a53a75f44b30279a7536e0bd92c89f4bebb9d90432793f7ba928035c4dbc9c003

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.4.0 [March 11, 2016]
+* Added support for prince_options[no_parallel_downloads]
+
 ### 0.3.0 [March 11, 2016]
 * Added support for prince_options[debug]
 

data/README.md

@@ -67,13 +67,16 @@ The majority of the code in this repo is generated using swagger-codegen on [doc
 
 ## Release Process
 
-1. `script/test`
-2. Increment version in code:
+1. Pull latest master
+2. Merge feature branch(es) into master
+3. `script/test`
+4. Increment version in code:
   - `swagger-config.json`
   - `lib/docraptor/version.rb`
-3. Update [CHANGELOG.md](CHANGELOG.md)
-4. `rake release`
-5. Update documentation on docraptor.com
+5. Update [CHANGELOG.md](CHANGELOG.md)
+6. Commit "Release version vX.Y.Z"
+7. `rake release`
+8. Refresh documentation on docraptor.com
 
 
 ## Version Policy

data/docraptor.yaml

@@ -214,6 +214,9 @@ definitions:
       no_network:
         type: boolean
         description: Disable network access.
+      no_parallel_downloads:
+        type: boolean
+        description: Disables parallel fetching of assets during PDF creation. Useful if your asset host has strict rate limiting.
       http_user:
         type: string
         description: Set the user for HTTP authentication.

data/lib/docraptor/models/prince_options.rb

@@ -11,6 +11,9 @@ module DocRaptor
     # Disable network access.
     attr_accessor :no_network
 
+    # Disables parallel fetching of assets during PDF creation. Useful if your asset host has strict rate limiting.
+    attr_accessor :no_parallel_downloads
+
     # Set the user for HTTP authentication.
     attr_accessor :http_user
 
@@ -96,6 +99,8 @@ module DocRaptor
 
         :'no_network' => :'no_network',
 
+        :'no_parallel_downloads' => :'no_parallel_downloads',
+
         :'http_user' => :'http_user',
 
         :'http_password' => :'http_password',
@@ -155,6 +160,7 @@ module DocRaptor
         :'baseurl' => :'String',
         :'no_xinclude' => :'BOOLEAN',
         :'no_network' => :'BOOLEAN',
+        :'no_parallel_downloads' => :'BOOLEAN',
         :'http_user' => :'String',
         :'http_password' => :'String',
         :'http_proxy' => :'String',
@@ -203,6 +209,10 @@ module DocRaptor
         self.no_network = attributes[:'no_network']
       end
 
+      if attributes[:'no_parallel_downloads']
+        self.no_parallel_downloads = attributes[:'no_parallel_downloads']
+      end
+
       if attributes[:'http_user']
         self.http_user = attributes[:'http_user']
       end
@@ -325,6 +335,7 @@ module DocRaptor
           baseurl == o.baseurl &&
           no_xinclude == o.no_xinclude &&
           no_network == o.no_network &&
+          no_parallel_downloads == o.no_parallel_downloads &&
           http_user == o.http_user &&
           http_password == o.http_password &&
           http_proxy == o.http_proxy &&
@@ -359,7 +370,7 @@ module DocRaptor
 
     # Calculate hash code according to all attributes.
     def hash
-      [baseurl, no_xinclude, no_network, http_user, http_password, http_proxy, http_timeout, insecure, media, no_author_style, no_default_style, no_embed_fonts, no_subset_fonts, no_compress, encrypt, key_bits, user_password, owner_password, disallow_print, disallow_copy, disallow_annotate, disallow_modify, debug, input, version, javascript, css_dpi, profile].hash
+      [baseurl, no_xinclude, no_network, no_parallel_downloads, http_user, http_password, http_proxy, http_timeout, insecure, media, no_author_style, no_default_style, no_embed_fonts, no_subset_fonts, no_compress, encrypt, key_bits, user_password, owner_password, disallow_print, disallow_copy, disallow_annotate, disallow_modify, debug, input, version, javascript, css_dpi, profile].hash
     end
 
     # build the object from hash

data/lib/docraptor/version.rb

@@ -1,3 +1,3 @@
 module DocRaptor
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/script/generate_language

@@ -1,18 +1,18 @@
 #!/bin/sh
 set -e
-cd "`dirname \"$0\"`/.."
+cd "$(dirname "$0")/.."
 
 LANGUAGE="$1"
 CONFIG_FILE="swagger-config.json"
 
-if [ "$LANGUAGE" == "" ]; then
+if [ "$LANGUAGE" = "" ]; then
   ./script/swagger # prints languages
   exit 1
 fi
 
 if [ ! -f "$CONFIG_FILE" ]; then
   echo "Could not find $CONFIG_FILE"
-  ./script/swagger config-help -l $LANGUAGE
+  ./script/swagger config-help -l "$LANGUAGE"
   exit 1
 fi
 
@@ -20,8 +20,8 @@ fi
 
 ./script/swagger generate \
   -i docraptor.yaml \
-  -l $LANGUAGE \
-  -c $CONFIG_FILE
+  -l "$LANGUAGE" \
+  -c "$CONFIG_FILE"
 
 # call a generator cleanup script
 if [ -f "script/post_generate_language" ]; then

data/script/swagger

@@ -1,19 +1,25 @@
 #!/bin/bash
 set -e
-cd "`dirname \"$0\"`/.."
+cd "$(dirname "$0")/.."
+
+SWAGGER_CODGEN_REVISION=$(cat .swagger-revision 2> /dev/null || true)
+if [ "$SWAGGER_CODGEN_REVISION" = "" ]; then
+  echo "Set a revision of swagger-codegen to use in .swagger-revision"
+  exit 1
+fi
 
 if [ ! -d "swagger-codegen" ]; then
   git clone https://github.com/swagger-api/swagger-codegen
 fi
 
-SWAGGER_CODGEN_REVISION=$(cat .swagger-revision)
-cd swagger-codegen
-if [[ `cat .git/HEAD` != "$SWAGGER_CODGEN_REVISION" ]]; then
-  git fetch
-  git checkout $SWAGGER_CODGEN_REVISION
-  mvn clean package
-fi
-cd ..
+(
+  cd swagger-codegen
+  if [[ $(cat .git/HEAD) != "$SWAGGER_CODGEN_REVISION" ]]; then
+    git fetch
+    git checkout "$SWAGGER_CODGEN_REVISION"
+    mvn clean package
+  fi
+)
 
 executable="./swagger-codegen/modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 

data/script/update_from_upstream

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
-cd "`dirname \"$0\"`/.."
+cd "$(dirname "$0")/.."
 
-if [[ `basename $PWD` == "swagger" ]]; then
+if [[ $(basename "$PWD") == "swagger" ]]; then
   echo "This command is only used in langauge specific repositories"
   exit 1
 fi
@@ -10,23 +10,23 @@ fi
 # Gets content at $1 and puts it into $2, automatically chmod +x if $2 is the
 # script dir.
 get() {
-  curl --fail --silent --show-error $1 > $2
-  if [[ `dirname $2` == "script" ]]; then
-    chmod +x $2
+  curl --fail --silent --show-error "$1" > "$2"
+  if [[ $(dirname "$2") == "script" ]]; then
+    chmod +x "$2"
   fi
 }
 
 # Gets a file $1 from the upstream repo and places it in the same location.
 get_upstream() {
-  get "https://raw.githubusercontent.com/docraptor/docraptor-swagger/master/$1" $1
+  get "https://raw.githubusercontent.com/docraptor/docraptor-swagger/master/$1" "$1"
 }
 
 # Main entry point, wrapped in a function so that bash can handle replacing
 # this file while executing it.
 update() {
-  original=`md5 script/update_from_upstream`
+  original=$(md5 script/update_from_upstream)
   get_upstream script/update_from_upstream
-  if [[ `md5 script/update_from_upstream` != "$original" ]]; then
+  if [[ $(md5 script/update_from_upstream) != "$original" ]]; then
     echo "Detected updated update_from_upstream command, running again"
     script/update_from_upstream
     exit 0 # recursive call above handled everything

data/swagger-config.json

@@ -1,5 +1,5 @@
 {
 	"gemName": "docraptor",
 	"moduleName": "DocRaptor",
-  "gemVersion": "0.3.0"
+  "gemVersion": "0.4.0"
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docraptor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Elijah Miller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus