inversion 0.10.1 → 0.10.2

data/ChangeLog

@@ -1,8 +1,56 @@
+2012-06-27  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/inversion/mixins.rb, lib/inversion/template.rb,
+	spec/inversion/mixins_spec.rb:
+	Add Modules/Classes to the immediate object list when deep copying.
+	Don't needlessly deep_copy the node tree on template duplication.
+	[fb0ab0db2042] [tip]
+
+2012-06-22  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, Rakefile:
+	Update dependencies.
+	[bf49edf3b889]
+
+	* .hgtags:
+	Added tag v0.10.1 for changeset 16d06faa003e
+	[f45915b72d58]
+
+	* .hgsigs:
+	Added signature for changeset 432abb56d593
+	[16d06faa003e] [v0.10.1]
+
+	* History.rdoc, lib/inversion.rb:
+	Bump patch version, update history.
+	[432abb56d593]
+
+	* lib/inversion/mixins.rb, lib/inversion/renderstate.rb,
+	lib/inversion/template.rb, spec/inversion/template_spec.rb:
+	Fix attribute changes being shared between duplicated templates.
+
+	- Pull up deep_copy function into a mixin
+	- Use deep_copy in a copy constructor on Inversion::Template to make
+	internal datastructures distinct, including @attributes.
+	- Also clean up some old cruft with the way the Parser is used.
+	[8350fbf49ef2]
+
+2012-05-18  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems:
+	Bumping Loggability dependency for inheritance bugfix
+	[b65ce51ca6ee]
+
+2012-05-10  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, Rakefile:
+	Bump Loggability dependency to 0.2.
+	[7e3c047cbfba]
+
 2012-05-07  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
 	Added tag v0.10.0 for changeset 64cf302354aa
-	[79bc44fab294] [tip]
+	[79bc44fab294]
 
 	* .hgsigs:
 	Added signature for changeset 9d9c49d532be
@@ -35,7 +83,7 @@
 
 	* .hgtags:
 	Added tag v0.9.0 for changeset 27f082ef7985
-	[dd18f3255985] [github/master]
+	[dd18f3255985]
 
 	* .hgsigs:
 	Added signature for changeset b208fa9154b1

data/History.rdoc

@@ -1,3 +1,10 @@
+== v0.10.2 [2012-06-27] Mahlon E. Smith  <mahlon@martini.nu>
+
+- Bugfix: Don't dup Classes and Modules in template attributes.
+- Optimization: Don't needlessly duplicate the node tree on template
+  duplication.
+
+
 == v0.10.1 [2012-06-22] Michael Granger <ged@FaerieMUD.org>
 
 - Bugfix: duplicated templates get distinct copies of their attributes.

data/Rakefile

@@ -20,20 +20,19 @@ hoespec = Hoe.spec 'inversion' do
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 	self.developer 'Mahlon E. Smith', 'mahlon@martini.nu'
 
-	self.dependency 'loggability',   '~> 0.2'
+	self.dependency 'loggability',   '~> 0.4'
 
+	self.dependency 'highline',      '~> 1.6',  :development
+	self.dependency 'hoe-deveiate',  '~> 0.1',  :development
+	self.dependency 'hoe-manualgen', '~> 0.3',  :development
+	self.dependency 'rack-test',     '~> 0.6',  :development
 	self.dependency 'rdoc',          '~> 3.12', :development
-	self.dependency 'rspec',         '~> 2.8',  :development
+	self.dependency 'rspec',         '~> 2.10', :development
+	self.dependency 'simplecov',     '~> 0.6',  :development
+	self.dependency 'sinatra',       '~> 1.3',  :development
 	self.dependency 'tilt',          '~> 1.3',  :development
-	self.dependency 'sinatra',       '~> 1.2',  :development
-	self.dependency 'rack-test',     '~> 0.6',  :development
-	self.dependency 'simplecov',     '~> 0.4',  :development
-	self.dependency 'hoe-manualgen', '~> 0.2',  :development
-
-	# bin/inversion deps
-	self.dependency 'trollop',       '~> 1.16', :development
-	self.dependency 'highline',      '~> 1.6',  :development
 	self.dependency 'sysexits',      '~> 1.0',  :development
+	self.dependency 'trollop',       '~> 1.16', :development
 
 	self.spec_extras[:licenses] = ["BSD"]
 	self.spec_extras[:rdoc_options] = ['-f', 'fivefish', '-t', 'Inversion Templates']

data/lib/inversion.rb

@@ -25,10 +25,10 @@ module Inversion
 	warn ">>> Inversion requires Ruby 1.9.2 or later. <<<" if RUBY_VERSION < '1.9.2'
 
 	# Library version constant
-	VERSION = '0.10.1'
+	VERSION = '0.10.2'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 432abb56d593 $
+	REVISION = %q$Revision: 7236fd2ac3fb $
 
 
 	### Get the Inversion version.

data/lib/inversion/mixins.rb

@@ -200,6 +200,10 @@ module Inversion
 	# A collection of data-manipulation functions.
 	module DataUtilities
 
+		###############
+		module_function
+		###############
+
 		### Recursively copy the specified +obj+ and return the result.
 		def deep_copy( obj )
 			# self.log.debug "Deep copying: %p" % [ obj ]
@@ -208,7 +212,7 @@ module Inversion
 			return obj if obj.class.name == 'RSpec::Mocks::Mock'
 
 			return case obj
-				when NilClass, Numeric, TrueClass, FalseClass, Symbol
+				when NilClass, Numeric, TrueClass, FalseClass, Symbol, Module
 					obj
 
 				when Array
@@ -216,6 +220,7 @@ module Inversion
 
 				when Hash
 					newhash = {}
+					newhash.default_proc = obj.default_proc if obj.default_proc
 					obj.each do |k,v|
 						newhash[ deep_copy(k) ] = deep_copy( v )
 					end

data/lib/inversion/template.rb

@@ -157,7 +157,6 @@ class Inversion::Template
 	### Copy constructor -- make copies of some internal data structures, too.
 	def initialize_copy( other )
 		@options    = deep_copy( other.options )
-		@node_tree  = deep_copy( other.node_tree )
 		@attributes = deep_copy( other.attributes )
 	end
 

data/spec/inversion/mixins_spec.rb

@@ -139,5 +139,120 @@ describe Inversion, "mixins" do
 		end
 	end
 
+
+	describe Inversion::DataUtilities do
+
+		it "doesn't try to dup immediate objects" do
+			Inversion::DataUtilities.deep_copy( nil ).should be( nil )
+			Inversion::DataUtilities.deep_copy( 112 ).should be( 112 )
+			Inversion::DataUtilities.deep_copy( true ).should be( true )
+			Inversion::DataUtilities.deep_copy( false ).should be( false )
+			Inversion::DataUtilities.deep_copy( :a_symbol ).should be( :a_symbol )
+		end
+
+		it "doesn't try to dup modules/classes" do
+			klass = Class.new
+			Inversion::DataUtilities.deep_copy( klass ).should be( klass )
+		end
+
+		it "makes distinct copies of arrays and their members" do
+			original = [ 'foom', Set.new([ 1,2 ]), :a_symbol ]
+
+			copy = Inversion::DataUtilities.deep_copy( original )
+
+			copy.should == original
+			copy.should_not be( original )
+			copy[0].should == original[0]
+			copy[0].should_not be( original[0] )
+			copy[1].should == original[1]
+			copy[1].should_not be( original[1] )
+			copy[2].should == original[2]
+			copy[2].should be( original[2] ) # Immediate
+		end
+
+		it "makes recursive copies of deeply-nested Arrays" do
+			original = [ 1, [ 2, 3, [4], 5], 6, [7, [8, 9], 0] ]
+
+			copy = Inversion::DataUtilities.deep_copy( original )
+
+			copy.should == original
+			copy.should_not be( original )
+			copy[1].should_not be( original[1] )
+			copy[1][2].should_not be( original[1][2] )
+			copy[3].should_not be( original[3] )
+			copy[3][1].should_not be( original[3][1] )
+		end
+
+		it "makes distinct copies of Hashes and their members" do
+			original = {
+				:a => 1,
+				'b' => 2,
+				3 => 'c',
+			}
+
+			copy = Inversion::DataUtilities.deep_copy( original )
+
+			copy.should == original
+			copy.should_not be( original )
+			copy[:a].should == 1
+			copy.key( 2 ).should == 'b'
+			copy.key( 2 ).should_not be( original.key(2) )
+			copy[3].should == 'c'
+			copy[3].should_not be( original[3] )
+		end
+
+		it "makes distinct copies of deeply-nested Hashes" do
+			original = {
+				:a => {
+					:b => {
+						:c => 'd',
+						:e => 'f',
+					},
+					:g => 'h',
+				},
+				:i => 'j',
+			}
+
+			copy = Inversion::DataUtilities.deep_copy( original )
+
+			copy.should == original
+			copy[:a][:b][:c].should == 'd'
+			copy[:a][:b][:c].should_not be( original[:a][:b][:c] )
+			copy[:a][:b][:e].should == 'f'
+			copy[:a][:b][:e].should_not be( original[:a][:b][:e] )
+			copy[:a][:g].should == 'h'
+			copy[:a][:g].should_not be( original[:a][:g] )
+			copy[:i].should == 'j'
+			copy[:i].should_not be( original[:i] )
+		end
+
+		it "copies the default proc of copied Hashes" do
+			original = Hash.new {|h,k| h[ k ] = Set.new }
+
+			copy = Inversion::DataUtilities.deep_copy( original )
+
+			copy.default_proc.should == original.default_proc
+		end
+
+		it "preserves taintedness of copied objects" do
+			original = Object.new
+			original.taint
+
+			copy = Inversion::DataUtilities.deep_copy( original )
+
+			copy.should_not be( original )
+			copy.should be_tainted()
+		end
+
+		it "preserves frozen-ness of copied objects" do
+			original = Object.new
+			original.freeze
+
+			copy = Inversion::DataUtilities.deep_copy( original )
+
+			copy.should_not be( original )
+			copy.should be_frozen()
+		end
+	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inversion
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
   prerelease: 
 platform: ruby
 authors:
@@ -37,7 +37,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -120,13 +120,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.10'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -134,15 +134,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: hoe-deveiate
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -150,15 +150,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -166,15 +166,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -182,7 +182,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +190,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -198,15 +198,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -214,15 +214,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -230,7 +230,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: sysexits
   requirement: !ruby/object:Gem::Requirement
@@ -247,6 +247,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement