rails5_xhr_update 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fee933190f7c4836569a6925afd4281466e6150d
-  data.tar.gz: 429a19dc4003f90b164972afd2ef3a6c89c9f33b
+  metadata.gz: 617d1833f375a4e5cff4712f90a98a1618754a14
+  data.tar.gz: 1652b16844179fa4fe0558821bfcc387b3ad9431
 SHA512:
-  metadata.gz: '09777cb0429c67a9e58a4c7597fb3715428cfefdcca1503d266b7238de5d508f17a290d1883a31bba55802f5790e5cd43f3602479617352f7b6d9d9cc1b943e6'
-  data.tar.gz: 0a16fb5c56d32435e5bcd710bdcbe41fe599ebcdc8353dd66de974fe609674961e06e9218ac4f3bf7515ff6eee31400328189ded031afd5df523c95fa33546b0
+  metadata.gz: 4e4756ae63f858884c861bbe48d1818df9188d4d10e7bdb04bbcf9fa13c7a1b3bf9124ec8b89e8d382de5254c5ca77bd0b6231f51db756f409445eb58a064148
+  data.tar.gz: 7c80335e30b5d243bcb50946696235f5da47f3a60cbda98ab34ab2b88a923f28dd681d7ee6657482033b1cbe15e7aa6f61cc833771f9e4440baf251ff494ee51

data/CHANGES.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 0.4.0 (2018/06/14)
+
+__Added__
+
+* Support keyword arguments to `xhr`.
+* Support the `format` keyword argument to `xhr`.
+
 ## 0.3.0 (2018/05/26)
 
 __Added__

data/lib/rails5_xhr_update/cli.rb

@@ -45,6 +45,7 @@ module Rails5XHRUpdate
         config.on('-w', '--write', 'Write changes back to files') do |write|
           @options[:write] = write
         end
+        config.version = Rails5XHRUpdate::VERSION
       end.parse!
     end
   end

data/lib/rails5_xhr_update/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rails5XHRUpdate
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/rails5_xhr_update/xhr_to_rails5.rb

@@ -20,7 +20,7 @@ module Rails5XHRUpdate
     def on_send(node)
       return if node.children[1] != :xhr
       arguments = extract_and_validate_arguments(node)
-      children = initial_children(node) + add_xhr_node(*arguments)
+      children = initial_children(node) + add_xhr_node(arguments)
       replace(node.loc.expression, Rails5XHRUpdate.ast_to_string(
                                      node.updated(nil, children)
       ))
@@ -28,23 +28,24 @@ module Rails5XHRUpdate
 
     private
 
-    def add_xhr_node(params = nil, session = nil, flash = nil)
+    def add_xhr_node(arguments)
       children = []
-      children << Rails5XHRUpdate.ast_pair(:flash, flash) \
-        unless flash.nil? || flash.children.empty?
-      children << Rails5XHRUpdate.ast_pair(:params, params) \
-        unless params.nil? || params.children.empty?
-      children << Rails5XHRUpdate.ast_pair(:session, session) \
-        unless session.nil? || session.children.empty?
+      arguments.keys.sort.each do |argument|
+        value = arguments[argument]
+        children << Rails5XHRUpdate.ast_pair(argument, value) \
+          unless value.nil? || value.children.empty?
+      end
       children << Rails5XHRUpdate.ast_pair(:xhr, AST_TRUE)
       [Parser::AST::Node.new(:hash, children)]
     end
 
     def extract_and_validate_arguments(node)
       arguments = node.children[4..-1]
-      raise Exception, 'should this happen?' if keyword_args?(arguments)
+      if (keyword_arguments = handle_keyword_args(arguments))
+        return keyword_arguments
+      end
       raise Exception, "Unhandled:\n\n #{arguments}" if arguments.size > 3
-      arguments
+      { params: arguments[0], session: arguments[1], flash: arguments[2] }
     end
 
     def initial_children(node)
@@ -53,11 +54,18 @@ module Rails5XHRUpdate
       [nil, http_method, http_path]
     end
 
-    def keyword_args?(arguments)
+    def handle_keyword_args(arguments)
       return false if arguments.size != 1
       return false if arguments[0].children.empty?
       first_key = arguments[0].children[0].children[0].children[0]
-      %i[params session flash].include?(first_key)
+      return false unless %i[params session flash format].include?(first_key)
+
+      result = {}
+      arguments[0].children.each do |node|
+        raise Exception, "unexpected #{node}" if node.children.size != 2
+        result[node.children[0].children[0]] = node.children[1]
+      end
+      result
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails5_xhr_update
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Bryce Boe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-26 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest