docraptor 1.3.0 → 1.4.0

data/lib/docraptor/models/prince_options.rb

@@ -1,19 +1,18 @@
 =begin
-#DocRaptor v1
+#DocRaptor
 
 #A native client library for the DocRaptor HTML to PDF/XLS service.
 
-OpenAPI spec version: 1.3.0
+OpenAPI spec version: 1.4.0
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.2.3
+Swagger Codegen version: 2.4.14
 
 =end
 
 require 'date'
 
 module DocRaptor
-
   class PrinceOptions
     # Set the baseurl for assets.
     attr_accessor :baseurl
@@ -205,7 +204,7 @@ module DocRaptor
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
       if attributes.has_key?(:'baseurl')
         self.baseurl = attributes[:'baseurl']
@@ -246,7 +245,7 @@ module DocRaptor
       if attributes.has_key?(:'media')
         self.media = attributes[:'media']
       else
-        self.media = "print"
+        self.media = 'print'
       end
 
       if attributes.has_key?(:'no_author_style')
@@ -308,7 +307,7 @@ module DocRaptor
       if attributes.has_key?(:'input')
         self.input = attributes[:'input']
       else
-        self.input = "html"
+        self.input = 'html'
       end
 
       if attributes.has_key?(:'version')
@@ -330,30 +329,29 @@ module DocRaptor
       if attributes.has_key?(:'pdf_title')
         self.pdf_title = attributes[:'pdf_title']
       end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      return invalid_properties
+      invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      input_validator = EnumAttributeValidator.new('String', ["html", "xml", "auto"])
+      input_validator = EnumAttributeValidator.new('String', ['html', 'xml', 'auto'])
       return false unless input_validator.valid?(@input)
-      return true
+      true
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] input Object to be assigned
     def input=(input)
-      validator = EnumAttributeValidator.new('String', ["html", "xml", "auto"])
+      validator = EnumAttributeValidator.new('String', ['html', 'xml', 'auto'])
       unless validator.valid?(input)
-        fail ArgumentError, "invalid value for 'input', must be one of #{validator.allowable_values}."
+        fail ArgumentError, 'invalid value for "input", must be one of #{validator.allowable_values}.'
       end
       @input = input
     end
@@ -414,10 +412,10 @@ module DocRaptor
       return nil unless attributes.is_a?(Hash)
       self.class.swagger_types.each_pair do |key, type|
         if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
+          # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
@@ -499,7 +497,7 @@ module DocRaptor
     # @return [Hash] Returns the value in the form of hash
     def _to_hash(value)
       if value.is_a?(Array)
