jets 1.9.30 → 1.9.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4e4b8a6a2842c6772696ca1191d189588975fc2f2e2ef758de08290f1e16c7e
-  data.tar.gz: effd407588558209807f29ab629773c85750618541c87c07df7e83e32372102a
+  metadata.gz: c63b7332e7379ad4ce0c15ec52689dbf55b555096f7b5a72a7e1130e3ede6396
+  data.tar.gz: 42700a327a878e1ece6a5431e5af99f23c6e971c15310067ad20390064599f23
 SHA512:
-  metadata.gz: 2d2fdba19a9b9958a91391c73b8f24b104785314cc75ee7ab74bd65b9df9f9f8007cd641887737dcc6e7247e536fa105c1fb148aa21ba21b8bc60fc7514eab07
-  data.tar.gz: 9a417c92f8deee8e871fecff627720f914b1a389218cb5540a4f8b145cffed95de0587a545644e7e0bb7ab0c44c4bf256a81dee5d194ded90e784228780d0eb8
+  metadata.gz: a47cc35fd06dccedca525ce2289b44e3853e321a825e2ed6904b02b941fa40965fd9a1ed3f23438df1f50b82b1ec4243aa25f39e80e18881374e01c3a2c100f4
+  data.tar.gz: 71882882151ce2d226323fb7ba5c374c3fa81bc1dfc34c8650ad4b1e082924129f743939df1260afa3bc485ea7a6289fb99c1287a1e6e603de4e52270ac76966

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [1.9.31]
+- #307 Update comment in Gemfile template
+- #315 Improve spec_helpers: Use Rack::Multipart utils to properly build body params (especially with files and nested hashes)from galetahub/master
+- #316 Copy .ruby-version file to build directory
+
 ## [1.9.30]
 - #305 allow url paths that contain dashes
 

data/lib/jets/builders/code_builder.rb

@@ -27,6 +27,7 @@ module Jets::Builders
 
     def build
       check_ruby_version
+      copy_ruby_version_file
       @version_purger.purge
       cache_check_message
 
@@ -370,6 +371,12 @@ module Jets::Builders
       end
     end
 
+    def copy_ruby_version_file
+      return unless File.exists?(".ruby-version")
+
+      FileUtils.cp_r(Jets.root.join(".ruby-version"), build_area)
+    end
+
     def ruby_version_supported?
       pattern = /(\d+)\.(\d+)\.(\d+)/
       md = RUBY_VERSION.match(pattern)

data/lib/jets/commands/templates/skeleton/Gemfile.tt

@@ -7,10 +7,12 @@ gem "jets"
 gem "webpacker", git: "https://github.com/tongueroo/webpacker.git", branch: "jets"
 <% end -%>
 <% if @database == 'postgresql' %>
-# Include pg gem if you are using ActiveRecord, remove if you are not
+# Include pg gem if you are using ActiveRecord, remove next line
+# and config/database.yml file if you are not
 gem "pg", "~> 1.1.3"
 <% elsif @database == 'mysql' %>
-# Include mysql2 gem if you are using ActiveRecord, remove if you are not
+# Include mysql2 gem if you are using ActiveRecord, remove next line
+# and config/database.yml file if you are not
 gem "mysql2", "~> 0.5.2"
 <% end %>
 <% unless options[:mode] == 'job' -%>

data/lib/jets/spec_helpers/request.rb

@@ -29,20 +29,21 @@ module Jets
         json['headers'] = (headers || {}).stringify_keys
 
         if method != :get
-          json['headers']['Content-Type'] = "multipart/form-data; boundary=#{multipart_boundary}"
-          body = +''
-          params.body_params.to_a.each do |e|
-            key, value = e
-            body << multipart_item(name: key, value: value)
+          json['headers']['Content-Type'] = 'application/x-www-form-urlencoded'
+          body = Rack::Multipart.build_multipart(params.body_params)
+
+          if body
+            json['headers']['Content-Length'] ||= body.length.to_s
+            json['headers']['Content-Type'] = "multipart/form-data; boundary=#{Rack::Multipart::MULTIPART_BOUNDARY}"
+          else
+            body = Rack::Utils.build_nested_query(params.body_params)
           end
-          body << multipart_end
 
-          json['body'] = Base64.encode64 body
+          json['body'] = Base64.encode64(body)
           json['isBase64Encoded'] = true
         end
 
-        params.query_params.to_a.each do |e|
-          key, value = e
+        params.query_params.each do |key, value|
           json['queryStringParameters'] ||= {}
           json['queryStringParameters'][key.to_s] = value.to_s
         end
@@ -50,33 +51,6 @@ module Jets
         json
       end
 
-      def multipart_boundary
-        @boundary ||= '-' * 16 + SecureRandom.hex(32)
-      end
-
-      def multipart_item(name:, value:)
-        if value.is_a? File
-          multipart_file(name: name, filename: File.basename(value.path),
-                         data: ::IO.read(value.path))
-        else
-          multipart_text(name: name, text: value)
-        end
-      end
-
-      def multipart_text(name:, text:)
-        "--#{multipart_boundary}\r\nContent-Disposition: form-data; name=\"#{name}\"\r\n"\
-        "Content-Type: text/plain\r\n\r\n#{text}\r\n"
-      end
-
-      def multipart_file(name:, filename:, data:)
-        "--#{multipart_boundary}\r\nContent-Disposition: form-data; name=\"#{name}\"; "\
-        "filename=\"#{filename}\"\r\n\r\n#{data}\r\n"
-      end
-
-      def multipart_end
-        "--#{multipart_boundary}--"
-      end
-
       def find_route!
         path = self.path
         path = path[0..-2] if path.end_with? '/'
@@ -101,4 +75,4 @@ module Jets
       end
     end
   end
-end
+end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.9.30"
+  VERSION = "1.9.31"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.9.30
+  version: 1.9.31
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer