need_label 0.1.0 → 0.2.1

data/README.rdoc

@@ -3,6 +3,21 @@
 Need_label outputs a class attribute to the indispensable input item of rails.
 An indispensable input can be expressed by combining with css.
 
+= How to use
+
+(1) Add your Gemfile.
+  gem "need_label"
+
+(2) Add validation on your model.
+  class User < ActiveRecord::Base
+    validates :name, :presence => true
+  end
+
+(3) Add css. (Example)
+  label.need-label{
+    border-bottom: inset 2px red;
+  }
+
 == Copyright
 
 Copyright (c) 2011 Yamamoto Kazuhisa. See LICENSE.txt for

data/Rakefile

@@ -1,49 +1 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "need_label"
-  gem.homepage = "http://github.com/kazuhisa/need_label"
-  gem.license = "MIT"
-  gem.summary = "output need-label"
-  gem.description = "A class is outputted about an indispensable input item."
-  gem.email = "ak.hisashi@gmail.com"
-  gem.authors = ["Yamamoto Kazuhisa"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "need_label #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'bundler/gem_tasks'

data/lib/need_label/helpers.rb

@@ -12,13 +12,26 @@ module ActionView
         end
         need = false if options.class == Hash && options[:need_label] == false
         if need && object.present? && object.class.respond_to?(:validators)
-          need_attributes = object.class.validators.
-              select{|e| e.is_a? ActiveModel::Validations::PresenceValidator}.map{|e| e.attributes[0]}
+          need_attributes = []
+          object.class.validators.each do |validator|
+            if validator.is_a? ActiveModel::Validations::PresenceValidator
+              if validator.options[:if].nil?
+                need_attributes << validator
+              else
+                if validator.options[:if].is_a? Proc
+                  need_attributes << validator if object.instance_eval(&validator.options[:if])
+                elsif validator.options[:if].is_a? String
+                  need_attributes << validator if object.instance_eval(&eval("proc{#{validator.options[:if]}}"))
+                end
+              end
+            end
+          end
+          need_attributes.map!{|e| e.attributes[0]}
           if need_attributes.index(method.to_sym)
             if content_or_options.present? && content_or_options.class == Hash && content_or_options[:class].present?
-              content_or_options[:class] = content_or_options[:class] + " need-label"
+              content_or_options[:class] = content_or_options[:class] + ' need-label'
             else
-              options[:class] = "need-label"
+              options[:class] = 'need-label'
             end
           end
         end

data/lib/need_label/version.rb

@@ -0,0 +1,3 @@
+module NeedLabel
+  VERSION = '0.2.1'
+end

data/lib/need_label.rb

@@ -1,3 +1,2 @@
-# -*- coding: utf-8 -*-
-
+require 'need_label/version'
 require 'need_label/helpers'

data/need_label.gemspec

@@ -1,77 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'need_label/version'
 
 Gem::Specification.new do |s|
-  s.name = %q{need_label}
-  s.version = "0.1.0"
+  s.name          = 'need_label'
+  s.version       = NeedLabel::VERSION
+  s.authors       = ['Yamamoto Kazuhisa']
+  s.email         = ['ak.hisashi@gmail.com']
+  s.description   = %q{A class is outputted about an indispensable input item.}
+  s.summary       = %q{A class is outputted about an indispensable input item.}
+  s.homepage      = 'https://github.com/kazuhisa/need_label'
+  s.license       = 'MIT'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Yamamoto Kazuhisa}]
-  s.date = %q{2011-10-31}
-  s.description = %q{A class is outputted about an indispensable input item.}
-  s.email = %q{ak.hisashi@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/need_label.rb",
-    "lib/need_label/helpers.rb",
-    "need_label.gemspec",
-    "spec/fake_app.rb",
-    "spec/requests/need_label_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/kazuhisa/need_label}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{output need-label}
+  s.files         = `git ls-files`.split($/)
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ['lib']
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.7"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.7.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>, ["~> 1.3.0"])
-      s.add_development_dependency(%q<rspec-rails>, ["~> 2.7.0"])
-      s.add_development_dependency(%q<capybara>, ["~> 1.1.0"])
-      s.add_development_dependency(%q<nokogiri>, ["~> 1.5.0"])
-    else
-      s.add_dependency(%q<rails>, [">= 3.0.7"])
-      s.add_dependency(%q<rspec>, ["~> 2.7.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, ["~> 1.3.0"])
-      s.add_dependency(%q<rspec-rails>, ["~> 2.7.0"])
-      s.add_dependency(%q<capybara>, ["~> 1.1.0"])
-      s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
-    end
-  else
-    s.add_dependency(%q<rails>, [">= 3.0.7"])
-    s.add_dependency(%q<rspec>, ["~> 2.7.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, ["~> 1.3.0"])
-    s.add_dependency(%q<rspec-rails>, ["~> 2.7.0"])
-    s.add_dependency(%q<capybara>, ["~> 1.1.0"])
-    s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
-  end
+  s.add_development_dependency 'bundler', '~> 1.3'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec', '~> 2.13'
+  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'sqlite3', '~> 1.3.0'
+  s.add_development_dependency 'capybara','~> 1.1'
+  s.add_development_dependency 'rr'
+  s.add_dependency 'rails', '>= 3.0.7'
 end
 

data/spec/fake_app.rb

@@ -10,14 +10,16 @@ ActiveRecord::Base.establish_connection('test')
 
 # config
 app = Class.new(Rails::Application)
-app.config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
-app.config.session_store :cookie_store, :key => "_myapp_session"
+app.config.secret_token = '3b7cd727ee24e8444053437c36cc66c4'
+app.config.session_store :cookie_store, :key => '_myapp_session'
 app.config.active_support.deprecation = :log
 app.initialize!
 
 # routes
 app.routes.draw do
   resources :users
+  resources :user_with_procs
+  resources :user_with_strings
 end
 
 # models
@@ -25,6 +27,14 @@ class User < ActiveRecord::Base
   validates :name, :presence => true
 end
 
+class UserWithProc < ActiveRecord::Base
+  validates :name, :presence => true, :if => proc{self.age > 20}
+end
+
+class UserWithString < ActiveRecord::Base
+  validates :name, :presence => true, :if => 'self.age > 20'
+end
+
 # controllers
 class ApplicationController < ActionController::Base; end
 
@@ -35,5 +45,7 @@ Object.const_set(:ApplicationHelper, Module.new)
 class CreateAllTables < ActiveRecord::Migration
   def self.up
     create_table(:users) {|t| t.string :name; t.integer :age}
+    create_table(:user_with_procs) {|t| t.string :name; t.integer :age}
+    create_table(:user_with_strings) {|t| t.string :name; t.integer :age}
   end
 end

data/spec/requests/need_label_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe "output need-label class" do
-  describe "instance variable type without options" do
+describe 'need-label is outputted to class.' do
+  describe 'instance variable parameter without options' do
     before do
       class UsersController < ApplicationController
         def new
@@ -17,21 +17,17 @@ describe "output need-label class" do
           ERB
         end
       end
-      visit "/users/new"
+      visit '/users/new'
     end
-    it "It checks that need-label is outputted." do
-      doc = Nokogiri::HTML(page.html)
-      label = doc.xpath("//label[@for='user_name']")
-      label[0]["class"].should == "need-label"
+    it 'It checks that need-label is outputted.' do
+      page.has_xpath?("//label[@for='user_name'][@class='need-label']").should be_true
     end
-    it "It checks that need-label is not outputted." do
-      doc = Nokogiri::HTML(page.html)
-      label = doc.xpath("//label[@for='user_age']")
-      label[0]["class"].should be_nil
+    it 'It checks that need-label is not outputted.' do
+      page.has_xpath?("//label[@for='user_age'][not(@class)]").should be_true
     end
   end
   
-  describe "symbol type without options" do
+  describe 'symbol parameter without options' do
     before do
       class UsersController < ApplicationController
         def new
@@ -47,21 +43,17 @@ describe "output need-label class" do
           ERB
         end
       end
-      visit "/users/new"
+      visit '/users/new'
     end
-    it "It checks that need-label is outputted." do
-      doc = Nokogiri::HTML(page.html)
-      label = doc.xpath("//label[@for='user_name']")
-      label[0]["class"].should == "need-label"
+    it 'It checks that need-label is outputted.' do
+      page.has_xpath?("//label[@for='user_name'][@class='need-label']").should be_true
     end
-    it "It checks that need-label is not outputted." do
-      doc = Nokogiri::HTML(page.html)
-      label = doc.xpath("//label[@for='user_age']")
-      label[0]["class"].should be_nil
+    it 'It checks that need-label is not outputted.' do
+      page.has_xpath?("//label[@for='user_age'][not(@class)]").should be_true
     end
   end
 
-  describe "instance variable type with hidden option" do
+  describe 'hidden option' do
     before do
       class UsersController < ApplicationController
         def new
@@ -77,51 +69,17 @@ describe "output need-label class" do
           ERB
         end
       end
-      visit "/users/new"
+      visit '/users/new'
     end
-    it "It checks that need-label is outputted." do
-      doc = Nokogiri::HTML(page.html)
-      label = doc.xpath("//label[@for='user_name']")
-      label[0]["class"].should be_nil
+    it 'It checks that need-label is outputted.' do
+      page.has_no_xpath?("//label[@for='user_name'][@class='need-label']").should be_true
     end
-    it "It checks that need-label is not outputted." do
-      doc = Nokogiri::HTML(page.html)
-      label = doc.xpath("//label[@for='user_age']")
-      label[0]["class"].should be_nil
+    it 'It checks that need-label is not outputted.' do
+      page.has_xpath?("//label[@for='user_age'][not(@class)]").should be_true
     end
   end
 
-  describe "symbol type with hidden option" do
-    before do
-      class UsersController < ApplicationController
-        def new
-          @user = User.new
-          render :inline => <<-ERB
-          <%= form_for :user do |f| %>
-            <%= f.label :name, :need_label => false %>
-            <%= f.text_field :name %>
-            <%= f.label :age %>
-            <%= f.text_field :age %>
-            <%= f.submit "save" %>
-          <% end %>
-          ERB
-        end
-      end
-      visit "/users/new"
-    end
-    it "It checks that need-label is outputted." do
-      doc = Nokogiri::HTML(page.html)
-      label = doc.xpath("//label[@for='user_name']")
-      label[0]["class"].should be_nil
-    end
-    it "It checks that need-label is not outputted." do
-      doc = Nokogiri::HTML(page.html)
-      label = doc.xpath("//label[@for='user_age']")
-      label[0]["class"].should be_nil
-    end
-  end
-
-  describe "instance variable type with class" do
+  describe 'specifies a class name' do
     before do
       class UsersController < ApplicationController
         def new
@@ -137,28 +95,24 @@ describe "output need-label class" do
           ERB
         end
       end
-      visit "/users/new"
+      visit '/users/new'
     end
-    it "It checks that need-label is outputted." do
-      doc = Nokogiri::HTML(page.html)
-      label = doc.xpath("//label[@for='user_name']")
-      label[0]["class"].should == "foo need-label"
+    it 'It checks that need-label is outputted.' do
+      page.has_xpath?("//label[@for='user_name'][@class='foo need-label']").should be_true
     end
-    it "It checks that need-label is not outputted." do
-      doc = Nokogiri::HTML(page.html)
-      label = doc.xpath("//label[@for='user_age']")
-      label[0]["class"].should be_nil
+    it 'It checks that need-label is not outputted.' do
+      page.has_xpath?("//label[@for='user_age'][not(@class)]").should be_true
     end
   end
 
-  describe "symbol type with class" do
+  describe 'specifies a class and hidden options.' do
     before do
       class UsersController < ApplicationController
         def new
           @user = User.new
           render :inline => <<-ERB
-          <%= form_for :user do |f| %>
-            <%= f.label :name, :class => "foo" %>
+          <%= form_for @user do |f| %>
+            <%= f.label :name, :class => "foo", :need_label => false %>
             <%= f.text_field :name %>
             <%= f.label :age %>
             <%= f.text_field :age %>
@@ -167,28 +121,24 @@ describe "output need-label class" do
           ERB
         end
       end
-      visit "/users/new"
+      visit '/users/new'
     end
-    it "It checks that need-label is outputted." do
-      doc = Nokogiri::HTML(page.html)
-      label = doc.xpath("//label[@for='user_name']")
-      label[0]["class"].should == "foo need-label"
+    it 'It checks that need-label is outputted.' do
+      page.has_xpath?("//label[@for='user_name'][@class='foo']").should be_true
     end
-    it "It checks that need-label is not outputted." do
-      doc = Nokogiri::HTML(page.html)
-      label = doc.xpath("//label[@for='user_age']")
-      label[0]["class"].should be_nil
+    it 'It checks that need-label is not outputted.' do
+      page.has_xpath?("//label[@for='user_age'][not(@class)]").should be_true
     end
   end
 
-  describe "instance variable type with class and hidden options" do
+  describe "proc type 'if' validate presence option added." do
     before do
-      class UsersController < ApplicationController
+      class UserWithProcsController < ApplicationController
         def new
-          @user = User.new
+          @user_with_proc = UserWithProc.new(:age => 21)
           render :inline => <<-ERB
-          <%= form_for @user do |f| %>
-            <%= f.label :name, :class => "foo", :need_label => false %>
+          <%= form_for @user_with_proc do |f| %>
+            <%= f.label :name %>
             <%= f.text_field :name %>
             <%= f.label :age %>
             <%= f.text_field :age %>
@@ -197,28 +147,21 @@ describe "output need-label class" do
           ERB
         end
       end
-      visit "/users/new"
-    end
-    it "It checks that need-label is outputted." do
-      doc = Nokogiri::HTML(page.html)
-      label = doc.xpath("//label[@for='user_name']")
-      label[0]["class"].should == "foo"
+      visit '/user_with_procs/new'
     end
-    it "It checks that need-label is not outputted." do
-      doc = Nokogiri::HTML(page.html)
-      label = doc.xpath("//label[@for='user_age']")
-      label[0]["class"].should be_nil
+    it 'It checks that need-label is outputted.' do
+      page.has_xpath?("//label[@for='user_with_proc_name'][@class='need-label']").should be_true
     end
   end
 
-  describe "symbol type with class and hidden options" do
+  describe "string type 'if' validate presence option added." do
     before do
-      class UsersController < ApplicationController
+      class UserWithStringsController < ApplicationController
         def new
-          @user = User.new
+          @user_with_string = UserWithString.new(:age => 21)
           render :inline => <<-ERB
-          <%= form_for :user do |f| %>
-            <%= f.label :name, :class => "foo", :need_label => false %>
+          <%= form_for @user_with_string do |f| %>
+            <%= f.label :name %>
             <%= f.text_field :name %>
             <%= f.label :age %>
             <%= f.text_field :age %>
@@ -227,17 +170,10 @@ describe "output need-label class" do
           ERB
         end
       end
-      visit "/users/new"
-    end
-    it "It checks that need-label is outputted." do
-      doc = Nokogiri::HTML(page.html)
-      label = doc.xpath("//label[@for='user_name']")
-      label[0]["class"].should == "foo"
+      visit '/user_with_strings/new'
     end
-    it "It checks that need-label is not outputted." do
-      doc = Nokogiri::HTML(page.html)
-      label = doc.xpath("//label[@for='user_age']")
-      label[0]["class"].should be_nil
+    it 'It checks that need-label is outputted.' do
+      page.has_xpath?("//label[@for='user_with_string_name'][@class='need-label']").should be_true
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -15,5 +15,6 @@ RSpec.configure do |config|
   config.mock_with :rr
   config.before :all do
     CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'users'
+    CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'user_with_procs'
   end
 end