chop 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fae72c2ccddb7b9d3cf1e2af62273f6e3fa108b
-  data.tar.gz: 0b333a8b0dfedf4c1da7ae3d56e01dae37684a70
+  metadata.gz: 8dae29be1ed5e8747e2a7ccee7504b65968d7b0a
+  data.tar.gz: f0647eff2fd3aae0039af3079ccc977224d7d53f
 SHA512:
-  metadata.gz: 95a559fee2d75b1c7ec85114d55464a11285a582cbefa9b6fce85c5f7c958e58b66bbaaa5fe9d21c72e7d769353aea3f1f6b467ebcfda4816888383c9ec8b791
-  data.tar.gz: 1b993d05855c234058edb68cb7164acaa70ff18c40b1693e75371567e4e3c4050ca9410f8d18c71970d1c24e1434deaf380041772ae346acaf79f3be76eeb51b
+  metadata.gz: 89883bd7d309b914d545c591ba51119061d66cfb01b9227e39b0fa5ddd333108647f3aad4c396e5b7f173bc9b51ac521bc0dbf3533c9e2e612ce3dd1bbe5de5c
+  data.tar.gz: 89691d599ef482ae8563bf730200b16168fa8f14a3d4ce15c84c45bc22dc4933d210bde4fa7fc94f9bac0ba837827aa764b5076acf226535bc04593104df6a4a

data/lib/chop.rb

@@ -3,6 +3,7 @@ require "chop/builder"
 require "chop/table"
 require "chop/definition_list"
 require "chop/unordered_list"
+require "chop/form"
 require "chop/dsl"
 
 module Chop

data/lib/chop/base.rb

@@ -0,0 +1,95 @@
+require "active_support/core_ext/object/blank"
+
+module Chop
+  class Base < Struct.new(:selector, :table, :session, :block)
+    def self.diff! selector, table, session: Capybara.current_session, &block
+      new(selector, table, session, block).diff!
+    end
+
+    attr_accessor :rows_finder
+    attr_accessor :cells_finder
+    attr_accessor :transformations
+
+    def initialize selector = nil, table = nil, session = Capybara.current_session, block = nil, &other_block
+      super
+      self.selector ||= default_selector
+      self.rows_finder = default_rows_finder
+      self.cells_finder = default_cells_finder
+      self.transformations = []
+      instance_eval &block if block.respond_to?(:call)
+      instance_eval &other_block if block_given?
+    end
+
+    def transformation &block
+      transformations << block
+    end
+
+    def normalize
+      transformation do |raw|
+        max = raw.map(&:count).max
+        raw.map! do |row|
+          row << "" while row.length < max
+          row
+        end
+      end
+    end
+
+    def rows &block
+      self.rows_finder = block
+    end
+
+    def cells &block
+      self.cells_finder = block
+    end
+
+    def allow_not_found
+      @allow_not_found = true
+    end
+
+    def to_a
+      results = rows_finder.call(root).map do |row|
+        row_to_text(row)
+      end
+      normalize
+      transformations.each { |transformation| transformation.call(results) }
+      results
+    end
+
+    def diff! cucumber_table = table
+      cucumber_table.diff! to_a
+    end
+
+    def hashes
+      rows = to_a.dup
+      header = rows.shift
+      rows.map do |row|
+        Hash[header.zip(row)]
+      end
+    end
+
+    private
+
+    def root
+      @root ||= begin
+        session.find(selector)
+      rescue Capybara::ElementNotFound
+        raise unless @allow_not_found
+        Capybara::Node::Simple.new("")
+      end
+    end
+
+    def row_to_text row
+      cells_finder.call(row).map do |cell|
+        cell_to_text(cell)
+      end
+    end
+
+    def cell_to_text cell
+      text = cell.text
+      if text.blank? and image = cell.all("img").first
+        text = image["alt"]
+      end
+      text
+    end
+  end
+end

data/lib/chop/definition_list.rb

@@ -1,49 +1,7 @@
-require "active_support/core_ext/object/blank"
+require "chop/base"
       
 module Chop
-  class DefinitionList < Struct.new(:selector, :table, :session, :block)
-    def self.diff! selector, table, session: Capybara.current_session, &block
-      new(selector, table, session, block).diff!
-    end
-
-    attr_accessor :transformations
-
-    def initialize selector = "dl", table = nil, session = Capybara.current_session, block = nil, &other_block
-      super
-      self.transformations = []
-      instance_eval &block if block.respond_to?(:call)
-      instance_eval &other_block if block_given?
-    end
-
-    def base_to_a
-      rows.collect do |row|
-        row_to_text(row)
-      end
-    end
-
-    def normalized_to_a
-      raw = base_to_a
-      max = raw.map(&:count).max
-      raw.map do |row|
-        row << "" while row.length < max
-        row
-      end
-    end
-
-    def to_a
-      results = normalized_to_a
-      transformations.each { |transformation| transformation.call(results) }
-      results
-    end
-
-    def transformation &block
-      transformations << block
-    end
-
-    def diff! cucumber_table = table
-      cucumber_table.diff! to_a
-    end
-
+  class DefinitionList < Base
     def column index, &block
       transformation do |raw|
         raw.map!.with_index do |row, row_index|
@@ -66,30 +24,20 @@ module Chop
 
     private
 
-    def rows
-      node.all("dfn")
-    end
-
-    def node
-      @node ||= session.find(selector)
+    def default_selector
+      "dl"
     end
 
-    def row_to_text row
-      cells(row).map do |cell|
-        cell_to_text(cell)
+    def default_rows_finder
+      Proc.new do |root|
+        root.all("dfn")
       end
     end
 
-    def cells row
-      row.all("dt,dd")
-    end
-
-    def cell_to_text cell
-      text = cell.text
-      if text.blank? and image = cell.all("img").first
-        text = image["alt"]
+    def default_cells_finder
+      Proc.new do |row|
+        row.all("dt,dd")
       end
-      text
     end
   end
 

data/lib/chop/dsl.rb

@@ -9,6 +9,10 @@ module Chop
       klass = const_get("Chop::#{class_name}")
       klass.diff! selector, table, session: session, &block
     end
+
+    def fill_in! table
+      Form.fill_in! table
+    end
   end
 end
 
@@ -25,6 +29,10 @@ if defined?(Cucumber::MultilineArgument::DataTable)
         super
       end
     end
+
+    def fill_in!
+      Chop.fill_in! self
+    end
   }
 end
 

data/lib/chop/form.rb

@@ -0,0 +1,18 @@
+module Chop
+  class Form < Struct.new(:table, :session)
+    def self.fill_in! table, session: Capybara.current_session
+      new(table, session).fill_in!
+    end
+
+    def fill_in!
+      table.rows_hash.each do |label, value|
+        field = session.find_field(label)
+        if field[:type] == "file"
+          session.attach_file label, "features/support/fixtures/#{value}"
+        else
+          session.fill_in label, with: value
+        end
+      end
+    end
+  end
+end

data/lib/chop/table.rb

@@ -1,103 +1,23 @@
-require "active_support/core_ext/object/blank"
+require "chop/base"
 
 module Chop
-  class Table < Struct.new(:selector, :table, :session, :block)
-    def self.diff! selector, table, session: Capybara.current_session, &block
-      new(selector, table, session, block).diff!
-    end
-
-    attr_accessor :transformations
-
-    def initialize(selector = "table", table = nil, session = Capybara.current_session, block = nil, &other_block)
-      super
-      self.transformations = []
-      instance_eval &block if block.respond_to?(:call)
-      instance_eval &other_block if block_given?
-    end
-
-    def header_elements
-      rows("thead")
-    end
-
-    def header
-      header_elements.map do |row|
-        row.all(:xpath, "./*").map(&:text)
-      end
-    end
-
-    def body_elements
-      rows("tbody")
-    end
-
-    def body
-      body_elements.map do |row|
-        row_to_text(row)
-      end
-    end
-
-    def base_to_a
-      header + body
-    end
-
-    def normalized_to_a
-      raw = base_to_a
-      max = raw.map(&:count).max
-      raw.select { |row| row.count == max }
-    end
-
-    def to_a
-      results = normalized_to_a
-      transformations.each { |transformation| transformation.call(results) }
-      results
-    end
-
-    def transformation &block
-      transformations << block
-    end
-
-    def diff! cucumber_table = table
-      cucumber_table.diff! to_a
-    end
-
-    def hashes
-      rows = to_a.dup
-      header = rows.shift
-      rows.map do |row|
-        Hash[header.zip(row)]
-      end
-    end
-
-    def allow_not_found
-      @allow_not_found = true
-    end
-
+  class Table < Base
     private
 
-    def rows parent = nil
-      node.all("#{parent} tr")
-    end
-
-    def node
-      @node ||= begin
-        session.find(selector)
-      rescue Capybara::ElementNotFound
-        raise unless @allow_not_found
-        Capybara::Node::Simple.new("")
-      end
+    def default_selector
+      "table"
     end
 
-    def row_to_text row
-      row.all(:xpath, "./*").map.with_index do |cell, index|
-        cell_to_text cell, index
+    def default_rows_finder
+      Proc.new do |root|
+        root.all("tr")
       end
     end
 
-    def cell_to_text cell, index
-      text = cell.text
-      if text.blank? and image = cell.all("img").first
-        text = image["alt"]
+    def default_cells_finder
+      Proc.new do |row|
+        row.all("td,th")
       end
-      text
     end
   end
 end

data/lib/chop/unordered_list.rb

@@ -1,63 +1,22 @@
-require "active_support/core_ext/object/blank"
+require "chop/base"
       
 module Chop
-  class UnorderedList < Struct.new(:selector, :table, :session, :block)
-    def self.diff! selector, table, session: Capybara.current_session, &block
-      new(selector, table, session, block).diff!
-    end
-
-    attr_accessor :transformations
-
-    def initialize selector = "ul", table = nil, session = Capybara.current_session, block = nil, &other_block
-      super
-      self.transformations = []
-      instance_eval &block if block.respond_to?(:call)
-      instance_eval &other_block if block_given?
-    end
-
-    def base_to_a
-      rows.collect do |row|
-        row_to_text(row)
-      end
-    end
-
-    def normalized_to_a
-      raw = base_to_a
-      max = raw.map(&:count).max
-      raw.select { |row| row.count == max }
-    end
-
-    def to_a
-      results = normalized_to_a
-      transformations.each { |transformation| transformation.call(results) }
-      results
-    end
-
-    def transformation &block
-      transformations << block
-    end
-
-    def diff! cucumber_table = table
-      cucumber_table.diff! to_a
-    end
-
+  class UnorderedList < Base
     private
 
-    def rows
-      node.all("li")
+    def default_selector
+      "ul"
     end
 
-    def node
-      @node ||= session.find(selector)
+    def default_rows_finder
+      Proc.new do |root|
+        root.all("li")
+      end
     end
 
-    def row_to_text row
-      [row].collect do |cell|
-        text = cell.text
-        if text.blank? and image = cell.all("img").first
-          text = image["alt"]
-        end
-        text
+    def default_cells_finder
+      Proc.new do |row|
+        [row]
       end
     end
   end

data/lib/chop/version.rb

@@ -1,3 +1,3 @@
 module Chop
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chop
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -126,9 +126,11 @@ files:
 - bin/setup
 - chop.gemspec
 - lib/chop.rb
+- lib/chop/base.rb
 - lib/chop/builder.rb
 - lib/chop/definition_list.rb
 - lib/chop/dsl.rb
+- lib/chop/form.rb
 - lib/chop/table.rb
 - lib/chop/unordered_list.rb
 - lib/chop/version.rb