chop 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58ec1d010f7e641bb853d3334ffcfea2422131f1
-  data.tar.gz: 96c010fae67db9a77ff16365cc5d724faf6b28e3
+  metadata.gz: f361d4f1d6428136b9187e57b495e8a7a2d1b8cb
+  data.tar.gz: 7405d53d647c0af2468fc92cbeaf8f860cb8a921
 SHA512:
-  metadata.gz: f24073305f6ee2fb53ccc7e1bca8f350b48a135c9775034ae918cc2a2774b919d4d14959db8fc8c85c90a951395c2f620aacfeb0784c5b323cfae26332abb781
-  data.tar.gz: 97592730bd93f1fa3d8fecac2ee7c58b08181df1d6fffc372e0bbc977760c90ad0e05cc5876cf33b26cbfcf1e967addf4706264d8c38103a4c746068e1d9f548
+  metadata.gz: 5a991f6f01794ef5dc5cf033713daeaae096c09b358a602302893491329a23a55e2c5fbaf592a920903370e77972862aea944e2c7036d1a071612f2883573a6f
+  data.tar.gz: 3ebb468ac5ad8ce0aeacb38611ee92b4cc2932fd809d9b61ec7142e802468987d70729af4c45c81c7054a04f1b902a4eb0acbaed965f71a09eed4a08f8336ab5

data/README.md

@@ -142,7 +142,7 @@ end
 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.
 
 ```ruby
-Chop.create! table, Users
+Chop.create! Users, table
 Chop.diff! table, "table"
 Chop.fill_in! table
 ```

data/lib/chop/create.rb

@@ -1,10 +1,11 @@
 require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/object/blank"
+require "active_support/hash_with_indifferent_access"
 
 module Chop
-  class Create < Struct.new(:table, :klass, :block)
-    def self.create! table, klass, &block
-      new(table, klass, block).create!
+  class Create < Struct.new(:klass, :table, :block)
+    def self.create! klass, table, &block
+      new(klass, table, block).create!
     end
 
     attr_accessor :transformations
@@ -18,7 +19,10 @@ module Chop
 
     def create! cucumber_table = table
       cucumber_table.hashes.map do |attributes|
-        transformations.each { |transformation| transformation.call(attributes) }
+        attributes = HashWithIndifferentAccess.new(attributes)
+        attributes = transformations.reduce(attributes) do |attrs, transformation|
+          transformation.call(attrs)
+        end
         if klass.is_a?(Hash)
           if factory = klass[:factory_girl]
             FactoryGirl.create factory, attributes
@@ -37,8 +41,9 @@ module Chop
 
     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)
+        mappings.reduce(attributes) do |attrs, (old, new)|
+          attrs[new] = attrs.delete(old) if attrs.key?(old)
+          attrs
         end
       end
     end
@@ -49,16 +54,15 @@ module Chop
         attribute = attribute.values.first
       end
       transformation do |attributes|
-        attributes[attribute.to_s] = yield(attributes.fetch(attribute.to_s, default))
+        attributes.merge attribute => yield(attributes.fetch(attribute, default))
       end
     end
 
     def underscore_keys
       transformation do |attributes|
-        new_attributes = attributes.inject({}) do |hash, (key, value)|
+        attributes.reduce(HashWithIndifferentAccess.new) do |hash, (key, value)|
           hash.merge key.parameterize.underscore => value
         end
-        attributes.replace new_attributes
       end
     end
 

data/lib/chop/definition_list.rb

@@ -8,7 +8,7 @@ module Chop
 
     def column index, &block
       transformation do |rows|
-        rows.map!.with_index do |row, row_index|
+        rows.map.with_index do |row, row_index|
           row[index] = block.call(row[index])
           row
         end

data/lib/chop/diff.rb

@@ -1,6 +1,7 @@
 require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/class/attribute"
+require "active_support/hash_with_indifferent_access"
 
 module Chop
   class Diff < Struct.new(:selector, :table, :session, :block)
@@ -49,13 +50,14 @@ module Chop
             end
           end
           row[index] = yield(row[index])
+          row
         end
       else
         if block.arity.zero?
           @new_header = yield
         else
           header_transformation do |row|
-            row.replace yield(row)
+            yield(row)
           end
         end
       end
@@ -68,11 +70,11 @@ module Chop
     def hash_transformation &block
       transformation do |rows|
         header = rows[0]
-        keys = header.to_a.map { |cell| cell.text.parameterize.underscore.to_sym }
+        keys = header.to_a.map { |cell| cell.text.parameterize.underscore }
         body = rows[1..-1]
-        hashes = body.map { |row| Hash[keys.zip(row)] }
+        hashes = body.map { |row| HashWithIndifferentAccess[keys.zip(row)] }
         yield hashes
-        rows.replace [header] + hashes.map(&:values)
+        [header] + hashes.map(&:values)
       end
     end
 
@@ -117,9 +119,9 @@ module Chop
       rows = normalize(rows)
 
       header = @new_header ? normalize([@new_header]).first : rows.shift || []
-      header_transformations.each do |transformation|
-        transformation.call(header)
-        header = normalize([header]).first
+      header = header_transformations.reduce(header) do |header, transformation|
+        header = transformation.call(header)
+        normalize([header]).first
       end
 
       if header
@@ -127,9 +129,9 @@ module Chop
         rows = normalize(rows)
       end
 
-      transformations.each do |transformation|
-        transformation.call(rows)
-        rows = normalize(rows)
+      rows = transformations.reduce(rows) do |rows, transformation|
+        rows = transformation.call(rows)
+        normalize(rows)
       end
 
       rows.map do |row|

data/lib/chop/dsl.rb

@@ -1,7 +1,7 @@
 module Chop
   module DSL
-    def create! table, klass, &block
-      Create.create! table, klass, &block
+    def create! klass, table, &block
+      Create.create! klass, table, &block
     end
 
     def diff! selector, table, session: Capybara.current_session, &block
@@ -19,10 +19,10 @@ end
 if defined?(Cucumber::MultilineArgument::DataTable)
   Cucumber::MultilineArgument::DataTable.prepend Module.new {
     def create! klass, &block
-      Chop.create! self, klass, &block
+      Chop.create! klass, self, &block
     end
 
-    def diff! other_table, options={}, &block
+    def diff! other_table="table", options={}, &block
       if other_table.is_a?(String) && !other_table.include?("|")
         Chop.diff! other_table, self, &block
       else

data/lib/chop/form.rb

@@ -16,7 +16,10 @@ module Chop
     class Field < Struct.new(:session, :label, :value, :path, :field)
       def self.for session, label, value, path
         field = session.find_field(label)
-        descendants.map do |klass|
+        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

data/lib/chop/version.rb

@@ -1,3 +1,3 @@
 module Chop
-  VERSION = "0.15.0"
+  VERSION = "0.16.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chop
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Micah Geisel