engineering 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 77f2d000480b81c235ca318065fa10b03ae24c53
-  data.tar.gz: 7079726edaaa3a2c4861f91170a2522b298a0882
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWFiMzc4YTE4YmIxMTc2MmZlYzNiNTcwZDcyMDhmYjkxODE4MDRmYg==
+  data.tar.gz: !binary |-
+    YTVhOWE2ODI0MjQ4OTM5N2Q5MjMzZWQ0NzU3NWFhM2MzODJmMmYzNg==
 SHA512:
-  metadata.gz: 27e226858c03ed4213db6d169386886f6492aec85c8ca60d9d9ad70d0148391af909741443359ef3481ba816e9cc36c4a1c3dae21030e3e68126fe022b839fe1
-  data.tar.gz: dd254bd2ede34af0ab21f9635c3e4c92b4e1ac32be27423736f401641df720bad14484e3a4dd4857d20a4a369e23da3876897a77568cbab3ad0e5743e6d8452a
+  metadata.gz: !binary |-
+    MWVlMmM5M2QzY2YzNzU2MjFhZTNkOTA0NjE4NjgyZmYxMjU1YzY2NDhkZTJh
+    MWIyZWNlNzNlNTY3N2Q0MmNmZDU4NTNlZjA4YjQ0M2UzMTI1M2IwNmZjMDBj
+    YzgxOGFmZDQyNGQ3NTdhYzEyZjMxZTU1ZTBlZWM2ZGExZmY5MjU=
+  data.tar.gz: !binary |-
+    NjE1ZDE1ODkyOGVmM2QyZjhhMWIxZWI4ZDMzNjY4NGQ1MDVjMGU3N2NjY2E5
+    NzUyZmI3MTM0NTQ2NTgzOGY3NmI2YzNiOGZhMWIwMzY2ZDg1Y2Q1YjM5MmMw
+    MGU4MzYwYjk3YTE1OWJhM2QwMmRhYTY0ODVlZDlmYjMzOWUwMmE=

data/README.markdown

@@ -1,6 +1,9 @@
 Engineering for Ruby
 ====================
 
+[![Build Status](https://travis-ci.org/bfoz/engineering.svg?branch=master)](https://travis-ci.org/bfoz/engineering)
+[![Gem Version](https://badge.fury.io/rb/engineering.svg)](http://badge.fury.io/rb/engineering)
+
 This is a meta-gem for all things related to engineering (particularly CAD stuff). The Engineering module
 is your one stop shop for all of the tools you need for your latest mad-engineering project.
 
@@ -11,11 +14,6 @@ that isn't in Engineering, either let me know, or fork and add it yourself (and
 send me a pull request). Or feel free to create your own gem that reopens
 the module and adds whatever is missing, if that's more your style.
 
-License
--------
-
-Copyright 2012-2014 Brandon Fosdick <bfoz@bfoz.net> and released under the BSD license.
-
 Dependencies
 ------------
 
@@ -107,3 +105,8 @@ Once a Model has been defined, it can be instantiated and exported to SketchUp w
     SketchUp.write('MyCube.su', MyCube.new)
 
 Then, launch SketchUp, open the _Ruby Console_ (it's in the Window menu), and _load 'MyCube.su'_. Your new geometry will replace whatever was already in the SketchUp document (a person if you just opened it), so be careful.
+
+License
+-------
+
+Copyright 2012-2015 by [Brandon Fosdick](bfoz@bfoz.net) and released under the [BSD license](http://opensource.org/licenses/BSD-2-Clause).

data/engineering.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
     s.name        = "engineering"
-    s.version     = '0.3'
+    s.version     = '0.4'
     s.authors     = ["Brandon Fosdick"]
     s.email       = ["bfoz@bfoz.net"]
     s.homepage    = "http://github.com/bfoz/engineering"
@@ -18,10 +18,10 @@ Gem::Specification.new do |s|
     s.require_paths = ["lib"]
 
     s.add_dependency	'dxf', '~> 0.3'
-    s.add_dependency	'geometry', '~> 6.4'
-    s.add_dependency	'model', '~> 0.2'
+    s.add_dependency	'geometry', '~> 6.5'
+    s.add_dependency	'model', '~> 0.3'
     s.add_dependency	'sketch', '~> 0.4'
-    s.add_dependency	'units', '~> 2.4'
+    s.add_dependency	'units', '~> 3.0'
 
     s.required_ruby_version = '>= 2.0'
 end

data/lib/builder/model.rb

@@ -1,5 +1,4 @@
-require 'model'
-
+require_relative '../model'
 require_relative '../model/dsl'
 require_relative 'extrusion'
 
@@ -7,7 +6,7 @@ module Engineering
     module Builder
 	# Build a {Model} subclass
 	class Model
-	    include ::Model::DSL
+	    prepend ::Model::DSL
 
 	    # Convenience method for creating a new builder and evaluating a block
 	    def self.build(&block)
@@ -24,9 +23,6 @@ module Engineering
 	    def build(super_class=::Model, &block)
 		@klass = Class.new(super_class)
 		if block_given?
-		    @klass.singleton_class.send :attr_reader, :elements
-		    @klass.instance_variable_set(:@elements, [])
-
 		    @self_before_instance_eval = block.binding.eval('self')
 		    self.instance_eval(&block)
 
@@ -81,6 +77,12 @@ private
 		[self.class.new.build(::Model::Group, &block), args]
 	    end
 
+
+	    # Build a new {Layout}
+	    def build_layout(*args, &block)
+		[self.class.new.build(::Model::Layout, &block), args]
+	    end
+
 	    # Define an attribute with the given name and optional default value (or block)
 	    # @param name [String]	The attribute's name
 	    # @param value An optional default value
@@ -107,9 +109,9 @@ private
 
 	    def push(element, *args)
 		if element.is_a? Class
-		    @klass.instance_variable_get(:@elements).push [element, args]
+		    @klass.send :push, [element, args]
 		elsif element.is_a?(Array) and element.first.is_a?(Class)
-		    @klass.instance_variable_get(:@elements).push element
+		    @klass.send :push, element
 		else
 		    raise ArgumentError, "Can't push instances while building a class"
 		end

data/lib/model.rb

@@ -0,0 +1,23 @@
+require 'model'
+
+class Model
+    @elements = Array.new
+    def self.elements
+	super_elements = self.superclass.singleton_class.instance_method(:elements)
+	super_elements.bind(self.superclass).call + @elements
+    rescue
+	@elements
+    end
+
+    def self.inherited(subclass)
+	subclass.instance_variable_set(:@elements, [])
+    end
+
+    class << self
+	private
+
+	def push(*args)
+	    @elements.push *args
+	end
+    end
+end

data/lib/model/dsl.rb

@@ -22,5 +22,16 @@ class Model
 	def attr_writer(name)
 	    define_attribute_writer(name)
 	end
+
+	# If the missing method happens to be the same as a known subclass of
+	#  {Model}, then pass the call to the push method.
+	def method_missing(method, *args, &block)
+	    klass = Object.const_get(method)
+	    if klass <= Model
+		push klass, *args, &block
+	    end
+	rescue
+	    super
+	end
     end
 end

data/test/builder/model.rb

@@ -156,6 +156,21 @@ describe Engineering::Builder::Model do
 	end
     end
 
+    describe 'when creating a subclass with a stack layout' do
+	let :klass do
+	    subject.build do
+		stack do
+		end
+	    end
+	end
+
+	it 'must create a Layout subclass' do
+	    klass.elements.size.must_equal 1
+	    klass.elements.first.first.ancestors.must_include Model::Layout
+	    klass.elements.first.last.first[:direction].must_equal :vertical
+	end
+    end
+
     describe 'when creating a subclass that contains another Model subclass' do
 	let :klass do
 	    subject.build do
@@ -188,4 +203,30 @@ describe Engineering::Builder::Model do
 	    klass.new.first.transformation.translation.must_equal Geometry::Point[1,2,3]
 	end
     end
+
+    describe 'shortcuts' do
+	after { Object.send :remove_const, :Foo }
+
+	it 'must have a shortcut for pushing a subclass without arguments' do
+	    Foo = Class.new(Model)
+	    klass = subject.build do
+		Foo()
+	    end
+
+	    klass.elements.length.must_equal 1
+	    klass.elements.first.first.ancestors.must_include Model
+	    klass.elements.first.last.must_equal []
+	end
+
+	it 'must have a shortcut for pushing a subclass with arguments' do
+	    Foo = Class.new(Model)
+	    klass = subject.build do
+		Foo origin:[1,2,3]
+	    end
+
+	    klass.elements.length.must_equal 1
+	    klass.elements.first.first.ancestors.must_include Model
+	    klass.elements.first.last.must_equal [origin:[1,2,3]]
+	end
+    end
 end

data/test/model.rb

@@ -0,0 +1,27 @@
+require 'minitest/autorun'
+require_relative '../lib/model'
+
+describe Model do
+    describe 'when subclassing Model' do
+	let(:subclass) { Class.new(Model) }
+
+	it 'must have an elements accessor' do
+	    subclass.elements.must_equal []
+	end
+
+	it 'must not be modifiable' do
+	    ->{ subclass.push }.must_raise NoMethodError
+	end
+
+	describe 'when subclassing a subclass of Model' do
+	    let(:subsubclass) { Class.new(subclass) }
+
+	    it 'must have grandchildren' do
+		subclass.instance_variable_set(:@elements, [:a])
+		subsubclass.instance_variable_set(:@elements, [:b])
+
+		subsubclass.elements.must_equal [:a, :b]
+	    end
+	end
+    end
+end

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: engineering
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Brandon Fosdick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dxf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: geometry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '6.4'
+        version: '6.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '6.4'
+        version: '6.5'
 - !ruby/object:Gem::Dependency
   name: model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: sketch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: units
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 description: Tools for Mad Engineers and those who want to be
 email:
 - bfoz@bfoz.net
@@ -87,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - README.markdown
 - Rakefile
@@ -97,6 +97,7 @@ files:
 - lib/builder/model.rb
 - lib/builder/sketch.rb
 - lib/engineering.rb
+- lib/model.rb
 - lib/model/dsl.rb
 - lib/sketchup.rb
 - test/builder/extrusion.rb
@@ -117,6 +118,7 @@ files:
 - test/geometry/edge.rb
 - test/geometry/point.rb
 - test/geometry/size.rb
+- test/model.rb
 - test/model/builder.rb
 - test/model/extrusion.rb
 - test/sketchup.rb
@@ -131,41 +133,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: engineering
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Mad Engineering, Ruby style
-test_files:
-- test/builder/extrusion.rb
-- test/builder/model.rb
-- test/builder/sketch.rb
-- test/engineering.rb
-- test/fixtures/sketchup/empty.su
-- test/fixtures/sketchup/hexagon_sketch.su
-- test/fixtures/sketchup/line_sketch.su
-- test/fixtures/sketchup/rectangle_sketch.su
-- test/fixtures/sketchup/simple_extrusion.su
-- test/fixtures/sketchup/simple_extrusion_units.su
-- test/fixtures/sketchup/sketch_group.su
-- test/fixtures/sketchup/sketch_group_group.su
-- test/fixtures/sketchup/sketch_group_group_group.su
-- test/fixtures/translated_extrusion.su
-- test/geometry.rb
-- test/geometry/edge.rb
-- test/geometry/point.rb
-- test/geometry/size.rb
-- test/model/builder.rb
-- test/model/extrusion.rb
-- test/sketchup.rb
-- test/sketchup/builder.rb
-- test/units/literal.rb
+test_files: []