formulaic 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bef13aba12616219a2a8e5f254c3298ec6c00c8
-  data.tar.gz: c1eb43ca79ac45e3b9121f402dc1b74ff99ca809
+  metadata.gz: 5d9ec5d5cc87209a8e0c514da227986091fae2f6
+  data.tar.gz: a4c19d8ff89e8aff97e4ba5ac7691acab348801d
 SHA512:
-  metadata.gz: 16362b7ff583f4a85b68608d21eb77b605045a28b3305ba01fe8b0bc84e74155498991ca1d6d6a9b03a507929a59d7f4a0fa401d9c8064446a33c5ad5de8c032
-  data.tar.gz: 756dcffdc59c4219e50f717b08f0f41a5e70930e50cb4cc6d094c020909f64776ace0638c7ebafc1b7b15560ef8e4d36e94edb1b99c40202b90f666845cfec94
+  metadata.gz: be8c3a6bf12ca92ec6d77030be9f4f2e6abfe7a3853131022b378118493b62e395867a0314e28895ffb63d075017db7695d4714b9a4ecbda806688cc8ba2e719
+  data.tar.gz: 13be8a70905ad76aaf456134f2ca47451ee8a5856b944064b4fad8b65e45ee296bbeab18af1d568746d1c5cdd276c5671480b5332ca25525acbe55fab2165546

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p195
+ruby-2.1.0

data/README.md

@@ -9,7 +9,7 @@ procedurally calling Capybara’s DSL methods.
 
 ```ruby
 feature 'New user registration' do
-  scenario 'succesfull sign up' do
+  scenario 'successfull sign up' do
     visit sign_in_path
 
     fill_form(:user, { name: 'Caleb', email: 'caleb@thoughtbot.com', 'Terms of Service': true })
@@ -82,7 +82,7 @@ end
 fill_form(:user, attributes_for(:user))
 ```
 
-You may have attributes included in your `User` factory that don’t pretain to
+You may have attributes included in your `User` factory that don’t pertain to
 sign up:
 
 ```ruby

data/lib/formulaic/dsl.rb

@@ -7,5 +7,9 @@ module Formulaic
     def input(model_name, field, action = :create)
       Label.new(model_name, field, action).to_str
     end
+
+    def submit(model_class, action = :create)
+      I18n.t([:helpers, :submit, model_class, action].join('.'))
+    end
   end
 end

data/lib/formulaic/errors.rb

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

data/lib/formulaic/inputs/string_input.rb

@@ -2,18 +2,26 @@ module Formulaic
   module Inputs
     class StringInput < Input
       def fill
-        if %w(text email password textarea).any? { |type| page.has_field?(input_text, type: type) }
+        if page.has_selector?(:fillable_field, input_text)
           fill_in(input_text, with: value)
-        elsif page.has_field?(input_text, type: 'radio')
+        elsif page.has_selector?(:radio_button, input_text)
           choose(value)
-        else
+        elsif has_option_in_select?(value, input_text)
           select(value, from: input_text)
+        else
+          raise Formulaic::InputNotFound.new(%[Unable to find input "#{input_text}".])
         end
       end
 
       def input_text
         @input_text ||= input(model_name, field)
       end
+
+      def has_option_in_select?(option, select)
+        find(:select, select).has_selector?(:option, option)
+      rescue Capybara::ElementNotFound
+        false
+      end
     end
   end
 end

data/lib/formulaic/version.rb

@@ -1,3 +1,3 @@
 module Formulaic
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/features/fill_in_user_form_spec.rb

@@ -22,6 +22,33 @@ describe 'Fill in user form' do
     expect(input(:user, :password).value).to eq 'supersecr3t'
   end
 
+  it 'finds and fills a email field' do
+    visit 'user_form'
+    form = Formulaic::Form.new(:user, email: 'caleb@example.com')
+
+    form.fill
+
+    expect(input(:user, :email).value).to eq 'caleb@example.com'
+  end
+
+  it 'finds and fills a tel field' do
+    visit 'user_form'
+    form = Formulaic::Form.new(:user, phone: '123-555-1234')
+
+    form.fill
+
+    expect(input(:user, :phone).value).to eq '123-555-1234'
+  end
+
+  it 'finds and fills a url field' do
+    visit 'user_form'
+    form = Formulaic::Form.new(:user, url: 'https://github.com')
+
+    form.fill
+
+    expect(input(:user, :url).value).to eq 'https://github.com'
+  end
+
   it 'finds and fills a textarea' do
     visit 'user_form'
     form = Formulaic::Form.new(:user, bio: 'blah blah blah')

data/spec/fixtures/user_form.html

@@ -2,6 +2,8 @@
   <div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓"><input name="authenticity_token" type="hidden" value="O6ORla31JvEaWroCuiA7bArM15ztDotMfPAbNW0v61g="></div>
   <div class="input string required user_name"><label class="string required" for="user_name"><abbr title="required">*</abbr> Display name</label><input class="string required" id="user_name" maxlength="255" name="user[name]" size="50" type="text"></div>
   <div class="input email required user_email"><label class="email required" for="user_email"><abbr title="required">*</abbr> Email</label><input class="string email required" id="user_email" maxlength="255" name="user[email]" size="50" type="email"></div>
+  <div class="input tel required user_phone"><label class="tel required" for="user_phone"><abbr title="required">*</abbr> Phone Number</label><input class="string phone required" id="user_phone" maxlength="255" name="user[phone]" size="50" type="tel"></div>
+  <div class="input url required user_url"><label class="tel required" for="user_url"><abbr title="required">*</abbr> Website</label><input class="string url required" id="user_url" maxlength="255" name="user[url]" size="50" type="url"></div>
   <div class="input password optional user_password"><label class="password optional" for="user_password">Password</label><input class="password optional" id="user_password" name="user[password]" size="50" type="password"></div>
   <div class="input select required user_awesome">
     <label class="select required" for="user_awesome"><abbr title="required">*</abbr> Are you awesome?</label>

data/spec/formulaic/dsl_spec.rb

@@ -9,6 +9,12 @@ describe Formulaic::Dsl do
     expect(object_with_dsl).to respond_to(:fill_form)
   end
 
+  it 'finds a submit label' do
+    I18n.backend.store_translations(:en, { helpers: { submit: { user: { create: 'Create user' } } } })
+
+    expect(object_with_dsl.submit(:user)).to eq 'Create user'
+  end
+
   def object_with_dsl
     @object_with_dsl ||= Class.new do
       include Formulaic::Dsl

data/spec/spec_helper.rb

@@ -24,6 +24,8 @@ module SpecHelper
             user:
               name: Display name
               email: Email
+              phone: Phone Number
+              url: Website
               password: Password
               date_of_birth: Date of birth
               terms_of_service: I agree to the Terms of Service

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: formulaic
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Caleb Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !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: i18n
   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: activesupport
   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
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: pry
   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: |
@@ -118,9 +118,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -129,6 +129,7 @@ files:
 - formulaic.gemspec
 - lib/formulaic.rb
 - lib/formulaic/dsl.rb
+- lib/formulaic/errors.rb
 - lib/formulaic/form.rb
 - lib/formulaic/inputs.rb
 - lib/formulaic/inputs/array_input.rb
@@ -154,17 +155,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Simplify form filling with Capybara