robust_excel_ole 1.25 → 1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec2281789116629bceb9d28bb49ea8c75f10306084d5d81348cd3d05f521e2ac
-  data.tar.gz: 1adb8026858ed313c16dae70914448ce4c77a8cfc047fdf5fba15cdb41a9e448
+  metadata.gz: a2553a7622f9092b5067ad3f7e945d57a1dbfa6e540716b326c6b684a351cf79
+  data.tar.gz: e623c4a2f3e22ef1da88b6475d7f6dc277c9f3f4581db27427fd9ca6aa400f24
 SHA512:
-  metadata.gz: f0daec2c817688fe78593042eefc2bd34c3d8e8d9eaed6cbcf1653892fc3d4e16e146832f7d9e8ddeac70d4d66bbaf22e7c72cb4e1aa27cfdf2ca2f04f29146b
-  data.tar.gz: be997a68bd9b9c543b65c780779607210bd005db79bb448fec1c5f49cd05760213b01860555d8439ed7f91264e833e889034db7bc75e85681a77c0e224c0956a
+  metadata.gz: 9056cec7af1bf9c6c04ab2df83dd080bb63308f5c5a7d6af13286090d357441928d7dcb2dde2371940e36729fafb26460098d2063254f8809796a9dde87ddc85
+  data.tar.gz: d036c741ef593695e0fecfd8f1e34b1db5bec0e7e2430b5a88f1e16a297a804b1a9d95c8bc847bc993f0a1ea4b666cd56db200cc9cdfec38078dab6c5b4ef59b

data/Changelog

@@ -1,6 +1,17 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [1.26] 2020-09-10
+
+### Added
+  - General#change_current_binding
+
+## [1.25] 2020-10-09]
+
+## [1.24] 2020-25-09
+
+## [1.23] 2020-02-09
+
 ## [1.22] 2020-10-08
 
 ### Added

data/README.rdoc

@@ -64,15 +64,7 @@ If you want to start the console under jruby, and if you don't want to use a ver
  
  jreo
 
-The call of the console will include RobustExcelOle for you. The consoles require the ruby gem 'pry' and 'pry-bond' to enable the ruby shell 'pry' with filename and string completion. The ruby shell 'pry' allows, among other useful things, to change the value of 'self' in the console: Let 'object' be an (almost) arbitrary object, e.g. a workbook, then you can put
-
-  object.pry
-
-or
-
-  cd object
-
-to assign self to this object. The original pry console is adapted to preserve local variables.
+The call of the console will include RobustExcelOle for you. The consoles require the ruby gem 'pry' and 'pry-bond' to enable the ruby shell 'pry' with filename and string completion. 
 
 The following examples can be used for both scripts and console. If you have started the console in the gem path, you can just put these examples.
 
@@ -326,7 +318,21 @@ and set another value to that range.
 For more details about reading and writing contents of cells and ranges see {README_ranges}[https://github.com/Thomas008/robust_excel_ole/blob/master/docs/README_ranges.rdoc]
 
 
-=== More things
+=== More features
+
+The ruby shell 'pry' allows, among other useful things, to change the value of 'self' in the console. For example,
+
+  object.pry
+
+or
+
+  cd object
+
+will set +object+ to self. However, this command also starts another pry repl (with another binding). Moreover, local variables in the previous binding are forgotten.
+
+The method +General.change_current_binding+ allows to change the value of self within the current binding, while preserving the local variables, without starting another repl. 
+
+  General.change_current_binding
 
 You can convert some Win32Ole objects into a RobustExcelOle object.
 

data/lib/reo_console.rb

@@ -4,41 +4,34 @@ require '../robust_excel_ole/lib/robust_excel_ole'
 include REO
 include General
 
-# pry mit behalten lokaler Variablen
+# change the current binding such that self is the current object in the pry-instance, 
+# preserve the local variables
 
 class Pry
 
-  class REPL
+  class << self
+    attr_accessor :pry_instance
+  end
 
-    def repl
-      loop do
-        case val = read
-        when :control_c
-          output.puts ""
-          pry.reset_eval_string
-        when :no_more_input
-          output.puts "" if output.tty?
-          break
-        else
-          output.puts "" if val.nil? && output.tty?                    
-          # determine the local variables in the binding before evaluation
-          bnd = pry.binding_stack.first
-          exclude_vars = [:__, :_, :_dir, :_dir_, :_file, :_file_, :_in_, :_out_, :_ex, :_ex_, :pry_instance]
-          local_vars = Pry.get_local_vars
-          bnd.local_variables.each do |var|
-            unless exclude_vars.include?(var) 
-              pry.add_sticky_local(var) do
-                bnd.local_variable_get(var)
-              end
-            end
-          end
-          return pry.exit_value unless pry.eval(val)
-        end
-      end
+  def self.change_current_binding(current_object)
+    pry_instance = self.pry_instance
+    old_binding = pry_instance.binding_stack.pop
+    pry_instance.push_binding(current_object.__binding__)
+    exclude_vars = [:__, :_, :_dir, :_dir_, :_file, :_file_, :_in_, :_out_, :_ex, :_ex_, :pry_instance]
+    old_binding.local_variables.each do |var|
+      pry_instance.add_sticky_local(var) {old_binding.local_variable_get(var)} unless exclude_vars.include?(var)
     end
+    self.pry_instance = pry_instance
+    nil
   end
-end
 
+  def push_initial_binding(target = nil)
+    # memorize the current pry instance
+    self.class.pry_instance = self 
+    push_binding(target || Pry.toplevel_binding)
+  end
+
+end
 
 # some pry configuration
 Pry.config.windows_console_warning = false
@@ -48,20 +41,23 @@ Pry.config.prompt_name = "REO "
 #Pry.config.history_save = true
 #Pry.editor = 'notepad'  # 'subl', 'vi'
 
-Pry.config.prompt = Pry::Prompt.new(
-  "REO",
-  "The RobustExcelOle Prompt. Besides the standard information it puts the current object",
-  [
-   proc { |target_self, nest_level, pry|
+prompt_proc1 = proc { |target_self, nest_level, pry|
    "[#{pry.input_ring.count}] #{pry.config.prompt_name}(#{Pry.view_clip(target_self.inspect)})#{":#{nest_level}" unless nest_level.zero?}> "
- },
+ }
 
- proc { |target_self, nest_level, pry|
+prompt_proc2 =  proc { |target_self, nest_level, pry|
   "[#{pry.input_ring.count}] #{pry.config.prompt_name}(#{Pry.view_clip(target_self.inspect)})#{":#{nest_level}" unless nest_level.zero?}* "
  }
-]
-)
 
+Pry.config.prompt = if RUBY_PLATFORM =~ /java/
+  [prompt_proc1, prompt_proc2]
+else
+  Pry::Prompt.new(
+    "REO",
+    "The RobustExcelOle Prompt. Besides the standard information it puts the current object",
+    [prompt_proc1, prompt_proc2]
+    )
+end
 
 hooks = Pry::Hooks.new
 

data/lib/robust_excel_ole/excel.rb

@@ -76,7 +76,7 @@ module RobustExcelOle
       end
       connected = (not ole_xl.nil?) && win32ole_excel.nil?
       ole_xl ||= WIN32OLE.new('Excel.Application')
-      hwnd = ole_xl.HWnd
+      hwnd = ole_xl.Hwnd
       stored = hwnd2excel(hwnd)
       if stored && stored.alive?
         result = stored
@@ -297,7 +297,7 @@ module RobustExcelOle
       finishing_living_excel = alive?
       if finishing_living_excel
         hwnd = (begin
-                  @ole_excel.HWnd
+                  @ole_excel.Hwnd
                 rescue
                   nil
                 end)

data/lib/robust_excel_ole/general.rb

@@ -44,7 +44,7 @@ module General
     file[0,2] = './' if ::EXPANDPATH_JRUBY_BUG && file  =~ /[A-Z]:[^\/]/
     file = File.expand_path(file)
     file = RobustExcelOle::Cygwin.cygpath('-w', file) if RUBY_PLATFORM =~ /cygwin/
-    WIN32OLE.new('Scripting.FileSystemObject').GetAbsolutePathName(file).tr('/','\\')
+    WIN32OLE.new('Scripting.FileSystemObject').GetAbsolutePathName(file) #.tr('/','\\')
   end
 
   # @private
@@ -64,7 +64,11 @@ module General
     path
   end
 
-  module_function :absolute_path, :canonize, :normalize
+  def change_current_binding(current_object)
+    Pry.change_current_binding(current_object)
+  end
+
+  module_function :absolute_path, :canonize, :normalize, :change_current_binding
 
 end
 
@@ -142,32 +146,36 @@ class WIN32OLE
     raise TypeREOError, "given object cannot be type-lifted to a RobustExcelOle object"
   end
 
+=begin
+  def to_reo
+    case ole_type.name
+    when 'Range' then RobustExcelOle::Range.new(self)
+    when '_Worksheet' then RobustExcelOle::Worksheet.new(self)
+    when '_Workbook' then RobustExcelOle::Workbook.new(self)
+    when '_Application' then RobustExcelOle::Excel.new(self)
+    else
+      self
+    end
+  end
+=end
 
- # def method_missing(name, *args, &blk)
- #   puts "method_missing:"
- #   puts "name: #{name.inspect}"
- #   puts "self: #{self}"
- #   puts "self.ole_type: #{self.ole_type}"
- #   puts "self.to_reo: #{self.to_reo}"
- #   begin
- #     reo_obj = self.to_reo
- #   rescue
- #     puts "error: #{$!.message}"
- #     raise # NoMethodError, "undefined method #{name.inspect} for #{self.inspect}"
- #   end
- #   reo_obj.send(name, *args, &blk)
- # end
-
-  #alias method_missing_before_implicit_typelift method_missing 
-  #def method_missing(name, *args, &blk)
-  #  begin
-  #    reo_obj = self.to_reo
-  #  rescue
-  #    puts "$!.message: #{$!.message}"
-  #    method_missing_before_implicit_typelift(name, *args, &blk)
-  #  end
-  #  reo_obj.send(name, *args, &blk)
-  #end
+=begin
+  alias method_missing_before_implicit_typelift method_missing 
+  
+  def method_missing(name, *args, &blk)
+    puts "method_missing:"
+    puts "name: #{name.inspect}"
+    #raise NoMethodError if name.to_s == "Hwnd" or name.to_s == "FullName" or name.to_s == "UsedRange" or name.to_s == "Row" or name.to_s == "ListRows"
+    begin
+      reo_obj = self.to_reo
+      puts "reo_obj: #{reo_obj.inspect}"
+    rescue
+      puts "$!.message: #{$!.message}"
+      method_missing_before_implicit_typelift(name, *args, &blk)
+    end
+    reo_obj.send(name, *args, &blk)
+  end
+=end
 
 end
 
@@ -293,7 +301,6 @@ module MethodHelpers
       super
     end
   end
-
 end
 
 REO = RobustExcelOle

data/lib/robust_excel_ole/version.rb

@@ -1,3 +1,3 @@
 module RobustExcelOle
-  VERSION = "1.25"
+  VERSION = "1.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robust_excel_ole
 version: !ruby/object:Gem::Version
-  version: '1.25'
+  version: '1.26'
 platform: ruby
 authors:
 - traths
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry