formulaic 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e824316e6057f6205ce73483ffbd7f513d4a02a6
-  data.tar.gz: 778f34355e21e73ca38564f5163781d4ae34474f
+  metadata.gz: 5aac19cb8a6553a97ce1cf6fd5685efe3d9670cd
+  data.tar.gz: 4b2936160b65052f3eaf8f11fed542104ef86c2e
 SHA512:
-  metadata.gz: 8dc66a2e7bca50643c48344247a6912f2f5d1645b1b4141f25af2b94042b970307417f5e7f2949d9fcd53fe3eccaa534bf5ad719de5171d8f2f996250c0526bb
-  data.tar.gz: cd453dffc6b4d9c381ef65d8c52119234c1b3d38adf9ce89272bc5efd4b9467ec7cc2f8341f1df8de45938f21d501b6ae86ca667d708774c5f455859a9d00bff
+  metadata.gz: 8aeb601d65baf8db3eb4a524b64917ca82ffc172aa3827c60c96beb2802974a6907c5569bb07d048af4f7e741f97794d89e07958902a6348c5fb123e280629f2
+  data.tar.gz: 9821a23573b2387dde20940b476ef9e2247177c565aaeacc218deaf4f18058858d237cdc5bdb1aa926122603e9a7876ad2db857cc63804aa8f87f2ba8fa51568

data/.ruby-version

@@ -1 +1 @@
-2.2.0
+2.4.0

data/.travis.yml

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

data/README.md

@@ -122,7 +122,7 @@ You may have attributes included in your `User` factory that don’t pertain to
 sign up:
 
 ```ruby
-fill_form(:user, attributes_for(:user).slice(sign_up_attributes))
+fill_form(:user, attributes_for(:user).slice(*sign_up_attributes))
 
 # ...
 def sign_up_attributes
@@ -142,6 +142,11 @@ it knows to pass directly to `fill_in` rather than trying to find a translation.
 You’ll need to find submit buttons yourself since `submit` is a thin wrapper
 around `I18n.t`.
 
+Formulaic assumes your forms don't use AJAX, setting the wait time to 0. This can be configured using:
+```ruby
+Formulaic.default_wait_time = 5
+```
+
 ## Known Limitations
 
 * Formulaic currently supports the following mappings from the `#class` of the
@@ -171,8 +176,13 @@ around `I18n.t`.
 
 ## About
 
-Formulaic is maintained by [Caleb Thompson](http://github.com/calebthompson).
-It was written by [thoughtbot](http://thoughtbot.com) with the help of our
-[contributors](http://github.com/thoughtbot/formulaic/contributors).
+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
 
 [![Ralph](http://thoughtbot.com/assets/thoughtbot-logo.png)](http://thoughtbot.com)

data/lib/formulaic.rb

@@ -7,4 +7,15 @@ require 'formulaic/form'
 require 'formulaic/dsl'
 
 module Formulaic
+  class << self
+    attr_accessor :default_wait_time
+
+    def configure
+      yield self
+    end
+  end
+end
+
+Formulaic.configure do |config|
+  config.default_wait_time = 0
 end

data/lib/formulaic/dsl.rb

@@ -16,7 +16,10 @@ module Formulaic
     end
 
     def submit(model_class, action = :create)
-      I18n.t([:helpers, :submit, model_class, action].join('.'))
+      I18n.t "#{model_class}.#{action}",
+             scope: [:helpers, :submit],
+             model: model_class.to_s.humanize,
+             default: action
     end
   end
 end

data/lib/formulaic/errors.rb

@@ -1,3 +1,4 @@
 module Formulaic
   class InputNotFound < StandardError; end
+  class OptionForSelectInputNotFound < StandardError; end
 end

data/lib/formulaic/form.rb

@@ -8,7 +8,8 @@ module Formulaic
       DateTime => Formulaic::Inputs::DateTimeInput,
       Array => Formulaic::Inputs::ArrayInput,
       String => Formulaic::Inputs::StringInput,
-      Fixnum => Formulaic::Inputs::StringInput,
+      Symbol => Formulaic::Inputs::StringInput,
+      1.class => Formulaic::Inputs::StringInput,
       Float => Formulaic::Inputs::StringInput,
       TrueClass => Formulaic::Inputs::BooleanInput,
       FalseClass => Formulaic::Inputs::BooleanInput,

data/lib/formulaic/inputs/input.rb

@@ -7,7 +7,7 @@ module Formulaic
       include Capybara::DSL
 
       def initialize(label, value)
-        @label = label.to_str
+        @label = label
         @value = value
       end
 

data/lib/formulaic/inputs/string_input.rb

@@ -2,22 +2,41 @@ module Formulaic
   module Inputs
     class StringInput < Input
       def fill
-        if page.has_selector?(:fillable_field, label)
+        if page.has_selector?(:fillable_field, label, wait: Formulaic.default_wait_time)
           fill_in(label, with: value)
-        elsif page.has_selector?(:radio_button, label)
+        elsif page.has_selector?(:radio_button, label, wait: Formulaic.default_wait_time)
           choose(value)
-        elsif has_option_in_select?(value, label)
-          select(value, from: label)
+        elsif has_option_in_select?(translate_option(value), label)
+          select(translate_option(value), from: label)
         else
           raise Formulaic::InputNotFound.new(%[Unable to find input "#{label}".])
         end
       end
 
       def has_option_in_select?(option, select)
-        find(:select, select).has_selector?(:option, option)
+        element = find(:select, select)
+        if ! element.has_selector?(:option, option, wait: Formulaic.default_wait_time)
+          raise Formulaic::OptionForSelectInputNotFound.new(%[Unable to find option with text matching "#{option}".])
+        end
+        true
       rescue Capybara::ElementNotFound
         false
       end
+
+      private
+
+      def translate_option(option)
+        I18n.t(lookup_paths_for_option.first,
+               scope: :'simple_form.options', default: lookup_paths_for_option)
+      end
+
+      def lookup_paths_for_option
+        [
+          :"#{label.model_name}.#{label.attribute}.#{value}",
+          :"defaults.#{label.attribute}.#{value}",
+          value.to_s,
+        ]
+      end
     end
   end
 end

data/lib/formulaic/label.rb

@@ -12,7 +12,7 @@ module Formulaic
       if attribute.is_a?(String)
         attribute
       else
-        translate || human_attribute_name || attribute.to_s
+        translate || human_attribute_name || attribute.to_s.humanize
       end
     end
     alias_method :to_s, :to_str

data/lib/formulaic/version.rb

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

data/spec/features/fill_in_user_form_spec.rb

@@ -2,9 +2,6 @@ require 'spec_helper'
 require 'pathname'
 
 describe 'Fill in user form' do
-
-  before(:all) { load_translations }
-
   it 'finds and fills text fields' do
     visit 'user_form'
     form = Formulaic::Form.new(:user, :new, name: 'George')
@@ -14,6 +11,14 @@ describe 'Fill in user form' do
     expect(input(:user, :name).value).to eq 'George'
   end
 
+  it 'finds and fills text fields with symbol values' do
+    visit 'user_form'
+    form = Formulaic::Form.new(:user, :new, name: :George)
+    form.fill
+
+    expect(input(:user, :name).value).to eq 'George'
+  end
+
   it 'finds and fills a password field' do
     visit 'user_form'
     form = Formulaic::Form.new(:user, :new, password: 'supersecr3t')
@@ -224,4 +229,24 @@ describe 'Fill in user form' do
 
     expect(page.find('#user_friend_ids_1')).to be_checked
   end
+
+  it 'raises an useful error when option not found for select' do
+    visit 'user_form'
+
+    form = Formulaic::Form.new(:user, :new, role: :unknown)
+
+    expect { form.fill }
+      .to raise_error(
+        Formulaic::OptionForSelectInputNotFound,
+        %[Unable to find option with text matching "unknown".])
+  end
+
+  it 'translate option for select when translation is available' do
+    visit 'user_form'
+
+    form = Formulaic::Form.new(:user, :new, role: :admin)
+    form.fill
+
+    expect(page).to have_select('user_role', selected: 'Administrator')
+  end
 end

data/spec/fixtures/user_form.html

@@ -302,5 +302,13 @@
     </select>
   </div>
   <div class="input boolean required user_terms_of_service"><input name="user[terms_of_service]" type="hidden" value="0"><input class="boolean required" id="user_terms_of_service" name="user[terms_of_service]" type="checkbox" value="1"><label class="boolean required" for="user_terms_of_service"><abbr title="required">*</abbr> I agree to the Terms of Service</label></div>
+  <div class="input select required user_role">
+    <label class="select required" for="user_role"><abbr title="required">*</abbr> Role</label>
+    <select class="select required" name="user[role]" id="user_role">
+      <option value=""></option>
+      <option selected="selected" value="member">Member</option>
+      <option value="admin">Administrator</option>
+    </select>
+  </div>
   <input name="commit" type="submit" value="Register">
 </form>

data/spec/formulaic/dsl_spec.rb

@@ -49,10 +49,16 @@ describe Formulaic::Dsl do
   end
 
   describe 'submit' do
-    it 'finds a submit label' do
+    it 'finds a custom submit label' do
       I18n.backend.store_translations(:en, { helpers: { submit: { user: { create: 'Create user' } } } })
 
       expect(object_with_dsl.submit(:user)).to eq 'Create user'
+
+      I18n.backend.store_translations(:en, { helpers: { submit: { user: { create: nil } } } })
+    end
+
+    it 'finds the default submit label' do
+      expect(object_with_dsl.submit(:user)).to eq 'Create User'
     end
   end
 
@@ -67,6 +73,8 @@ describe Formulaic::Dsl do
       expect(Formulaic::Form).to have_received(:new)
         .with(:model, :new, attributes: :values)
       expect(object_with_dsl).to have_received(:click_on).with('Create model')
+
+      I18n.backend.store_translations(:en, { helpers: { submit: { model: { create: nil } } } })
     end
   end
 

data/spec/formulaic/label_spec.rb

@@ -13,6 +13,8 @@ describe Formulaic::Label do
     I18n.backend.store_translations(:en, { simple_form: { labels: { user: { name: "Translated" } } } } )
 
     expect(label(:user, :name)).to eq("Translated")
+
+    I18n.backend.store_translations(:en, { simple_form: { labels: { user: { name: nil } } } } )
   end
 
   it "should leave cases alone" do
@@ -23,10 +25,8 @@ describe Formulaic::Label do
     expect(label(:student, "Course selection")).to eq "Course selection"
   end
 
-  class User
-    def self.human_attribute_name(attribute)
-      attribute.to_s.humanize
-    end
+  it "humanizes attribute if no translation is found and human_attribute_name is not available" do
+    expect(label(:student, :course_selection)).to eq "Course selection"
   end
 
   def label(model_name, attribute, action = :new)

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 require 'formulaic'
 
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
+
 module SpecHelper
   def input(model, field)
     page.find("##{model}_#{field}")
@@ -16,8 +18,14 @@ module SpecHelper
               end
   end
 
-  def load_translations
+  def reset_and_load_translations
+    I18n.reload!
     I18n.backend.store_translations(:en, YAML.load(<<-TRANSLATIONS))
+        helpers:
+          submit:
+            create: 'Create %{model}'
+            update: 'Update %{model}'
+            submit: 'Save %{model}'
         simple_form:
           labels:
             user:
@@ -35,6 +43,11 @@ module SpecHelper
                 phone: Phone Number
                 terms_of_service: I agree to the Terms of Service
                 url: Website
+          options:
+            user:
+              role:
+                admin: Administrator
+                member: Member
     TRANSLATIONS
     I18n.backend.store_translations(:es, YAML.load(<<-TRANSLATIONS))
       date:
@@ -56,6 +69,10 @@ module SpecHelper
   end
 end
 
-RSpec.configure do |c|
-  c.include SpecHelper
+RSpec.configure do |config|
+  config.include SpecHelper
+
+  config.before(:each) do
+    reset_and_load_translations
+  end
 end

data/spec/support/models/user.rb

@@ -0,0 +1,5 @@
+class User
+  def self.human_attribute_name(attribute)
+    attribute.to_s.humanize
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formulaic
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Caleb Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -154,6 +154,7 @@ files:
 - spec/formulaic/form_spec.rb
 - spec/formulaic/label_spec.rb
 - spec/spec_helper.rb
+- spec/support/models/user.rb
 homepage: https://github.com/thoughtbot/formulaic
 licenses:
 - MIT
@@ -174,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Simplify form filling with Capybara
@@ -188,3 +189,4 @@ test_files:
 - spec/formulaic/form_spec.rb
 - spec/formulaic/label_spec.rb
 - spec/spec_helper.rb
+- spec/support/models/user.rb