formulaic 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5aac19cb8a6553a97ce1cf6fd5685efe3d9670cd
-  data.tar.gz: 4b2936160b65052f3eaf8f11fed542104ef86c2e
+SHA256:
+  metadata.gz: 1e2acd58cffacd098ba64bdbe7e6b6a8397b2645e052a840cee04e64d30e4319
+  data.tar.gz: cd1f8f8402992ec04222ed7030c6690358cda018f838e7aae24f2648a1eb6c15
 SHA512:
-  metadata.gz: 8aeb601d65baf8db3eb4a524b64917ca82ffc172aa3827c60c96beb2802974a6907c5569bb07d048af4f7e741f97794d89e07958902a6348c5fb123e280629f2
-  data.tar.gz: 9821a23573b2387dde20940b476ef9e2247177c565aaeacc218deaf4f18058858d237cdc5bdb1aa926122603e9a7876ad2db857cc63804aa8f87f2ba8fa51568
+  metadata.gz: b9318b1108f7841eb5d09e9c53b862d4b222056e6996e99a4cee82d7ab00ba5453f949b1490f7769349c4e9fe9ed7f9c38dbd56f24b9081fb96aaa051fa627b4
+  data.tar.gz: 9a48cb6d20301b9502e637231c2b23db4fe7b7a9387dc29078ca05df34e7b815c23038640f90d15d07a0ac1a93fec3ba4de405e6c0c42cb6ae134fc1e1d291e7

data/.github/workflows/ci.yml

@@ -0,0 +1,25 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - head
+          - '3.3'
+          - '3.2'
+          - '3.1'
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # 'bundle install' and cache
+    - name: Run tests
+      run: bundle exec rake

data/.ruby-version

@@ -1 +1 @@
-2.4.0
+3.3.1

data/NEWS.md

@@ -1,3 +1,28 @@
+v0.4.2
+------
+
+* Fix imports for testing, update build matrix 41f797d
+
+  *Caleb Hearth*
+* Merge pull request #81 from petergoldstein/feature/migrate_ci_to_github_actions ae644c4
+
+  *Caleb Hearth*
+* Migrate CI to GitHub Actions c6b147b
+
+  *Peter Goldstein*
+* Freshen things up a bit 1e893f2
+
+  *Caleb Hearth*
+* Merge pull request #76 from ElMassimo/patch-1 9f19bfa
+
+  *Caleb Hearth*
+* Add additional instructions for delegation ffa7775
+
+  *Máximo Mussini*
+* Add instructions for Capybara Test Helpers 0da1d04
+
+  *Máximo Mussini*
+
 v0.1.1
 ------
 
@@ -10,10 +35,10 @@ v0.1.0
 
 * Add `fill_form_and_submit` shortcut [48f9bc2](https://github.com/thoughtbot/formulaic/commit/48f9bc257d6c2b26c859388ab01da8963b818a85)
 
-  *Caleb Thompson*
+  *Caleb Hearth*
 * Allow action to be specified in DSL [ad4bb54](https://github.com/thoughtbot/formulaic/commit/ad4bb5402d68131038e53f67e2e981f6aa1d5fa9)
 
-  *Caleb Thompson*
+  *Caleb Hearth*
 * Add support for File attachments [f4e4bae](https://github.com/thoughtbot/formulaic/commit/f4e4bae978ab32fde017ae8344f862076a9ef31a)
 
   *Dan Collis-Puro and Sean Doyle*

data/README.md

@@ -1,7 +1,7 @@
 # Formulaic
 
-[![Build Status](https://travis-ci.org/thoughtbot/formulaic.png?branch=master)](https://travis-ci.org/thoughtbot/formulaic)
-[![Code Climate](https://codeclimate.com/github/thoughtbot/formulaic.png)](https://codeclimate.com/github/thoughtbot/formulaic)
+[![Build Status](https://travis-ci.org/calebhearth/formulaic.png?branch=master)](https://travis-ci.org/calebhearth/formulaic)
+[![Code Climate](https://codeclimate.com/github/calebhearth/formulaic.png)](https://codeclimate.com/github/calebhearth/formulaic)
 
 Remove the tedium of formulaic form filling with Capybara.
 
@@ -112,7 +112,7 @@ class ActionDispatch::IntegrationTest
 end
 ```
 
-### Integration with [FactoryGirl](https://github.com/thoughtbot/factory_girl)
+### Integration with [Factory Bot](https://github.com/thoughtbot/factory_bot)
 
 ```ruby
 fill_form(:user, attributes_for(:user))
@@ -130,6 +130,22 @@ def sign_up_attributes
 end
 ```
 
+### Integration with [Capybara::TestHelper](https://github.com/ElMassimo/capybara_test_helpers)
+
+```ruby
+class BaseTestHelper < Capybara::TestHelper
+  include Formulaic::Dsl
+end
+```
+
+or alternatively delegate the needed methods:
+
+```ruby
+class FormTestHelper < BaseTestHelper
+  delegate_to_test_context(:fill_form, :input, :submit, :fill_form_and_submit)
+end
+```
+
 ## Assumptions
 
 Formulaic relies pretty heavily on the assumption that your application is using
@@ -176,13 +192,8 @@ Formulaic.default_wait_time = 5
 
 ## About
 
-Formulaic is maintained by [Caleb Thompson][caleb]
-and thoughtbot's [Austin Ruby on Rails development team][team],
-with the help of community [contributors].
-Thank you!
-
-[caleb]: http://github.com/calebthompson
-[team]: https://thoughtbot.com/austin?utm_source=github
-[contributors]: http://github.com/thoughtbot/formulaic/contributors
+Formulaic is maintained by [Caleb Hearth][caleb] and formerly thoughtbot with
+the help of community [contributors]. Thank you!
 
-[![Ralph](http://thoughtbot.com/assets/thoughtbot-logo.png)](http://thoughtbot.com)
+[caleb]: http://github.com/calebhearth
+[contributors]: http://github.com/thoughtbot/calebhearth/contributors

data/formulaic.gemspec

@@ -6,26 +6,30 @@ require 'formulaic/version'
 Gem::Specification.new do |spec|
   spec.name          = 'formulaic'
   spec.version       = Formulaic::VERSION
-  spec.authors       = ['Caleb Thompson']
-  spec.email         = ['caleb@calebthompson.io']
+  spec.authors       = ['Caleb Hearth']
+  spec.email         = ['caleb@calebhearth.com']
   spec.summary       = 'Simplify form filling with Capybara'
   spec.description   = <<-DESCRIPTION.sub(/^ +/, '')
     Removes the tedium of formulaic form filling with Capybara by allowing you
     to specify a hash of attributes to be input rather than procedurally calling
     Capybara’s DSL methods.
   DESCRIPTION
-  spec.homepage      = 'https://github.com/thoughtbot/formulaic'
+  spec.homepage      = 'https://github.com/calebhearth/formulaic'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ['lib']
 
+  spec.metadata = {
+    "funding-uri" => "https://github.com/sponsors/calebhearth"
+  }
+
   spec.add_dependency 'capybara'
   spec.add_dependency 'i18n'
   spec.add_dependency 'activesupport'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry'

data/lib/formulaic/form.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'active_support/time_with_zone'
 
 module Formulaic
@@ -14,6 +15,7 @@ module Formulaic
       TrueClass => Formulaic::Inputs::BooleanInput,
       FalseClass => Formulaic::Inputs::BooleanInput,
       File => Formulaic::Inputs::FileInput,
+      Rack::Multipart::UploadedFile => Formulaic::Inputs::FileInput
     }.freeze
 
     def initialize(model_name, action, attributes)

data/lib/formulaic/inputs/array_input.rb

@@ -1,11 +1,6 @@
 module Formulaic
   module Inputs
     class ArrayInput < Input
-      def initialize(label, value)
-        @label = label
-        @value = value
-      end
-
       def fill
         attempt_to_fill_selects ||
           attempt_to_fill_checkboxes ||

data/lib/formulaic/inputs/boolean_input.rb

@@ -3,9 +3,9 @@ module Formulaic
     class BooleanInput < Input
       def fill
         if value
-          check(label)
+          check(label.to_str)
         else
-          uncheck(label)
+          uncheck(label.to_str)
         end
       end
     end

data/lib/formulaic/inputs/file_input.rb

@@ -2,7 +2,7 @@ module Formulaic
   module Inputs
     class FileInput < Input
       def fill
-        attach_file(label, value.path)
+        attach_file(label.to_str, value.path)
       end
     end
   end

data/lib/formulaic/inputs/select_input.rb

@@ -21,7 +21,7 @@ module Formulaic
       end
 
       def has_select?
-        has_field?(label, type: "select")
+        has_field?(label.to_str, type: "select")
       end
 
       def select_is_multiple?
@@ -30,7 +30,7 @@ module Formulaic
       end
 
       def select_element
-        @select_element ||= find_field(label, type: "select")
+        @select_element ||= find_field(label.to_str, type: "select")
       end
     end
   end

data/lib/formulaic/inputs/string_input.rb

@@ -2,19 +2,19 @@ module Formulaic
   module Inputs
     class StringInput < Input
       def fill
-        if page.has_selector?(:fillable_field, label, wait: Formulaic.default_wait_time)
-          fill_in(label, with: value)
-        elsif page.has_selector?(:radio_button, label, wait: Formulaic.default_wait_time)
+        if page.has_selector?(:fillable_field, label.to_str, wait: Formulaic.default_wait_time)
+          fill_in(label.to_str, with: value)
+        elsif page.has_selector?(:radio_button, label.to_str, wait: Formulaic.default_wait_time)
           choose(value)
-        elsif has_option_in_select?(translate_option(value), label)
-          select(translate_option(value), from: label)
+        elsif has_option_in_select?(translate_option(value), label.to_str)
+          select(translate_option(value), from: label.to_str)
         else
           raise Formulaic::InputNotFound.new(%[Unable to find input "#{label}".])
         end
       end
 
       def has_option_in_select?(option, select)
-        element = find(:select, select)
+        element = find(:select, select.to_str)
         if ! element.has_selector?(:option, option, wait: Formulaic.default_wait_time)
           raise Formulaic::OptionForSelectInputNotFound.new(%[Unable to find option with text matching "#{option}".])
         end

data/lib/formulaic/label.rb

@@ -1,3 +1,6 @@
+require "active_support"
+require "active_support/core_ext/object/blank"
+
 module Formulaic
   class Label
     attr_reader :model_name, :attribute, :action

data/lib/formulaic/version.rb

@@ -1,3 +1,3 @@
 module Formulaic
-  VERSION = '0.4.0'
+  VERSION = '0.4.2'
 end

data/spec/features/fill_in_user_form_spec.rb

@@ -192,14 +192,28 @@ describe 'Fill in user form' do
     expect(page).to have_select('user_awesome', selected: 'Yes')
   end
 
-  it 'attaches a file to a file field' do
-    visit 'user_form'
-    file = File.open('spec/fixtures/file.txt')
-    form = Formulaic::Form.new(:user, :new, avatar: file)
+  context 'when File is an instance of File class' do
+    it 'attaches a file to a file field' do
+      visit 'user_form'
+      file = File.open('spec/fixtures/file.txt')
+      form = Formulaic::Form.new(:user, :new, avatar: file)
 
-    form.fill
+      form.fill
+
+      expect(input(:user, :avatar).value).to eq file.path
+    end
+  end
+
+  context 'when File is an instance of Rack::Multipart::UploadedFile class' do
+    it 'attaches a file to a file field' do
+      visit 'user_form'
+      file = Rack::Multipart::UploadedFile.new('spec/fixtures/file.txt')
+      form = Formulaic::Form.new(:user, :new, avatar: file)
 
-    expect(input(:user, :avatar).value).to eq file.path
+      form.fill
+
+      expect(input(:user, :avatar).value).to eq file.path
+    end
   end
 
   it 'finds and fills a date field regardless of select box order' do

data/spec/formulaic/form_spec.rb

@@ -2,6 +2,16 @@ require 'spec_helper'
 
 describe Formulaic::Form do
   it 'throws an error if it does not know how to fill an attribute type' do
-    expect { Formulaic::Form.new(nil, nil, { invalid: nil }) }.to raise_error(Formulaic::Form::InvalidAttributeTypeError)
+    expect do
+      Formulaic::Form.new(nil, nil, { invalid: nil })
+    end.to raise_error(Formulaic::Form::InvalidAttributeTypeError)
+  end
+
+  it "doesn't throw error for Rack::Multipart::UploadedFile object" do
+    rack_multipart_uploaded_file = Rack::Multipart::UploadedFile.new(__FILE__)
+
+    expect do
+      Formulaic::Form.new(:user, :new, { avatar: rack_multipart_uploaded_file })
+    end.not_to raise_error
   end
 end

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ module SpecHelper
 
   def page
     @page ||= begin
-                Capybara.app = Rack::File.new(File.expand_path('../fixtures', __FILE__))
+                Capybara.app = Rack::Files.new(File.expand_path('../fixtures', __FILE__))
                 Capybara.current_session
               end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formulaic
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
-- Caleb Thompson
-autorequire: 
+- Caleb Hearth
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2024-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -113,15 +113,15 @@ description: |
       to specify a hash of attributes to be input rather than procedurally calling
       Capybara’s DSL methods.
 email:
-- caleb@calebthompson.io
+- caleb@calebhearth.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -155,11 +155,12 @@ files:
 - spec/formulaic/label_spec.rb
 - spec/spec_helper.rb
 - spec/support/models/user.rb
-homepage: https://github.com/thoughtbot/formulaic
+homepage: https://github.com/calebhearth/formulaic
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  funding-uri: https://github.com/sponsors/calebhearth
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -174,9 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: Simplify form filling with Capybara
 test_files:

data/.travis.yml

@@ -1,7 +0,0 @@
-rvm:
-  - "2.2"
-  - "2.3"
-  - "2.4.0"
-  - "ruby-head"
-notifications:
-  email: false