husc 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2ecc7f13a00dac04cd5ab80ee385bb90e04d730d235225829d749d3c77cac57
-  data.tar.gz: 6a2e882ca3c00ecd12ebba69c98b72c8317d87226a441236214bd6f3cb25e9d5
+  metadata.gz: 432d286c2357f38cbe25dd64354018fcb9f376dd330d352d680f36d0fc8a5f72
+  data.tar.gz: d21d5c3b59bd316a1563a6f84f1dc054714a6fb92139de0b82b8b3881816a711
 SHA512:
-  metadata.gz: e07266a3fb848360f8c3e8b367773c3fd0881c248d34940f05e549b8944a681ea637833aef4312f75256eeed88e22060d81a80c51516ca71a20ca93d9ea9a9d6
-  data.tar.gz: 745f8810a558d0ef25a69a7113e987b0c45f70b56127662cfc8774e2d2a79b7925d1315d8daa76fe838ba155925f41040ea0a18bf2c79d002f224fc9bbbcec41
+  metadata.gz: 20774f8bb988212e92a8ea29de92bbf5c14a1d1fc7b458a58343b0c69237c61673e1a7dc0d197a436b22e74e86cbed09d4ca243a603aab8cfbb9bdf8d3595f7b
+  data.tar.gz: e186641c198e3c05557a1491e77c34b2b542f9b339077981e96f5579f643cac2b15302809162011feaaf4ed65ededaa7225b109cba102d0e0e3d3a2f32844399

data/lib/husc/version.rb

@@ -1,3 +1,3 @@
 class Husc
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/lib/husc.rb

@@ -81,57 +81,58 @@ class Husc
     # ファイルアップロード  => file（String）を指定
     # ボタンクリック        => click(Bool)を指定
     @params << {}
-    opts.each {|key, value| @params[-1][key.to_sym] = value}
+    opts = opts.map { |k, v| [k.to_sym, v] }.to_h
+    opts.each { |k, v| @params[-1][k.to_sym] = v }
   end
 
-  def submit(url = @url, opt)
+  def submit(opts)
     ## -----*----- フォーム送信 -----*----- ##
-    @agent.get(url) do |page|
-      # フォーム指定
-      if opt.kind_of?(Integer)
-        form = page.forms[opt]
-      else
-        form = page.form(**opt)
+    # フォーム指定
+    opts = opts.map { |k,v| [k.to_sym, v] }.to_h
+    if opts.kind_of?(Integer)
+      form = @agent.page.forms[opts]
+    else
+      form = @agent.page.form(**opts)
+    end
+    return if form.nil?
+    button = nil
+
+    @params.each do |param|
+      # テキスト，数値など
+      if param.include?(:value) && !param.include?(:check)
+        value = param.delete(:value)
+        next if value.nil?
+        form.field_with(**param).value = value unless form.field_with(**param).nil?
       end
-      return if form.nil?
-
-      @params.each do |param|
-        # テキスト，数値など
-        if param.include?(:value) && !param.include?(:check)
-          value = param.delete(:value)
-          next if value.nil?
-          form.field_with(**param).value = value unless form.field_with(**param).nil?
-        end
-
-        # チェックボックス
-        if param.include?(:check)
-          check = param.delete(:check)
-          next if check.nil?
-          if check
-            form.checkbox_with(**param).check unless form.checkbox_with(**param).nil?
-          else
-            form.checkbox_with(**param).uncheck unless form.checkbox_with(**param).nil?
-          end
-        end
 
-        # ファイルアップロード
-        if param.include?(:file)
-          file = param.delete(:file)
-          next if file.nil? || !File.exist?(file)
-          form.file_upload_with(**param).file_name = file unless form.file_upload_with(**param).nil?
+      # チェックボックス
+      if param.include?(:check)
+        check = param.delete(:check)
+        next if check.nil?
+        if check
+          form.checkbox_with(**param).check unless form.checkbox_with(**param).nil?
+        else
+          form.checkbox_with(**param).uncheck unless form.checkbox_with(**param).nil?
         end
+      end
 
-        # ボタンクリック
-        if param.include?(:click)
-          click = param.delete(:click)
-          next unless click
-          form.button_with(**param) unless form.button_with(**param).nil?
-        end
+      # ファイルアップロード
+      if param.include?(:file)
+        file = param.delete(:file)
+        next if file.nil? || !File.exist?(file)
+        form.file_upload_with(**param).file_name = file unless form.file_upload_with(**param).nil?
       end
 
-      form = form.submit
-      update_params(form.content.toutf8)
+      # ボタンクリック
+      if param.include?(:click)
+        click = param.delete(:click)
+        next unless click
+        button = form.button_with(**param) unless form.button_with(**param).nil?
+      end
     end
+
+    form = @agent.submit(form, button)
+    update_params(form.content.toutf8)
     @params = []
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: husc
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Tatsuya Abe