oozby 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72a9ef479750895c4718a2fc8d0f68ca54f9741e
-  data.tar.gz: 61345c4bbfd49980801843157756baef7ce98cba
+  metadata.gz: bbeac0d8921f607998af1bcdc80dcd33fc8a1458
+  data.tar.gz: 9aa07a90a933bb5e71371132efeb3e319d19b7cd
 SHA512:
-  metadata.gz: 61786bf4d356df899a4b091501d6e8477d4ac8ea8d449888b0efde86a018558d793d24c1049e94e63947b47cf0bb453ba804c9198db18d74874c131b519f1019
-  data.tar.gz: 3f9f1a23a1e03c1287eecca227ac4fe9b1c1a0c0ff367ffadcc929087961029027cc41994ea22401e1796f16cdd6862f4603088029a25f9e3e11bd9fe3f5e2c3
+  metadata.gz: e93d14c4822a3d96ccc2ec468186308e6ce7d15413cc0a6a7bbf5d7cfce07596b444f4bf6fda1004876d6d1c536b8e99a39c85d48ff12105e19bd334fca3788a
+  data.tar.gz: 1164475b829db6152960f3aee796ea3d0f360208f2820837d01f0ca9910bfd431d4d1c233e661ed845ab77369448fada5d4513cc6a6685f9a6a5a13ccbe8aa49

data/lib/oozby/base.rb

@@ -17,7 +17,7 @@ class Oozby
     rescue
       warn "Recent Calls: " + env.instance_variable_get(:@method_history).last(10).reverse.inspect
       backtrace = $!.backtrace
-      backtrace = backtrace.select { |item| !item.include? __dir__ }
+      backtrace = backtrace.select { |item| !item.include? __dir__ } unless backtrace.first.include? __dir__
       raise $!, $!.message, backtrace
     end
     @code_tree = env._abstract_tree

data/lib/oozby/method_preprocessor.rb

@@ -60,13 +60,13 @@ class Oozby::MethodPreprocessor
     expanded_names(info)
     layout_defaults(info)
     
-    if info[:named_args][:r]
+    if info.named_args[:r]
       # render rounded rectangle
       info.replace rounded_cube(**args_parse(info, :size, :center, :r))
     end
   end
   
-  def expanded_names(info)
+  def expanded_names(info, height_label: :h)
     # let users use 'radius' as longhand for 'r'
     info.named_args[:r]  = info.named_args.delete(:radius)   if info.named_args[:radius]
     info.named_args[:r1] = info.named_args.delete(:radius1)  if info.named_args[:radius1]
@@ -76,28 +76,35 @@ class Oozby::MethodPreprocessor
     
     info.named_args[:"$fn"] = info.named_args.delete(:facets) if info.named_args[:facets]
     
-    # allow range for radius
-    if info.named_args[:r].is_a? Range
-      range = info.named_args.delete(:r)
-      info.named_args[:r1] = range.first
-      info.named_args[:r2] = range.last
-    end
-    
     # let users specify diameter instead of radius - convert it
     {  diameter: :r,                    dia: :r,               d: :r,
       diameter1: :r1, diameter_1: :r1, dia1: :r1, dia_1: :r1, d1: :r1,
       diameter2: :r2, diameter_2: :r2, dia2: :r2, dia_2: :r2, d2: :r2
     }.each do |d, r|
       if info.named_args.key? d
-        info.named_args[r] = info.named_args.delete(d) / 2.0
+        data = info.named_args.delete(d)
+        if data.is_a? Range
+          data = Range.new(data.first / 2.0, data.last / 2.0, data.exclude_end?)
+        else
+          data = data / 2.0
+        end
+        info.named_args[r] = data
       end
     end
     
+    # allow range for radius
+    if info.named_args[:r].is_a? Range
+      range = info.named_args.delete(:r)
+      info.named_args[:r1] = range.first
+      info.named_args[:r2] = range.last
+    end
+    
     # long version 'height' becomes 'h'
-    info.named_args[:h] = info.named_args.delete(:height) if info.named_args[:height]
+    height_specification = info.named_args.delete(:height) || info.named_args.delete(:h)
+    info.named_args[height_label] = height_specification if height_specification
   end
   
-  def _linear_extrude(info); layout_defaults(info); expanded_names(info); end
+  def _linear_extrude(info); layout_defaults(info); expanded_names(info, height_label: :height); end
   def _rotate_extrude(info); layout_defaults(info); expanded_names(info); end
   
   def _circle(info); expanded_names(info); end
@@ -148,11 +155,11 @@ class Oozby::MethodPreprocessor
       translate(offset) do
         # extrude the main body parts using rounded_rect as the basis
         linear_extrude(height: size[2] - diameter, center: true) {
-          inject_abstract_tree(preprocessor.rounded_rect(size: [size[0], size[1]], center: center, r: r)) }
+          inject_abstract_tree(preprocessor.rounded_rect(size: [size[0], size[1]], center: true, r: r)) }
         rotate([90,0,0]) { linear_extrude(height: size[1] - diameter, center: true) {
-          inject_abstract_tree(preprocessor.rounded_rect(size: [size[0], size[2]], center: center, r: r)) }}
+          inject_abstract_tree(preprocessor.rounded_rect(size: [size[0], size[2]], center: true, r: r)) }}
         rotate([0,90,0]) { linear_extrude(height: size[0] - diameter, center: true) {
-          inject_abstract_tree(preprocessor.rounded_rect(size: [size[2], size[1]], center: center, r: r)) }}
+          inject_abstract_tree(preprocessor.rounded_rect(size: [size[2], size[1]], center: true, r: r)) }}
         
         # fill in the corners with spheres
         xr, yr, zr = size.map { |x| (x / 2) - r }
@@ -189,7 +196,7 @@ class Oozby::MethodPreprocessor
   def args_parse(info, *arg_names)
     args = info[:named_args].dup
     info[:args].length.times do |index|
-      warn "Overwriting argument #{arg_names[index]}"
+      warn "Overwriting argument #{arg_names[index]}" if args.key? arg_names[index]
       args[arg_names[index]] = info[:args][index]
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oozby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Bluebie
@@ -46,7 +46,8 @@ files:
 - license.txt
 - bin/oozby
 homepage: http://github.com/Bluebie/digiusb.rb
-licenses: []
+licenses:
+- LGPL-3
 metadata: {}
 post_install_message: 
 rdoc_options: