oozby 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 582eb27392751e57f1f1f4b40721f90d1c00b119
-  data.tar.gz: 475814b52c59cfe2914341010f8fd52c8b1329cc
+  metadata.gz: cdb941976cc799e103cace769bb835829c0f6e2a
+  data.tar.gz: 02cd7754307c2772d08da24d5daffc0c980f3488
 SHA512:
-  metadata.gz: 65b282a8ea18ee15d80c339bb389bcd03220b8afbe85c3e30ca3f538d6c730b58dabd69a10a987eb2142c5ff8fa31d0788247c1507eb935a821441c8a1e86464
-  data.tar.gz: 56048c0db5681f7e0e6164f3bea334e967bb61651d506b175622a27402fbb34067ea3ea8c66c387f0d5444d722699caf328ff251a3d34243e2f6568178311c7e
+  metadata.gz: b91789fe1b0168b93e7414ef24a70b1eabbe1fd1aa6f84131b8a0522a90136d14b8a1c723cfc9927e480a1d058243821f45e76f3e3265ac020b5649de72392c5
+  data.tar.gz: fecffe94b5cbdc3a3cdd1dbf704ec25d70f39e0fc740ac54a2dd19df972b7f3df9fa94a8efb35ee7b09c8c5329ed22e13da133d7fdd50444a26179066f97129e

data/bin/oozby

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'thor' # command line utility utility
+gem 'listen', '< 2.0.0'
 require 'listen' # listen to filesystem for changes in a smart way
 require 'pp' # pretty printer
 require 'rbconfig' # to get path to ruby binary, for making subprocesses

data/lib/oozby/environment.rb

@@ -149,6 +149,16 @@ class Oozby::Environment
     (a[1].to_f * value_proportion) + (b[1].to_f * (1.0 - value_proportion))
   end
   
+  # utility for rotating around in a full circle and doing stuff
+  def turn iterations = nil, &proc
+    if iterations
+      raise "Iterations must be Numeric" unless iterations.is_a? Numeric
+      (0.0...360.0).step(360.0 / iterations, &proc)
+    else
+      0.0...360.0 # return a range which can be iterated however
+    end
+  end
+  
   # gets and sets resolution settings
   def resolution **settings, &proc
     warn "Setting fragments_per_turn and degrees_per_fragment together makes no sense!" if settings[:fragments_per_turn] && settings[:degrees_per_fragment]

data/lib/oozby/preprocessor-definitions.rb

@@ -5,16 +5,16 @@ class Oozby::Preprocessor
   public
   
   default_filters [:xyz, default: 0]
-  passthrough :rotate
-  passthrough :translate
-  passthrough :mirror
+  passthrough :rotate, :a, :v
+  passthrough :translate, :v
+  passthrough :mirror, :v
+  passthrough :resize, :newsize, :auto
   default_filters [:xyz, default: 1]
-  passthrough :scale
-  passthrough :resize  
+  passthrough :scale, :v
   
   default_filters # none for these guys
-  passthrough :multmatrix
-  passthrough :color
+  passthrough :multmatrix, :m
+  passthrough :color, :c
   
   default_filters :resolution, :layout_defaults, :expanded_names
   
@@ -37,9 +37,8 @@ class Oozby::Preprocessor
     return call
   end
   
-  passthrough :sphere
-  #passthrough :cylinder
-  passthrough :polyhedron
+  passthrough :sphere, :r
+  passthrough :polyhedron, :points, :triangles, :convexity
   # 2d shapes
   
   # detect requests for rounded squares and transfer them over
@@ -51,8 +50,10 @@ class Oozby::Preprocessor
     return call
   end
   
-  passthrough :circle
-  passthrough :polygon
+  filter :refuse_args, :h
+  passthrough :circle, :r
+  filter :refuse_args, :h
+  passthrough :polygon, :points, :paths
   # extrude 2d shapes to 3d shapes
   filter :expanded_names, height_label: :height
   passthrough :linear_extrude
@@ -171,6 +172,7 @@ class Oozby::Preprocessor
       [:radius2, :radius_2] => :r2,
       [:facets, :fragments, :sides] => :"$fn",
       [:inr, :inradius, :in_radius, :inner_r, :inner_radius] => :ir,
+      [:width] => :diameter,
       [:height, :h] => height_label
     )
     
@@ -266,7 +268,7 @@ class Oozby::Preprocessor
         if call.named_args.keys.include? key
           value = call.named_args[key]
           if acceptable.none? { |accepts| accepts === value }
-            raise "#{call.method}'s argument #{key} must be #{acceptable.inspect}"
+            raise "#{@original_method}'s argument #{key} must be #{acceptable.inspect}"
           end
         end
       end
@@ -277,10 +279,17 @@ class Oozby::Preprocessor
   # Usage> filter :require_args, :first_arg, :second_arg
   def require_args *list
     list.each do |name|
-      raise "#{call.method} requires argument #{name}" unless call.named_args.keys.include? name
+      raise "#{@original_method} requires argument #{name}" unless call.named_args.keys.include? name
     end
   end
   
+  # ban a list of arguments, to highlight mistakes like passing height to circle
+  # Usage> filter :refuse_args, :h
+  def refuse_args *list
+    list.each do |name|
+      raise "#{@original_method} doesn't support #{name}" if call.named_args.keys.include? name
+    end
+  end
   
   def rounded_rectangle size: [1,1], center: false, corner_radius: 0.0, facets: nil
     size = [size] * 2 if size.is_a? Numeric

data/lib/oozby/preprocessor.rb

@@ -26,11 +26,6 @@ class Oozby::Preprocessor
       super
     end
     
-    # def passthrough method_name
-    #   @@method_filters[method_name] = @@queued_filters
-    #   @@queued_filters = @@default_filters.dup
-    # end
-    
     def finalize_filter method_name
       @@method_filters[method_name] = @@queued_filters
       @@queued_filters = @@default_filters.dup
@@ -83,7 +78,7 @@ class Oozby::Preprocessor
   def transform_call call_info
     raise "call info isn't Oozby::Element #{call_info.inspect}" unless call_info.is_a? Oozby::Element
     @call = call_info
-    original_method = @call.method
+    @original_method = @call.method
     
     run_filters call_info.method.to_sym
     
@@ -98,7 +93,7 @@ class Oozby::Preprocessor
         # replace called item with this new stuff
         return result
       elsif result != nil # ignore nil - we don't need to do anything for that!
-        raise "#{original_method} preprocessor returned invalid result #{result.inspect}"
+        raise "#{@original_method} preprocessor returned invalid result #{result.inspect}"
       end
     end
     
@@ -173,7 +168,11 @@ class Oozby::Preprocessor
       env.preprocessor(false) {
         env._execute_oozby(&proc)
       }
-    }).find { |x| x.is_a? Oozby::Element }
+    }).find { |x|
+      x.is_a? Oozby::Element
+    }.tap { |x|
+      x.modifier = "#{call.modifier}#{x.modifier}" if call.modifier
+    }
   end
   
   # remember list of public methods defined so far - these are system ones

data/lib/oozby/version.rb

@@ -1,5 +1,5 @@
 class Oozby
-  Version = '0.4.0'
+  Version = '0.4.2'
   
   def self.version
     Oozby::Version

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: oozby
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Bluebie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: amatch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.11
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
 description: OpenSCAD - a cad language for creating solid 3d objects, useful for CNC
@@ -90,24 +90,24 @@ files:
 - license.txt
 - examples/using classes/demo-class.rb
 - bin/oozby
-homepage: http://github.com/Bluebie/digiusb.rb
+homepage: http://creativepony.com/oozby/
 licenses:
 - LGPL-3
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - lib/oozby/base.rb
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []