autocad 0.4.6 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 425a738e6826de0f157bec94b8b02be7e48e2d2209df2560d14281fa54430d4b
-  data.tar.gz: 3ee1c842a9f909f62b8d39d9776cad73aa645ebd64901ed66d3bb1a2bc1cb0e6
+  metadata.gz: c493af716dddb2e4096f73bca30fdb0de952bf2da0d7803bd7f707f9576ffe3f
+  data.tar.gz: 652b6088a00cdf198f2fc84b2391d94b42d0c37858134769518782bef51973d5
 SHA512:
-  metadata.gz: ec8069f2d8abb5604d02de54f1c60762837746ec1c303749684261977e197ffed5ab74884105e532dda696bf4720fbbb61d9e1ef477ac743c0495b5c467e00fe
-  data.tar.gz: f5b978c18f2723c2834a013b072bae1599517df53d232d1e787b12d29a832157813dd18c978f8f95c3f45a3bd3e7b90afe802fa334b1f9287eb3495685e33c97
+  metadata.gz: 65eb1d1238ab59216b526d548fde497988d13062e17338b183692812d7d45feafac9c688b954492e4382028157fd5ab5c4097f8182f05d10852376810705abda
+  data.tar.gz: 3eb0d132ad96e4e6dc8b85096e76c5ab90ecd9ab17775352a96c9439ecdf4c76a0958f64851f1467e1ad6a0851f533a19354be39de076834abf42655c9eb43b0

data/.rubocop/minitest.yml

@@ -1,2 +1,2 @@
-require:
-  - rubocop-minitest
+plugins:
+  - rubocop-minitest

data/.rubocop/strict.yml

@@ -1,4 +1,4 @@
-Lint/Debugger: # don't leave binding.pry
-  Enabled: true
-  Exclude: []
-
+Lint/Debugger: # don't leave binding.pry
+  Enabled: true
+  Exclude: []
+

data/.rubocop.yml

@@ -1,33 +1,36 @@
-inherit_mode:
-  merge:
-    - Exclude
-
-require:
-  - standard
-  - standard-custom
-  - standard-performance
-  - rubocop-performance
-
-inherit_gem:
-  standard: config/base.yml
-  standard-performance: config/base.yml
-  standard-custom: config/base.yml
-
-inherit_from:
-  - .rubocop/minitest.yml
-  - .rubocop/strict.yml
-
-AllCops:
-  NewCops: disable
-  SuggestExtensions: false
-  TargetRubyVersion: 3.3
-  Exclude:
-    - 'sig/**/*'
-
-# RBS annotations allowed
-Layout/LeadingCommentSpace:
-  Enabled: true
-  AllowRBSInlineAnnotation: true
-
-Layout/EndOfLine:
-  EnforcedStyle: lf
+  
+inherit_mode:
+  merge:
+    - Exclude
+
+plugins:
+  - rubocop-performance
+  - standard-custom
+  - standard-performance
+
+require:
+  - standard
+  - rubocop-rbs_inline
+
+inherit_gem:
+  standard: config/base.yml
+  standard-performance: config/base.yml
+  standard-custom: config/base.yml
+
+inherit_from:
+  - .rubocop/minitest.yml
+  - .rubocop/strict.yml
+
+AllCops:
+  NewCops: disable
+  SuggestExtensions: false
+  TargetRubyVersion: 3.4
+  Exclude:
+    - 'sig/**/*'
+
+# RBS annotations allowed
+Layout/LeadingCommentSpace:
+  AllowRBSInlineAnnotation: true
+
+Layout/EndOfLine:
+  EnforcedStyle: lf

data/CHANGELOG.md

