chop 0.28.1 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6ba456da0a548764f1a18e69630fe483b74ba5f4011c4f2f0468f63425e6a16
-  data.tar.gz: 0b7ddf32ce0881dc3fea0ab5360dc6f9140b07a819b26c648de400b777938742
+  metadata.gz: e7abe69b089b6ecea7a858c4f3b8976836898cb4059272ea0cf75564478c55ec
+  data.tar.gz: 3cb9b264816068b341a25dc31f64a6720c3342fa147e65226f2f40855f581ad3
 SHA512:
-  metadata.gz: 7bf304ee6020e23edda9a226fa4dbde24a23ba8a7cd0e4e098eb024da1e90ea89e552515c751bcf347d96dd7bed41ec49199478501d852eb2f61b3a95bc956b3
-  data.tar.gz: 51dbb0ca6ec2295305349948418cfb0c56a8ffeedad2570b444053da19a300ff60600a94108667d12c902c342fe066638c7d185e030953c93adb2be98bc7550c
+  metadata.gz: 43fe87ba581cdcc8a53d1f0e52f8f8a8de20fc7254ec00326e669c41e3fd999014c9fc29d91b93d52c65ec68a35aa42448aacc445521de91ad44da30ba70c8d5
+  data.tar.gz: 15f0337c814421702e794364e2fb1f038bd024cdfab7092bad0119e0b749ffb5d2368a2956352014bd7d0175c91cbaa539a26f8b620c3982ed1a24791d35ac21

data/.github/workflows/ci.yml

@@ -5,8 +5,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gemfile: [ rails_6.1, rails_7.0, rails_7.1 ]
-        ruby: [ '3.0', 3.1, 3.2 ]
+        gemfile: [ rails_7.0, rails_7.1, rails_7.2 ]
+        ruby: [ 3.1, 3.2, 3.3 ]
 
     runs-on: ubuntu-latest
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps

data/Appraisals

@@ -1,7 +1,3 @@
-appraise "rails-6.1" do
-  gem "rails", "~>6.1.0"
-end
-
 appraise "rails-7.0" do
   gem "rails", "~>7.0.0"
 end
@@ -10,3 +6,7 @@ appraise "rails-7.1" do
   gem "rails", "~>7.1.0"
 end
 
+appraise "rails-7.2" do
+  gem "rails", "~>7.2.0"
+end
+

data/gemfiles/{rails_6.1.gemfile → rails_7.2.gemfile}

@@ -5,6 +5,6 @@ source "https://rubygems.org"
 gem "byebug"
 gem "puma", "~>5.0"
 gem "rack", "~>2.0"
-gem "rails", "~>6.1.0"
+gem "rails", "~>7.2.0"
 
 gemspec path: "../"

data/lib/chop/create.rb

@@ -157,19 +157,19 @@ module Chop
       end
     end
 
-    def has_many key, klass=nil, delimiter: ", ", name_field: :name
+    def has_many key, klass=nil, delimiter: ", ", field: :name
       klass ||= key.to_s.classify.constantize
-      field key do |names|
+      self.field key do |names|
         names.split(delimiter).map do |name|
-          klass.find_by!(name_field => name)
+          klass.find_by!(field => name)
         end
       end
     end
 
-    def has_one key, klass=nil, name_field: :name
+    def has_one key, klass=nil, field: :name
       klass ||= key.to_s.classify.constantize
-      field key do |name|
-        klass.find_by!(name_field => name) if name.present?
+      self.field key do |name|
+        klass.find_by!(field => name) if name.present?
       end
     end
     alias_method :belongs_to, :has_one

data/lib/chop/diff.rb

@@ -5,8 +5,12 @@ require "active_support/hash_with_indifferent_access"
 
 module Chop
   class Diff < Struct.new(:selector, :table, :session, :timeout, :block)
-    def self.diff! selector, table, session: Capybara.current_session, timeout: Capybara.default_max_wait_time, &block
-      new(selector, table, session, timeout, block).diff!
+    def self.diff! selector, table, session: Capybara.current_session, timeout: Capybara.default_max_wait_time, errors: [], **kwargs, &block
+      errors += session.driver.invalid_element_errors
+      errors += [Cucumber::MultilineArgument::DataTable::Different]
+      session.document.synchronize timeout, errors: errors do
+        new(selector, table, session, timeout, block).diff! **kwargs
+      end
     end
 
     def cell_to_image_filename cell
@@ -135,11 +139,11 @@ module Chop
       end
     end
 
-    def diff! cucumber_table = table
+    def diff! cucumber_table = table, **kwargs
       actual = to_a
       # FIXME should just delegate to Cucumber's #diff!. Cucumber needs to handle empty tables better.
       if !cucumber_table.raw.flatten.empty? && !actual.flatten.empty?
-        cucumber_table.diff! actual
+        cucumber_table.diff! actual, **kwargs
       elsif cucumber_table.raw.flatten != actual.flatten
         raise Cucumber::MultilineArgument::DataTable::Different.new(cucumber_table)
       end

data/lib/chop/dsl.rb

@@ -8,7 +8,7 @@ module Chop
       Create.create! klass, table, &block
     end
 
-    def diff! selector, table, session: Capybara.current_session, as: nil, timeout: nil, &block
+    def diff! selector, table, session: Capybara.current_session, as: nil, timeout: nil, **kwargs, &block
       class_name = if as
         as.to_s
       elsif selector.respond_to?(:tag_name)
@@ -17,7 +17,7 @@ module Chop
         session.find(selector).tag_name
       end.camelize
       klass = const_get("Chop::#{class_name}")
-      kwargs = { session: session }
+      kwargs[:session] = session
       kwargs[:timeout] = timeout if timeout.present?
       klass.diff! selector, table, **kwargs, &block
     end

data/lib/chop/form.rb

@@ -100,6 +100,12 @@ module Chop
       def fill_in!
         session.select value, from: label
       end
+
+      def get_value
+        if selected_value = field.value
+          field.find("option[value='#{selected_value}']").text
+        end
+      end
     end
 
     class MultipleCheckbox < Field

data/lib/chop/version.rb

@@ -1,3 +1,3 @@
 module Chop
-  VERSION = "0.28.1"
+  VERSION = "0.30.0"
 end

data/lib/chop.rb

@@ -1,4 +1,5 @@
 require "chop/version"
+require "cucumber"
 require "chop/create"
 require "chop/table"
 require "chop/definition_list"
@@ -13,7 +14,14 @@ module Chop
   extend Config
 
   def self.empty_table
-    Cucumber::MultilineArgument::DataTable.from([[]])
+    empty = Cucumber::MultilineArgument::DataTable.from([[]])
+
+    def empty.diff! other_table, **kwargs, &block
+      super other_table, **kwargs.reverse_merge(surplus_col: true, surplus_row: true), &block
+    rescue Capybara::ElementNotFound
+    end
+
+    empty
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chop
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.30.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-29 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -141,9 +141,9 @@ files:
 - bin/setup
 - chop.gemspec
 - gemfiles/.bundle/config
-- gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
 - gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.2.gemfile
 - lib/chop.rb
 - lib/chop/config.rb
 - lib/chop/create.rb
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.6
 signing_key: 
 specification_version: 4
 summary: Slice and dice your cucumber tables with ease!