formkeeper-japanese 0.0.1 → 0.0.2

data/Gemfile

@@ -6,7 +6,7 @@ gemspec
 gem "hpricot"
 gem "rack"
 gem "moji"
-gem "formkeeper", "~> 0.0.4"
+gem "formkeeper", "~> 0.0.12"
 
 group :development, :test do
   gem "rspec"

data/README.md

@@ -1,6 +1,6 @@
 # FormKeeper::Japanese
 
-TODO: Write a gem description
+This provides Japanese specific filters and constraints for formkeeper
 
 ## Installation
 
@@ -18,7 +18,40 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+### Synopsis
+
+In your sinatra application with sinatra-formkeeper
+
+```ruby
+require 'sinatra/formkeeper'
+require 'formkeeper/japanese'
+
+post '/entry' do
+  form do
+    field :yomigana, :present => true, :katakana => true, :length => 0..16 :filters => [:hiragana_to_katakana]
+    field :tel, :present => true, :int => true, :filters => [:zenkaku_to_hankaku]
+  end
+end
+
+```
+
+### Filters
+
+* zenkaku_to_hankaku
+* hankaku_to_zenkaku
+* hiragana_to_katakana
+* katakana_to_hiragana
+
+### Constraints
+
+* kana
+* hiragana
+* katakana
+
+## See Also
+
+* https://github.com/lyokato/formkeeper
+* https://github.com/lyokato/sinatra-formkeeper
 
 ## Contributing
 

data/lib/formkeeper/japanese.rb

@@ -4,6 +4,7 @@ require "moji"
 module FormKeeper
   module Japanese
     module Filter
+
       class ZenkakuToHankaku < ::FormKeeper::Filter::Base
         def process(value)
           Moji.zen_to_han(value)
@@ -28,7 +29,6 @@ module FormKeeper
     module Constraint
       class Kana < FormKeeper::Constraint::Base
         def validate(value, arg)
-          # TODO support ZENKAKU/HANKAKU KIGOU \p{Punct}
           result = value =~ /^#{Moji.kana}+$/
           result = !result if !arg
           result
@@ -36,7 +36,6 @@ module FormKeeper
       end
       class Hiragana < FormKeeper::Constraint::Base
         def validate(value, arg)
-          # TODO support ZENKAKU/HANKAKU KIGOU \p{Punct}
           result = value =~ /^#{Moji.hira}+$/
           result = !result if !arg
           result
@@ -44,7 +43,6 @@ module FormKeeper
       end
       class Katakana < FormKeeper::Constraint::Base
         def validate(value, arg)
-          # TODO support ZENKAKU/HANKAKU KIGOU
           result = value =~ /^#{Moji.kata}+$/
           result = !result if !arg
           result
@@ -54,13 +52,13 @@ module FormKeeper
   end
 end
 
-FormKeeper::Validator.register_filter :hiragana2katakana, 
+FormKeeper::Validator.register_filter :hiragana_to_katakana, 
   FormKeeper::Japanese::Filter::HiraToKata.new
-FormKeeper::Validator.register_filter :katakana2hiragana, 
+FormKeeper::Validator.register_filter :katakana_to_hiragana, 
   FormKeeper::Japanese::Filter::KataToHira.new
-FormKeeper::Validator.register_filter :hankaku2zenkaku, 
+FormKeeper::Validator.register_filter :hankaku_to_zenkaku, 
   FormKeeper::Japanese::Filter::HankakuToZenkaku.new
-FormKeeper::Validator.register_filter :zenkaku2hankaku, 
+FormKeeper::Validator.register_filter :zenkaku_to_hankaku, 
   FormKeeper::Japanese::Filter::ZenkakuToHankaku.new
 FormKeeper::Validator.register_constraint :kana, 
   FormKeeper::Japanese::Constraint::Kana.new

data/lib/formkeeper/japanese/version.rb

@@ -1,5 +1,5 @@
 module FormKeeper
   module Japanese
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/validator_spec.rb

@@ -7,7 +7,7 @@ describe FormKeeper::Japanese do
 
     rule = FormKeeper::Rule.new
     rule.filters :strip
-    rule.field :nickname, :present => true, :kana => true, :characters => 4..8
+    rule.field :nickname, :present => true, :kana => true, :length => 4..8
 
     params = {}
     params['nickname'] = 'ほげほげ'
@@ -24,8 +24,8 @@ describe FormKeeper::Japanese do
   it "validates hiragana with katakana filter" do
 
     rule = FormKeeper::Rule.new
-    rule.filters :hiragana2katakana
-    rule.field :nickname, :present => true, :kana => true, :characters => 4..8
+    rule.filters :hiragana_to_katakana
+    rule.field :nickname, :present => true, :kana => true, :length => 4..8
 
     params = {}
     params['nickname'] = 'ほげほげ'
@@ -39,11 +39,57 @@ describe FormKeeper::Japanese do
 
   end
 
+  it "validates katakana with hiragana filter" do
+
+    rule = FormKeeper::Rule.new
+    rule.filters :katakana_to_hiragana
+    rule.field :nickname, :present => true, :kana => true, :length => 4..8
+
+    params = {}
+    params['nickname'] = 'ホゲホゲ'
+
+    validator = FormKeeper::Validator.new
+    report = validator.validate(params, rule)
+
+    report.failed?.should_not be_true
+
+    report[:nickname].should == 'ほげほげ'
+
+  end
+
+  it "validates valid kana filter" do
+
+    rule = FormKeeper::Rule.new
+    rule.field :value01, :present => true, :hiragana => true, :length => 4..8
+    rule.field :value02, :present => true, :hiragana => true, :length => 4..8
+    rule.field :value03, :present => true, :katakana => true, :length => 4..8
+    rule.field :value04, :present => true, :katakana => true, :length => 4..8
+
+    params = {}
+    params['value01'] = 'ほげほげ'
+    params['value02'] = 'ホゲホゲ'
+    params['value03'] = 'ほげほげ'
+    params['value04'] = 'ホゲホゲ'
+
+    validator = FormKeeper::Validator.new
+    report = validator.validate(params, rule)
+
+    report.failed?.should be_true
+
+    report.failed_on?(:value02, :hiragana).should be_true
+    report.failed_on?(:value03, :katakana).should be_true
+
+    report[:value01].should == 'ほげほげ'
+    report[:value04].should == 'ホゲホゲ'
+
+  end
+
+
   it "validates invalid length of hiragana" do
 
     rule = FormKeeper::Rule.new
-    rule.filters :hiragana2katakana
-    rule.field :nickname, :present => true, :kana => true, :characters => 4..8
+    rule.filters :hiragana_to_katakana
+    rule.field :nickname, :present => true, :kana => true, :length => 4..8
 
     params = {}
     params['nickname'] = 'ほげ'
@@ -53,14 +99,14 @@ describe FormKeeper::Japanese do
 
     report.failed?.should be_true
 
-    report.failed_on?(:nickname, :characters).should be_true
+    report.failed_on?(:nickname, :length).should be_true
 
   end
 
   it "validates zenkaku integer" do
 
     rule = FormKeeper::Rule.new
-    rule.filters :zenkaku2hankaku
+    rule.filters :zenkaku_to_hankaku
     rule.field :nickname, :present => true, :int => true
 
     params = {}
@@ -75,5 +121,23 @@ describe FormKeeper::Japanese do
 
   end
 
+  it "validates hankaku integer" do
+
+    rule = FormKeeper::Rule.new
+    rule.filters :hankaku_to_zenkaku
+    rule.field :nickname, :present => true, :int => true
+
+    params = {}
+    params['nickname'] = '123456789'
+
+    validator = FormKeeper::Validator.new
+    report = validator.validate(params, rule)
+
+    report.failed?.should_not be_true
+
+    report[:nickname].should == '１２３４５６７８９'
+
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formkeeper-japanese
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies: []
 description: formkeeper's plugin for japanese specific filters and validators
 email:
@@ -41,12 +41,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -519163813347447336
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -519163813347447336
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24