crystalscad 0.6.5 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 287d067c580abbd3c12857eaf2d24f4b2c0c3195
-  data.tar.gz: d1b32c216e29a883f4f76ddf7ce4434735305e5d
+  metadata.gz: acc0be6258406fcd9ce18f27bcdfa1f7d3b58878
+  data.tar.gz: 7f6fe119c519dc95483a5dad60c72aca8fcbaf86
 SHA512:
-  metadata.gz: 18f560c3ed30377de9236824876ab974ae54f4ddb386527152c975a81830e24fd43845b25d47c4c3504c85b04121fa154b5cc1ee639416addd5a0f302afbdcf8
-  data.tar.gz: 4ea021b28a6b058881c763649e0cf8b147823032db76b94ea2dca66d3d03faa54b4e1344434227fdd79ccc9d4d42455e5b8d9e95c72fe8b423030df156752f7a
+  metadata.gz: 2a044145935cb14d98890d87833a350a24009c288ea0bf36dbce2676e070d46433fcf3bcaedf661a5225315247670546fd9b5e7e7fdb70b319579baf16270428
+  data.tar.gz: c4c87cddd1ddae6809b49e6e5fb8121609ce20340200148062bc6c61779a441bdc741195d1e225731f7491e1de1704ec595830703ff1b6f86e95e58eae73a9c8

data/crystalscad.gemspec

@@ -7,9 +7,9 @@ require "crystalscad/version"
 Gem::Specification.new do |gem|
   gem.name        = "crystalscad"
   gem.version     = CrystalScad::VERSION
-  gem.authors     = ["Joachim Glauche"]
-  gem.email       = ["webmaster@joaz.de"]
-  gem.homepage    = "http://github.com/Joaz/CrystalScad"
+  gem.authors     = ["Jennifer Glauche"]
+  gem.email       = ["mail@crystalscad.jglauche.de"]
+  gem.homepage    = "http://github.com/jglauche/CrystalScad"
   gem.summary     = %q{CrystalScad is a framework for programming OpenScad models in Ruby}
   gem.description = %q{Inspired by SolidPython, based on RubyScad}
 		

data/examples/pipe_bug.rb

@@ -4,7 +4,7 @@ require "crystalscad"
 include CrystalScad
 
 # Used to debug
-# https://github.com/Joaz/CrystalScad/issues/5
+# https://github.com/jglauche/CrystalScad/issues/5
 
 pipe = Pipe.new(diameter:10)
 

data/examples/text.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/ruby1.9.3
+require "rubygems"
+require "crystalscad"
+include CrystalScad
+
+string = "CrystalScad!"
+
+res = text(text: string)
+res += text(text: string, size: 3).translate(y: 10)
+res += text(text: string, spacing: 0.75).translate(y: 20)
+res.save("text.scad")

data/lib/crystalscad/CrystalScad.rb

@@ -256,8 +256,28 @@ module CrystalScad
   class AdvancedPrimitive < Primitive
     
     
+		NUMERIC_ATTRIBUTES = []
+
+    def self.numeric_attributes(*attribute_names)
+			Array(attribute_names).flatten.each do |attrbute_name|
+				NUMERIC_ATTRIBUTES << attrbute_name.to_sym
+			end
+		end
+
+		class <<self
+			alias_method :numeric_attribute, :numeric_attributes
+		end
+
     def initialize(attributes)
-      @attr = attributes.collect { |k, v| "#{k} = \"#{v}\"" }.join(', ')
+			@attr = attributes.collect { |k, v|
+				value_output = if NUMERIC_ATTRIBUTES.include?(k.to_sym)
+					v.to_f
+				else
+					"\"#{v}\""
+				end
+
+				"#{k} = #{value_output}"
+			}.join(', ')
       super
     end
     
@@ -269,6 +289,7 @@ module CrystalScad
 
 
   class Text < AdvancedPrimitive
+		numeric_attributes :size, :spacing
 		def initialize(attributes)
 			@operation = "text"
 			super(attributes)

data/lib/crystalscad/Hardware.rb

@@ -54,11 +54,11 @@ module CrystalScad::Hardware
 			add_to_bom
 			case @args[:type].to_s
   			when "912"
-    			res = bolt_912(@args[:additional_length], @args[:additional_diameter])
+    			res = bolt_912(@args[:additional_length], @args[:additional_diameter], @args[:head_margin])
   			when "933"
     			res = bolt_933(@args[:additional_length], @args[:additional_diameter], @args[:head_margin])
 	      when "7380"
-    			res = bolt_7380(@args[:additional_length], @args[:additional_diameter])
+    			res = bolt_7380(@args[:additional_length], @args[:additional_diameter], @args[:head_margin])
 		    else
 		      raise "unkown type #{args[:type]} for Bolt!"
 		  end
@@ -89,8 +89,11 @@ module CrystalScad::Hardware
 		end 
 
     # ISO 7380
-  	def bolt_7380(additional_length=0, addtional_diameter=0)
-	    chart_iso7380 = {
+  	def bolt_7380(additional_length=0, addtional_diameter=0, head_margin=0)
+	    if head_margin.to_f != 0
+				puts "[warning] :head_margin is not implemented for 7380 bolts"
+			end
+			chart_iso7380 = {
 	                    3 => {head_dia:5.7,head_length:1.65},
 	                    4 => {head_dia:7.6,head_length:2.2},
 	                    5 => {head_dia:9.5,head_length:2.75},
@@ -107,9 +110,8 @@ module CrystalScad::Hardware
 	  end
 
     # DIN 912
-		def bolt_912(additional_length=0, addtional_diameter=0)
+		def bolt_912(additional_length=0, addtional_diameter=0, head_margin=0)
 			
-	
 			chart_din912 = {2 => {head_dia:3.8,head_length:2,thread_length:16},
               			  2.5=> {head_dia:4.5,head_length:2.5,thread_length:17},
 			                3 => {head_dia:5.5,head_length:3,thread_length:18},
@@ -131,8 +133,7 @@ module CrystalScad::Hardware
 										
 										 }
 
-			res = cylinder(d:chart_din912[@size][:head_dia],h:chart_din912[@size][:head_length]).translate(z:-chart_din912[@size][:head_length]).color("Gainsboro") 
-			
+			res = cylinder(d:chart_din912[@size][:head_dia]+head_margin,h:chart_din912[@size][:head_length]).translate(z:-chart_din912[@size][:head_length]).color("Gainsboro") 			
 			total_length = @length + additional_length
 			thread_length=chart_din912[@size][:thread_length]		
 	    if total_length.to_f <= thread_length
@@ -343,9 +344,9 @@ module CrystalScad::Hardware
 		end
 
 		def nut_934(show=true,margin=0,height_margin=0)		
-			@s += margin
+			size = @s + margin
 			
-			res = cylinder(d:(@s/Math.sqrt(3))*2,h:@height+height_margin,fn:6)
+			res = cylinder(d:(size/Math.sqrt(3))*2,h:@height+height_margin,fn:6)
 			res -= cylinder(d:@size,h:@height) if show == true
 		 	if @support
 				res -= add_support			
@@ -357,9 +358,8 @@ module CrystalScad::Hardware
 
 
 	class TSlot < CrystalScad::Assembly
-		# the code in this class is based on code by Nathan Zadoks 	
-		# taken from https://github.com/nathan7/scadlib
-		# Ported to CrystalScad by Joachim Glauche
+		# the code in this class is based on code by edef1c 	
+		# Ported to CrystalScad by Jennifer Glauche 
 		# License: GPLv3
 		attr_accessor :args
 		def initialize(args={})

data/lib/crystalscad/version.rb

@@ -1,4 +1,4 @@
 module CrystalScad
-  VERSION = "0.6.5"
+  VERSION = "0.6.8"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crystalscad
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.8
 platform: ruby
 authors:
-- Joachim Glauche
+- Jennifer Glauche
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyscad
@@ -68,7 +68,7 @@ dependencies:
         version: 1.0.5
 description: Inspired by SolidPython, based on RubyScad
 email:
-- webmaster@joaz.de
+- mail@crystalscad.jglauche.de
 executables:
 - crystalgen
 extensions: []
@@ -95,6 +95,7 @@ files:
 - examples/printed_thread.rb
 - examples/printed_thread2.rb
 - examples/stack.rb
+- examples/text.rb
 - examples/threads.rb
 - examples/threads2.rb
 - examples/threads3.rb
@@ -119,7 +120,7 @@ files:
 - skeleton_project/skeleton.rb
 - static/logo.png
 - static/logo_small.png
-homepage: http://github.com/Joaz/CrystalScad
+homepage: http://github.com/jglauche/CrystalScad
 licenses:
 - GPL-3
 metadata: {}
@@ -139,8 +140,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: CrystalScad is a framework for programming OpenScad models in Ruby
 test_files: []
+has_rdoc: