formulaic 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bddf9295abcf67c8f465f0cf868233fec7998cc
-  data.tar.gz: a5b5c6bf0604458bfac05486835a8a53e02547b3
+  metadata.gz: 0088b91d76fbea5e19d5ed4686b97ec33d61f715
+  data.tar.gz: 1cda22db0d57d6b7546ba194ced8b4b0a5fdb4ff
 SHA512:
-  metadata.gz: 1b37abbe416ec93dc90fb814ccef4df969a087d82c33baa247b92b499719cf325baf481f80aabfd11c0f06a47535c64ad64ca1e8ba3f363dfe901031cba3e587
-  data.tar.gz: 78d46b03a053535978e7ec32c9ce9eb437f06b4bbafeccb07bec18c01043c60c03352ba16cce0c4c6e99b5fb749bbc0f3f46655f170c71cf23a3ccb4e501e0ef
+  metadata.gz: 819cb9b9db1691670db98579f4cf4a866b0ea5bfa989b16ef1c3f5ffb674d520f1bb1c4e762bac7455a6b6a0f1126155db5bff98cd6bef0e2cd9b44f88370efc
+  data.tar.gz: 4371252fb0c97d45bb35caeb94111d30d1b74de4bf97e9d810fb6f68443ad57a6f63ac7a2be8b2b6219f5cb895e567a85f12b9207df8791dc421eaa5045ef423

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.0
+2.1.2

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
   - "2.0.0"
+  - "2.1.0"
   - "2.1.1"
-  - "2.1-head"
+  - "2.1.2"
 notifications:
   email: false

data/NEWS.md

@@ -1,5 +1,18 @@
+v0.1.0
+------
+
+* Add `fill_form_and_submit` shortcut [48f9bc2](https://github.com/thoughtbot/formulaic/commit/48f9bc257d6c2b26c859388ab01da8963b818a85)
+
+  *Caleb Thompson*
+* Allow action to be specified in DSL [ad4bb54](https://github.com/thoughtbot/formulaic/commit/ad4bb5402d68131038e53f67e2e981f6aa1d5fa9)
+
+  *Caleb Thompson*
+* Add support for File attachments [f4e4bae](https://github.com/thoughtbot/formulaic/commit/f4e4bae978ab32fde017ae8344f862076a9ef31a)
+
+  *Dan Collis-Puro and Sean Doyle*
+
 v0.0.6
 ------
 
 * Treat integers as String inputs (which allows them to fill
-  `input[type="numeric"]`. (f7a8353)
+  `input[type="numeric"]`). [Pull Request](https://github.com/thoughtbot/formulaic/pull/21)

data/README.md

@@ -27,7 +27,7 @@ end
 ### `fill_form`
 
 ```ruby
-fill_form(model_name, attributes)
+fill_form(model_name, action = :new, attributes)
 ```
 
 `fill_form` provides an interface to completely filling out a form. Provide the
@@ -69,13 +69,32 @@ submit(:user, :update)
 The `model_name` and `action` should match up to the
 `helpers.submit.<model_name>.<action>` translations.
 
+### `fill_form_and_submit`
+
+```ruby
+fill_form_and_submit(:user, action = :new, attributes)
+```
+
+Effectively a `fill_form` followed by `click_on submit`, but smart enough to
+`fill_form` with `:new` and `submit` with `:create` and the edit/update cousin.
+
+### Nested Forms
+
+If you have nested forms, through `fields_for` (or any variant), you are able to
+fill them with an extra call to `fill_form`.
+
+```ruby
+fill_form(main_model_name, main_model_attributes)
+fill_form(nested_model_name, nested_model_attributes)
+```
+
 ### Integration with RSpec:
 
 ```ruby
 # spec/spec_helper.rb
 
 RSpec.configure do |config|
-  config.include Formulaic::Dsl
+  config.include Formulaic::Dsl, type: :feature
 end
 ```
 
@@ -132,6 +151,7 @@ around `I18n.t`.
   | `TrueClass`                           | `check`                          |
   | `FalseClass`                          | `uncheck`                        |
   | `Array`                               | `check` each array member, which should all be strings |
+  | `File`                                | `attach_file` with `File#path`   |
 
 * Formulaic is currently tied to `simple_form` translations and field structure.
   If you pass a string for the attribute, we’ll try to fill the input that
@@ -142,7 +162,9 @@ around `I18n.t`.
   the labels to determine where to fill what data.
 * Formulaic can’t figure out how to fill fields with HTML labels:
   `page.fill_in('<strong>Text</strong> here', with: 'something')` doesn’t work
-  with Capybara. The usual workaround is to pass a CSS selector.
+  with Capybara. The usual workaround is to pass a CSS selector (which you can
+  do by passing a string as the attribute key).
+* Formulaic can't handle multiple file attachments on the same input.
 
 ## About
 

data/lib/formulaic/dsl.rb

@@ -1,10 +1,17 @@
 module Formulaic
   module Dsl
-    def fill_form(model_name, attributes)
-      Form.new(model_name, attributes).fill
+    def fill_form(model_name, action = :new, attributes)
+      Form.new(model_name, action, attributes).fill
     end
 
-    def input(model_name, field, action = :create)
+    def fill_form_and_submit(model_name, action = :new, attributes)
+      form_action_to_submit_action = { new: :create, edit: :update }
+      fill_form(model_name, action, attributes)
+      submit_action = form_action_to_submit_action[action] || action
+      click_on submit(model_name, submit_action)
+    end
+
+    def input(model_name, field, action = :new)
       Label.new(model_name, field, action).to_str
     end
 

data/lib/formulaic/form.rb

@@ -10,11 +10,12 @@ module Formulaic
       Fixnum => Formulaic::Inputs::StringInput,
       TrueClass => Formulaic::Inputs::BooleanInput,
       FalseClass => Formulaic::Inputs::BooleanInput,
+      File => Formulaic::Inputs::FileInput,
     }.freeze
 
-    def initialize(model_name, attributes)
+    def initialize(model_name, action, attributes)
+      @action = action
       @inputs = build_inputs(model_name, attributes)
-      @session = session
     end
 
     def fill
@@ -23,7 +24,7 @@ module Formulaic
 
     private
 
-    attr_reader :session, :model_name, :inputs
+    attr_reader :model_name, :inputs, :action
 
     def build_inputs(model_name, attributes)
       attributes.map do |field, value|
@@ -32,7 +33,8 @@ module Formulaic
     end
 
     def build_input(model_name, field, value)
-      input_class_for(value).new(model_name, field, value)
+      label = Label.new(model_name, field, action)
+      input_class_for(value).new(label, value)
     end
 
     def input_class_for(value)

data/lib/formulaic/inputs.rb

@@ -3,3 +3,4 @@ require 'formulaic/inputs/array_input'
 require 'formulaic/inputs/boolean_input'
 require 'formulaic/inputs/date_input'
 require 'formulaic/inputs/string_input'
+require 'formulaic/inputs/file_input'

data/lib/formulaic/inputs/boolean_input.rb

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

data/lib/formulaic/inputs/date_input.rb

@@ -2,7 +2,7 @@ module Formulaic
   module Inputs
     class DateInput < Input
       def fill
-        select_date(value, from: input(model_name, field))
+        select_date(value, from: label)
       end
 
       private

data/lib/formulaic/inputs/file_input.rb

@@ -0,0 +1,9 @@
+module Formulaic
+  module Inputs
+    class FileInput < Input
+      def fill
+        attach_file(label, value.path)
+      end
+    end
+  end
+end

data/lib/formulaic/inputs/input.rb

@@ -6,19 +6,14 @@ module Formulaic
     class Input
       include Capybara::DSL
 
-      def initialize(model_name, field, value)
-        @model_name = model_name
-        @field = field
+      def initialize(label, value)
+        @label = label.to_str
         @value = value
       end
 
       private
 
-      def input(model_name, field, action = :create)
-        Label.new(model_name, field, action).to_str
-      end
-
-      attr_accessor :model_name, :field, :value
+      attr_accessor :label, :value
     end
   end
 end

data/lib/formulaic/inputs/string_input.rb

@@ -2,21 +2,17 @@ module Formulaic
   module Inputs
     class StringInput < Input
       def fill
-        if page.has_selector?(:fillable_field, input_text)
-          fill_in(input_text, with: value)
-        elsif page.has_selector?(:radio_button, input_text)
+        if page.has_selector?(:fillable_field, label)
+          fill_in(label, with: value)
+        elsif page.has_selector?(:radio_button, label)
           choose(value)
-        elsif has_option_in_select?(value, input_text)
-          select(value, from: input_text)
+        elsif has_option_in_select?(value, label)
+          select(value, from: label)
         else
-          raise Formulaic::InputNotFound.new(%[Unable to find input "#{input_text}".])
+          raise Formulaic::InputNotFound.new(%[Unable to find input "#{label}".])
         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

data/lib/formulaic/label.rb

@@ -1,6 +1,6 @@
 module Formulaic
   class Label
-    def initialize(model_name, attribute, action = :create)
+    def initialize(model_name, attribute, action)
       @model_name = model_name
       @attribute = attribute
       @action = action

data/lib/formulaic/version.rb

@@ -1,3 +1,3 @@
 module Formulaic
-  VERSION = '0.0.6'
+  VERSION = '0.1.0'
 end

data/spec/features/fill_in_user_form_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'pathname'
 
 describe 'Fill in user form' do
 
@@ -6,7 +7,7 @@ describe 'Fill in user form' do
 
   it 'finds and fills text fields' do
     visit 'user_form'
-    form = Formulaic::Form.new(:user, name: 'George')
+    form = Formulaic::Form.new(:user, :new, name: 'George')
 
     form.fill
 
@@ -15,7 +16,7 @@ describe 'Fill in user form' do
 
   it 'finds and fills a password field' do
     visit 'user_form'
-    form = Formulaic::Form.new(:user, password: 'supersecr3t')
+    form = Formulaic::Form.new(:user, :new, password: 'supersecr3t')
 
     form.fill
 
@@ -24,7 +25,7 @@ describe 'Fill in user form' do
 
   it 'finds and fills a email field' do
     visit 'user_form'
-    form = Formulaic::Form.new(:user, email: 'caleb@example.com')
+    form = Formulaic::Form.new(:user, :new, email: 'caleb@example.com')
 
     form.fill
 
@@ -33,7 +34,7 @@ describe 'Fill in user form' do
 
   it 'finds and fills a tel field' do
     visit 'user_form'
-    form = Formulaic::Form.new(:user, phone: '123-555-1234')
+    form = Formulaic::Form.new(:user, :new, phone: '123-555-1234')
 
     form.fill
 
@@ -42,7 +43,7 @@ describe 'Fill in user form' do
 
   it 'finds and fills a url field' do
     visit 'user_form'
-    form = Formulaic::Form.new(:user, url: 'https://github.com')
+    form = Formulaic::Form.new(:user, :new, url: 'https://github.com')
 
     form.fill
 
@@ -51,7 +52,7 @@ describe 'Fill in user form' do
 
   it 'finds and fills a textarea' do
     visit 'user_form'
-    form = Formulaic::Form.new(:user, bio: 'blah blah blah')
+    form = Formulaic::Form.new(:user, :new, bio: 'blah blah blah')
 
     form.fill
 
@@ -60,7 +61,7 @@ describe 'Fill in user form' do
 
   it 'finds and fills a date field' do
     visit 'user_form'
-    form = Formulaic::Form.new(:user, date_of_birth: Date.new(1980, 1, 2))
+    form = Formulaic::Form.new(:user, :new, date_of_birth: Date.new(1980, 1, 2))
 
     form.fill
 
@@ -71,7 +72,7 @@ describe 'Fill in user form' do
 
   it 'finds and checks a boolean field' do
     visit 'user_form'
-    form = Formulaic::Form.new(:user, terms_of_service: true)
+    form = Formulaic::Form.new(:user, :new, terms_of_service: true)
 
     form.fill
 
@@ -80,7 +81,7 @@ describe 'Fill in user form' do
 
   it 'finds and fills in a number field' do
     visit 'user_form'
-    form = Formulaic::Form.new(:user, age: 10)
+    form = Formulaic::Form.new(:user, :new, age: 10)
 
     form.fill
 
@@ -89,10 +90,20 @@ describe 'Fill in user form' do
 
   it 'selects a string if there is no input' do
     visit 'user_form'
-    form = Formulaic::Form.new(:user, awesome: 'Yes')
+    form = Formulaic::Form.new(:user, :new, awesome: 'Yes')
 
     form.fill
 
     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)
+
+    form.fill
+
+    expect(input(:user, :avatar).value).to eq file.path
+  end
 end

data/spec/fixtures/user_form.html

@@ -5,6 +5,7 @@
   <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 integer required user_age"><label class="integer required" for="user_age"><abbr title="required">*</abbr> Age</label><input class="numeric integer age required" id="user_age" maxlength="255" name="user[age]" size="50" type="number"></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 file optional user_avatar"><label class="file optional" for="user_avatar">Avatar</label><input class="file optional" id="user_avatar" name="user[avatar]" type="file" /></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

@@ -1,18 +1,73 @@
 require 'spec_helper'
 
 describe Formulaic::Dsl do
-  it 'responds to input' do
-    expect(object_with_dsl).to respond_to(:input)
+  describe 'input' do
+    it 'builds a label' do
+      label = instance_double('Formulaic::Label')
+      allow(label).to receive(:to_str)
+      allow(Formulaic::Label).to receive(:new).and_return(label)
+
+      object_with_dsl.input :model, :attribute, :action
+
+      expect(Formulaic::Label).to have_received(:new)
+        .with(:model, :attribute, :action)
+      expect(label).to have_received(:to_str)
+    end
+
+    it 'defaults action to :new' do
+      allow(Formulaic::Label).to receive(:new).and_return(double(to_str: nil))
+
+      object_with_dsl.input :model, :attribute
+
+      expect(Formulaic::Label).to have_received(:new)
+        .with(:model, :attribute, :new)
+    end
+
   end
 
-  it 'responds to fill_form' do
-    expect(object_with_dsl).to respond_to(:fill_form)
+  describe 'fill_form' do
+    it 'creates a form and fills it' do
+      form = instance_double('Formulaic::Form')
+      allow(form).to receive(:fill)
+      allow(Formulaic::Form).to receive(:new).and_return(form)
+
+      object_with_dsl.fill_form :model, :action, attributes: :values
+
+      expect(Formulaic::Form).to have_received(:new)
+        .with(:model, :action, attributes: :values)
+      expect(form).to have_received(:fill)
+    end
+
+    it 'assumes that action = :new' do
+      allow(Formulaic::Form).to receive(:new).and_return(double(fill: nil))
+
+      object_with_dsl.fill_form :model, attributes: :values
+
+      expect(Formulaic::Form).to have_received(:new)
+        .with(:model, :new, attributes: :values)
+    end
   end
 
-  it 'finds a submit label' do
-    I18n.backend.store_translations(:en, { helpers: { submit: { user: { create: 'Create user' } } } })
+  describe 'submit' do
+    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
+  end
+
+  describe 'fill_form_and_submit' do
+    it 'fills a form and submits it' do
+      I18n.backend.store_translations(:en, { helpers: { submit: { model: { create: 'Create model' } } } })
+      allow(Formulaic::Form).to receive(:new).and_return(double(fill: nil))
+      allow(object_with_dsl).to receive(:click_on)
+
+      object_with_dsl.fill_form_and_submit :model, attributes: :values
 
-    expect(object_with_dsl.submit(:user)).to eq 'Create user'
+      expect(Formulaic::Form).to have_received(:new)
+        .with(:model, :new, attributes: :values)
+      expect(object_with_dsl).to have_received(:click_on).with('Create model')
+    end
   end
 
   def object_with_dsl

data/spec/formulaic/form_spec.rb

@@ -2,6 +2,6 @@ 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, { invalid: nil }) }.to raise_error(Formulaic::Form::InvalidAttributeTypeError)
+    expect { Formulaic::Form.new(nil, nil, { invalid: nil }) }.to raise_error(Formulaic::Form::InvalidAttributeTypeError)
   end
 end

data/spec/formulaic/label_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 describe Formulaic::Label do
+  before(:each) do
+    class_double("User").as_stubbed_const
+    allow(User).to receive(:human_attribute_name).and_return("Human Attribute Name")
+  end
+
   it 'returns the string if there are no translations and it can not human_attribute_name the class' do
     expect(label(nil, 'My label')).to eq 'My label'
   end
@@ -19,13 +24,7 @@ describe Formulaic::Label do
     expect(label(:user, 'Work URL')).to eq 'Work URL'
   end
 
-  def label(model_name, attribute, action = :create)
+  def label(model_name, attribute, action = :new)
     Formulaic::Label.new(model_name, attribute, action).to_str
   end
 end
-
-class User
-  def self.human_attribute_name(*)
-    'Human Attribute Name'
-  end
-end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'formulaic'
-require 'pry'
 
 module SpecHelper
   def input(model, field)
@@ -23,15 +22,17 @@ module SpecHelper
           labels:
             user:
               age: Age
-              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
+              avatar: Avatar
               awesome: Are you awesome?
               bio: Biography
+              date_of_birth: Date of birth
+              email: Email
+              name: Display name
+              new:
+                password: Password
+                phone: Phone Number
+                terms_of_service: I agree to the Terms of Service
+                url: Website
     TRANSLATIONS
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formulaic
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Caleb Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -137,11 +137,13 @@ files:
 - lib/formulaic/inputs/array_input.rb
 - lib/formulaic/inputs/boolean_input.rb
 - lib/formulaic/inputs/date_input.rb
+- lib/formulaic/inputs/file_input.rb
 - lib/formulaic/inputs/input.rb
 - lib/formulaic/inputs/string_input.rb
 - lib/formulaic/label.rb
 - lib/formulaic/version.rb
 - spec/features/fill_in_user_form_spec.rb
+- spec/fixtures/file.txt
 - spec/fixtures/user_form.html
 - spec/formulaic/dsl_spec.rb
 - spec/formulaic/form_spec.rb
@@ -173,6 +175,7 @@ specification_version: 4
 summary: Simplify form filling with Capybara
 test_files:
 - spec/features/fill_in_user_form_spec.rb
+- spec/fixtures/file.txt
 - spec/fixtures/user_form.html
 - spec/formulaic/dsl_spec.rb
 - spec/formulaic/form_spec.rb