@@ -1,5 +1,5 @@
-## [Unreleased]
-
-## [0.1.0] - 2024-11-27
-
-- Initial release
+## [Unreleased]
+
+## [0.1.0] - 2024-11-27
+
+- Initial release

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2024 Dominic Sisneros
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2024 Dominic Sisneros
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,39 +1,134 @@
-# Autocad
-
-TODO: Delete this and the text below, and describe your gem
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/autocad`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-## Installation
-
-TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
-
-Install the gem and add to the application's Gemfile by executing:
-
-    $ bundle add UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
-
-If bundler is not being used to manage dependencies, install the gem by executing:
-
-    $ gem install UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/dsisnero/autocad. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/dsisnero/autocad/blob/main/CODE_OF_CONDUCT.md).
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the Autocad project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/dsisnero/autocad/blob/main/CODE_OF_CONDUCT.md).
+# Autocad
+
+A Ruby library for automating AutoCAD operations through the COM interface (version 0.5).
+
+## Features
+
+- Create, open, and manipulate AutoCAD drawings
+- Work with layers, blocks, text, and other drawing elements
+- Support for symbolic color names through ACAD::COLOR constants
+- Selection sets for filtering and manipulating objects
+- PDF export capabilities
+- Event handling for AutoCAD events
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'autocad', '~> 0.5'
+```
+
+And then execute:
+
+```bash
+$ bundle install
+```
+
+Or install it yourself as:
+
+```bash
+$ gem install autocad
+```
+
+## Usage
+
+### Basic Operations
+
+```ruby
+# Start AutoCAD and create a new drawing
+Autocad.run do |app|
+  drawing = app.new_drawing("test.dwg")
+  
+  # Create a new layer with a color
+  layer = drawing.create_layer("MyLayer", ACAD::COLOR::RED)
+  
+  # Switch to model space
+  drawing.to_model_space
+  
+  # Add a line to the drawing
+  model = drawing.model_space
+  pt1 = Point3d(0, 0, 0)
+  pt2 = Point3d(10, 10, 0)
+  line = model.add_line(pt1, pt2)
+  
+  # Save and close the drawing
+  drawing.save
+  drawing.close
+end
+```
+
+### Working with Colors
+
+```ruby
+# Colors can be specified in multiple ways:
+layer.color = Autocad::Color::Blue    # Using constants
+layer.color = :green                  # Using symbols
+layer.color = "RED"                   # Using strings
+layer.color = 1                       # Using AutoCAD color indices
+```
+
+### Working with Layers
+
+```ruby
+# Create a layer
+layer = drawing.create_layer("NewLayer", :blue)
+
+# Set the active layer
+drawing.active_layer = layer
+
+# Iterate through all layers
+drawing.layers.each do |layer|
+  puts "Layer: #{layer.name}, Color: #{layer.color_name}"
+end
+```
+
+### Working with Selection Sets
+
+```ruby
+# Create a selection set
+ss = drawing.create_selection_set("MySelection")
+
+# Filter for specific objects
+ss.filter do |f|
+  f.and(f.model_space, f.block_reference)
+end
+
+# Select objects
+ss.select
+
+# Process selected objects
+ss.each do |obj|
+  puts obj.inspect
+end
+```
+
+### Exporting to PDF
+
+```ruby
+# Export the current drawing to PDF
+drawing.save_as_pdf(dir: "output")
+
+# Batch convert multiple drawings
+Autocad.with_drawings(["drawing1.dwg", "drawing2.dwg"], read_only: true) do |drawing|
+  drawing.save_as_pdf(dir: "output")
+end
+```
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/dsisnero/autocad. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/dsisnero/autocad/blob/main/CODE_OF_CONDUCT.md).
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Code of Conduct
+
+Everyone interacting in the Autocad project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/dsisnero/autocad/blob/main/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,10 +1,26 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
-require "minitest/test_task"
-
-Minitest::TestTask.create
-
-require "standard/rake"
-
-task default: %i[test standard]
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'minitest/test_task'
+
+Minitest::TestTask.create
+
+Minitest::TestTask.create :unit do |t|
+  t.test_globs = ['spec/unit/**/*_spec.rb']
+  t.warning = false
+end
+
+# Create a namespace for test tasks
+namespace :test do
+  desc "Run unit tests"
+  task :unit => :unit
+
+  desc "Run specific drawing test"
+  task :drawing_set_variables do
+    sh "ruby -Ilib:spec spec/unit/autocad/drawing_spec.rb --line 117"
+  end
+end
+
+require 'standard/rake'
+
+task default: %i[test standard]

data/exe/autocad

@@ -1,3 +1,3 @@
-#!/usr/bin/env ruby
-
-require "autocad"
+#!/usr/bin/env ruby
+
+require "autocad"

data/gemfiles/rubocop.gemfile

@@ -1,6 +1,7 @@
 source "https://rubygems.org" do
-  gem "standard", "~> 1.28"
+  gem "standard"
 
   gem "rubocop-minitest"
+  gem "rubocop-rbs_inline"
   # gem "guard-rubocop"
 end

data/lib/autocad/app.rb

@@ -1,9 +1,9 @@
 # rbs_inline: enabled
 
 require_relative "event_handler"
+require_relative "element"
 require_relative "drawing"
 require_relative "paths"
-require_relative "element"
 require_relative "line"
 require_relative "text"
 require_relative "mtext"
@@ -11,6 +11,15 @@ require_relative "pviewport"
 require_relative "block"
 require_relative "block_reference"
 require_relative "selection_set"
+require_relative "plot"
+require_relative "plot_configuration"
+require_relative "layout"
+require_relative "bounding_box"
+require_relative "viewport"
+require_relative "point"
+require_relative "dim_style"
+require_relative "spline"
+
 
 require "win32ole"
 module Windows
@@ -37,9 +46,33 @@ module Autocad
   class App
     include Common
     @default_error_proc = ->(e, f) {
-      puts "Couldn't open drawing #{f}" if f
-      debug_error if $DEBUG
-      raise e
+      if e.is_a?(DrawingClose)
+        # For DrawingClose errors, try to close via the app
+        drawing_name = e.drawing_name
+        puts "Error with drawing #{drawing_name}: #{e.message}"
+        begin
+          # Try to find and close the drawing by name
+          if drawing_name && !drawing_name.empty?
+            ole_obj.Documents.each do |doc|
+              if doc.Name == drawing_name
+                begin
+                  doc.Close(false)
+                  puts "Successfully closed drawing #{drawing_name} via app"
+                rescue => close_err
+                  puts "Failed to close drawing #{drawing_name}: #{close_err.message}"
+                end
+                break
+              end
+            end
+          end
+        rescue StandardError => close_err
+          puts "Additional error during cleanup: #{close_err.message}"
+        end
+      else
+        puts "Couldn't open drawing #{f}" if f
+        debug_error if $DEBUG
+        raise e
+      end
     }
 
     class << self
@@ -117,11 +150,15 @@ module Autocad
             begin
               the_app.open_drawing(file, read_only:, wait_time:, wait_interval:, error_proc:, &block)
               the_app.ole_obj.ole_methods # check if server still open
+            rescue DrawingClose => e
+              # Handle DrawingClose errors specifically
+              error_proc.call(e, e.drawing_name)
+              next # Continue to the next drawing
             rescue => e
               raise e unless error_proc
 
               error_proc.call(e, file)
-              the_app = new(visible: opt_visible)
+              the_app = new(visible: visible)
             end
           end
         ensure
@@ -206,11 +243,18 @@ module Autocad
       drawing_from_ole(ole)
     end
 
-    def drawing_from_ole(ole) #: Drawing
-      Drawing.new(self, ole)
+    # @rbs drawing: Drawing
+    # @rbs return void
+    def active_drawing=(drawing)
+      ole_obj.ActiveDocument = drawing.ole_obj
+    end
+
+    def drawing_from_ole(ole, requested_name = nil) #: Drawing
+      Drawing.new(self, ole, requested_name)
     end
 
-    attr_reader :error_proc, :visible, :logger
+    attr_reader :visible, :logger
+    attr_accessor :error_proc
 
     # Constructor for app
     # @rbs visible: bool -- do you want the app to be visible
@@ -230,6 +274,19 @@ module Autocad
       @error_proc.call(e, nil)
     end
 
+    # save the current drawing
+    # @rbs dir: String|Pathname -- the dir to save drawing to
+    # @rbs model: bool -- prints model space instead of paperspace in pdf document
+    # @rbs return void
+    def save_open_drawings(dir: Pathname.getwd, model: false)
+      return unless has_drawings?
+      drawings.each do |d|
+        d.copy(dir:)
+        d.save_as_pdf(dir:, model:)
+        # d.close(false)
+      end
+    end
+
     def windows_path(path)
       @windows.windows_path(path)
     end
@@ -336,7 +393,7 @@ module Autocad
     end
 
     def zoom_pick_window
-      ole_obj.ZoomPickWindowo
+      ole_obj.ZoomPickWindow
     end
 
     def zoom_extents
@@ -347,7 +404,7 @@ module Autocad
       ole_obj.ZoomPrevious
     end
 
-    def zoom_scaled(magnify: 1.0, scale_type: :paper_space)
+    def zoom_scaled(magnify = 1.0, scale_type: :relative)
       scale_type = case scale_type
       when :paper_space
         ACAD::AcZoomScaledRelativePSpace
@@ -391,12 +448,43 @@ module Autocad
 
     def close_all_drawings(save: false)
       return unless @ole_obj
-      until @ole_obj.Documents.Count == 0
-        begin
-          @ole_obj.ActiveDocument.Close(save)
-        rescue
-          break
+      begin
+        # Get a count first since the collection will change as we close drawings
+        count = @ole_obj.Documents.Count
+        count.times do |i|
+          # Always close the first one since the collection shifts
+          begin
+            doc = @ole_obj.Documents.Item(0)
+            doc.Close(save) if doc
+          rescue StandardError => e
+            puts "Error closing document: #{document.name} #{e.message}"
+            break
+          end
+        end
+      rescue StandardError => e
+        puts "Error in close_all_drawings: #{e.message}"
+      end
+    end
+
+    # Close a specific drawing
+    # @rbs drawing: Drawing | String -- the drawing or drawing name to close
+    # @rbs save: bool -- whether to save the drawing
+    def close_drawing(drawing, save = true)
+      begin
+        # Get the drawing name
+        drawing_name = drawing.is_a?(String) ? drawing : (drawing.respond_to?(:name) ? drawing.name : nil)
+        return unless drawing_name
+
+        # Try to find the drawing in the Documents collection and close it
+        ole_obj.Documents.each do |doc|
+          if doc.Name == drawing_name
+            doc.Close(save)
+            puts "Successfully closed drawing #{drawing_name}"
+            break
+          end
         end
+      rescue StandardError => e
+        puts "Error in close_drawing #{drawing_name}: #{e.message}"
       end
     end
 
@@ -427,7 +515,7 @@ module Autocad
       # binding.break unless seedfile
       windows_name = windows_path(filename)
       ole = new_ole_drawing(windows_name, open: open, wait_time: opts[:wait_time], wait_interval: opts[:wait_interval])
-      drawing = drawing_from_ole(ole)
+      drawing = Drawing.new(self, ole, filename)
       return drawing unless block
 
       begin
@@ -454,23 +542,34 @@ module Autocad
       file_path = Pathname.new(filename).expand_path
       raise FileNotFound.new(file_path) unless file_path.file?
 
+      err_fn = error_proc || @error_proc
+
       begin
         ole = ole_open_drawing(windows_path(filename), read_only:, wait_time:, wait_interval:)
       rescue DrawingError => e
         raise e unless err_fn
-
         err_fn.call(e, e.drawing)
+        return nil
       end
+
       drawing = drawing_from_ole(ole)
       return drawing unless block_given?
 
       begin
         yield drawing
+      rescue DrawingClose => e
+        # Handle DrawingClose errors specifically
+        err_fn.call(e, e.drawing_name)
+        return nil
       rescue => e
         raise e unless err_fn
         err_fn.call(e, filename)
       ensure
-        drawing.close
+        begin
+          drawing.close unless drawing.nil? || drawing.instance_variable_get(:@drawing_closed)
+        rescue DrawingClose => e
+          err_fn.call(e, e.drawing_name)
+        end
       end
     end
 
@@ -478,16 +577,6 @@ module Autocad
 
     alias_method :current_drawing, :active_drawing
 
-    def model_space
-      ModelSpace.new(doc_ole.ModelSpace)
-    end
-
-    def paper_space
-      PaperSpace.new(doc_ole.PaperSpace)
-    end
-
-    alias_method :model, :model_space
-
     # @rbs message: String -- the String to put in Autocad prompt
     def prompt(message)
       doc.prompt(message)
@@ -576,6 +665,16 @@ module Autocad
       ole_preferences_files.SupportPath.split(";").map { |f| Pathname.new(f) }
     end
 
+    def support_path_files
+      return enum_for(:support_path_files) unless block_given?
+
+      support_paths.each do |path|
+        path.children.each do |file|
+          yield file if file.file?
+        end
+      end
+    end
+
     # @rbs return [Array<Pathname>] all paths in Files.PrinterConfigPath
     def printer_config_paths
       ole_preferences_files.PrinterConfigPath.split(";").map { |f| Pathname.new(f) }

data/lib/autocad/arc.rb

@@ -2,14 +2,17 @@ require_relative "element"
 
 module Autocad
   class Arc < Element
+    # @rbs return Float
     def length
       @ole_obj.ArcLength
     end
 
+    # @rbs return Point3d
     def start_point
       Point3d(ole_obj.StartPoint)
     end
 
+    # @rbs return Point3d
     def end_point
       Point3d(ole_obj.EndPoint)
     end