jpmobile 0.1.4 → 0.1.5

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 4
+:patch: 5
 :build: 

data/lib/jpmobile/util.rb

@@ -10,11 +10,12 @@ module Jpmobile
         end
       when Array
         obj.collect!{|value| deep_apply(value, &proc)}
-      when NilClass, TrueClass, FalseClass, Tempfile, StringIO
-        return obj
-      else
+      when String
         obj = obj.to_param if obj.respond_to?(:to_param)
         proc.call(obj)
+      else
+        # NilClass, TrueClass, FalseClass, Tempfile, StringIO, etc...
+        return obj
       end
     end
 
@@ -32,11 +33,12 @@ module Jpmobile
         end
       when Symbol
         new_obj = proc.call(obj.to_s).to_sym
-      when NilClass, TrueClass, FalseClass, Tempfile, StringIO
-        new_obj = obj
-      else
+      when String
         obj = obj.to_param if obj.respond_to?(:to_param)
         new_obj = proc.call(obj)
+      else
+        # NilClass, TrueClass, FalseClass, Tempfile, StringIO, etc...
+        new_obj = obj
       end
 
       new_obj
@@ -67,7 +69,7 @@ module Jpmobile
       if utf8_str.respond_to?(:encode)
         utf8_str.encode("Shift_JIS", :crlf_newline => true)
       else
-        NKF.nkf("-m0 -x -Ws", utf8_str).gsub(/\n/, "\r\n")
+        NKF.nkf("-m0 -x -W --oc=cp932", utf8_str).gsub(/\n/, "\r\n")
       end
     end
 
@@ -75,7 +77,7 @@ module Jpmobile
       if sjis_str.respond_to?(:encode)
         sjis_str.encode("UTF-8", :universal_newline => true)
       else
-        NKF.nkf("-m0 -x -Sw", sjis_str).gsub(/\r\n/, "\n")
+        NKF.nkf("-m0 -x -w --ic=cp932", sjis_str).gsub(/\r\n/, "\n")
       end
     end
 

data/spec/unit/util_spec.rb

@@ -4,31 +4,41 @@ require 'nkf'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe Jpmobile::Util, ".deep_apply" do
+  include Jpmobile::Util
+
   it 'nilのときはnilを返すこと' do
-    Jpmobile::Util.deep_apply(nil) {|obj| obj }.should equal(nil)
+    deep_apply(nil) {|obj| obj }.should equal(nil)
   end
 
   it 'trueのときはtrueを返すこと' do
-    Jpmobile::Util.deep_apply(true) {|obj| obj }.should equal(true)
+    deep_apply(true) {|obj| obj }.should equal(true)
   end
 
   it 'falseのときはそのまま値を返すこと' do
-    Jpmobile::Util.deep_apply(false) {|obj| obj }.should equal(false)
+    deep_apply(false) {|obj| obj }.should equal(false)
   end
 
   it 'Tempfileのインスタンスのときはそのまま値を返すこと' do
     temp = Tempfile.new('test')
-    Jpmobile::Util.deep_apply(temp) {|obj| obj}.object_id.should equal(temp.object_id)
-    # 本来 Jpmobile::Util.deep_apply(temp) {|obj| obj }.should equal(temp) が通るべきのような。
+    deep_apply(temp) {|obj| obj}.object_id.should equal(temp.object_id)
+    # 本来 deep_apply(temp) {|obj| obj }.should equal(temp) が通るべきのような。
     # 参考 http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-list/41720
   end
 
   it 'StringIOのインスタンスのときはそのまま値を返すこと' do
     string_io = StringIO.new('test')
-    Jpmobile::Util.deep_apply(string_io) {|obj| obj }.should equal(string_io)
+    deep_apply(string_io) {|obj| obj }.should equal(string_io)
   end
 
   it "utf8_to_sjis で改行コードが CRLF に変更されること" do
-    Jpmobile::Util.utf8_to_sjis("UTF8\nTEXT\n").should == Jpmobile::Util.sjis("UTF8\r\nTEXT\r\n")
+    utf8_to_sjis("UTF8\nTEXT\n").should == sjis("UTF8\r\nTEXT\r\n")
+  end
+
+  it "0x8150がU+FFE3に変換されること" do
+    sjis_to_utf8(sjis("\x81\x50")).should == [0xffe3].pack("U")
+  end
+
+  it "U+FFE3が0x8150に変換されること" do
+    utf8_to_sjis([0xffe3].pack("U")).should == sjis("\x81\x50")
   end
 end

data/test/rails/rails_root/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-RailsRoot::Application.config.secret_token = 'ddd89a5d8777a00430608bc36c9108b2b8c2bc7fa2c15270971d1535d01ac7f267227f4003bd3d2e251bec7f1c32b2bec39d7919e25fb7225962e499b9c38793'
+RailsRoot::Application.config.secret_token = '48ba9ac780d58f5ec08701d73d252900c9e2d89cbcc0107da56f8aa2add56a3a5849505e5408e58fa9228118f85ff9ca214ce19f4c2fe2b2a696abcc44e3ec65'

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/util.rb

@@ -67,7 +67,7 @@ module Jpmobile
       if utf8_str.respond_to?(:encode)
         utf8_str.encode("Shift_JIS", :crlf_newline => true)
       else
-        NKF.nkf("-m0 -x -Ws", utf8_str).gsub(/\n/, "\r\n")
+        NKF.nkf("-m0 -x -W --oc=cp932", utf8_str).gsub(/\n/, "\r\n")
       end
     end
 
@@ -75,7 +75,7 @@ module Jpmobile
       if sjis_str.respond_to?(:encode)
         sjis_str.encode("UTF-8", :universal_newline => true)
       else
-        NKF.nkf("-m0 -x -Sw", sjis_str).gsub(/\r\n/, "\n")
+        NKF.nkf("-m0 -x -w --ic=cp932", sjis_str).gsub(/\r\n/, "\n")
       end
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Yoji Shidara
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 +09:00
+date: 2011-01-20 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency