yorisoi 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caedf5f60896e709fb5b77a40139e185d5a8a8df
-  data.tar.gz: 37b578bb4f96733f41c02dc3ad353d3aa61323ee
+  metadata.gz: b0f95438615085c743c53f193e9743c03b3085af
+  data.tar.gz: 2d54df0cc3cf706af58327545e0729b16c531b07
 SHA512:
-  metadata.gz: c254f7f6aa64901cd67db7fa48bf3b7f4e9917ae66dc4c0d79e3f0a2ce41941303ad72beeef6180070ba2b62dfebcc8a05b33516b6e45ebb594e05fe27d72e4c
-  data.tar.gz: cb797bfe4dacbfbe800efc3e7c64f0c3fc4dda12c7d4453a98cbe4072e96b1fd13409df75e7f4946f97d6d9ee062ad284edbd28dc2f8a3a0fbec929f4a34e9e2
+  metadata.gz: 841ef79b76da7304363f073cd846052b2c5b957728115bef08e2abb5d1ac3005786437f951375ddad67ec2436632f916802ebb5734ecf7eb847615095c730129
+  data.tar.gz: d1629b2f3d3ea2e5462920cd38d0229d98d1d8f6900974038e178db420c89b0809b8abe0d083530f05adcf31fb249675a7eb1e217d2582b7dda425e350c2924f

data/lib/yorisoi/version.rb

@@ -1,3 +1,3 @@
 module Yorisoi
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/yorisoi.rb

@@ -39,15 +39,21 @@ module Yorisoi
     using Arralizer
     using Flipper
 
-    attr_accessor :wrapper, :invalid_wrapper, :errors_wrapper, :error_wrapper
+    attr_accessor :wrapper, :invalid_wrapper, :errors_wrapper, :error_wrapper, :stored_error
 
 
     def initialize(object_name, object, template, options)
       self.default_tag = options[:builder_tag] || {}
+      store_error(object)
       super
     end
 
 
+    def store_error(object)
+      @stored_error = object.errors.presence || {}
+    end
+
+
     (field_helpers - [:check_box, :radio_button, :fields_for, :hidden_field, :label]).each do |selector|
       class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
         def #{selector}(attribute, options = {})
@@ -95,13 +101,6 @@ module Yorisoi
     end
 
 
-    def pick_error(attribute)
-      return nil if @object.nil? || !(messages = @object.errors.messages[attribute]).present?
-
-      errors_wrapper.(messages.map(&error_wrapper.(attribute)).join.html_safe, attribute)
-    end
-
-
     def radio_button(attribute, label_and_value, options = {})
       wrap_field(attribute, options) do
         if label_and_value.is_a?(Array)
@@ -124,6 +123,16 @@ module Yorisoi
     end
 
 
+    def remnant
+      return if @stored_error.blank?
+      errors_wrapper.(@stored_error.map { |attribute, *errors|
+        errors.map { |message|
+          error_wrapper.(attribute, message)
+        }
+      }.flatten.join.html_safe, :remnant)
+    end
+
+
     def select(attribute, choices = nil, options = {}, html_options = {}, &block)
       wrap_field(attribute, options) { super }
     end
@@ -134,13 +143,29 @@ module Yorisoi
       no_wrap = options.delete(:no_wrap)
 
       if (error_html = pick_error(attribute)).present?
-        no_errors ? yield : yield + error_html
+        if no_errors
+          yield
+        else
+          delete_stored_error!(attribute)
+          yield + error_html
+        end
       else
         no_wrap ? yield : wrapper.(yield, attribute)
       end.html_safe
     end
 
 
+    def write_error(attribute)
+      delete_stored_error!(attribute)
+      pick_error(attribute)
+    end
+
+
+    def delete_stored_error!(attribute)
+      @stored_error.delete(attribute)
+    end
+
+
     private
     def around_proc(label_text)
       ->(tag) {
@@ -179,6 +204,13 @@ module Yorisoi
     end
 
 
+    def pick_error(attribute)
+      return nil if @object.nil? || !(messages = @object.errors.messages[attribute]).present?
+
+      errors_wrapper.(messages.map(&error_wrapper.(attribute)).join.html_safe, attribute)
+    end
+
+
     def radio_button_wrapper
       ->(content, attribute) { content_tag(:ul, content, class: %w(radio-buttons).push(attribute)) }
     end
@@ -218,4 +250,4 @@ module Yorisoi
       end
     end
   end
-end
+end

data/spec/controllers/samples_controller_spec.rb

@@ -10,7 +10,20 @@ RSpec.describe SamplesController, :type => :controller do
     end
   end
 
-  describe "POST create" do
+  describe "display remnant" do
+    it 'valid params NOT render error message' do
+      post :create, remnant: true, sample: attributes_for(:sample)
+      expect(response.body).not_to have_tag('ul.errors.text')
+      expect(response.body).not_to have_tag('ul.errors.password')
+      expect(response.body).not_to have_tag('ul.errors.textarea')
+      expect(response.body).to have_tag('ul.errors.select')
+      expect(response.body).to have_tag('ul.errors.radio')
+      expect(response.body).to have_tag('ul.errors.checkbox')
+      expect(response.body).to have_tag('ul.errors.remnant li.error', count: 6)
+    end
+  end
+
+    describe "POST create" do
     it 'valid params NOT render error message' do
       post :create, sample: attributes_for(:valid_sample)
       expect(response.body).not_to have_tag('ul.errors.text')

data/spec/dummy/app/controllers/samples_controller.rb

@@ -3,13 +3,16 @@ class SamplesController < ApplicationController
     @sample = Sample.new
   end
 
+  def remnant
+    @sample = Sample.new
+  end
 
   def create
     Sample.create!(sample_params)
-    redirect_to new_path
+    redirect_to params[:remnant] ? remnant_path : new_path
   rescue ActiveRecord::RecordInvalid => e
     @sample = e.record
-    render :new
+    render params[:remnant] ? :remnant : :new
   end
 
 

data/spec/dummy/app/views/samples/new.html.erb

@@ -101,55 +101,4 @@
             <li><%= f.submit :submit, class: [:button, :green] %></li>
         </ul>
     <% end %>
-</article>
-<article class="w400 floater">
-    <h1>Default</h1>
-    <%= form_for @sample, url: create_path, method: :post do |f| %>
-        <div class="input-box p100">
-            <section class="input-set">
-                <label class="input-head">text</label>
-                <div class="input-body p100">
-                    <%= f.text_field :text, class: [:p100] %>
-                </div>
-            </section>
-            <section class="input-set">
-                <label class="input-head">password</label>
-                <div class="input-body p100">
-                    <%= f.password_field :password, class: [:p100] %>
-                </div>
-            </section>
-            <section class="input-set">
-                <label class="input-head">textarea</label>
-                <div class="input-body p100">
-                    <%= f.text_area :textarea, class: [:p100] %>
-                </div>
-            </section>
-            <section class="input-set">
-                <label class="input-head">select</label>
-                <div class="input-body p100">
-                    <%= f.select :select, Const::SELECT, {prompt: :select}, {class: [:p100]} %>
-                </div>
-            </section>
-            <section class="input-set">
-                <label class="input-head">collection<br>radio buttons</label>
-                <div class="input-body p100 collection">
-                    <%#= f.radio_buttons :radio, {class: [:bigger]}, Const::RADIO.zip(Const::RADIO) %>
-                    <%= f.collection_radio_buttons :radio, Const::RADIO.zip(Const::RADIO), :last, :first, {}, class: [:bigger] do |b| %>
-                        <% b.label { b.radio_button + b.text } %>
-                    <% end %>
-                </div>
-            </section>
-            <section class="input-set">
-                <label class="input-head">collection<br>check boxes</label>
-                <div class="input-body p100 collection">
-                    <%= f.collection_check_boxes :checkbox, Const::CHECKBOX.zip(Const::CHECKBOX), :last, :first, {}, class: [:bigger] do |b| %>
-                        <% b.label { b.check_box + b.text } %>
-                    <% end %>
-                </div>
-            </section>
-        </div>
-        <ul class="form-button-area">
-            <li><%= f.submit :submit, class: [:button, :green] %></li>
-        </ul>
-    <% end %>
 </article>

data/spec/dummy/app/views/samples/remnant.html.erb

@@ -0,0 +1,107 @@
+<style type="text/css">
+    <!--
+    h1 {
+        margin: 10px 0;
+        font-size: 24px;
+        font-weight: bold;
+    }
+
+    ul.errors {
+        margin: 10px 0 0 25px;
+    }
+
+    ul.errors li {
+        list-style: square;
+        color: #c00;
+    }
+
+    .collection label,
+    ul.radio-buttons > li,
+    ul.check-boxes > li {
+        display: inline-block;
+        padding-right: 10px;
+    }
+
+    .input-head,
+    .input-body {
+        border-top: 1px solid #ccc;
+        padding-top: 15px;
+        padding-bottom: 15px;
+    }
+
+    .input-head {
+        vertical-align: top;
+        padding-top: 20px;
+    }
+
+    .field_with_errors input,
+    .field_with_errors textarea,
+    .field_with_errors select {
+        border-color: #c00;
+    }
+
+    .field_with_errors {
+        padding-bottom: 1px;
+        border-bottom: 2px solid #c00;
+    }
+
+    .floater {
+        padding: 30px;
+        float: left;
+    }
+
+    .collection label div {
+        display: inline-block;
+    }
+
+    -->
+</style>
+<article class="w400 floater">
+    <h1>Yorisoi Remnant Error</h1>
+    <%= form_for @sample, url: create_path, method: :post, builder: Yorisoi::Builder do |f| %>
+        <%= hidden_field :remnant, value: true %>
+        <%= yield :remnant %>
+        <div class="input-box p100">
+            <section class="input-set">
+                <label class="input-head">text</label>
+                <div class="input-body p100">
+                    <%= f.text_field :text, class: [:p100], no_errors: true %>
+                </div>
+            </section>
+            <section class="input-set">
+                <label class="input-head">password</label>
+                <div class="input-body p100">
+                    <%= f.password_field :password, class: [:p100], no_errors: true %>
+                </div>
+            </section>
+            <section class="input-set">
+                <label class="input-head">textarea</label>
+                <div class="input-body p100">
+                    <%= f.text_area :textarea, class: [:p100], no_errors: true %>
+                </div>
+            </section>
+            <section class="input-set">
+                <label class="input-head">select</label>
+                <div class="input-body p100">
+                    <%= f.select :select, Const::SELECT, {prompt: :select}, {class: [:p100]} %>
+                </div>
+            </section>
+            <section class="input-set">
+                <label class="input-head">radio buttons</label>
+                <div class="input-body p100">
+                    <%= f.radio_buttons :radio, {class: [:bigger]}, Const::RADIO.zip(Const::RADIO) %>
+                </div>
+            </section>
+            <section class="input-set">
+                <label class="input-head">check boxes</label>
+                <div class="input-body p100">
+                    <%= f.check_boxes :checkbox, {class: [:bigger]}, Const::CHECKBOX.zip(Const::CHECKBOX) %>
+                </div>
+            </section>
+        </div>
+        <%= f.remnant %>
+        <ul class="form-button-area">
+            <li><%= f.submit :submit, class: [:button, :green] %></li>
+        </ul>
+    <% end %>
+</article>

data/spec/dummy/config/routes.rb

@@ -1,6 +1,7 @@
 Rails.application.routes.draw do
   scope :samples do
     get :new, to: 'samples#new'
+    get :remnant, to: 'samples#remnant'
     post :create, to: 'samples#create'
   end
 end

data/spec/libs/yorisoi_spec.rb

@@ -16,12 +16,12 @@ RSpec.describe Yorisoi::Builder do
     end
 
     it 'change error child' do
-      @f = Yorisoi::Builder.new(:sample, @sample, TestHelper.new, {
+      changed = Yorisoi::Builder.new(:sample, @sample, TestHelper.new, {
               builder_tag: {
                   errors_wrapper: ->(error_children, attribute) { %{<div class="error-messages #{attribute}">#{error_children}</div>}.html_safe },
                   error_wrapper: ->(error, attribute) { %{<p class="error-message #{attribute}">#{error}</p>}.html_safe }
               }})
-      expect(@f.text_field(:text)).to have_tag('div.error-messages.text p.error-message.text')
+      expect(changed.text_field(:text)).to have_tag('div.error-messages.text p.error-message.text')
     end
   end
 
@@ -39,6 +39,27 @@ RSpec.describe Yorisoi::Builder do
     end
   end
 
+  context 'remnant errors' do
+    before :each do
+      @sample.valid?
+      @count = @sample.errors.count
+      @fr = Yorisoi::Builder.new(:sample, @sample, TestHelper.new, {})
+    end
+
+    it do
+      @fr.write_error(:text)
+
+      p @fr.remnant
+      expect(@fr.remnant).to have_tag('li.error', count: 11)
+    end
+
+    it do
+      @fr.text_field(:text)
+
+      expect(@fr.remnant).to have_tag('li.error', count: 11)
+    end
+  end
+
   context 'with label expanded' do
     let(:label_and_value) do
       %w(label_name value_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yorisoi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - mmmpa
@@ -173,6 +173,7 @@ files:
 - spec/dummy/app/models/sample.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/samples/new.html.erb
+- spec/dummy/app/views/samples/remnant.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -217,6 +218,7 @@ files:
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/supports/active_model.rb
+- yorisoi-0.0.1.gem
 - yorisoi.gemspec
 homepage: http://mmmpa.net/
 licenses: