microstation 0.8.6 → 0.8.7

data/lib/microstation/scan/type.rb

@@ -1,9 +1,6 @@
 module Microstation
-
   module Scan
-
     module Type
-
       # MsdElementTypeCellLibraryHeader
       # MsdElementTypeCellHeader
       # MsdElementTypeLine
@@ -78,6 +75,7 @@ module Microstation
 
       def resolve_type_scans
         return unless type_inclusions.size > 0
+
         reset_ole_types
         type_inclusions.each do |type|
           ole_obj.IncludeType(type)
@@ -85,11 +83,11 @@ module Microstation
       end
 
       def include_cell_header
-        self.include_type(::Microstation::MSD::MsdElementTypeCellHeader)
+        include_type(::Microstation::MSD::MsdElementTypeCellHeader)
       end
 
       def include_shared_cell
-        self.include_type(::Microstation::MSD::MsdElementTypeSharedCell)
+        include_type(::Microstation::MSD::MsdElementTypeSharedCell)
       end
 
       def include_cells
@@ -98,19 +96,19 @@ module Microstation
       end
 
       def include_dimensions
-        self.include_type(::Microstation::MSD::MsdElementTypeDimension)
+        include_type(::Microstation::MSD::MsdElementTypeDimension)
       end
 
       def include_text
-        self.include_type(::Microstation::MSD::MsdElementTypeText)
+        include_type(::Microstation::MSD::MsdElementTypeText)
       end
 
       def include_tags
-        self.include_type ::Microstation::MSD::MsdElementTypeTag
+        include_type ::Microstation::MSD::MsdElementTypeTag
       end
 
       def include_text_nodes
-        self.include_type ::Microstation::MSD::MsdElementTypeTextNode
+        include_type ::Microstation::MSD::MsdElementTypeTextNode
       end
 
       def include_textual
@@ -119,16 +117,12 @@ module Microstation
       end
 
       def include_solids
-        self.include_type ::Microstation::MSD::MsdElementTypeSolid
+        include_type ::Microstation::MSD::MsdElementTypeSolid
       end
 
       def include_lines
-        self.include_type ::Microstation::MSD::MsdElementTypeLine
+        include_type ::Microstation::MSD::MsdElementTypeLine
       end
-
-
     end
-
   end
-
 end

data/lib/microstation/scan_trait.rb

@@ -1,62 +1,55 @@
-require_relative 'criteria_creation_t'
+require_relative "criteria_creation_t"
 module Microstation
-
   module ScanTrait
-
-     def create_scanner(name,&block)
+    def create_scanner(name, &block)
       app.create_scanner(name, &block)
     end
 
     def text_criteria
-      app.scanners[:textual] || app.create_scanner(:textual){ include_textual}
+      app.scanners[:textual] || app.create_scanner(:textual) { include_textual }
     end
 
     def graphics_criteria
-      app.scanners[:graphical] || app.create_scanner(:graphical){ ExcludeNonGraphical}
+      app.scanners[:graphical] || app.create_scanner(:graphical) { ExcludeNonGraphical }
     end
 
     def tags_criteria
-      app.scanners[:tags] || app.create_scanner(:tags){ include_tags}
+      app.scanners[:tags] || app.create_scanner(:tags) { include_tags }
     end
 
     def cells_criteria
-      app.scanners[:cells] || app.create_scanner(:cells){ include_cells}
+      app.scanners[:cells] || app.create_scanner(:cells) { include_cells }
     end
 
     def lines_criteria
-      app.scanners[:lines] || app.create_scanner(:lines){ include_lines}
+      app.scanners[:lines] || app.create_scanner(:lines) { include_lines }
     end
 
     def scan_graphical(&block)
-      self.scan_model(graphic_criteria, &block)
+      scan_model(graphic_criteria, &block)
     end
 
     def scan_text(&block)
-      self.scan_model(text_criteria,&block)
+      scan_model(text_criteria, &block)
     end
 
     def scan_tags(&block)
-      self.scan_model(tags_criteria,&block)
+      scan_model(tags_criteria, &block)
     end
 
     def scan_cells(&block)
-      self.scan_model(cells_criteria,&block)
+      scan_model(cells_criteria, &block)
     end
 
     def scan_lines(&block)
-      self.scan_model(lines_criteria, &block)
+      scan_model(lines_criteria, &block)
     end
 
-
     def scan_cell_with_name(name, &block)
       sc = create_scanner
       sc.IncludeOnlyCell(name)
       sc.include_cell
-      self.scan_model(sc,&block)
+      scan_model(sc, &block)
     end
-
-
-
   end
-
 end

data/lib/microstation/scanner.rb

@@ -1,8 +1,5 @@
 module Microstation
-
-
   class Scanner
-
     attr_reader :app
 
     def initialize(app)
@@ -12,13 +9,6 @@ module Microstation
 
     private
 
-    def ole_obj
-      @ole_obj
-    end
-    
-    
-
+    attr_reader :ole_obj
   end
-
-
 end

data/lib/microstation/tag.rb

@@ -1,11 +1,7 @@
-require_relative 'tagged_element'
-
-
+require_relative "tagged_element"
 
 module Microstation
-
   class Tag < Element
-
     # def initialize(ole)
     #   @ole_obj = ole
     #   @original = @ole_obj.Value
@@ -20,7 +16,6 @@ module Microstation
       ole_obj.Value = value
     end
 
-
     def ole_value
       @ole_obj.Value
     end
@@ -29,7 +24,6 @@ module Microstation
       @ole_obj.TagDefinitionName
     end
 
-    
     def inspect
       "#{name}: #{value} ts ->#{tagset_name}"
     end
@@ -55,9 +49,7 @@ module Microstation
       @ole_obj.Value = value
     end
 
-    def base_element=(ele)
-      @base_element = ele
-    end
+    attr_writer :base_element
 
     def ole_base_element
       @ole_obj.BaseElement
@@ -65,13 +57,16 @@ module Microstation
 
     def base_element_id
       base = ole_base_element
-      id = base.Id || base.ID64 rescue nil
-      if id.class == WIN32OLE_RECORD
-        if id.Low > id.High
-          return id.Low
-        else
-          return id.High
-        end
+      id = begin
+        base.Id || base.ID64
+      rescue
+        nil
+      end
+      if id.instance_of?(WIN32OLE_RECORD)
+        return id.Low if id.Low > id.High
+
+        return id.High
+
       end
       id
     end
@@ -79,9 +74,5 @@ module Microstation
     def base_element
       @base_element ||= TaggedElement.new(ole_base_element)
     end
-
   end
-
-
-
 end

data/lib/microstation/tag_set.rb

@@ -1,17 +1,17 @@
-#require File.join(File.dirname(__FILE__) , 'attributes')
-require File.join(File.dirname(__FILE__), 'ts/instance')
-require File.join(File.dirname(__FILE__), 'ts/attribute')
+# require File.join(File.dirname(__FILE__) , 'attributes')
+require File.join(File.dirname(__FILE__), "ts/instance")
+require File.join(File.dirname(__FILE__), "ts/attribute")
 
 module Microstation
-
   module OleCollection
-
-    def initialize(ole_col)
+    def initialize(_ole_col)
       @ole_obj = ole
     end
 
     def [](name)
-      ole_obj(name) rescue nil
+      ole_obj(name)
+    rescue
+      nil
     end
 
     def each
@@ -23,17 +23,16 @@ module Microstation
     def wrap(ts)
       ts
     end
-
   end
 
-
   class TagSets
     include Enumerable
 
     attr_reader :drawing, :ole_obj
 
-    def initialize(drawing,ole)
-      raise if ole == nil
+    def initialize(drawing, ole)
+      raise if ole.nil?
+
       @drawing = drawing
       @ole_obj = ole
     end
@@ -41,13 +40,13 @@ module Microstation
     def init_ts
       result = []
       @ole_obj.each do |ts|
-        result << TagSet.new(drawing,ts)
+        result << TagSet.new(drawing, ts)
       end
       result
     end
 
     def to_s
-      "Tagsets: #{tagsets.to_s}"
+      "Tagsets: #{tagsets}"
     end
 
     def reset
@@ -56,23 +55,21 @@ module Microstation
     end
 
     def names
-      self.map{|ts| ts.name}
+      map { |ts| ts.name }
     end
 
-
     def tagsets
       @tagsets ||= init_ts
     end
 
-    def each
-      tagsets.each do |obj|
-        yield obj
-      end
+    def each(&block)
+      tagsets.each(&block)
     end
 
     def find(name)
       return nil if empty?
-      tagsets.detect{|ts| ts.name == name}
+
+      tagsets.detect { |ts| ts.name == name }
     end
 
     def last
@@ -86,7 +83,11 @@ module Microstation
     def remove(name)
       ts = find(name)
       if ts
-        @ole_obj.Remove(name) rescue nil
+        begin
+          @ole_obj.Remove(name)
+        rescue
+          nil
+        end
         ts.close
         ts = nil
       end
@@ -99,13 +100,18 @@ module Microstation
 
     def create(name)
       raise if self[name]
-     
-      ole = @ole_obj.add(name) rescue binding.pry
-     # ts = Tagset.new(ole)
+
+      ole = begin
+        @ole_obj.add(name)
+      rescue
+        binding.pry
+      end
+      # ts = Tagset.new(ole)
       # yield definer if block_given?
       reset
       ts = self[name]
       raise if ts.nil?
+
       yield ts if block_given?
       ts
     end
@@ -113,7 +119,6 @@ module Microstation
     def size
       tagsets.size
     end
-
   end
 
   # class Definer
@@ -124,7 +129,6 @@ module Microstation
   #     @tagset = tagset
   #   end
 
-
   #   def add_attribute(name,type,prompt: name, is_hidden: false, is_constant: false, default: nil)
   #     ole_td = create_ole_definition(name, type)
   #     td = TS::Attribute.new(ole_td)
@@ -157,10 +161,7 @@ module Microstation
 
   # end
 
-
-
   class Definition
-
     attr_reader :tagset
 
     def initialize(tagset)
@@ -178,13 +179,12 @@ module Microstation
     #   @definer ||= Definer.new(tagset)
     # end
 
-
     def attributes
       @attributes ||= init_definitions
     end
 
     def attribute_names
-      attributes.map{|a| a.name}
+      attributes.map { |a| a.name }
     end
 
     def reset
@@ -192,11 +192,11 @@ module Microstation
     end
 
     def close
-      attributes.each{| a| a.close}
+      attributes.each { |a| a.close }
     end
 
     def [](name)
-      attributes.find{|d| d.name == name}
+      attributes.find { |d| d.name == name }
     end
 
     protected
@@ -209,8 +209,8 @@ module Microstation
       @tagset.ole_obj.TagDefinitions
     end
 
-    def create_ole_definition(name,type)
-      ole_tag_definitions.Add(name,ole_type(type))
+    def create_ole_definition(name, type)
+      ole_tag_definitions.Add(name, ole_type(type))
     end
 
     def init_definitions
@@ -221,7 +221,7 @@ module Microstation
       results
     end
 
-    def create_attribute(name,type,prompt: name, is_hidden: false, is_constant: false, default: nil)
+    def create_attribute(name, type, prompt: name, is_hidden: false, is_constant: false, default: nil)
       ole_td = create_ole_definition(name, type)
       td = TS::Attribute.new(ole_td)
       td.prompt = prompt
@@ -235,49 +235,41 @@ module Microstation
     def ole_type(type)
       TS::Attribute.tag_type(type)
     end
-
   end
 
   class TagSet
+    attr_reader :ole_obj, :instances, :drawing
 
-    attr_reader :ole_obj
-
-    attr_reader :instances, :drawing
-
-    def initialize(drawing,ole)
+    def initialize(drawing, ole)
       @drawing = drawing
       @ole_obj = ole
       @instances = nil
     end
 
-    def add_attribute(name,type,**options, &block)
-      ts = definition.add_attribute(name,type,**options, &block)
+    def add_attribute(name, type, **options, &block)
+      ts = definition.add_attribute(name, type, **options, &block)
     end
 
     # def definer
     #   @definer ||= Definer.new(self)
     # end
 
-
-  
     def add_instance(array)
-      @instances << TS::Instance.new(self,array)
+      @instances << TS::Instance.new(self, array)
     end
 
-    def create_instance(base_element_id , tags , model )
-      if @instaces.nil?
-        @instance = []
-        ti = TS::Instances.new(self, base_element_id, tags, model)
-        @instances << ti
-        ti
-     end 
+    def create_instance(base_element_id, tags, model)
+      return unless @instaces.nil?
+
+      @instance = []
+      ti = TS::Instances.new(self, base_element_id, tags, model)
+      @instances << ti
+      ti
     end
 
     def create_instance(id, elements, model)
-      if @instances.nil?
-        @instances = []
-      end
-      ti = TS::Instance.new(self,id,elements,model)
+      @instances = [] if @instances.nil?
+      ti = TS::Instance.new(self, id, elements, model)
       @instances << ti
       ti
     end
@@ -294,15 +286,13 @@ module Microstation
 
     def instances
       if @instances.nil? && find_tagset_instances_not_called?
-        @instances = @drawing.create_tagset_instances( ts_name: name).to_a
+        @instances = @drawing.create_tagset_instances(ts_name: name).to_a
       end
       raise if find_tagset_instances_not_called?
+
       @instances.nil? ? [] : @instances
     end
 
-
-
-
     # def create_instances_from_drawing(drawing)
     #   mytags = tags_for_self(tags)
     #   grouped = grouped_tags_to_host(mytags)
@@ -313,7 +303,6 @@ module Microstation
     #   Microstation.app.current_drawing.scan_tags
     # end
 
-
     def close
       @ole_obj = nil
     end
@@ -352,18 +341,14 @@ module Microstation
       @tag_definitions = nil
     end
 
-
     def find_tagset_instances_not_called?
       !drawing.find_tagset_instances_called?
     end
 
-
     # def create_ole_definition(name,type)
     #   ole_tag_definitions.Add(name, ole_type(type))
     # end
 
-    private
-
     # protected
 
     # def tags_for_self(tags)
@@ -377,9 +362,5 @@ module Microstation
     # def ole_tag_definitions
     #   @ole_obj.TagDefinitions
     # end
-    
-
-
   end
-
 end

data/lib/microstation/tag_set_trait.rb

@@ -1,13 +1,11 @@
 module Microstation
-
   module TagSetTrait
-
     def tagsets
-      @tagsets ||= TagSets.new(self,ole_obj_tagsets)
+      @tagsets ||= TagSets.new(self, ole_obj_tagsets)
     end
 
     def tagset_names
-      tagsets.map{|ts| ts.name}
+      tagsets.map { |ts| ts.name }
     end
 
     def reset_tagsets
@@ -15,16 +13,16 @@ module Microstation
       tagsets
     end
 
-    def create_tagset(name,&block)
+    def create_tagset(name, &block)
       ts = tagsets.create(name)
       reset_tagsets
       block.call ts if block
       ts
     end
 
-    def create_tagset!(name,&block)
+    def create_tagset!(name, &block)
       remove_tagset(name)
-      create_tagset(name,&block)
+      create_tagset(name, &block)
     end
 
     def remove_tagset(name)
@@ -43,9 +41,7 @@ module Microstation
     end
 
     def ensure_tags(tags)
-      tags.map{|t| t.class == WIN32OLE ? app.ole_to_ruby(t) : t }
+      tags.map { |t| t.instance_of?(WIN32OLE) ? app.ole_to_ruby(t) : t }
     end
-
   end
-
 end