microstation 0.8.6 → 0.8.7

data/lib/microstation/point3d.rb

@@ -1,71 +1,58 @@
 module Microstation
-
-
-
   class Point3d
-
     class << self
-
       def ole_point3d?(ole)
-        ole.class == WIN32OLE_RECORD && ole.typename == 'Point3d'
+        ole.instance_of?(WIN32OLE_RECORD) && ole.typename == "Point3d"
       end
 
-      def cartesian_to_polar(x,y)
-        r = Math.sqrt(x*x + y*y)
-        angle = Angle.radians(Math.atan2(y,x))
-        [r,angle]
+      def cartesian_to_polar(x, y)
+        r = Math.sqrt(x * x + y * y)
+        angle = Angle.radians(Math.atan2(y, x))
+        [r, angle]
       end
 
-      def from_polar_degrees(r,a)
-        
+      def from_polar_degrees(r, a)
       end
 
       def from_ole(ole)
         new(ole.X, ole.Y, ole.Z)
       end
 
-      def polar_to_cartesian(r,a)
-
+      def polar_to_cartesian(r, a)
       end
-
     end
 
     attr_reader :x, :y, :z
 
-    def initialize(x=0,y=0,z=0)
+    def initialize(x = 0, y = 0, z = 0)
       @x = x
       @y = y
       @z = z
     end
 
-
-    def +(pt)
-      case pt
+    def +(other)
+      case other
       when Point3d
-        self.class.new(self.x + pt.x, self.y + pt.y, self.z + pt.z)
+        self.class.new(x + other.x, y + other.y, z + other.z)
       when Array
-        self.class.new(self.x + pt[0], self.y + pt[1])
+        self.class.new(x + other[0], y + other[1])
       end
     end
 
-    def -(pt)
-      case pt
+    def -(other)
+      case other
       when Point3d
-        self.class.new(self.x - pt.x, self.y - pt.y, self.z - pt.z)
+        self.class.new(x - other.x, y - other.y, z - other.z)
       when Array
-        self.class.new(self.x - pt[0], self.y - pt[1])
+        self.class.new(x - other[0], y - other[1])
       end
     end
 
     def zero
-      new(0.0,0.0,0,0)
+      new(0.0, 0.0, 0, 0)
     end
 
     def to_cartesian
-
     end
-
   end
-
-
 end

data/lib/microstation/primitive_command_interface.rb

@@ -1,5 +1,4 @@
 module PrimitiveCommandInterface
-
   def Keyin(keyin)
   end
 
@@ -12,17 +11,14 @@ module PrimitiveCommandInterface
   def Cleanup
   end
 
-  def Dynamics(pt,view,drawmode)
+  def Dynamics(pt, view, drawmode)
   end
 
   def Start
   end
-
-
 end
 
-class LineCreation 
-
+class LineCreation
   include PrimitiveCommandInterface
 
   attr_reader :points
@@ -32,25 +28,24 @@ class LineCreation
     @points = Array.new(2)
   end
 
-  def DataPoint(pt, view)
+  def DataPoint(pt, _view)
     case points.compact.size
     when 0
       app.ole_obj.CommandState.StartDynamics
       @points[0] = pt
       app.show_prompt "Place end point"
     when 1
-      @points[1] =  pt
+      @points[1] = pt
       line_from_pts(@points)
       @points[0] = @points[1]
     end
   end
 
+  def Dynamics(pt, _view, _drawmode)
+    return unless @points.compact.size == 1
 
-  def Dynamics(pt, view, drawmode)
-    if @points.compact.size == 1
-      @points[1] = pt
-      line = line_from_pts(@points)
-    end
+    @points[1] = pt
+    line = line_from_pts(@points)
   end
 
   def Reset
@@ -62,5 +57,4 @@ class LineCreation
     app.show_command "VBA PlaceLine Example"
     app.show_prompt "Select start of line"
   end
-
 end

data/lib/microstation/properties.rb

@@ -1,61 +1,73 @@
 module Microstation
-
   module Properties
-
     def author=(var = nil)
       if var
         @ole_obj.Author = var
       else
-        @ole_obj.Author rescue nil
+        begin
+          @ole_obj.Author
+        rescue
+          nil
+        end
       end
-
     end
 
-      alias_method :author, :author=
+    alias_method :author, :author=
 
     def subject=(var = nil)
       if var
         @ole_obj.Subject = var
       else
-        @ole_obj.Subject rescue nil
+        begin
+          @ole_obj.Subject
+        rescue
+          nil
+        end
       end
-
     end
 
-     alias_method :subject, :subject=
+    alias_method :subject, :subject=
 
     def comments=(var = nil)
       if var
         @ole_obj.Comments = var
       else
-        @ole_obj.Comments rescue nil
+        begin
+          @ole_obj.Comments
+        rescue
+          nil
+        end
       end
     end
 
-      alias_method :comments, :comments=
+    alias_method :comments, :comments=
 
     def title=(var = nil)
       if var
         @ole_obj.Title = var
       else
-        @ole_obj.Title rescue nil
+        begin
+          @ole_obj.Title
+        rescue
+          nil
+        end
       end
     end
 
-    alias_method :title,:title=
+    alias_method :title, :title=
 
     def keywords=(var = nil)
       if var
         @ole_obj.Keywords = var
       else
-        @ole_obj.Keywords rescue nil
+        begin
+          @ole_obj.Keywords
+        rescue
+          nil
+        end
       end
     end
 
-
     alias_method :keywords, :keywords=
-
   end
-
-
 end

data/lib/microstation/property_handler.rb

@@ -1,7 +1,5 @@
 module Microstation
-
   class PropertyHandler
-
     attr_reader :ole_obj
 
     def initialize(ole)
@@ -10,29 +8,31 @@ module Microstation
 
     def has_property?(value)
       prop = ole_obj.SelectByAccessString(value)
-      !!(prop)
+      !!prop
     end
 
     def [](property)
       return unless has_property?(property)
+
       ole_obj.GetValue
     end
 
     def get_property_as_point3d(property)
       return unless has_property?(property)
+
       ole_pt = ole_obj.GetValueAsPoint3d
       Point3d.new(ole_pt)
     end
 
-
-    def []=(property,value)
+    def []=(property, value)
       return unless has_property?(property)
+
       ole_obj.SetValue(value)
     end
 
     def property_names
       names = ole_obj.GetAccessStrings
-      result  = []
+      result = []
       names.each do |e|
         if block_given?
           yield e
@@ -42,7 +42,5 @@ module Microstation
       end
       result unless block_given?
     end
-
   end
-
 end

data/lib/microstation/scan/color.rb

@@ -1,9 +1,6 @@
 module Microstation
-
   module Scan
-
     module Color
-
       def color_inclusions
         @color_inclusions ||= []
       end
@@ -23,16 +20,12 @@ module Microstation
 
       def resolve_color_scans
         return unless color_inclusions.size > 0
+
         reset_ole_colors
         color_inclusions.each do |color|
           ole_obj.IncludeColor(color)
         end
       end
-
     end
-
   end
 end
-
-      
-      

data/lib/microstation/scan/criteria.rb

@@ -1,30 +1,23 @@
-require_relative 'klass'
-require_relative 'type'
-require_relative 'level'
-require_relative 'color'
-require_relative 'line_style'
-require_relative 'line_weight'
-require_relative 'subtype'
-require_relative 'range'
+require_relative "klass"
+require_relative "type"
+require_relative "level"
+require_relative "color"
+require_relative "line_style"
+require_relative "line_weight"
+require_relative "subtype"
+require_relative "range"
 
 module Microstation
-
   class App
-
     def create_ole_scan_criteria
       ole_obj.CreateObjectInMicroStation("MicroStationDGN.ElementScanCriteria")
     end
-
   end
-
 end
 
 module Microstation
-
   module Scan
-
     class Criteria
-
       include Scan::Klass
       include Scan::Type
       include Scan::Level
@@ -34,25 +27,23 @@ module Microstation
       include Scan::Subtype
       include Scan::Range
 
-      attr_reader :app
+      attr_reader :app, :ole_obj
 
-      def self.create_scanner(name=nil, app,&block)
-        sc = create(name,app)
+      def self.create_scanner(name = nil, app, &block)
+        sc = create(name, app)
         return sc unless block
-        block.arity < 1 ? sc.instance_eval(&block) : block.call(sc)
+
+        (block.arity < 1) ? sc.instance_eval(&block) : block.call(sc)
         sc
       end
 
-      def self.create(name=nil,app)
+      def self.create(name = nil, app)
         sc = new(app)
-        if name.nil?
-          name = "anon#{app.scanners.size + 1}"
-        end
+        name = "anon#{app.scanners.size + 1}" if name.nil?
         app.scanners[name] = sc
         sc
       end
 
-
       def initialize(app)
         @app = app
         @ole_obj = @app.create_ole_scan_criteria
@@ -74,16 +65,9 @@ module Microstation
         @ole_obj = nil
       end
 
-      def ole_obj
-        @ole_obj
-      end
-
-      def method_missing(method,*args)
-        @ole_obj.send(method,*args)
+      def method_missing(method, *args)
+        @ole_obj.send(method, *args)
       end
-
-
     end
   end
-
 end

data/lib/microstation/scan/klass.rb

@@ -1,15 +1,12 @@
 module Microstation
-
   module Scan
-
     module Klass
-
-      # msdElementClassPrimary # 0 (&H0)  
-      # msdElementClassPatternComponent #1 (&H1)  
-      # msdElementClassConstruction #2 (&H2)  
-      # msdElementClassDimension #3 (&H3)  
-      # msdElementClassPrimaryRule #4 (&H4)  
-      # msdElementClassLinearPatterned #5 (&H5)  
+      # msdElementClassPrimary # 0 (&H0)
+      # msdElementClassPatternComponent #1 (&H1)
+      # msdElementClassConstruction #2 (&H2)
+      # msdElementClassDimension #3 (&H3)
+      # msdElementClassPrimaryRule #4 (&H4)
+      # msdElementClassLinearPatterned #5 (&H5)
       # msdElementClassContructionRule #6 (&H6)
 
       def class_inclusions
@@ -23,7 +20,7 @@ module Microstation
 
       def reset_ole_classes
         ole_obj.ExcludeAllClasses
-      end      
+      end
 
       def include_class(klass)
         class_inclusions << klass
@@ -31,13 +28,12 @@ module Microstation
 
       def resolve_class_scans
         return unless class_inclusions.size > 0
+
         reset_ole_classes
         class_inclusions.each do |klass|
           ole_obj.IncludeClass(klass)
         end
       end
-      
     end
   end
-
 end

data/lib/microstation/scan/level.rb

@@ -1,9 +1,6 @@
 module Microstation
-
   module Scan
-
     module Level
-
       def level_inclusions
         @level_inclusions ||= []
       end
@@ -11,7 +8,7 @@ module Microstation
       def include_level(level)
         level_inclusions << level
       end
-      
+
       def reset_levels
         reset_ole_levels
         @level_inclusions = []
@@ -23,16 +20,12 @@ module Microstation
 
       def resolve_level_scans
         return unless level_inclusions.size > 0
+
         reset_ole_levels
         level_inclusions.each do |level|
           ole_obj.IncludeLevel(level)
         end
       end
-
     end
-
   end
-
 end
-
-      

data/lib/microstation/scan/line_style.rb

@@ -1,13 +1,11 @@
 module Microstation
-
   module Scan
-
     module LineStyle
-
       def linestyles
-        @app.active_design_file.LineStyles rescue []
+        @app.active_design_file.LineStyles
+      rescue
+        []
       end
-      
 
       def linestyle_inclusions
         @linestyle_inclusions ||= []
@@ -28,18 +26,12 @@ module Microstation
 
       def resolve_linestyle_scans
         return unless linestyle_inclusions.size > 0
+
         reset_ole_linestyles
         linestyle_inclusions.each do |linestyle|
           ole_obj.IncludeLineStyle(linestyle)
         end
       end
-
     end
-
   end
-
 end
-
-      
-
-      

data/lib/microstation/scan/line_weight.rb

@@ -1,9 +1,6 @@
 module Microstation
-
   module Scan
-
     module LineWeight
-
       def lineweight_inclusions
         @lineweight_inclusions ||= []
       end
@@ -23,6 +20,7 @@ module Microstation
 
       def resolve_lineweight_scans
         return unless lineweight_inclusions.size > 0
+
         reset_ole_lineweights
         lineweight_inclusions.each do |lineweight|
           ole_obj.IncludeLineWeight(lineweight)

data/lib/microstation/scan/range.rb

@@ -1,19 +1,13 @@
 module Microstation
-
   module Scan
-
     module Range
-
       def include_within_range(range)
         ole_obj.IncludeOnlyWithinRange(range)
       end
 
-      def range_from_points(pt1,pt2)
-        app.Range3dFromPoint3dPoint3d(pt1,pt2)
+      def range_from_points(pt1, pt2)
+        app.Range3dFromPoint3dPoint3d(pt1, pt2)
       end
-
     end
   end
-
-
 end

data/lib/microstation/scan/scan_trait.rb

@@ -1,51 +1,48 @@
-module Microstation
-
-
-  module ScanTrait
-
-    def create_scanner(&block)
-      app.create_scanner(&block)
-    end
-
-    def scan_graphical(&block)
-      sc = create_scanner
-      sc.ExcludeNonGraphical
-      self.scan(sc,&block)
-    end
-
-    def scan_text(&block)
-      sc = create_scanner do
-        include_textual
-      end
-      self.scan(sc,&block)
-    end
-
-    def scan(criteria)
-      scan_result = ole_run_scan(criteria)
-      return [] unless scan_result
-      scan_enum = Microstation::Enumerator.new(scan_result)
-      result =  []
-      if block_given?
-        scan_enum.each do |item|
-          yield item
-        end
-      else
-        scan_enum.each do |item|
-          result << item
-        end
-      end
-
-      return result unless block_given?
-    end
-
-    private
-
-    def ole_run_scan(criteria)
-      criteria.resolve
-      scan_result = self.ole_obj.Scan(criteria.ole_obj) rescue nil
-    end
-
-
-  end
-
-end
+module Microstation
+  module ScanTrait
+    def create_scanner(&block)
+      app.create_scanner(&block)
+    end
+
+    def scan_graphical(&block)
+      sc = create_scanner
+      sc.ExcludeNonGraphical
+      scan(sc, &block)
+    end
+
+    def scan_text(&block)
+      sc = create_scanner do
+        include_textual
+      end
+      scan(sc, &block)
+    end
+
+    def scan(criteria, &block)
+      scan_result = ole_run_scan(criteria)
+      return [] unless scan_result
+
+      scan_enum = Microstation::Enumerator.new(scan_result)
+      result = []
+      if block
+        scan_enum.each(&block)
+      else
+        scan_enum.each do |item|
+          result << item
+        end
+      end
+
+      return result unless block
+    end
+
+    private
+
+    def ole_run_scan(criteria)
+      criteria.resolve
+      scan_result = begin
+        ole_obj.Scan(criteria.ole_obj)
+      rescue
+        nil
+      end
+    end
+  end
+end

data/lib/microstation/scan/subtype.rb

@@ -1,9 +1,6 @@
 module Microstation
-
   module Scan
-
     module Subtype
-
       def subtype_inclusions
         @subtype_inclusions ||= []
       end
@@ -28,13 +25,6 @@ module Microstation
           ole_obj.IncludeSubtype(subtype)
         end
       end
-
     end
-
   end
-
 end
-
-
-      
-