win32screenshot 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c6e29c2c5baea6ccc52e0a3988c6f9abb76b83054b38072918d097e21471d67
-  data.tar.gz: 93ee67cb6debdcf6128b2ebc6ffed4165cd54b119417f625bca2431db0996971
+  metadata.gz: cfaefd42ed419ebf47ddbc1f191f68466dc30685c3cfd812474bec028e1bab0c
+  data.tar.gz: e4c3fbedae082e998a8df7991eeecd54915123f0dff4006605c57c5c31b6af28
 SHA512:
-  metadata.gz: 3ea409fdeeba7caf2dc68858eb378983641003b9167112b58ae8138cd48789f705c2efa77002295614d75f07a0b75a8e783b8bcb47ccb02e1368e030dbb344b1
-  data.tar.gz: 313e9d5d815495afe4bd59e04b2603e778494500ce19649812335df18f71fdc966635af43074e6ce71e9f0b5da54436839dad4a02e04cf38556d4320756562a6
+  metadata.gz: 74f3b311f74ab58d0aa481f2d7212fa8d258e124b53acaa1f4b6adb3dbd3ef2e0e16c83aa0434aacf35bb74ebce853755e95a0e366a72fb319cc5c2cb924122d
+  data.tar.gz: 417262ff0d00e1c6223fe42259a6139d0bbc0f794ccbb2670aef16ce38b4bfddff934a906cb340f3e7df08407cba0bd816e8600532b0ed5a49e0b5de8cb6b309

data/CHANGES.md

@@ -1,3 +1,10 @@
+# 5.0.0 2023-07-20
+* Add support for 64-bit Ruby (by @bensandland via PR #37)
+
+# 4.1.0 2023-02-05
+* Add support for Ruby 3.2 (by @kaiwaredaikon009 via PR #36)
+
+
 # 4.0.0 2022-06-18
 * Add support for taking screenchots of non-native Windows (e.g. Google Chrome).
 * When taking screenshot of `:desktop` then all monitors will be included if they exist.
@@ -6,14 +13,17 @@
 
 Changes done by @bensandland via PR #34.
 
+
 # 3.1.0 2022-02-05
 *   Update dependencies
 
+
 # 3.0.0 2019-12-11
 *   Use RAutomation 1.0.0 as its dependency to be able to use newer ffi.
 *   Update bundled ImageMagick to 7.0.9-8.
 *   Update MiniMagick dependency.
 
+
 # 2.1.0 2016-01-09
 *   Add Image#write! for overwriting images.
 *   Update MiniMagick dependency.

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    win32screenshot (4.0.0)
+    win32screenshot (5.0.0)
       ffi (~> 1.15.0)
       mini_magick (~> 4.9)
-      rautomation (~> 1.1.0)
+      rautomation (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.5.0)
-    ffi (1.15.5-x86-mingw32)
+    ffi (1.15.5-x64-mingw32)
     mini_magick (4.11.0)
     rake (13.0.6)
-    rautomation (1.1.0)
+    rautomation (2.0.1-x64-mingw32)
       ffi (~> 1.15.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -33,6 +33,7 @@ GEM
       webrick (~> 1.7.0)
 
 PLATFORMS
+  x64-mingw32
   x86-mingw32
 
 DEPENDENCIES
@@ -42,4 +43,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.3.3
+   2.3.24

data/README.md

@@ -1,6 +1,6 @@
 # Win32::Screenshot
 
-*   http://github.com/jarmo/win32screenshot
+*  http://github.com/jarmo/win32screenshot
 
 
 ## DESCRIPTION
@@ -9,39 +9,45 @@ Capture Screenshots on Windows with Ruby to bmp, gif, jpg or png formats!
 
 ## INSTALL
 
-    gem install win32screenshot
+```
+gem install win32screenshot
+```
 
 ## SYNOPSIS
 
-    require 'win32/screenshot'
+```ruby
+require 'win32/screenshot'
 
-    # Take a screenshot of the window with the specified title
-    Win32::Screenshot::Take.of(:window, title: "Windows Internet Explorer").write("image.bmp")
+# Take a screenshot of the window with the specified title
+Win32::Screenshot::Take.of(:window, title: "Windows Internet Explorer").write("image.bmp")
 
-    # Take a screenshot of the whole desktop area, including all monitors if multiple are connected
-    Win32::Screenshot::Take.of(:desktop).write("image.png")
+# Take a screenshot of the whole desktop area, including all monitors if multiple are connected
+Win32::Screenshot::Take.of(:desktop).write("image.png")
 
-    # Take a screenshot of the foreground window
-    Win32::Screenshot::Take.of(:foreground).write("image.png")
+# Take a screenshot of the foreground window
+Win32::Screenshot::Take.of(:foreground).write("image.png")
 
-    # Take a screenshot of the foreground window, and writing over previous image if it exists
-    Win32::Screenshot::Take.of(:foreground).write!("image.png")
+# Take a screenshot of the foreground window, and writing over previous image if it exists
+Win32::Screenshot::Take.of(:foreground).write!("image.png")
 
-    # Take a screenshot of the specified window with title matching the regular expression
-    Win32::Screenshot::Take.of(:window, title: /internet/i).write("image.jpg")
+# Take a screenshot of the specified window with title matching the regular expression
+Win32::Screenshot::Take.of(:window, title: /internet/i).write("image.jpg")
 
-    # Take a screenshot of the window with the specified handle
-    Win32::Screenshot::Take.of(:window, hwnd: 123456).write("image.gif")
+# Take a screenshot of the window with the specified handle
+Win32::Screenshot::Take.of(:window, hwnd: 123456).write("image.gif")
 
-    # Take a screenshot of the child window with the specified internal class name
-    Win32::Screenshot::Take.of(:rautomation, RAutomation::Window.new(hwnd: 123456).
-                              child(class: "Internet Explorer_Server")).write("image.png")
+# Take a screenshot of the child window with the specified internal class name
+Win32::Screenshot::Take.of(
+  :rautomation,
+  RAutomation::Window.new(hwnd: 123456).child(class: "Internet Explorer_Server")
+).write("image.png")
 
-    # Use the bitmap blob for something else
-    image = Win32::Screenshot::Take.of(:window, hwnd: 123456)
-    image.height # => height of the image
-    image.width  # => width of the image
-    image.bitmap # => bitmap blob
+# Use the bitmap blob for something else
+image = Win32::Screenshot::Take.of(:window, hwnd: 123456)
+image.height # => height of the image
+image.width  # => width of the image
+image.bitmap # => bitmap blob
+```
 
 ## Copyright
 

data/lib/win32/screenshot/image.rb

@@ -1,48 +1,48 @@
-module Win32
-  module Screenshot
-    # Holds the bitmap data and writes it to the disk
-    class Image
-      # [String] raw bitmap blob
-      attr_reader :bitmap
-
-      # [String] bitmap width
-      attr_reader :width
-
-      # [String] bitmap height
-      attr_reader :height
-
-      # Supported output formats
-      FORMATS = %w{bmp gif jpg png}
-
-      # @private
-      def initialize(blob, width, height)
-        @bitmap = blob
-        @width = width
-        @height = height
-      end
-
-      # Writes image to the disk.
-      # @param [String] file_path writes image to the specified path.
-      # @raise [RuntimeError] when _file_path_ already exists.
-      # @raise [RuntimeError] when _file_path_ is not with the supported output {FORMATS} extension.
-      def write(file_path)
-        raise "File already exists: #{file_path}!" if File.exists? file_path
-        write! file_path
-      end
-      
-      #Writes image to disk, writing over existing copy if it exists.
-      def write!(file_path)
-        ext = File.extname(file_path)[1..-1]
-        raise "File '#{file_path}' has to have one of the following extensions: #{FORMATS.join(", ")}" unless ext && FORMATS.include?(ext.downcase)
-
-        if ext.downcase == "bmp"
-          File.open(file_path, "wb") {|io| io.write @bitmap}
-        else
-          image = ::MiniMagick::Image.read @bitmap
-          image.format ext
-          image.write file_path
-        end        
-      end
-    end
-  end
-end
+module Win32
+  module Screenshot
+    # Holds the bitmap data and writes it to the disk
+    class Image
+      # [String] raw bitmap blob
+      attr_reader :bitmap
+
+      # [String] bitmap width
+      attr_reader :width
+
+      # [String] bitmap height
+      attr_reader :height
+
+      # Supported output formats
+      FORMATS = %w{bmp gif jpg png}
+
+      # @private
+      def initialize(blob, width, height)
+        @bitmap = blob
+        @width = width
+        @height = height
+      end
+
+      # Writes image to the disk.
+      # @param [String] file_path writes image to the specified path.
+      # @raise [RuntimeError] when _file_path_ already exists.
+      # @raise [RuntimeError] when _file_path_ is not with the supported output {FORMATS} extension.
+      def write(file_path)
+        raise "File already exists: #{file_path}!" if File.exist? file_path
+        write! file_path
+      end
+      
+      #Writes image to disk, writing over existing copy if it exists.
+      def write!(file_path)
+        ext = File.extname(file_path)[1..-1]
+        raise "File '#{file_path}' has to have one of the following extensions: #{FORMATS.join(", ")}" unless ext && FORMATS.include?(ext.downcase)
+
+        if ext.downcase == "bmp"
+          File.open(file_path, "wb") {|io| io.write @bitmap}
+        else
+          image = ::MiniMagick::Image.read @bitmap
+          image.format ext
+          image.write file_path
+        end        
+      end
+    end
+  end
+end

data/lib/win32/screenshot/version.rb

@@ -1,5 +1,5 @@
 module Win32
   module Screenshot
-    VERSION = "4.0.0"
+    VERSION = "5.0.0"
   end
 end

data/spec/spec_helper.rb

@@ -5,38 +5,16 @@ require 'rspec'
 require 'fileutils'
 
 module SpecHelper
-  HWND_TOPMOST = -1
-  HWND_NOTOPMOST = -2
-  SWP_NOSIZE = 1
-  SWP_NOMOVE = 2
-  SWP_SHOWWINDOW = 40
-
-  extend FFI::Library
-  ffi_lib 'user32'
-  ffi_convention :stdcall
-
-  # user32.dll
-  attach_function :set_window_pos, :SetWindowPos,
-                  [:long, :long, :int, :int, :int, :int, :int], :bool
-  
   def save_and_verify_image(img, file=nil)
-    FileUtils.mkdir @temp_dir unless File.exists?(@temp_dir)
+    FileUtils.mkdir @temp_dir unless File.exist?(@temp_dir)
     file_name = File.join @temp_dir, "#{file}.bmp"
     img.write file_name
     expect(img.bitmap[0..1]).to eq('BM')
   end
 
   def resize title
-    hwnd = RAutomation::Window.new(:title => title).hwnd
-    set_window_pos(hwnd,
-                   HWND_TOPMOST,
-                   0, 0, 150, 238,
-                   SWP_NOMOVE)
-    set_window_pos(hwnd,
-                   HWND_NOTOPMOST,
-                   0, 0, 0, 0,
-                   SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE)
-    sleep 1
+    window = RAutomation::Window.new(title: title)
+    window.move(left: 0, top: 0, width: 150, height: 238)
   end
 end
 

data/win32screenshot.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   
   s.add_dependency("ffi", "~> 1.15.0")
   s.add_dependency("mini_magick", "~> 4.9")
-  s.add_dependency("rautomation", "~> 1.1.0")
+  s.add_dependency("rautomation", "~> 2.0")
   
   s.add_development_dependency("rspec", "~> 3.10")
   s.add_development_dependency("yard")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32screenshot
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Jarmo Pertman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-18 00:00:00.000000000 Z
+date: 2023-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.24
 signing_key: 
 specification_version: 4
 summary: Capture Screenshots on Windows with Ruby to bmp, gif, jpg or png formats.