-        value.compact.map{ |v| _to_hash(v) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -512,5 +510,4 @@ module DocRaptor
     end
 
   end
-
 end

data/lib/docraptor/version.rb

@@ -1,15 +1,15 @@
 =begin
-#DocRaptor v1
+#DocRaptor
 
 #A native client library for the DocRaptor HTML to PDF/XLS service.
 
-OpenAPI spec version: 1.3.0
+OpenAPI spec version: 1.4.0
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.2.3
+Swagger Codegen version: 2.4.14
 
 =end
 
 module DocRaptor
-  VERSION = "1.3.0"
+  VERSION = '1.4.0'
 end

data/script/fix_gemspec.rb

@@ -1,6 +1,7 @@
-bad_files       = %q{s.files         = `find *`.split("\n").uniq.sort.select{|f| !f.empty? }}
+# coding: utf-8
+bad_files       = %q{s.files         = `find *`.split("\n").uniq.sort.select { |f| !f.empty? }}
 bad_test_files  = %q{s.test_files    = `find spec/*`.split("\n")}
-good_files      = %q{s.files         = `git ls-files`.split("\n").uniq.sort.select{|f| !f.empty? }}
+good_files      = %q{s.files         = `git ls-files`.split("\n").uniq.sort.select { |f| !f.empty? }}
 good_test_files = %q{s.test_files    = `git ls-files spec test`.split("\n")}
 
 development_dependency_marker = %q{  s.add_development_dependency 'autotest-fsevent', '~> 0.2', '>= 0.2.12'}

data/script/swagger

@@ -8,6 +8,11 @@ if [ "$SWAGGER_CODGEN_REVISION" = "" ]; then
   exit 1
 fi
 
+if ! [ -x "$(command -v mvn)" ]; then
+  echo 'Error: mvn not installed, using homebrew to install' >&2
+  brew install maven
+fi
+
 if [ ! -d "swagger-codegen" ]; then
   git clone https://github.com/swagger-api/swagger-codegen
 fi
@@ -31,5 +36,5 @@ if [ ! -f "$executable" ]; then
   mvn clean package
 fi
 
-export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
+export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties -DapiTests=false -DapiDocs=false -DmodelTests=false -DmodelDocs=false"
 java $JAVA_OPTS -jar $executable $*

data/spec/api_client_spec.rb

@@ -1,12 +1,12 @@
 =begin
-#DocRaptor v1
+#DocRaptor
 
-#No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+#A native client library for the DocRaptor HTML to PDF/XLS service.
 
-OpenAPI spec version: 1.2.0
+OpenAPI spec version: 1.4.0
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.2.3
+Swagger Codegen version: 2.4.14
 
 =end
 
@@ -51,11 +51,11 @@ describe DocRaptor::ApiClient do
     end
   end
 
-  describe "params_encoding in #build_request" do
+  describe 'params_encoding in #build_request' do
     let(:config) { DocRaptor::Configuration.new }
     let(:api_client) { DocRaptor::ApiClient.new(config) }
 
-    it "defaults to nil" do
+    it 'defaults to nil' do
       expect(DocRaptor::Configuration.default.params_encoding).to eq(nil)
       expect(config.params_encoding).to eq(nil)
 
@@ -63,18 +63,18 @@ describe DocRaptor::ApiClient do
       expect(request.options[:params_encoding]).to eq(nil)
     end
 
-    it "can be customized" do
+    it 'can be customized' do
       config.params_encoding = :multi
       request = api_client.build_request(:get, '/test')
       expect(request.options[:params_encoding]).to eq(:multi)
     end
   end
 
-  describe "timeout in #build_request" do
+  describe 'timeout in #build_request' do
     let(:config) { DocRaptor::Configuration.new }
     let(:api_client) { DocRaptor::ApiClient.new(config) }
 
-    it "defaults to 0" do
+    it 'defaults to 0' do
       expect(DocRaptor::Configuration.default.timeout).to eq(0)
       expect(config.timeout).to eq(0)
 
@@ -82,88 +82,105 @@ describe DocRaptor::ApiClient do
       expect(request.options[:timeout]).to eq(0)
     end
 
-    it "can be customized" do
+    it 'can be customized' do
       config.timeout = 100
       request = api_client.build_request(:get, '/test')
       expect(request.options[:timeout]).to eq(100)
     end
   end
 
-  describe "#deserialize" do
+  describe '#build_request' do
+    let(:config) { DocRaptor::Configuration.new }
+    let(:api_client) { DocRaptor::ApiClient.new(config) }
+
+    it 'does not send multipart to request' do
+      expect(Typhoeus::Request).to receive(:new).with(anything, hash_not_including(:multipart))
+      api_client.build_request(:get, '/test')
+    end
+
+    context 'when the content type is multipart' do
+      it 'sends multipart to request' do
+        expect(Typhoeus::Request).to receive(:new).with(anything, hash_including(multipart: true))
+        api_client.build_request(:get, '/test', {header_params: { 'Content-Type' => 'multipart/form-data'}})
+      end
+    end
+  end
+
+  describe '#deserialize' do
     it "handles Array<Integer>" do
       api_client = DocRaptor::ApiClient.new
-      headers = {'Content-Type' => 'application/json'}
+      headers = { 'Content-Type' => 'application/json' }
       response = double('response', headers: headers, body: '[12, 34]')
       data = api_client.deserialize(response, 'Array<Integer>')
       expect(data).to be_instance_of(Array)
       expect(data).to eq([12, 34])
     end
 
-    it "handles Array<Array<Integer>>" do
+    it 'handles Array<Array<Integer>>' do
       api_client = DocRaptor::ApiClient.new
-      headers = {'Content-Type' => 'application/json'}
+      headers = { 'Content-Type' => 'application/json' }
       response = double('response', headers: headers, body: '[[12, 34], [56]]')
       data = api_client.deserialize(response, 'Array<Array<Integer>>')
       expect(data).to be_instance_of(Array)
       expect(data).to eq([[12, 34], [56]])
     end
 
-    it "handles Hash<String, String>" do
+    it 'handles Hash<String, String>' do
       api_client = DocRaptor::ApiClient.new
-      headers = {'Content-Type' => 'application/json'}
+      headers = { 'Content-Type' => 'application/json' }
       response = double('response', headers: headers, body: '{"message": "Hello"}')
       data = api_client.deserialize(response, 'Hash<String, String>')
       expect(data).to be_instance_of(Hash)
-      expect(data).to eq({:message => 'Hello'})
+      expect(data).to eq(:message => 'Hello')
     end
   end
 
   describe "#object_to_hash" do
-    it "ignores nils and includes empty arrays" do
+    it 'ignores nils and includes empty arrays' do
       # uncomment below to test object_to_hash for model
-      #api_client = DocRaptor::ApiClient.new
-      #_model = DocRaptor::ModelName.new
+      # api_client = DocRaptor::ApiClient.new
+      # _model = DocRaptor::ModelName.new
       # update the model attribute below
-      #_model.id = 1 
+      # _model.id = 1
       # update the expected value (hash) below
-      #expected = {id: 1, name: '', tags: []}
-      #expect(api_client.object_to_hash(_model)).to eq(expected)
+      # expected = {id: 1, name: '', tags: []}
+      # expect(api_client.object_to_hash(_model)).to eq(expected)
     end
   end
 
-  describe "#build_collection_param" do
+  describe '#build_collection_param' do
     let(:param) { ['aa', 'bb', 'cc'] }
     let(:api_client) { DocRaptor::ApiClient.new }
 
-    it "works for csv" do
+    it 'works for csv' do
       expect(api_client.build_collection_param(param, :csv)).to eq('aa,bb,cc')
     end
 
-    it "works for ssv" do
+    it 'works for ssv' do
       expect(api_client.build_collection_param(param, :ssv)).to eq('aa bb cc')
     end
 
-    it "works for tsv" do
+    it 'works for tsv' do
       expect(api_client.build_collection_param(param, :tsv)).to eq("aa\tbb\tcc")
     end
 
-    it "works for pipes" do
+    it 'works for pipes' do
       expect(api_client.build_collection_param(param, :pipes)).to eq('aa|bb|cc')
     end
 
-    it "works for multi" do
+    it 'works for multi' do
       expect(api_client.build_collection_param(param, :multi)).to eq(['aa', 'bb', 'cc'])
     end
 
-    it "fails for invalid collection format" do
+    it 'fails for invalid collection format' do
       expect(proc { api_client.build_collection_param(param, :INVALID) }).to raise_error(RuntimeError, 'unknown collection format: :INVALID')
     end
   end
 
-  describe "#json_mime?" do
+  describe '#json_mime?' do
     let(:api_client) { DocRaptor::ApiClient.new }
 
-    it "works" do
+    it 'works' do
       expect(api_client.json_mime?(nil)).to eq false
       expect(api_client.json_mime?('')).to eq false
 
@@ -177,10 +194,10 @@ describe DocRaptor::ApiClient do
     end
   end
 
-  describe "#select_header_accept" do
+  describe '#select_header_accept' do
     let(:api_client) { DocRaptor::ApiClient.new }
 
-    it "works" do
+    it 'works' do
       expect(api_client.select_header_accept(nil)).to be_nil
       expect(api_client.select_header_accept([])).to be_nil
 
@@ -193,10 +210,10 @@ describe DocRaptor::ApiClient do
     end
   end
 
-  describe "#select_header_content_type" do
+  describe '#select_header_content_type' do
     let(:api_client) { DocRaptor::ApiClient.new }
 
-    it "works" do
+    it 'works' do
       expect(api_client.select_header_content_type(nil)).to eq('application/json')
       expect(api_client.select_header_content_type([])).to eq('application/json')
 
@@ -208,10 +225,10 @@ describe DocRaptor::ApiClient do
     end
   end
 
-  describe "#sanitize_filename" do
+  describe '#sanitize_filename' do
     let(:api_client) { DocRaptor::ApiClient.new }
 
-    it "works" do
+    it 'works' do
       expect(api_client.sanitize_filename('sun')).to eq('sun')
       expect(api_client.sanitize_filename('sun.gif')).to eq('sun.gif')
       expect(api_client.sanitize_filename('../sun.gif')).to eq('sun.gif')

data/spec/configuration_spec.rb

@@ -1,12 +1,12 @@
 =begin
-#DocRaptor v1
+#DocRaptor
 
-#No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+#A native client library for the DocRaptor HTML to PDF/XLS service.
 
-OpenAPI spec version: 1.2.0
+OpenAPI spec version: 1.4.0
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.2.3
+Swagger Codegen version: 2.4.14
 
 =end
 
@@ -17,25 +17,25 @@ describe DocRaptor::Configuration do
 
   before(:each) do
     # uncomment below to setup host and base_path
-    #require 'URI'
-    #uri = URI.parse("https://docraptor.com")
-    #DocRaptor.configure do |c|
-    #  c.host = uri.host
-    #  c.base_path = uri.path
-    #end
+    # require 'URI'
+    # uri = URI.parse("https://docraptor.com")
+    # DocRaptor.configure do |c|
+    #   c.host = uri.host
+    #   c.base_path = uri.path
+    # end
   end
 
   describe '#base_url' do
     it 'should have the default value' do
       # uncomment below to test default value of the base path
-      #expect(config.base_url).to eq("https://docraptor.com")
+      # expect(config.base_url).to eq("https://docraptor.com")
     end
 
     it 'should remove trailing slashes' do
       [nil, '', '/', '//'].each do |base_path|
         config.base_path = base_path
         # uncomment below to test trailing slashes
-        #expect(config.base_url).to eq("https://docraptor.com")
+        # expect(config.base_url).to eq("https://docraptor.com")
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,12 +1,12 @@
 =begin
-#DocRaptor v1
+#DocRaptor
 
-#No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+#A native client library for the DocRaptor HTML to PDF/XLS service.
 
-OpenAPI spec version: 1.2.0
+OpenAPI spec version: 1.4.0
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.2.3
+Swagger Codegen version: 2.4.14
 
 =end
 

data/swagger-config.json

@@ -1,7 +1,7 @@
 {
     "gemName": "docraptor",
     "moduleName": "DocRaptor",
-    "gemVersion": "1.3.0",
+    "gemVersion": "1.4.0",
     "gemAuthor": "Expected Behavior",
     "gemAuthorEmail": "support@docraptor.com",
     "gemHomepage": "https://github.com/docraptor/docraptor-ruby",