formulaic 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 402a37df86e5dd8b34b2aa265b27ebf777ef2a15
-  data.tar.gz: 85085a9bbf8b9a4e575c0cc0cac2d880210f61a6
+  metadata.gz: 46041f49475675c4e48824b44f5a4825f1e0a2c6
+  data.tar.gz: 5ff5c7da932bbad514632342cf19f84a45778b38
 SHA512:
-  metadata.gz: bbb668c73e63d172e8769f7a5f4e63db0cacb478d02f0210365cab04c872e3705f82e22b5713d295a36c77fca4ab756887a910f435b065f2a98876aacb5bbe8d
-  data.tar.gz: dc8a724475b8548eb3bf414c1f859558a67e63f809003156f1050fae839be484a1762130c1db066a39fb3995dcfb256800b2e16a7eac04cd8d61229ddc0691e8
+  metadata.gz: 07e7b143f6ef68deedac88596f213d42dee31ce1b84079dc1855ee33c8eb554babae2742ee3fc65be8f85996c9a8b310bcc628a3385b529ef4fbdc09d53f44d3
+  data.tar.gz: f0efb3b62c2580f2fcad9618b1d59e77fd2872ce22f7884d0fbd7b283b9e9732f3f4b2ab43d27cfcf934aef0e42133f3c129bf190262124df582144833aa1451

data/README.md

@@ -150,7 +150,7 @@ around `I18n.t`.
   | `Date`, `ActiveSupport::TimeWithZone` | `select` year, month, and day    |
   | `TrueClass`                           | `check`                          |
   | `FalseClass`                          | `uncheck`                        |
-  | `Array`                               | `check` each array member, which should all be strings |
+  | `Array`                               | `check` or `select` each array member, which should all be strings. If not all items can be selected or checked, an error will be thrown.|
   | `File`                                | `attach_file` with `File#path`   |
 
 * Formulaic is currently tied to `simple_form` translations and field structure.

data/lib/formulaic/inputs/array_input.rb

@@ -1,9 +1,40 @@
 module Formulaic
   module Inputs
     class ArrayInput < Input
+      def initialize(label, value)
+        @label = label
+        @value = value
+      end
+
       def fill
-        value.each { |checkbox| check checkbox }
+        attempt_to_fill_selects ||
+          attempt_to_fill_checkboxes ||
+          raise_input_error
+      end
+
+      private
+
+      def attempt_to_fill_selects
+        SelectInput.new(label, value).fill
+      end
+
+      def attempt_to_fill_checkboxes
+        CheckboxInput.new(label, value).fill
+      end
+
+      def contains_all_options?(nodes)
+        nodes.map(&:text).to_set.superset?(value.to_set)
+      end
+
+      def raise_input_error
+        raise(
+          InputNotFound,
+          %[Unable to find checkboxes or select[multiple] "#{label}" containing all options #{value.inspect}.]
+        )
       end
     end
   end
 end
+
+require 'formulaic/inputs/checkbox_input'
+require 'formulaic/inputs/select_input'

data/lib/formulaic/inputs/checkbox_input.rb

@@ -0,0 +1,36 @@
+module Formulaic
+  module Inputs
+    class CheckboxInput < ArrayInput
+      def fill
+        if has_check_boxes?
+          check_boxes
+          true
+        else
+          false
+        end
+      end
+
+      private
+
+      def has_check_boxes?
+        contains_all_options?(checkbox_labels)
+      end
+
+      def check_boxes
+        value.each { |checkbox| check checkbox }
+      end
+
+      def checkbox_labels
+        all(checkbox_labels_selector)
+      end
+
+      def checkbox_name_selector
+        "input[type='checkbox'][name='#{label.model_name}[#{label.attribute}][]']"
+      end
+
+      def checkbox_labels_selector
+        "#{checkbox_name_selector} ~ label,label:has(#{checkbox_name_selector})"
+      end
+    end
+  end
+end

data/lib/formulaic/inputs/select_input.rb

@@ -0,0 +1,37 @@
+module Formulaic
+  module Inputs
+    class SelectInput < ArrayInput
+      def fill
+        if has_multiple_select?
+          select_options
+          true
+        else
+          false
+        end
+      end
+
+      private
+
+      def select_options
+        value.each { |option| select option, from: label.to_str }
+      end
+
+      def has_multiple_select?
+        has_select? && select_is_multiple?
+      end
+
+      def has_select?
+        has_field?(label, type: "select")
+      end
+
+      def select_is_multiple?
+        select_element[:multiple].present? &&
+          contains_all_options?(select_element.all("option"))
+      end
+
+      def select_element
+        @select_element ||= find_field(label, type: "select")
+      end
+    end
+  end
+end

data/lib/formulaic/label.rb

@@ -1,5 +1,7 @@
 module Formulaic
   class Label
+    attr_reader :model_name, :attribute, :action
+
     def initialize(model_name, attribute, action)
       @model_name = model_name
       @attribute = attribute
@@ -17,8 +19,6 @@ module Formulaic
 
     private
 
-    attr_reader :model_name, :attribute, :action
-
     def translate
       I18n.t(lookup_paths.first, scope: :'simple_form.labels', default: lookup_paths).presence
     end

data/lib/formulaic/version.rb

@@ -1,3 +1,3 @@
 module Formulaic
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/features/fill_in_user_form_spec.rb

@@ -88,6 +88,58 @@ describe 'Fill in user form' do
     expect(input(:user, :age).value).to eq '10'
   end
 
+  it 'raises a useful error if selecting multiple from a normal select' do
+    visit 'user_form'
+    form = Formulaic::Form.new(:user, :new, awesome: ['Yes', 'No'])
+
+    expect { form.fill }
+      .to raise_error(
+        Formulaic::InputNotFound,
+        'Unable to find checkboxes or select[multiple] "Are you awesome?" containing all options ["Yes", "No"].'
+      )
+  end
+
+  it 'raises a useful error if not all select options are present' do
+    visit 'user_form'
+    form = Formulaic::Form.new(:user, :new, likes: ['Ruby', 'Perl'])
+
+    expect { form.fill }
+      .to raise_error(
+        Formulaic::InputNotFound,
+        'Unable to find checkboxes or select[multiple] "Your Likes" containing all options ["Ruby", "Perl"].'
+      )
+  end
+
+  it 'selects an array of strings' do
+    visit 'user_form'
+    form = Formulaic::Form.new(:user, :new, likes: ['Ruby', 'Rails'])
+
+    form.fill
+
+    expect(input(:user, :likes).value).to eq ['ruby', 'rails']
+  end
+
+  it 'raises a useful error if not all checkboxes are present' do
+    visit 'user_form'
+    form = Formulaic::Form.new(:user, :new, dislikes: ['Java', 'Go'])
+
+    expect { form.fill }
+      .to raise_error(
+        Formulaic::InputNotFound,
+        'Unable to find checkboxes or select[multiple] "Your Dislikes" containing all options ["Java", "Go"].'
+      )
+  end
+
+  it 'selects an array of checkboxes' do
+    visit 'user_form'
+    form = Formulaic::Form.new(:user, :new, dislikes: ['Java', 'PHP'])
+
+    form.fill
+
+    expect(page).to have_checked_field "Java"
+    expect(page).to have_checked_field "PHP"
+  end
+
   it 'selects a string if there is no input' do
     visit 'user_form'
     form = Formulaic::Form.new(:user, :new, awesome: 'Yes')

data/spec/fixtures/user_form.html

@@ -1,12 +1,17 @@
 <form accept-charset="UTF-8" action="/users" class="simple_form new_user" id="new_user" method="post" novalidate="novalidate">
   <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 string required user_name"><label class="string required"
+      for="user_name"><abbr title="required">*</abbr> Your 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> Your 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 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 integer required user_age"><label class="integer required"
+      for="user_age"><abbr title="required">*</abbr> Your 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 file optional user_avatar"><label class="file optional"
+      for="user_avatar">Your 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">Your 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>
     <select class="select required" id="user_awesome" name="user[awesome]">
@@ -15,9 +20,34 @@
       <option value="false">No</option>
     </select>
   </div>
-  <div class="input text required user_bio"><label class="text required" for="user_bio"><abbr title="required">*</abbr> Biography</label><textarea class="text required" cols="40" id="user_bio" name="user[bio]" rows="20" style="overflow: hidden; word-wrap: break-word; resize: horizontal; height: 464px;"></textarea></div>
+  <div class="input select user_likes">
+    <label class="select" for="user_likes">Your Likes</label>
+    <select class="select" id="user_likes" name="user[likes][]" multiple>
+      <option value=""></option>
+      <option value="ruby">Ruby</option>
+      <option value="rails">Rails</option>
+      <option value="git">Git</option>
+    </select>
+  </div>
+  <div class="input check_boxes optional user_dislikes">
+    <label class="check_boxes optional">Your Dislikes</label>
+    <span class="checkbox">
+      <input class="check_boxes optional" id="user_dislikes_1" name="user[dislikes][]" type="checkbox" value="java">
+      <label class="collection_check_boxes" for="user_dislikes_1">Java</label>
+    </span>
+    <span class="checkbox">
+      <label class="collection_check_boxes" for="user_dislikes_2">
+        PHP
+        <input class="check_boxes optional" id="user_dislikes_2" name="user[dislikes][]" type="checkbox" value="php">
+      </label>
+    </span>
+    <input name="user[dislikes][]" type="hidden" value="">
+  </div>
+  <div class="input text required user_bio"><label class="text required"
+      for="user_bio"><abbr title="required">*</abbr> Your Biography</label><textarea class="text required" cols="40" id="user_bio" name="user[bio]" rows="20" style="overflow: hidden; word-wrap: break-word; resize: horizontal; height: 464px;"></textarea></div>
   <div class="input date required user_date_of_birth">
-    <label class="date required" for="user_date_of_birth_1i"><abbr title="required">*</abbr> Date of birth</label>
+    <label class="date required" for="user_date_of_birth_1i"><abbr
+        title="required">*</abbr> Your Date of birth</label>
     <select class="date required" id="user_date_of_birth_1i" name="user[date_of_birth(1i)]">
       <option value="2001">2001</option>
       <option value="2000">2000</option>

data/spec/spec_helper.rb

@@ -21,15 +21,17 @@ module SpecHelper
         simple_form:
           labels:
             user:
-              age: Age
-              avatar: Avatar
+              age: Your Age
+              avatar: Your Avatar
               awesome: Are you awesome?
               bio: Biography
-              date_of_birth: Date of birth
-              email: Email
-              name: Display name
+              date_of_birth: Your Date of birth
+              likes: Your Likes
+              dislikes: Your Dislikes
+              email: Your Email
+              name: Your Display name
               new:
-                password: Password
+                password: Your Password
                 phone: Phone Number
                 terms_of_service: I agree to the Terms of Service
                 url: Website

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formulaic
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Caleb Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -136,9 +136,11 @@ files:
 - lib/formulaic/inputs.rb
 - lib/formulaic/inputs/array_input.rb
 - lib/formulaic/inputs/boolean_input.rb
+- lib/formulaic/inputs/checkbox_input.rb
 - lib/formulaic/inputs/date_input.rb
 - lib/formulaic/inputs/file_input.rb
 - lib/formulaic/inputs/input.rb
+- lib/formulaic/inputs/select_input.rb
 - lib/formulaic/inputs/string_input.rb
 - lib/formulaic/label.rb
 - lib/formulaic/version.rb