mini_readline 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 793eb879f57f816dab6f1477f3002b6960f12334
-  data.tar.gz: cd10a35a578e18486ac007110415aa180f4411a6
+  metadata.gz: b4f4d133f9c4b1b125c72e46f6fc975765bdfc84
+  data.tar.gz: 7d4998a8f1e72d332dabf336d3c18d5dc3fc046a
 SHA512:
-  metadata.gz: 38ea7f6fe11aa30e9efa69fc239b937447ba0ac1355824eb77bd8e807611e4c6b83c4d04decf57ec0aba32867b1f6b59843cd8f45d28bdd91b33f0b169df6093
-  data.tar.gz: c239271af20834e7a64324a677225ac9784cabbbbb32ab788a33083e6ad10d7ce8187f26f545a81bb3c583b50172ef02a492eb59b3eced33172aee9953041310
+  metadata.gz: 804e9995ed300252cd50c0afdbd102d92c32b50e72a1264d264e7beeaba04acd76425d2e219411402ae558fcc529f43162f83100d6d2f5628027efdc6160db50
+  data.tar.gz: 923e4575825fac2d9862daf90742100e0cafe14519142424ef6408806f7a5c069a691a2d26ee183b4a521d6279f393e9b8ebdab9086ccf64db0d825e3b94cbfe

data/README.md

@@ -9,6 +9,12 @@ of Ruby programs. It will also try to correct a number of irritating issues
 encountered when running cross platform environments. See Cross Platform
 Portability Progress below for more details.
 
+Finally, I know this code must seem to give off a sort of angry birds vibe
+against the original rb-readline gem. This sort of thing is not good. I owe
+a great debt of gratitude to the authors and maintainers of that vital code.
+Their getting around the whole Win32API, dl obsolescence debacle saved me so
+much time and frustration that words do not suffice. Thanks!
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/mini_readline/raw_term/windows/win_32_api.rb

@@ -3,38 +3,28 @@
 #* windows/win_32_api.rb - Support for selected low level Win32 API entry points.
 module MiniReadline
 
-  require 'dl'
+  require 'fiddle'
 
-  #The classic \Win32API gem is deprecated, so we emulate it with DL.
+  #The classic \Win32API gem is deprecated, so we emulate it with fiddle.
   class Win32API
 
-    #A hash of DLL files used for one or more API entry points.
     DLL = {}
+    TYPEMAP = {"0" => Fiddle::TYPE_VOID, "S" => Fiddle::TYPE_VOIDP, "I" => Fiddle::TYPE_LONG}
+    CALL_TYPE_TO_ABI = {:stdcall => 1, :cdecl => 1, nil => 1} #Taken from Fiddle::Importer
 
-    #Type mappings
-    TYPEMAP = {"0" => DL::TYPE_VOID, "S" => DL::TYPE_VOIDP, "I" => DL::TYPE_LONG}
-
-    #Set up an API entry point.
     def initialize(dllname, func, import, export = "0", calltype = :stdcall)
-      @proto = [import].join.tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
-      handle = DLL[dllname] ||= DL.dlopen(dllname)
-      @func  = DL::CFunc.new(handle[func], TYPEMAP[export.tr("VPpNnLlIi", "0SSI")], func, calltype)
+      @proto = import.join.tr("VPpNnLlIi", "0SSI").chomp('0').split('')
+      handle = DLL[dllname] ||= Fiddle.dlopen(dllname)
+      @func = Fiddle::Function.new(handle[func], TYPEMAP.values_at(*@proto), CALL_TYPE_TO_ABI[calltype])
     end
 
-    #Call the Win 32 API entry point with appropriate arguments.
-    #<br>Endemic Code Smells
-    #* :reek:FeatureEnvy
     def call(*args)
-      args.each_with_index do |arg, index|
-        case @proto[index]
-          when "S"
-            args[index], = [arg == 0 ? nil : arg].pack("p").unpack("l!*")
-          when "I"
-            args[index], = [arg].pack("I").unpack("i")
-        end
+      args.each_with_index do |x, i|
+        args[i], = [x == 0 ? nil : x].pack("p").unpack("l!*") if @proto[i] == "S" && !x.is_a?(Fiddle::Pointer)
+        args[i], = [x].pack("I").unpack("i") if @proto[i] == "I"
       end
 
-      @func.call(args).to_i || 0
+      @func.call(*args).to_i || 0
     end
 
   end

data/lib/mini_readline/version.rb

@@ -1,4 +1,4 @@
 module MiniReadline
   #The current version of the mini_readline gem.
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_readline
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Peter Camilleri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -185,9 +185,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A simplified replacement for readline.
 test_files: []
-has_rdoc: