win32-clipboard 0.4.3 → 0.4.4

data/CHANGES

@@ -1,3 +1,10 @@
+== 0.4.4 - 26-Aug-2008
+* Some internal refactoring to ensure that the clipboard is closed on failure
+  in a more robust fashion.
+* Renamed the test file.
+* Eliminated the custom memcpy function, since windows-pr now does the right
+  thing. This necessitated bumping the minimum required windows-pr version.
+
 == 0.4.3 - 25-Jul-2007
 * Changed ClipboardError to Clipboard::Error
 * Added a Rakefile with tasks for testing and installation.

data/MANIFEST

@@ -5,4 +5,4 @@
 * win32-clipboard.gemspec
 * examples/clipboard_test.rb
 * lib/win32/clipboard.rb
-* test/tc_clipboard.rb
+* test/test_clipboard.rb

data/README

@@ -1,5 +1,5 @@
 == Description
-   win32-clipboard - a Ruby package for interacting with the Win32 clipboard.
+   win32-clipboard - a Ruby library for interacting with the Win32 clipboard.
 
 == Installation
    rake test (optional)
@@ -26,6 +26,8 @@ Clipboard.data(format=nil)
    specified, it will attempt to retrieve the data in that format. The
    default is Clipboard::TEXT.  See the 'Constants' section for
    the supported formats.
+   
+   If there is no data in the clipboard, then an empty string is returned.
     
    Note that this method does implicit conversions on formats with regards
    to text data.  See the MSDN documentation for more details.
@@ -93,8 +95,7 @@ Clipboard::TEXT
     
 Clipboard::UNICODETEXT
    Unicode text format. Each line ends with a carriage return/linefeed
-   (CR-LF) combination. A null character signals the end of the data.  This
-   format is only supported on NT/2000/XP.
+   (CR-LF) combination. A null character signals the end of the data.
     
 == Future Plans
    Add more formatting option contants and related methods.
@@ -103,10 +104,9 @@ Clipboard::UNICODETEXT
    Ruby's
     
 == Copyright
-   (C) 2003-2007 Daniel J. Berger
+   (C) 2003-2008 Daniel J. Berger
    All Rights Reserved
     
-== Author
+== Authors
    Daniel J. Berger
-   djberg96 at nospame gmail dot com
-   imperator on IRC (irc.freenode.org)
+   Park Heesob

data/Rakefile

@@ -16,7 +16,6 @@ task :install_gem do
 end
 
 Rake::TestTask.new do |t|
-   t.libs << 'lib'
    t.warning = true
-   t.test_files = FileList['test/tc*']
+   t.verbose = true
 end

data/lib/win32/clipboard.rb

@@ -1,6 +1,7 @@
 require 'windows/clipboard'
 require 'windows/memory'
 require 'windows/error'
+require 'windows/msvcrt/buffer'
 
 module Win32
    class Clipboard
@@ -9,21 +10,20 @@ module Win32
       include Windows::Clipboard
       include Windows::Memory
       include Windows::Error
+      include Windows::MSVCRT::Buffer
+
       extend Windows::Clipboard
       extend Windows::Memory
       extend Windows::Error
+      extend Windows::MSVCRT::Buffer
       
-      VERSION = '0.4.3'
+      VERSION = '0.4.4'
       
       # Clipboard data types
       TEXT        = CF_TEXT
       OEMTEXT     = CF_OEMTEXT
       UNICODETEXT = CF_UNICODETEXT
 
-      # We'll use a custom definition of memcpy since this is different than
-      # what's in the Windows::MSVCRT::Buffer module.
-      @@Memcpy = Win32API.new('msvcrt',  'memcpy', 'IPI', 'I')
-
       # Sets the clipboard contents to the data that you specify.  You may
       # optionally specify a clipboard format.  The default is Clipboard::TEXT.
       # 
@@ -40,34 +40,35 @@ module Win32
          # Global Allocate a movable piece of memory.
          hmem = GlobalAlloc(GHND, clip_data.length + 4)
          mem  = GlobalLock(hmem)
-         @@Memcpy.call(mem, clip_data, clip_data.length)
+         memcpy(mem, clip_data, clip_data.length)
 
          # Set the new data
-         if SetClipboardData(format, hmem) == 0
-            error = get_last_error
+         begin
+            if SetClipboardData(format, hmem) == 0
+               raise Error, "SetClipboardData() failed: " + get_last_error
+            end
+         ensure
             GlobalFree(hmem)
             self.close
-            raise Error, "SetClipboardData() failed: #{error}"
          end
 
-         GlobalFree(hmem)   
-         self.close
          self
       end 		
 
-      # Returns the data currently in the clipboard.  If +format+ is
+      # Returns the data currently in the clipboard. If +format+ is
       # specified, it will attempt to retrieve the data in that format. The
       # default is Clipboard::TEXT.
+      #
+      # If there is no data in the clipboard then an empty string is returned.
       # 
       def self.data(format = TEXT)
-         clipdata = ""
-         self.open
          begin
-            clipdata = GetClipboardData(format)
-         rescue ArgumentError
-            # Assume failure is caused by no data in clipboard
+            self.open
+            clipdata = GetClipboardData(format) || ""
+         ensure
+            self.close
          end
-         self.close
+
          clipdata
       end
       
@@ -80,9 +81,13 @@ module Win32
       # Empties the contents of the clipboard.
       # 
       def self.empty
-         self.open
-         EmptyClipboard()
-         self.close
+         begin
+            self.open
+            EmptyClipboard()
+         ensure
+            self.close
+         end
+
          self
       end
 
@@ -91,9 +96,14 @@ module Win32
       # 
       def self.num_formats
          count = 0
-         self.open
-         count = CountClipboardFormats()
-         self.close
+
+         begin
+            self.open
+            count = CountClipboardFormats()
+         ensure
+            self.close
+         end
+
          count
       end
       
@@ -104,17 +114,22 @@ module Win32
       end
       
       # Returns the corresponding name for the given +format_num+, or nil
-      # if it does not exist.  You cannot specify any of the predefined
+      # if it does not exist. You cannot specify any of the predefined
       # clipboard formats (or nil is returned), only registered formats.
       # 
       def self.format_name(format_num)
          val = nil
          buf = 0.chr * 80
-         self.open
-         if GetClipboardFormatName(format_num, buf, buf.length) != 0
-            val = buf
+
+         begin
+            self.open
+            if GetClipboardFormatName(format_num, buf, buf.length) != 0
+               val = buf
+            end
+         ensure
+            self.close
          end
-         self.close
+
          val.split(0.chr).first rescue nil
       end
       
@@ -125,13 +140,17 @@ module Win32
          formats = {}
          format = 0
          
-         self.open
-         while 0 != (format = EnumClipboardFormats(format))
-            buf = 0.chr * 80
-            GetClipboardFormatName(format, buf, buf.length)
-            formats[format] = buf.split(0.chr).first
+         begin
+            self.open
+            while 0 != (format = EnumClipboardFormats(format))
+               buf = 0.chr * 80
+               GetClipboardFormatName(format, buf, buf.length)
+               formats[format] = buf.split(0.chr).first
+            end
+         ensure
+            self.close
          end
-         self.close
+
          formats
       end
       

data/test/{tc_clipboard.rb → test_clipboard.rb}

@@ -1,8 +1,8 @@
 ###########################################################################
-# tc_clipboard.rb
+# test_clipboard.rb
 #
-# Test suite for the win32-clipboard package.  This will copy and remove
-# data from your clipboard.  If your current clipboard data is crucial to
+# Test suite for the win32-clipboard library.  This will copy and remove
+# data from your clipboard. If your current clipboard data is crucial to
 # you, please save it first.
 #
 # You should run this test case via the 'rake test' task.
@@ -11,9 +11,9 @@ require 'win32/clipboard'
 require 'test/unit'
 include Win32
 
-class TC_Win32ClipBoard < Test::Unit::TestCase  
+class TC_Win32_ClipBoard < Test::Unit::TestCase  
    def test_version
-      assert_equal('0.4.3', Clipboard::VERSION)
+      assert_equal('0.4.4', Clipboard::VERSION)
    end
      
    def test_data
@@ -23,12 +23,9 @@ class TC_Win32ClipBoard < Test::Unit::TestCase
       assert_raises(NameError){ Clipboard.data(CF_FOO) }
    end
    
-   # Alias
-   def test_get_data
+   def test_get_data_alias
       assert_respond_to(Clipboard, :get_data)
-      assert_nothing_raised{ Clipboard.get_data }     
-      assert_kind_of(String, Clipboard.get_data, 'bad data type')
-      assert_raises(NameError){ Clipboard.get_data(CF_FOO) }
+      assert_equal(true, Clipboard.method(:data) == Clipboard.method(:get_data))
    end
    
    def test_set_data

data/win32-clipboard.gemspec

@@ -2,19 +2,18 @@ require "rubygems"
 
 spec = Gem::Specification.new do |gem|
 	gem.name         = "win32-clipboard"
-	gem.version      = "0.4.3"
-	gem.author       = "Daniel J. Berger"
+	gem.version      = "0.4.4"
+	gem.authors      = ["Daniel J. Berger", "Park Heesob"]
 	gem.email        = "djberg96@gmail.com"
 	gem.homepage     = "http://www.rubyforge.org/projects/win32utils"
 	gem.platform     = Gem::Platform::RUBY
-	gem.summary      = "A package for interacting with the Windows clipboard"
-	gem.description  = "A package for interacting with the Windows clipboard"
-	gem.test_file    = "test/tc_clipboard.rb"
+	gem.summary      = "A library for interacting with the Windows clipboard"
+	gem.description  = "A library for interacting with the Windows clipboard"
+	gem.test_file    = "test/test_clipboard.rb"
 	gem.has_rdoc     = true
-	gem.require_path = "lib"
 	gem.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST']
 	gem.rubyforge_project = "win32utils"
-	gem.add_dependency("windows-pr", ">= 0.4.1")
+	gem.add_dependency("windows-pr", ">= 0.8.1")
 	
 	files = Dir["doc/*"] + Dir["examples/*"] + Dir["lib/win32/*"]
 	files += Dir["test/*"] + Dir["[A-Z]*"]

metadata

@@ -1,37 +1,42 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: win32-clipboard
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
-date: 2007-07-25 00:00:00 -06:00
-summary: A package for interacting with the Windows clipboard
-require_paths: 
-- lib
-email: djberg96@gmail.com
-homepage: http://www.rubyforge.org/projects/win32utils
-rubyforge_project: win32utils
-description: A package for interacting with the Windows clipboard
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.4.4
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Daniel J. Berger
+- Park Heesob
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-08-26 00:00:00 -06:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: windows-pr
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.8.1
+    version: 
+description: A library for interacting with the Windows clipboard
+email: djberg96@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- CHANGES
+- README
+- MANIFEST
 files: 
 - examples/clipboard_test.rb
 - lib/win32/clipboard.rb
-- test/tc_clipboard.rb
+- test/test_clipboard.rb
 - CHANGES
 - examples
 - lib
@@ -40,27 +45,31 @@ files:
 - README
 - test
 - win32-clipboard.gemspec
-test_files: 
-- test/tc_clipboard.rb
+has_rdoc: true
+homepage: http://www.rubyforge.org/projects/win32utils
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- CHANGES
-- README
-- MANIFEST
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: windows-pr
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.4.1
-    version: 
+rubyforge_project: win32utils
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: A library for interacting with the Windows clipboard
+test_files: 
+- test/test_clipboard.rb