chop 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e7cb04d85d09ab8d21ecdc9d07c59972a4daba7
-  data.tar.gz: 72c5efe46c120810aeadcb6958f870b983a631cd
+  metadata.gz: 7fae72c2ccddb7b9d3cf1e2af62273f6e3fa108b
+  data.tar.gz: 0b333a8b0dfedf4c1da7ae3d56e01dae37684a70
 SHA512:
-  metadata.gz: a72bf7733a5db76a20212921d0f5cbd8f1ab57c7abd2ed6545474e26c96d20faa15330025fb26de45fc5df7a4933e441e669abb16042645f81e58367228ae10f
-  data.tar.gz: 8d044df36e430cd64032f42917dff0abf449ae76eaa7f1bf2d8151bd816bf176c667b854885ea7028929b10f7189e33e01f6afd678edb3dd882bb034aedeb843
+  metadata.gz: 95a559fee2d75b1c7ec85114d55464a11285a582cbefa9b6fce85c5f7c958e58b66bbaaa5fe9d21c72e7d769353aea3f1f6b467ebcfda4816888383c9ec8b791
+  data.tar.gz: 1b993d05855c234058edb68cb7164acaa70ff18c40b1693e75371567e4e3c4050ca9410f8d18c71970d1c24e1434deaf380041772ae346acaf79f3be76eeb51b

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 .ruby-version
 .ruby-gemset
+.byebug_history

data/.travis.yml

@@ -1,4 +1,3 @@
 language: ruby
 rvm:
   - 2.2.3
-before_install: gem install bundler -v 1.10.6

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in chop.gemspec
 gemspec
+
+gem "byebug"

data/README.md

@@ -2,6 +2,8 @@
 
 Slice and dice your Cucumber tables with ease! Assumes usage of ActiveRecord and Capybara.
 
