microstation 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9e258964e3bdc19c8148e0c28f075c20e4a3b7432671d4738eeb928ec2d3e54
-  data.tar.gz: 24656d582226c6d708c2bb2dc1f05a4e5109bb0ebcd6e2c75ea1c94d0377f495
+  metadata.gz: 44de1e81a2814b3144d827cf42861a34b92728a4150e559b3dcbfc89e4720632
+  data.tar.gz: b41864547b3ce27283258bd1bb0c8136b07507fe2ff1f3af7ee16c8167e17406
 SHA512:
-  metadata.gz: b251be1af95e568c99fd52ad9cf02ead81681b1decf5c799b35a0d674cb96c457c3011c737658bab1ce52d4620dae59800f0f2a93fbcd4b9b22a09847b4ce9c6
-  data.tar.gz: 8d6220c777a73e1d90182469aa77511a3ceffe8970b94ddb1155d15b1d878ccfdc41a0eb20bfb858c03e55512f9891ad7a739feff2dfc5fb8902b7dc8d68b389
+  metadata.gz: f276123db4d72d0e85b47066240d4f4563ef9bc8d95ad7aaa0a48f12f6815afc699ae90e6475fc14a2e4a8f71d0dae30e765e941f164414eb7542684c8b5f556
+  data.tar.gz: afa76668ebe863cbbef1ee3c0a189a88d359a61a3a550c69cd20eff646cf4031f02dddd405b9e5df49d93c2fd422d0aeba5f7a6d94b889d7f6bb6922a40ee855

data/Gemfile

@@ -28,6 +28,7 @@ group :development, :test do
   gem 'rb-notifu'
   gem 'rb-readline'
   gem 'solargraph'
+  gem 'standard'
   gem 'wdm'
   gem 'win32console'
   gem 'yard'

data/lib/microstation/drawing.rb

@@ -13,9 +13,7 @@ require 'liquid'
 # //
 # ##define DISP_E_PARAMNOTFOUND       _HRESULT_TYPEDEF_(0x80020004L)
 module Microstation
-
   class Drawing
-
     include Properties
     include TagSetTrait
     include ScanTrait
@@ -35,7 +33,6 @@ module Microstation
       @app.register_handler('ISaveAsEvents_AfterSaveAs') do |*args|
         @drawing_saved = true
       end
-
     end
 
     def find_tagset_instances_called?
@@ -79,7 +76,7 @@ module Microstation
     # @param name - the name of the file
     # @param dir - the directory to save the drawing
     # @return [void]
-    def save_as_pdf(name: nil , dir: nil)
+    def save_as_pdf(name: nil, dir: nil)
       out_name = pdf_path(name: name, dir: dir)
       windows_name = app.windows_path(out_name)
       loop do
@@ -96,14 +93,14 @@ module Microstation
     # @param [Boolean] overwrite - whether to overwrite if file exists
     # @param [<Type>] format <description>
     #
-    # @return [void] 
+    # @return [void]
     #
-    def save_as(name,overwrite: false, format: 0)
+    def save_as(name, overwrite: false, format: 0)
       @drawing_saved = false
       path = Pathname(name).expand_path
       wpath = app.windows_path(name)
       begin
-        ole_obj.SaveAs(wpath,overwrite, format)
+        ole_obj.SaveAs(wpath, overwrite, format)
         wait_save_event(10)
         raise "drawing not saved in 10 seconds" unless @drawing_saved
       rescue => e
@@ -113,7 +110,7 @@ module Microstation
 
     def wait_save_event(secs, interval = 0.5)
       elapsed = 0
-      while(!@drawing_saved && elapsed <= 5)
+      while (!@drawing_saved && elapsed <= 5)
         elapsed += interval
         sleep(interval)
         WIN32OLE_EVENT.message_loop
@@ -134,7 +131,7 @@ module Microstation
     def scan_model(criteria, model: default_model_reference, &block)
       criteria = criteria || create_scan_criteria
       model = model || default_model_reference
-      model.scan_model(criteria,&block)
+      model.scan_model(criteria, &block)
     end
 
     # scans all the drawing models with criteria
@@ -172,7 +169,7 @@ module Microstation
     # models
     # @yield [String] text that is found
     def scan_text(&block)
-      scan_all(text_criteria,&block)
+      scan_all(text_criteria, &block)
     end
 
     # scan all tags in drawing and
@@ -184,7 +181,7 @@ module Microstation
     # scan all cells in drawing and
     # @yield [Cell] to the block
     def scan_cells(&block)
-      scan_all(cells_criteria,&block)
+      scan_all(cells_criteria, &block)
     end
 
     def scan_text_in_cells(&block)
@@ -195,13 +192,13 @@ module Microstation
 
     # @return [Model] the ole.DefaultModelReference
     def default_model_reference
-      Model.new(app,self,ole_obj.DefaultModelReference)
+      Model.new(app, self, ole_obj.DefaultModelReference)
     end
 
-
     def active_model
       return nil unless has_active_model?
-      Model.new(app,self, app_ole_obj.ActiveModelReference)
+
+      Model.new(app, self, app_ole_obj.ActiveModelReference)
     end
 
     # @return [Boolean] true if drawing has an active model
@@ -209,7 +206,6 @@ module Microstation
       app_ole_obj.HasActiveModelReference
     end
 
-    
     # @return [Date] date last modified
     def modified_date
       ole_obj.DateLastSaved
@@ -265,14 +261,13 @@ module Microstation
     def close
       @drawing_closed = true
       ole_obj.Close rescue nil
-      @ole_obj =nil
+      @ole_obj = nil
     end
 
     def drawing_closed?
       @drawing_closed
     end
 
-
     def pdf_name(name = nil)
       name = self.name unless name
       return Pathname(name).sub_ext(".pdf")
@@ -311,6 +306,7 @@ module Microstation
       m = model_from_ole(el).activate
       m
     end
+
     # Active a model
     # @param name [String] a
     def activate_model(name)
@@ -361,6 +357,7 @@ module Microstation
     # @return [Model, nil]
     def change_model(name)
       model = find_model(name)
+
       return unless model
       model.activate
     end
@@ -375,7 +372,6 @@ module Microstation
       result = []
       ole_obj.Models.each do |el|
         result << el.name
-        el = nil
       end
       result
     end
@@ -394,12 +390,13 @@ module Microstation
 
     def zoom_to_element(target, n_view)
       return nil unless target.graphical?
+
       zoom = 4
       range = target.Range
       oview = app_ole_obj.ActiveDesignFile.Views.Item(n_view)
       range_diff = app_ole_obj.Point3dSubtract(range.High, range.Low)
       extent = app_ole_obj.Point3dScale(range_diff, zoom)
-      
+
       oview_origin = app_ole_obj.Point3dSubtract(range.Low, app_ole_obj.Point3dScale(extent,0.5))
       oview.Origin = oview_origin
       oview.Extents = extent
@@ -506,7 +503,6 @@ module Microstation
       return results unless block_given?
     end
 
-
        def update_tagset(name,h_local={})
       tset_instances = select_tagset_instances_by_name(name)
       case tset_instances.size

data/lib/microstation/version.rb

@@ -1,5 +1,5 @@
 module Microstation
 
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 
 end

data/lib/microstation.rb

@@ -50,7 +50,7 @@ module Microstation
     end
 
     def default_app_options
-      @default_app_options
+       @default_app_options
     end
 
     def default_app_options=(opts)
@@ -100,7 +100,7 @@ module Microstation
     # @param dir 
     def drawings_in_dir(dir)
       dirpath = Pathname.new(dir).expand_path
-      drawings = Pathname.glob("#{dirpath}/*.d{gn,wg,xf}")
+      drawings = dirpath.glob("*.d{gn,wg,xf}").sort_by{ _1.basename('.*').to_s.downcase }
     end
 
     def dump_template_info_for_dir(dir, options={})
@@ -152,19 +152,19 @@ module Microstation
     end
 
     def scan_text(file,&block)
-      App.open_drawing(file) do |d|
+      ::App.open_drawing(file) do |d|
         d.scan_text(&block)
       end
     end
 
     def get_text(file, &block)
-      App.open_drawing(file) do |d|
-        d.get_text(&block)
+      ::App.open_drawing(file) do |d|
+         d.get_text(&block)
       end
     end
 
     def get_all_text(file)
-      App.open_drawing(file) do |d|
+      ::App.open_drawing(file) do |d|
         d.get_all_text
       end
     end
@@ -193,8 +193,8 @@ module Microstation
         drawing.close
       end
     end
-
-    def run(...)
+ 
+    def run(options={}, &block)
       App.run(...)
     end
 
@@ -213,7 +213,7 @@ if $0 == __FILE__
     f.write app.ole_obj.ole_methods_detail
   end
 
-  tlib = app.ole_obj.ole_typelib
+  tlib = app.ole_obj.ole_typelib 
   File.open('microstation_classes.txt','w') do |f|
     f.write app.ole_obj.ole_classes_detail
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: microstation
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Dominic Sisneros
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -458,7 +458,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: A ruby gem to control and automate Bentley Microstation using win32ole