windows-api 0.1.1 → 0.2.0

data/CHANGES

@@ -1,3 +1,7 @@
+= 0.2.0 - 20-Sep-2007
+* Now requires the win32-api library.
+* Replaced class variables with class instance variables to prevent conflicts.
+
 = 0.1.1 - 25-May-2007
 * Fixed a void parameter bug.
 

data/MANIFEST

@@ -3,7 +3,5 @@
 * README
 * Rakefile
 * windows-api.gemspec
-* ext/extconf.rb
-* ext/windows/api.c
 * lib/windows/api.rb
 * test/tc_windows_api.rb

data/README

@@ -1,6 +1,6 @@
 = Description
-   This is a wrapper for Win32API that simplifies various idioms typically
-   used by people who use Win32API.
+   This is a wrapper for Win32::API that simplifies various idioms typically
+   used by people who use Win32::API.
 
 = Synopsis
    require 'windows/api'
@@ -55,7 +55,7 @@
       end
    end
 
-= Advantages over plain Win32API
+= Advantages over plain Win32::API
    * Automatic constant generation.
    * Automatic definition of ANSI and Unicode method wrappers, including
      special handling for boolean methods.

data/Rakefile

@@ -19,33 +19,6 @@ task :install_gem do
    sh "gem install #{file}"
 end
 
-desc "Clean any build files for Windows::API"
-task :clean do
-   Dir.chdir('ext') do
-      if File.exists?("api.so") || File.exists?("windows/api.so")
-         sh "nmake distclean"
-         rm "api.c" if File.exists?("api.c")
-         rm "windows/api.so" if File.exists?("windows/api.so") 
-      end
-   end
-end
-
-desc "Build Windows::API (but don't install it)"
-task :build_c => [:clean] do
-   Dir.chdir('ext') do
-      cp "windows/api.c", "."
-      sh "ruby extconf.rb"
-      sh "nmake"
-      mv "api.so", "windows"
-   end
-end
-
-Rake::TestTask.new('test_c') do |test|
-   task :test_c => [:build_c]
-   test.libs << 'ext'
-   test.test_files = FileList['test/tc*']
-end
-
 Rake::TestTask.new do |test|
    test.libs << 'lib'
    test.warning = true

data/lib/windows/api.rb

@@ -1,22 +1,22 @@
-require 'Win32API'
+require 'win32/api'
 
 module Windows
    class API
-      VERSION = '0.1.1'
+      VERSION = '0.2.0'
       
       class Error < RuntimeError; end
       
-      @@auto_constant  = false
-      @@auto_method    = false
-      @@auto_unicode   = false
-      @@auto_namespace = nil
+      @auto_constant  = false
+      @auto_method    = false
+      @auto_unicode   = false
+      @auto_namespace = nil
       
-      # Returns the value of the @@auto_constant class variable. The default
-      # is nil, i.e. none. See the Windows::API.auto_constant= documentation
-      # for more information.
+      # Returns the value of the @auto_constant class instance variable. The
+      # default is nil, i.e. none. See the Windows::API.auto_constant=
+      # documentation for more information.
       #
       def self.auto_constant
-         @@auto_constant
+         @auto_constant
       end
 
       # Automatically sets a constant to match the function name.
@@ -52,34 +52,34 @@ module Windows
       # nesting and all, I'd love to know the solution.
       #
       def self.auto_constant=(bool)
-         @@auto_constant = bool
+         @auto_constant = bool
       end
       
-      # Returns the value of the auto_namespace class variable.  Used in
-      # conjunction with API.auto_constant and/or API.auto_method.
+      # Returns the value of the auto_namespace class instance variable. Used
+      # in conjunction with API.auto_constant and/or API.auto_method.
       # 
       def self.auto_namespace
-         @@auto_namespace
+         @auto_namespace
       end
       
-      # Sets the value of the auto_namespace class variable. The default is
-      # nil, i.e. none. Use in conjunction with the auto_constant and/or
-      # auto_method class variables, this method will automatically set a
-      # constant and/or method in +namespace+ equal to the function name set
+      # Sets the value of the auto_namespace class nstance variable. The
+      # default is nil, i.e. none. Use in conjunction with the auto_constant
+      # and/or auto_method class variables, this method will automatically set
+      # a constant and/or method in +namespace+ equal to the function name set
       # in the constructor.
       # 
       # The +namespace+ must refer to an existing module, not a class.
       # 
       def self.auto_namespace=(namespace)
-         @@auto_namespace = namespace
+         @auto_namespace = namespace
       end
       
-      # Returns the value of the auto_method class variable. Used in
+      # Returns the value of the auto_method class instance variable. Used in
       # conjunction with auto_unicode.  See API.auto_method= for more
       # information.
       # 
       def self.auto_method
-         @@auto_method
+         @auto_method
       end
       
       # If this option is set to true then a corresponding method is
@@ -122,15 +122,15 @@ module Windows
       # already ends with 'A' or 'W'.
       #
       def self.auto_method=(bool)
-         @@auto_method = bool
+         @auto_method = bool
       end
       
-      # Returns the value of the auto_unicode class variable. This is used
-      # in conjunction with the auto_method and/or auto_constant class
+      # Returns the value of the auto_unicode class instance variable. This
+      # is used in conjunction with the auto_method and/or auto_constant class
       # variables. Not significant if neither of those variables are set.
       # 
       def self.auto_unicode
-         @@auto_unicode
+         @auto_unicode
       end
       
       # If set to true, and the auto_constant variable is set, then the
@@ -167,7 +167,7 @@ module Windows
       # already ends with an 'A' or 'W'.
       # 
       def self.auto_unicode=(bool)
-         @@auto_unicode = bool
+         @auto_unicode = bool
       end
 
       attr_reader :function_name
@@ -208,12 +208,7 @@ module Windows
          @boolean       = rtype == 'B' ? true : false
          
          begin
-            @api = Win32API.new(
-               @dll_name,
-               @function_name,
-               @prototype,
-               @return_type
-            )
+            @api = Win32::API.new(func, proto, rtype, dll)
          rescue RuntimeError => err
             raise Error, err
          end
@@ -222,21 +217,21 @@ module Windows
          api_w = nil
          
          # If the auto_unicode option is set, and the func is not already
-         # an explicit ANSI or Unicode function name, generate Win32API
+         # an explicit ANSI or Unicode function name, generate Win32::API
          # objects for those functions as well. Ignore errors because not
          # all functions have explicit ANSI or Unicode equivalents.
          # 
-         if @@auto_unicode
+         if Windows::API.auto_unicode
             begin
                if func[-1].chr != 'A'
-                  api_a = Win32API.new(dll, "#{func}A", proto, rtype)
+                  api_a = Win32::API.new("#{func}A", proto, rtype, dll)
                end
             rescue RuntimeError
             end
          
             begin
                if func[-1].chr != 'W'
-                  api_w = Win32API.new(dll, "#{func}W", proto, rtype)
+                  api_w = Win32::API.new("#{func}W", proto, rtype, dll)
                end
             rescue RuntimeError
             end
@@ -245,11 +240,11 @@ module Windows
          # Automatically define a constant matching the function name if the
          # auto_constant option is set.
          # 
-         if @@auto_constant && @@auto_namespace
-            if @@auto_namespace != 'Windows'
-               namespace = class_for(@@auto_namespace)
+         if Windows::API.auto_constant && Windows::API.auto_namespace
+            if Windows::API.auto_namespace != 'Windows'
+               namespace = class_for(Windows::API.auto_namespace)
             else
-               namespace = @@auto_namespace
+               namespace = Windows::API.auto_namespace
             end
             
             namespace.const_set(func, @api)
@@ -257,7 +252,7 @@ module Windows
             # Automatically define the explicit ANSI and Unicode functions
             # as constants as well, if appropriate.
             # 
-            if @@auto_unicode
+            if Windows::API.auto_unicode
                namespace.const_set("#{func}A", api_a) if api_a
                namespace.const_set("#{func}W", api_w) if api_w
             end
@@ -267,7 +262,7 @@ module Windows
          # auto_method option is set. The explicit ANSI and Unicode methods
          # are added as well if the auto_unicode option is set to true.
          # 
-         if @@auto_method && @@auto_namespace
+         if Windows::API.auto_method && Windows::API.auto_namespace
             if proto == 'V'
                proto = ''
             else
@@ -287,7 +282,7 @@ module Windows
 
             if @boolean
                string = <<-EOC
-                  module #{@@auto_namespace} 
+                  module #{Windows::API.auto_namespace} 
                      def #{func}(#{proto})
                         #{func}.call(#{proto}) != 0
                      end
@@ -312,7 +307,7 @@ module Windows
                string << 'end'
             else
                string = <<-EOC
-                  module #{@@auto_namespace} 
+                  module #{Windows::API.auto_namespace} 
                      def #{func}(#{proto})
                         #{func}.call(#{proto})
                      end

data/test/tc_windows_api.rb

@@ -43,7 +43,7 @@ class TC_Windows_API < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('0.1.1', API::VERSION)
+      assert_equal('0.2.0', API::VERSION)
    end
 
    def test_auto_unicode
@@ -57,7 +57,7 @@ class TC_Windows_API < Test::Unit::TestCase
       assert_not_nil(Windows::Test::GetCurrentDirectory)
       assert_not_nil(Windows::Bar::GetUserName)
 
-      assert_kind_of(Win32API, Windows::Test::GetCurrentDirectory)
+      assert_kind_of(Win32::API, Windows::Test::GetCurrentDirectory)
       assert_respond_to(Windows::Test::GetCurrentDirectory, :call)
    end
 

data/windows-api.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |gem|
    gem.name        = "windows-api"
-   gem.version     = "0.1.1"
+   gem.version     = "0.2.0"
    gem.author      = "Daniel J. Berger"
    gem.email       = "djberg96@gmail.com"
    gem.homepage    = "http://www.rubyforge.org/projects/win32utils"
@@ -15,6 +15,7 @@ spec = Gem::Specification.new do |gem|
    gem.files.reject! { |fn| fn.include? "CVS" }
    gem.require_path = "lib"
    gem.extra_rdoc_files = ["README", "CHANGES", "MANIFEST"]
+   gem.add_dependency("win32-api", ">= 1.0.0")
 end
 
 if $0 == __FILE__

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.3
+rubygems_version: 0.9.4
 specification_version: 1
 name: windows-api
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-05-24 00:00:00 -06:00
+  version: 0.2.0
+date: 2007-09-20 00:00:00 -06:00
 summary: An easier way to create methods using Win32API
 require_paths: 
 - lib
@@ -34,7 +34,6 @@ files:
 - test/tc_windows_api.rb
 - CHANGES
 - CVS
-- ext
 - lib
 - MANIFEST
 - Rakefile
@@ -55,5 +54,13 @@ extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: win32-api
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: