naoki 1.0.23 → 1.0.24

data/.rvmrc

@@ -1 +1 @@
-rvm --create ruby-1.9.2-p180@naoki
+rvm --create ruby-1.9.2-p290@naoki

data/lib/naoki/data_secure.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # Create a DataSecure connection for encrypting/decrypting documents.
 # All operations performed on an instance share the same session/connection.
 # NB: this class is not thread-safe.  Create an instance for each thread.
@@ -94,7 +96,7 @@ module Naoki
             @session_pointer.get_pointer(0),
             @cipherspec_pointer.get_pointer(0),
             I_T_Operation_Encrypt,
-            plain_text.length,
+            plain_text.bytesize,
             transform_data_length_pointer)
         end
       end
@@ -102,16 +104,17 @@ module Naoki
 
     def decrypt(text)
       return dummy_decrypt(text) unless live?
-      transform(I_T_Operation_Decrypt, text) do |transform_data_length_pointer|
+      decrypted_text = transform(I_T_Operation_Decrypt, text) do |transform_data_length_pointer|
         check do
           I_C_CalculateOutputSizeForKey(
             @session_pointer.get_pointer(0),
             @cipherspec_pointer.get_pointer(0),
             I_T_Operation_Decrypt,
-            text.length,
+            text.bytesize,
             transform_data_length_pointer)
         end
       end
+      decrypted_text.ascii_only? ? decrypted_text : decrypted_text.force_encoding("UTF-8")
     end
 
     private
@@ -157,7 +160,7 @@ module Naoki
         @options['initialization_vector'],
         @options['initialization_vector'].length,
         text,
-        text.length,
+        text.bytesize,
         transform_data,
         transform_data_length_pointer
       ) }

data/naoki.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "naoki"
-  s.version = "1.0.23"
+  s.version = "1.0.24"
   s.platform = Gem::Platform::RUBY
   s.homepage = ""
   s.summary = "C bindings for SafeNet DataSecure ICAPI"

data/test/test_data_secure.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'helper'
 require 'stringio'
 
@@ -25,6 +27,13 @@ class TestDataSecure < MiniTest::Unit::TestCase
     end
   end
 
+  def test_unicode
+    expected = "zézéz"
+    encrypted_data = @data_secure.encrypt(expected)
+    decrypted_data = @data_secure.decrypt(encrypted_data)
+    assert(expected == decrypted_data || "decrypted string" == decrypted_data)
+  end
+
   private
 
   def encrypt_and_decrypt(size, unencrypted)

metadata

@@ -1,39 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: naoki
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.24
   prerelease: 
-  version: 1.0.23
 platform: ruby
-authors: 
+authors:
 - Chris Apolzon
 - Liron Yahdav
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-01 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70226713560360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70226713560360
 description: C bindings for SafeNet DataSecure ICAPI
-email: 
+email:
 - apolzon@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -49,32 +45,28 @@ files:
 - test/helper.rb
 - test/test_data_secure.rb
 - validate_config.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: C bindings for SafeNet DataSecure ICAPI
 test_files: []
-