microstation 0.8.6 → 0.8.7

data/lib/microstation/line.rb

@@ -1,19 +1,15 @@
-require 'microstation/element'
+require "microstation/element"
 
 module Microstation
-
   class Line < Element
-
     def length
       ole_obj.Length
     end
 
-
     def vertices
       ole_obj.AsVertexList
       n = ole_obj.VerticesCount
-      list = ole_obj.GetVertices
-      list
+      ole_obj.GetVertices
     end
   end
 end

data/lib/microstation/model.rb

@@ -1,45 +1,36 @@
-#require_relative 'scan/scan_trait'
-require 'microstation/wrap'
-require_relative 'model_trait'
-
-#require_relative 'ts/tagset_trait'
-#require_relative 'graphics'
-#require_relative 'ts/instance'
+# require_relative 'scan/scan_trait'
+require "microstation/wrap"
+require_relative "model_trait"
 
+# require_relative 'ts/tagset_trait'
+# require_relative 'graphics'
+# require_relative 'ts/instance'
 
 module Microstation
-
   class DefaultModel
-
     include ::Microstation::ModelTrait
 
-    attr_reader :app,:ole_obj
+    attr_reader :app, :ole_obj
 
-    def initialize(app,ole)
+    def initialize(app, ole)
       @app = app
       @ole_obj = ole
     end
 
     def drawing
-      @drawing ||= ::Microstation::Drawing.from_ole_obj(app,ole_obj)
+      @drawing ||= ::Microstation::Drawing.from_ole_obj(app, ole_obj)
     end
-
-
   end
 
-
   class Model
-
     include ::Microstation::ModelTrait
 
-    attr_reader :app,:drawing,:ole_obj
+    attr_reader :app, :drawing, :ole_obj
 
-    def initialize(app,drawing,ole)
+    def initialize(app, drawing, ole)
       @app = app
       @drawing = drawing
       @ole_obj = ole
     end
-
   end
-
 end

data/lib/microstation/model_trait.rb

@@ -1,9 +1,8 @@
-require_relative 'graphics'
-require_relative 'scan_trait'
+require_relative "graphics"
+require_relative "scan_trait"
 
 module Microstation
   module ModelTrait
-
     include Graphics
 
     include ScanTrait
@@ -14,7 +13,11 @@ module Microstation
     end
 
     def find_by_id(id)
-      ele = ole_obj.GetElementById64(id) rescue nil
+      ele = begin
+        ole_obj.GetElementById64(id)
+      rescue
+        nil
+      end
       return nil unless ele
       app.ole_to_ruby(ele)
     end
@@ -24,20 +27,20 @@ module Microstation
     end
 
     def get_selected_elements
-      Enumerator.new(ole_obj.GetSelectedElements,app)
+      Enumerator.new(ole_obj.GetSelectedElements, app)
     end
 
     def get_selected_text
-      get_selected_elements.select{|t| t.textual?}
+      get_selected_elements.select { |t| t.textual? }
     end
 
     def get_matching_text(re)
       result = []
       get_selected_text.each do |t|
-        md = re.match( t)
+        md = re.match(t)
         if md
           if block_given?
-            yield t,md
+            yield t, md
           else
             result << t
           end
@@ -46,10 +49,10 @@ module Microstation
       end
     end
 
-    def change_text_suffix(reg,offset)
-      get_matching_text(reg) do |t,md|
+    def change_text_suffix(reg, offset)
+      get_matching_text(reg) do |t, md|
         pre = md[1]
-        suff = Integer( md[2] ) + offset
+        suff = Integer(md[2]) + offset
         t.replace "#{pre}#{suff}"
       end
     end
@@ -78,7 +81,6 @@ module Microstation
       "Microstation::Model-#{name}"
     end
 
-
     def add_element(el)
       if el.respond_to? :ole_obj
         el = el.ole_obj
@@ -88,56 +90,55 @@ module Microstation
     end
 
     def select_tagset_instances
-
     end
 
-    def scan_tags_filtered( ts_name: nil, base_element_id: nil,&block)
+    def scan_tags_filtered(ts_name: nil, base_element_id: nil, &block)
       case [ts_name, base_element_id]
-          in [nil, nil]
-          scan_tags(&block)
-          in [String,nil]
-          scan_tags.select{ |t| t.tagset_name == ts_name }
-          in [String, Numeric]
-          scan_tags.select{ |t| t.tagset_name == ts_name && t.base_element_id == base_element_id }
-          in [nil, Numeric]
-          scan_tags.select{ |t| t.base_element_id == base_element_id  }
+      in [nil, nil]
+        scan_tags(&block)
+      in [String, nil]
+        scan_tags.select { |t| t.tagset_name == ts_name }
+      in [String, Numeric]
+        scan_tags.select { |t| t.tagset_name == ts_name && t.base_element_id == base_element_id }
+      in [nil, Numeric]
+        scan_tags.select { |t| t.base_element_id == base_element_id }
 
       end
     end
 
     def tags_to_hash(tags)
-      return to_enum(__callee__,tags) unless block_given?
-      tsets = tags.group_by{ |t| t.tagset_name }
+      return to_enum(__callee__, tags) unless block_given?
+      tsets = tags.group_by { |t| t.tagset_name }
       tsets.each do |tsname, tags|
-        elements = tags.group_by{|t| t.base_element_id}
+        elements = tags.group_by { |t| t.base_element_id }
         elements.each do |id, tag_elts|
           result_hash = {
             name: tsname,
             model: name,
             tags: tag_elts,
-            base_element_id: id,
+            base_element_id: id
           }
           yield result_hash
         end
       end
     end
 
-    def get_tagsets_in_model_hash(ts_name: nil, base_element_id: nil,&block)
+    def get_tagsets_in_model_hash(ts_name: nil, base_element_id: nil, &block)
       tags = scan_tags_filtered(ts_name: ts_name, base_element_id: base_element_id)
       tags_to_hash(tags, &block)
     end
 
     def get_tagsets_in_model_hash_old
       results = []
-      tsets  = scan_tags.group_by{|t| t.tagset_name}
+      tsets = scan_tags.group_by { |t| t.tagset_name }
       tsets.each do |tsname, tags|
-        elements = tags.group_by{|t| t.base_element_id}
+        elements = tags.group_by { |t| t.base_element_id }
         elements.each do |id, tag_elts|
           result_hash = {
             name: tsname,
             model: name,
             tags: tag_elts,
-            base_element_id: id,
+            base_element_id: id
           }
           if block_given?
             yield result_hash
@@ -146,22 +147,20 @@ module Microstation
           end
         end
         results unless block_given?
-      end 
-
+      end
     end
 
-
     # Scan the model with
     # @param [Scan::Criteria] criteria - the criteria to scan
     # @yield the item
-    def scan_model(criteria=nil)
+    def scan_model(criteria = nil)
       #    binding.pry
-      criteria = criteria || create_scanner(:nullscanner)
+      criteria ||= create_scanner(:nullscanner)
       scan_result = ole_run_scan(criteria)
       return [] unless scan_result
       #   binding.pry
       scan_enum = ::Microstation::Enumerator.new(scan_result, app)
-      result =  []
+      result = []
       if block_given?
         scan_enum.each do |item|
           yield item
@@ -180,10 +179,11 @@ module Microstation
 
     def ole_run_scan(criteria)
       criteria.resolve
-      scan_result = self.ole_obj.Scan(criteria.ole_obj) rescue nil
+      scan_result = begin
+        ole_obj.Scan(criteria.ole_obj)
+      rescue
+        nil
+      end
     end
-
-
   end
-
 end

data/lib/microstation/ole_cad_input_message.rb

@@ -1,25 +1,17 @@
 module Microstation
-
-
   module InputType
-
-    Command = 1
-    Reset = 2
-    DataPoint = 3
-    Keyin = 4
-    Any = 5
-    Unassigned = 6
-
+    COMMAND = 1
+    DATA_POINT = 3
+    KEYIN = 4
+    ANY = 5
+    UNASSIGNED = 6
   end
 
-
   class OLE_CadInputMessage
+    include WIN32OLE::VARIANT
+    attr_reader :lastargs, :ole_obj, :app
 
-     include WIN32OLE::VARIANT
-    attr_reader :lastargs,:ole_obj, :app
-
-
-    def initialize(ole,app)
+    def initialize(ole, app)
       @ole_obj = ole
       @app = app
     end
@@ -29,23 +21,23 @@ module Microstation
     end
 
     def command?
-      input_type == InputType::Command
+      input_type == InputType::COMMAND
     end
 
     def data_point?
-      input_type == InputType::DataPoint
+      input_type == InputType::DATA_POINT
     end
 
     def key_in?
-      input_type == InputType::Keyin
+      input_type == InputType::KEYIN
     end
 
     def any?
-      input_type == InputType::Any
+      input_type == InputType::ANY
     end
 
     def unassigned?
-      input_type == InputType::Unassigned
+      input_type == InputType::UNASSIGNED
     end
 
     def input_type
@@ -53,49 +45,48 @@ module Microstation
     end
 
     # MsdCadInputType InputType
-    def get_input_type()
+    def get_input_type
       ole_obj.InputType
     end
 
     # BSTR Keyin
-    def get_keyin()
-      ret = ole_obj._getproperty(1610743809, [], [])
+    def get_keyin
+      ret = ole_obj._getproperty(1_610_743_809, [], [])
       @lastargs = WIN32OLE::ARGV
       ret
     end
 
     # Point3d Point
-    def get_point()
+    def get_point
       app.to_point3d(ole_obj.Point)
     end
 
     # BSTR CommandKeyin
-    def get_command_keyin()
-      ret = ole_obj._getproperty(1610743811, [], [])
+    def get_command_keyin
+      ret = ole_obj._getproperty(1_610_743_811, [], [])
       @lastargs = WIN32OLE::ARGV
       ret
     end
 
     # _View View
-    def get_view()
-      ret = ole_obj._getproperty(1610743812, [], [])
+    def get_view
+      ret = ole_obj._getproperty(1_610_743_812, [], [])
       @lastargs = WIN32OLE::ARGV
       ret
     end
 
     # Point3d ScreenPoint
-    def get_screen_point()
-      ret = ole_obj._getproperty(1610743813, [], [])
+    def get_screen_point
+      ret = ole_obj._getproperty(1_610_743_813, [], [])
       @lastargs = WIN32OLE::ARGV
       ret
     end
 
     # I4 CursorButton
-    def get_cursor_button()
-      ret = ole_obj._getproperty(1610743814, [], [])
+    def get_cursor_button
+      ret = ole_obj._getproperty(1_610_743_814, [], [])
       @lastargs = WIN32OLE::ARGV
       ret
     end
   end
-
 end

data/lib/microstation/ole_helper.rb

@@ -1,21 +1,20 @@
 module OleHelper
-
   def select_ole_type(name)
-    if name.class == String
+    if name.instance_of?(String)
       name = Regexp.new(name)
     end
-    reg = Regexp.new(name.source,Regexp::IGNORECASE)
+    reg = Regexp.new(name.source, Regexp::IGNORECASE)
     typelib.ole_classes.select do |k|
       reg =~ k.name
     end
   end
 
   def select_ole_method(name)
-    if name.class == String
+    if name.instance_of?(String)
       name = Regexp.new(name)
     end
-    reg = Regexp.new(name.source,Regexp::IGNORECASE)
-    self.ole_methods.select do |k|
+    reg = Regexp.new(name.source, Regexp::IGNORECASE)
+    ole_methods.select do |k|
       reg =~ k.name
     end
   end
@@ -29,8 +28,8 @@ module OleHelper
   end
 
   def ole_classes_detail
-    s = String.new
-    ole_classes.sort_by{|k| k.ole_type}.each do |k|
+    s = ""
+    ole_classes.sort_by { |k| k.ole_type }.each do |k|
       s << "#{k.name}\n\n"
       s << "Type: #{k.ole_type}\n"
       s << "progid: #{k.progid}\n"
@@ -40,9 +39,8 @@ module OleHelper
     s
   end
 
-
   def ole_methods_detail
-    s = String.new
+    s = ""
     ole_methods.each do |m|
       s << "Method #{m.name}\n\n"
       s << "dispid: #{m.dispid}\n"
@@ -65,7 +63,6 @@ module OleHelper
     s
   end
 
-
   def each_ole_type
     return enum_for(:each_ole_type) unless block_given?
     typelib.ole_classes.each do |t|
@@ -74,8 +71,8 @@ module OleHelper
   end
 
   def get_ole_type(name)
-    if name.class == String
-      return ole_classes.find{|t| t.name == name}
+    if name.instance_of?(String)
+      return ole_classes.find { |t| t.name == name }
     end
     reg = Regexp.new(name.source, Regexp::IGNORECASE)
     ole_classes.find do |t|
@@ -84,69 +81,64 @@ module OleHelper
   end
 
   def typelib
-    self.ole_typelib
+    ole_typelib
   end
-
-
 end
 
-
 class WIN32OLE
-
   include OleHelper
-
 end
 
 
-  # def select_ole_type(name)
-    #   if name.class == String
-    #       name = Regexp.new(name)
-    #   end
-    #   reg = Regexp.new(name.source,Regexp::IGNORECASE)
-    #   typelib.ole_classes.select do |k|
-    #     reg =~ k.name
-    #   end
-    # end
-
-    # def select_ole_method(name)
-    #   if name.class == String
-    #     name = Regexp.new(name)
-    #   end
-    #   reg = Regexp.new(name.source,Regexp::IGNORECASE)
-    #   ole_obj.ole_methods.select do |k|
-    #     reg =~ k.name
-    #   end
-    # end
-
-    # def ole_classes
-    #   typelib.ole_classes
-    # end
-
-    # def create_ole_type(type)
-    #   WIN32OLE.new(type.guid)
-    # end
-
-    # def each_ole_type
-    #   return enum_for(:each_ole_type) unless block_given?
-    #   typelib.ole_classes.each do |t|
-    #     yield t
-    #   end
-    # end
-
-    # def get_ole_type(name)
-    #   if name.class == String
-    #     name = Regexp.new name
-    #   end
-    #   reg = Regexp.new(name.source, Regexp::IGNORECASE)
-    #   typelib.ole_classes.find do |t|
-    #     t.name =~ name
-    #   end
-    # end
+# def select_ole_type(name)
+#   if name.class == String
+#       name = Regexp.new(name)
+#   end
+#   reg = Regexp.new(name.source,Regexp::IGNORECASE)
+#   typelib.ole_classes.select do |k|
+#     reg =~ k.name
+#   end
+# end
+
+# def select_ole_method(name)
+#   if name.class == String
+#     name = Regexp.new(name)
+#   end
+#   reg = Regexp.new(name.source,Regexp::IGNORECASE)
+#   ole_obj.ole_methods.select do |k|
+#     reg =~ k.name
+#   end
+# end
+
+# def ole_classes
+#   typelib.ole_classes
+# end
+
+# def create_ole_type(type)
+#   WIN32OLE.new(type.guid)
+# end
+
+# def each_ole_type
+#   return enum_for(:each_ole_type) unless block_given?
+#   typelib.ole_classes.each do |t|
+#     yield t
+#   end
+# end
+
+# def get_ole_type(name)
+#   if name.class == String
+#     name = Regexp.new name
+#   end
+#   reg = Regexp.new(name.source, Regexp::IGNORECASE)
+#   typelib.ole_classes.find do |t|
+#     t.name =~ name
+#   end
+# end
 
 
 
 #    alias :find_ole_type :get_ole_type
 
- # def typelib
-    #   ole_obj.ole_typelib
-    # end
+# def typelib
+#   ole_obj.ole_typelib
+# end

data/lib/microstation/pdf_support.rb

@@ -1,12 +1,9 @@
 module Microstation
-
-
   module PdfSupport
-
-    def pdf_name(output_dir=nil)
-      name = self.basename
-      dir = output_dir || self.dirname
-      pdfname = Pathname(name).ext('pdf')
+    def pdf_name(output_dir = nil)
+      name = basename
+      dir = output_dir || dirname
+      pdfname = Pathname(name).ext("pdf")
       (dir + pdfname).expand_path
     end
 
@@ -18,23 +15,17 @@ module Microstation
       file.file?
     end
 
-    def needs_pdf?(output_dir=nil)
+    def needs_pdf?(output_dir = nil)
       pdf_path = pdf_name(output_dir)
       !file_exists?(pdf_path) || pdf_older?(pdf_path)
     end
 
     def pdf_older?(pdf)
-      self.mtime > pdf.mtime
+      mtime > pdf.mtime
     end
 
-
     def mtime
-      self.path.mtime
+      path.mtime
     end
-
-
   end
-
-
 end
-