+[![Build Status](https://travis-ci.org/botandrose/chop.svg?branch=master)](https://travis-ci.org/botandrose/chop)
+
 ## Installation
 
 ```ruby
@@ -14,7 +16,7 @@ end
 
 Chop monkeypatches Cucumber tables with two new methods:
 
-* `#build!`: Creates ActiveRecord instances.
+* `#build!`: Creates ActiveRecord instances. Also supports FactoryGirl.
 * `#diff!`: Enhances existing method to also accept a CSS selector. Currently supports diffing `<table>`, `<dl>`, and `<ul>`.
 
 Both these methods accept blocks for customization.
@@ -30,6 +32,7 @@ High-level declarative transformations:
 * `#has_one/#belongs_to`: Replaces an entity name with that entity. Uses `.find_by_name` by default.
 * `#has_many`: Replaces a comma-delimited list of entity names with an array of those entities. Uses `.find_by_name` by default.
 * `#underscore_keys`: Converts all hash keys to underscored versions.
+* `#rename`: Renames one or more fields.
 
 All these methods are implemented in terms of the following low-level methods, useful for when you need more control over the transformation:
 * `#field`: performs transformations on a specific field value.
@@ -45,23 +48,23 @@ TODO: Pending API overhaul.
 # features/manage_industries.feature
 
 Given the following industries exist:
-  | name              | wall_background_file | table_background_file |
-  | Another industry  | wall.jpg             | table.jpg             |
-  | Example industry  | wall.jpg             | table.jpg             |
+  | name             | wall_background | table_background |
+  | Another industry | wall.jpg        | table.jpg        |
+  | Example industry | wall.jpg        | table.jpg        |
 
 Given the following stories exist:
-  | industry          | image_file   | headline          |
-  | Example industry  | example.jpg  | Example headline  |
-  | Example industry  | example.jpg  | Another headline  |
+  | industry         | image       | headline         |
+  | Example industry | example.jpg | Example headline |
+  | Example industry | example.jpg | Another headline |
 
 Given I am on the home page
 Then I should see the following industries:
   | ANOTHER INDUSTRY |
   | EXAMPLE INDUSTRY |
 And I should see the following "EXAMPLE INDUSTRY" stories:
-  | IMAGE       | HEADLINE          |
-  | example.jpg | Example headline  |
-  | example.jpg | Another headline  |
+  | IMAGE       | HEADLINE         |
+  | example.jpg | Example headline |
+  | example.jpg | Another headline |
 ```
 
 ```ruby
@@ -69,13 +72,18 @@ And I should see the following "EXAMPLE INDUSTRY" stories:
 
 Given "the following industries exist:" do |table|
   table.create! ConversationTable::Industry do
+    rename({
+      :wall_background => wall_background_file,
+      :table_background => table_background_file,
+    })
     file :wall_background_file, :table_background_file
   end
 end
 
 Given "the following stories exist:" do |table|
-  table.create! ConversationTable::Story do
+  table.create! factory_girl: "conversation_table/story" do
     belongs_to :industry, ConversationTable::Industry
+    rename :image => :image_file
     file :image_file
   end
 end

data/chop.gemspec

@@ -19,7 +19,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "activerecord"
+  spec.add_dependency "cucumber"
+  spec.add_dependency "capybara"
+
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "slim"
 end

data/lib/chop.rb

@@ -3,34 +3,9 @@ require "chop/builder"
 require "chop/table"
 require "chop/definition_list"
 require "chop/unordered_list"
+require "chop/dsl"
 
 module Chop
-  class << self
-    def create! table, klass, &block
-      Builder.build! table, klass, &block
-    end
-
-    def diff! table, selector, &block
-      class_name = Capybara.current_session.find(selector).tag_name.capitalize
-      klass = const_get(class_name)
-      klass.diff! table, &block
-    end
-  end
-end
-
-if defined?(Cucumber::MultilineArgument::DataTable)
-  Cucumber::MultilineArgument::DataTable.prepend Module.new {
-    def create! klass, &block
-      Chop.create! self, klass, &block
-    end
-
-    def diff! other_table, options={}, &block
-      if other_table.is_a?(String) && !other_table.include?("|")
-        Chop.diff! self, other_table, &block
-      else
-        super
-      end
-    end
-  }
+  extend DSL
 end
 

data/lib/chop/builder.rb

@@ -1,3 +1,6 @@
+require "active_support/core_ext/string/inflections"
+require "active_support/core_ext/object/blank"
+
 module Chop
   class Builder < Struct.new(:table, :klass, :block)
     def self.build! table, klass, &block
@@ -6,16 +9,25 @@ module Chop
 
     attr_accessor :transformations
 
-    def initialize(*)
+    def initialize(*, &other_block)
       super
       self.transformations = []
       instance_eval &block if block.respond_to?(:call)
+      instance_eval &other_block if block_given?
     end
 
-    def build!
-      table.hashes.map do |attributes|
+    def build! cucumber_table = table
+      cucumber_table.hashes.map do |attributes|
         transformations.each { |transformation| transformation.call(attributes) }
-        klass.create! attributes
+        if klass.is_a?(Hash)
+          if factory = klass[:factory_girl]
+            FactoryGirl.create factory, attributes
+          else
+            raise "Unknown building strategy"
+          end
+        else
+          klass.create! attributes
+        end
       end
     end
 
@@ -23,6 +35,14 @@ module Chop
       transformations << block
     end
 
+    def rename mappings
+      transformation do |attributes|
+        mappings.each do |old, new|
+          attributes[new.to_s] = attributes.delete(old.to_s) if attributes.key?(old.to_s)
+        end
+      end
+    end
+
     def field attribute, default: ""
       transformation do |attributes|
         attributes[attribute.to_s] = yield(attributes.fetch(attribute.to_s, default))
@@ -66,7 +86,7 @@ module Chop
 
     def has_one key, klass=nil, name_field: :name
       field key do |name|
-        klass.find_by!(name_field => name)
+        klass.find_by!(name_field => name) if name.present?
       end
     end
     alias_method :belongs_to, :has_one

data/lib/chop/definition_list.rb

@@ -1,30 +1,67 @@
-require "delegate"
+require "active_support/core_ext/object/blank"
       
 module Chop
-  class DefinitionList < SimpleDelegator
-    def self.diff! table, &block
-      new.diff! table
+  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
 
-    def initialize selector = "dl", session: Capybara.current_session
-      super(session)
-      @selector = selector
+    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 to_a
+    def base_to_a
       rows.collect do |row|
         row_to_text(row)
       end
     end
 
     def normalized_to_a
-      raw = to_a
+      raw = base_to_a
       max = raw.map(&:count).max
-      raw.select { |row| row.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 diff! table
-      table.diff! normalized_to_a
+    def transformation &block
+      transformations << block
+    end
+
+    def diff! cucumber_table = table
+      cucumber_table.diff! to_a
+    end
+
+    def column index, &block
+      transformation do |raw|
+        raw.map!.with_index do |row, row_index|
+          row_element = rows[row_index]
+          cell_element = cells(row_element)[index]
+          row[index] = block.call(row[index], cell_element, row_element)
+          row
+        end
+      end
+    end
+
+    def header &block
+      transformation do |raw|
+        new_header = block.call(raw)
+        new_header << "" while new_header.length < (raw.first.try(:length) || 0)
+        raw.unshift new_header
+        raw
+      end
     end
 
     private
@@ -34,17 +71,25 @@ module Chop
     end
 
     def node
-      @node ||= find(@selector)
+      @node ||= session.find(selector)
     end
 
     def row_to_text row
-      row.all("dt,dd").collect do |cell|
-        text = cell.text
-        if text.blank? and image = cell.all("img").first
-          text = image["alt"]
-        end
-        text
+      cells(row).map do |cell|
+        cell_to_text(cell)
+      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"]
       end
+      text
     end
   end
 

data/lib/chop/dsl.rb

@@ -0,0 +1,30 @@
+module Chop
+  module DSL
+    def create! table, klass, &block
+      Builder.build! table, klass, &block
+    end
+
+    def diff! selector, table, session: Capybara.current_session, &block
+      class_name = session.find(selector).tag_name.capitalize
+      klass = const_get("Chop::#{class_name}")
+      klass.diff! selector, table, session: session, &block
+    end
+  end
+end
+
+if defined?(Cucumber::MultilineArgument::DataTable)
+  Cucumber::MultilineArgument::DataTable.prepend Module.new {
+    def create! klass, &block
+      Chop.create! self, klass, &block
+    end
+
+    def diff! other_table, options={}, &block
+      if other_table.is_a?(String) && !other_table.include?("|")
+        Chop.diff! other_table, self, &block
+      else
+        super
+      end
+    end
+  }
+end
+

data/lib/chop/table.rb

@@ -1,33 +1,18 @@
-require "delegate"
-      
-module Chop
-  class Table < SimpleDelegator
-    def self.diff! table, &block
-      klass = Class.new(self) do
-        class_attribute :cell_transformers
-        self.cell_transformers = []
-
-        def self.cell index, &block
-          cell_transformers[index] = block
-        end
-
-        def cell_to_text cell, index
-          if transformer = cell_transformers[index]
-            transformer.call cell
-          else
-            super
-          end
-        end
-
-        instance_eval &block if block_given?
-      end
+require "active_support/core_ext/object/blank"
 
-      klass.new.diff! table
+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
 
-    def initialize selector = "table", session: Capybara.current_session
-      super(session)
-      @selector = selector
+    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
@@ -35,7 +20,7 @@ module Chop
     end
 
     def header
-      header_elements.collect do |row|
+      header_elements.map do |row|
         row.all(:xpath, "./*").map(&:text)
       end
     end
@@ -45,23 +30,45 @@ module Chop
     end
 
     def body
-      body_elements.collect do |row|
+      body_elements.map do |row|
         row_to_text(row)
       end
     end
 
-    def to_a
+    def base_to_a
       header + body
     end
 
     def normalized_to_a
-      raw = to_a
+      raw = base_to_a
       max = raw.map(&:count).max
       raw.select { |row| row.count == max }
     end
 
-    def diff! table
-      table.diff! normalized_to_a
+    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
 
     private
@@ -71,7 +78,12 @@ module Chop
     end
 
     def node
-      @node ||= find(@selector)
+      @node ||= begin
+        session.find(selector)
+      rescue Capybara::ElementNotFound
+        raise unless @allow_not_found
+        Capybara::Node::Simple.new("")
+      end
     end
 
     def row_to_text row

data/lib/chop/unordered_list.rb

@@ -1,30 +1,44 @@
-require "delegate"
+require "active_support/core_ext/object/blank"
       
 module Chop
-  class UnorderedList < SimpleDelegator
-    def self.diff! table, &block
-      new.diff! table
+  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
 
-    def initialize selector = "ul", session: Capybara.current_session
-      super(session)
-      @selector = selector
+    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 to_a
+    def base_to_a
       rows.collect do |row|
         row_to_text(row)
       end
     end
 
     def normalized_to_a
-      raw = to_a
+      raw = base_to_a
       max = raw.map(&:count).max
       raw.select { |row| row.count == max }
     end
 
-    def diff! table
-      table.diff! normalized_to_a
+    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
 
     private
@@ -34,7 +48,7 @@ module Chop
     end
 
     def node
-      @node ||= find(@selector)
+      @node ||= session.find(selector)
     end
 
     def row_to_text row

data/lib/chop/version.rb

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

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: chop
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-18 00:00:00.000000000 Z
+date: 2017-02-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: slim
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Slice and dice your cucumber tables with ease!
 email:
 - micah@botandrose.com
@@ -72,6 +128,7 @@ files:
 - lib/chop.rb
 - lib/chop/builder.rb
 - lib/chop/definition_list.rb
+- lib/chop/dsl.rb
 - lib/chop/table.rb
 - lib/chop/unordered_list.rb
 - lib/chop/version.rb