clipboard 1.0.4 → 1.0.5

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 1.0.5
+* Windows 1.9 multibyte support
+
 == 1.0.4
 * Restore 1.8 Support
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clipboard (1.0.4)
+    clipboard (1.0.5)
 
 GEM
   remote: https://rubygems.org/

data/README.rdoc

@@ -43,4 +43,6 @@ Copyright (c) 2010-2013 Jan Lelis <http://happycode.org> released under the MIT
 Contributions by and thanks to
 * Michael Grosser
 
+See https://github.com/janlelis/clipboard/graphs/contributors for full list!
+
 J-_-L

data/lib/clipboard/version.rb

@@ -1,3 +1,3 @@
 module Clipboard
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/lib/clipboard/windows.rb

@@ -35,6 +35,7 @@ module Clipboard::Windows
 
     attach_function :lock,   :GlobalLock,   [ :long ], :pointer
     attach_function :unlock, :GlobalUnlock, [ :long ], :long
+    attach_function :size,   :GlobalSize,   [ :long ], :long
     attach_function :alloc,  :GlobalAlloc,  [ :long, :long ], :long
   end
 
@@ -47,16 +48,13 @@ module Clipboard::Windows
           pointer_to_data = Kernel32.lock( hclip )
           data = ""
           # Windows Unicode is ended by to null bytes, so get the whole string
-          current_byte = 0
-          until data.size >= 2 && data[-1].ord == 0 && data[-2].ord == 0
-            data << pointer_to_data.get_bytes( current_byte, 1 )
-            current_byte += 1
-          end
+          size = Kernel32.size( hclip )
+          data << pointer_to_data.get_bytes( 0, size - 2 )
           if RUBY_VERSION >= '1.9'
-            ret = data.chop.force_encoding("UTF-16LE").encode(Encoding.default_external) # TODO catch bad encodings
+            ret = data.force_encoding("UTF-16LE").encode(Encoding.default_external) # TODO catch bad encodings
           else # 1.8: fallback to simple CP850 encoding
             require 'iconv'
-            utf8 = Iconv.iconv( "UTF-8", "UTF-16LE", data.chop)[0]
+            utf8 = Iconv.iconv( "UTF-8", "UTF-16LE", data)[0]
             ret = Iconv.iconv( "CP850", "UTF-8", utf8)[0]
           end
         if data && 0 != data
@@ -80,7 +78,7 @@ module Clipboard::Windows
     if ( RUBY_VERSION >= '1.9' ) && 0 != User32.open( 0 )
       User32.empty( )
       data = data_to_copy.encode("UTF-16LE") # TODO catch bad encodings
-      data << 0 << 0
+      data << 0
       handler = Kernel32.alloc( GMEM_MOVEABLE, data.bytesize )
       pointer_to_data = Kernel32.lock( handler )
       pointer_to_data.put_bytes( 0, data, 0, data.bytesize )

data/spec/clipboard_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Please note: cannot test, if it really accesses your platform clipboard.
 
 require File.expand_path('spec/spec_helper')
@@ -18,6 +19,14 @@ describe Clipboard do
     Clipboard.paste.should == "FOO\nBAR"
   end
 
+  if RUBY_VERSION >= "1.9"
+    it "can copy & paste with multibyte char" do
+      Encoding.default_external = "utf-8"
+      Clipboard.copy("日本語")
+      Clipboard.paste.should == "日本語"
+    end
+  end
+
   it "returns data on copy" do
     Clipboard.copy('xxx').should == 'xxx'
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clipboard
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Jan Lelis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-23 00:00:00 Z
+date: 2013-04-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement