chop 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee08121005f0c0e0dc0c87490bd7e3dc5437aa25
-  data.tar.gz: 88f4109163927c7f3ded4aed309e2129ef8fbd35
+  metadata.gz: 3b908d6fd6ee8ad3a672d047bc4b8e6b32c2abd6
+  data.tar.gz: bc1c246a81f4dda4ef37fbfb14fe2b204566fb26
 SHA512:
-  metadata.gz: 5c090fba6c2c4f5c5033690955dbffb5cc391c7ba1ab0c1f1af10089178ed40d9da7b5af6e8fbb54d2edc3f518b96fa080d0180bff4834e5bd0cd216f5812b50
-  data.tar.gz: 2139c72e05d46285b0c1279951c62831f1fae90395a9d0a1d68d08c05699cd7e597b67ecb021a896a9cd5f6a62933a17af73d68bafc6b63a32e2f3c878a20ce1
+  metadata.gz: 6635faa8663d31c306ddf41b3c18dbeb5d3fe70836f3bc284be5d1916b8d98598e4567727b06d04e2206da71cd311ecb122f35f6ac0de0c84351a958378ed450
+  data.tar.gz: 22fd0b20cad3052e9f224e523dfdb81b19bbeb03ba49dd02757fe6451b922f96339d09808ed5667ece53bac5fec49696122d924c000b8a1421359eefd348504e

data/README.md

@@ -61,7 +61,7 @@ Overide Capybara finders:
 * `#allow_not_found`: diffing against a missing element will diff against `[[]]` instead of raising an exception.
 
 High-level declarative transformations:
-* `#image`: Replaces the specified cell with the alt text of the first image within it.
+* `#image`: Replaces the specified cell with the filename of the first image within it, stripped of path and cachebusters.
 
 All these methods are implemented in terms of the following low-level methods, useful for when you need more control over the transformation:
 * `#header`: add or transform the table header, depending on block arity.
@@ -149,11 +149,11 @@ end
 
 ### Don't like monkeypatching?
 
-Load `chop` before `cucumber` in your Gemfile, and call the two methods directly on the `Chop` module, passing the cucumber table in as the first argument.
+Load `chop` before `cucumber` in your Gemfile, and call the two methods directly on the `Chop` module, passing the cucumber table in as the last argument.
 
 ```ruby
 Chop.create! Users, table
-Chop.diff! table, "table"
+Chop.diff! "table", table
 Chop.fill_in! table
 ```
 

data/lib/chop.rb

@@ -2,6 +2,7 @@ require "chop/version"
 require "chop/create"
 require "chop/table"
 require "chop/definition_list"
+require "chop/dfn_dl"
 require "chop/unordered_list"
 require "chop/form"
 require "chop/dsl"

data/lib/chop/definition_list.rb

@@ -18,6 +18,25 @@ module Chop
         end
       end
     end
+
+    def field key
+      transformation do |rows|
+        rows.map do |row|
+          if row.first.text.parameterize.underscore == key.to_s
+            row[1] = yield(row[1])
+          end
+          row
+        end
+      end
+    end
+
+    def image *cols
+      block = ->(cell){ cell_to_image_filename(cell) }
+      cols.each do |col|
+        method = col.is_a?(Symbol) ? :field : :column
+        send method, col, &block
+      end
+    end
   end
 
   Dl = DefinitionList

data/lib/chop/dfn_dl.rb

@@ -0,0 +1,14 @@
+require "chop/definition_list"
+
+module Chop
+  class DfnDl < DefinitionList
+    self.rows_finder = ->(root) do
+      root.all("dfn")
+    end
+
+    self.cells_finder = ->(row) do
+      row.all("dt,dd")
+    end
+  end
+end
+

data/lib/chop/diff.rb

@@ -9,23 +9,18 @@ module Chop
       new(selector, table, session, block).diff!
     end
 
+    def cell_to_image_filename cell
+      cell.all("img").map do |img|
+        File.basename(img[:src] || "").split("?")[0].sub(/-[0-9a-f]{64}/, '')
+      end.first
+    end
+
     class_attribute :default_selector, :rows_finder, :cells_finder, :text_finder
 
     self.rows_finder = -> { raise "Missing rows finder!" }
     self.cells_finder = -> { raise "Missing cells finder!" }
     self.text_finder = ->(cell) { cell.text }
 
-    def self.text_or_image_alt_finder
-      ->(cell) do
-        text = cell.text
-        if text.blank? && image = cell.first("img")
-          image["alt"]
-        else
-          text
-        end
-      end
-    end
-
     attr_accessor :header_transformations, :transformations
 
     def initialize selector = nil, table = nil, session = Capybara.current_session, block = nil, &other_block
@@ -94,11 +89,7 @@ module Chop
     def image *keys
       keys.each do |key|
         field(key) do |cell|
-          if image = cell.first("img")
-            image["alt"]
-          else
-            cell
-          end
+          cell_to_image_filename(cell)
         end
       end
     end

data/lib/chop/dsl.rb

@@ -4,8 +4,8 @@ module Chop
       Create.create! klass, table, &block
     end
 
-    def diff! selector, table, session: Capybara.current_session, &block
-      class_name = session.find(selector).tag_name.capitalize
+    def diff! selector, table, session: Capybara.current_session, as: nil, &block
+      class_name = as ? as.to_s.camelize : session.find(selector).tag_name.camelize
       klass = const_get("Chop::#{class_name}")
       klass.diff! selector, table, session: session, &block
     end
@@ -24,7 +24,7 @@ if defined?(Cucumber::MultilineArgument::DataTable)
 
     def diff! other_table="table", options={}, &block
       if other_table.is_a?(String) && !other_table.include?("|")
-        Chop.diff! other_table, self, &block
+        Chop.diff! other_table, self, options, &block
       else
         super
       end

data/lib/chop/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chop
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -129,6 +129,7 @@ files:
 - lib/chop/config.rb
 - lib/chop/create.rb
 - lib/chop/definition_list.rb
+- lib/chop/dfn_dl.rb
 - lib/chop/diff.rb
 - lib/chop/dsl.rb
 - lib/chop/form.rb