chop 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e79910191410ddc45d44ca8198e96be315b3706f
-  data.tar.gz: 0e919573c294fada4231b742b8245c0762e3b0bf
+  metadata.gz: ee08121005f0c0e0dc0c87490bd7e3dc5437aa25
+  data.tar.gz: 88f4109163927c7f3ded4aed309e2129ef8fbd35
 SHA512:
-  metadata.gz: 3bfb0082be34fdea29550652f8f5dee5e07c7d2a637e4ef53d45713a74497c46cb8bd5cff0c167b9865f00dcaa9918adb39d33591b60badd90b694246bb299a0
-  data.tar.gz: 947aa02f4654d87317ead72b289528002c0dfe520d749d5c6c294b4bab566835e41f101a54b25b9285557be5381bfdb854519f9a2b17d7f963bd8572b22c8529
+  metadata.gz: 5c090fba6c2c4f5c5033690955dbffb5cc391c7ba1ab0c1f1af10089178ed40d9da7b5af6e8fbb54d2edc3f518b96fa080d0180bff4834e5bd0cd216f5812b50
+  data.tar.gz: 2139c72e05d46285b0c1279951c62831f1fae90395a9d0a1d68d08c05699cd7e597b67ecb021a896a9cd5f6a62933a17af73d68bafc6b63a32e2f3c878a20ce1

data/lib/chop/diff.rb

@@ -70,7 +70,12 @@ module Chop
     def hash_transformation &block
       transformation do |rows|
         header = rows[0]
-        keys = header.to_a.map { |cell| cell.text.parameterize.underscore }
+        keys = header.to_a.map.with_index do |cell, index|
+          key = cell.text.parameterize.underscore
+          next key if key.present?
+          next cell.text if cell.text.present?
+          index + 1
+        end
         body = rows[1..-1]
         hashes = body.map { |row| HashWithIndifferentAccess[keys.zip(row)] }
         yield hashes

data/lib/chop/form.rb

@@ -8,12 +8,27 @@ module Chop
     end
 
     def self.diff! selector, table, session: Capybara.current_session, &block
-      actual = session.find("form").all("input, textarea, select").map do |field|
-        [field.label, field.value]
+      all_fields = session.find("form").all("input, textarea, select")
+      deduplicated_fields = all_fields.inject([]) do |fields, field|
+        next fields if fields.map { |field| field[:name] }.include?(field[:name])
+        fields + [field]
+      end
+      actual = deduplicated_fields.inject([]) do |fields, field|
+        next fields unless label = find_label_for(field)
+        field = Field.from(session, field)
+        fields + [[label.text, field.get_value]]
       end
       table.diff! actual, surplus_row: false
     end
 
+    def self.find_label_for field, session: Capybara.current_session
+      if field[:id]
+        session.first("label[for='#{field[:id]}']")
+      else
+        raise "cannot find label without id... yet"
+      end
+    end
+
     def fill_in!
       table.rows_hash.each do |label, value|
         Field.for(session, label, value, path).fill_in!
@@ -23,13 +38,26 @@ module Chop
     class Field < Struct.new(:session, :label, :value, :path, :field)
       def self.for session, label, value, path
         field = session.find_field(label)
-        candidates = descendants.sort_by do |a|
-          a == Chop::Form::Default ? 1 : -1 # ensure Default comes last
-        end
         candidates.map do |klass|
           klass.new(session, label, value, path, field)
         end.find(&:matches?)
       end
+
+      def self.from session, field
+        candidates.map do |klass|
+          klass.new(session, nil, nil, nil, field)
+        end.find(&:matches?)
+      end
+
+      def self.candidates
+        descendants.sort_by do |a|
+          a == Chop::Form::Default ? 1 : -1 # ensure Default comes last
+        end
+      end
+
+      def get_value
+        field.value
+      end
     end
 
     class MultipleSelect < Field
@@ -89,6 +117,10 @@ module Chop
       def fill_in!
         field.set value.present?
       end
+
+      def get_value
+        field.checked? ? "✓" : ""
+      end
     end
 
     class Radio < Field
@@ -104,6 +136,10 @@ module Chop
         end
       end
 
+      def get_value
+        session.all("[name='#{field[:name]}']").find(&:checked?).try(:value)
+      end
+
       private
 
       def nonstandard_labelling?

data/lib/chop/version.rb

@@ -1,3 +1,3 @@
 module Chop
-  VERSION = "0.20.0"
+  VERSION = "0.20.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chop
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord