inversion 0.4.0 → 0.5.0

data.tar.gz.sig

@@ -1 +1 @@
-X�v?�Ђf�ڛ����\.K<1����ž>-��!�����C�q�*7��+f��#���܀�sw���҂�Q�
+tl�lK��+�ՠ3���$��T+��Qŝ���Q��jӑ	/�z���h�q���aMUE������kA/�����a�cdPz���?<�WY��������,���$��7':E�4r/+g`��'�j���qZ�|Lt5��C曀K��P/}� �6o(�L�=�$�G����3��a�HRU��0���j#�����~g���#����ԛ4p��*1�l!�%�!��OV��:gd�v�Ms��l  r�

data/ChangeLog

@@ -1,12 +1,110 @@
+2012-01-05  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.5.0 for changeset 0f4e4aa78d9c
+	[cc3f12489745] [tip]
+
+	* .hgsigs:
+	Added signature for changeset 11fb6ed08994
+	[0f4e4aa78d9c] [v0.5.0]
+
+	* History.rdoc, lib/inversion.rb:
+	Bump the minor version, update history.
+	[11fb6ed08994]
+
+	* lib/inversion/template.rb, spec/inversion/template_spec.rb:
+	Add an option to Inversion::Template.load for setting the encoding
+	of the template source.
+	[f5a4907d65db]
+
+	* .rvm.gems, .rvmrc, .tm_properties, Rakefile:
+	Use RVM to manage development environment
+	[87bccbf27c84]
+
+2011-10-05  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc:
+	Rewrapped README to 80 columns
+	[dd170965e7d2]
+
+	* .hgtags:
+	Added tag v0.4.0 for changeset 2aa4351a4080
+	[4f33cfcc83e3]
+
+	* .hgsigs:
+	Added signature for changeset 5b1e645db600
+	[2aa4351a4080] [v0.4.0]
+
+	* History.rdoc, Rakefile, lib/inversion.rb:
+	Bumped the minor version, updated the History file.
+	[5b1e645db600]
+
+	* lib/inversion/renderstate.rb, lib/inversion/template.rb,
+	lib/inversion/template/elsetag.rb,
+	lib/inversion/template/elsiftag.rb, lib/inversion/template/iftag.rb:
+	Reworked render toggling so the before/after rendering hooks are
+	called immediately before and after the node *would* have been
+	rendered. This further cleans up the conditional logic, and causes
+	the if/elsif/else tags to behave like you'd expect: the nodes they
+	demark aren't even touched if rendering is disabled.
+
+	Adjusted the other tags to account for the change.
+	[f9fcf011955e]
+
+	* .hgtags:
+	Added tag v0.3.0 for changeset 656f0e2bceea
+	[b1a9d8ac9401]
+
+	* .hgsigs:
+	Added signature for changeset cde501e6764c
+	[656f0e2bceea] [v0.3.0]
+
+	* History.rdoc, lib/inversion.rb:
+	Bump minor version and update History
+	[cde501e6764c]
+
+	* lib/inversion/template/elsiftag.rb, lib/inversion/template/iftag.rb:
+	Fix require loop in if/elsif tags
+	[707d9dc985c9]
+
+	* lib/inversion/mixins.rb:
+	Fixing a problem with HTML escaping of objects other than Strings
+	[434fba9c2f16]
+
+	* lib/inversion/renderstate.rb, lib/inversion/template.rb,
+	spec/inversion/renderstate_spec.rb:
+	Added render timing (Inversion::RenderState#time_elapsed)
+	[ed0bc421632e]
+
 2011-09-27  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgtags:
+	Added tag v0.2.0 for changeset f570e1eff279
+	[d51e6c51ad60]
+
+	* .hgsigs:
+	Added signature for changeset 9a7cec92550e
+	[f570e1eff279] [v0.2.0]
+
+	* Rakefile:
+	Check history before releases.
+	[9a7cec92550e]
+
+	* Manifest.txt, Rakefile:
+	Fix the Manifest.
+	[ace3bdf0dcd9]
+
+	* .hgtags:
+	Removed tag v0.2.0
+	[fe100c0ff417]
+
 	* .hgtags:
 	Added tag v0.2.0 for changeset 9b57bc8611b2
-	[8f0b8b864b1a] [tip]
+	[8f0b8b864b1a]
 
 	* .hgsigs:
 	Added signature for changeset 896d23953a0a
-	[9b57bc8611b2] [v0.2.0]
+	[9b57bc8611b2]
 
 	* History.rdoc, lib/inversion.rb:
 	Bumped minor version, updated History for release.
@@ -149,7 +247,7 @@
 
 	* manual/resources/css/manual.css, manual/resources/css/reset.css:
 	Fixing CSS font-face declarations; adding missing reset.css
-	[45f04400b244] [github/master]
+	[45f04400b244]
 
 	* .hgtags:
 	Added tag v0.0.4 for changeset 7a412b7ed72b
@@ -191,6 +289,10 @@
 	Avoid Pathname#expand_path in Inversion::Template.load [profiled]
 	[91cbb0c90b85]
 
+	* Rakefile:
+	Disable the .gemtest task that hoe defines without asking
+	[cf76def7d9cf]
+
 2011-09-16  Michael Granger  <ged@FaerieMUD.org>
 
 	* lib/inversion/template/elsiftag.rb:
@@ -201,12 +303,6 @@
 	Fix shadowed variable in BeginTag#handle_exception.
 	[8424ac44da4a]
 
-2011-09-21  Michael Granger  <ged@FaerieMUD.org>
-
-	* Rakefile:
-	Disable the .gemtest task that hoe defines without asking
-	[cf76def7d9cf]
-
 2011-08-17  Michael Granger  <ged@FaerieMUD.org>
 
 	* manual/resources/css/manual.css:
@@ -1054,6 +1150,14 @@
 	Merged with dc16cc877dfc, updated README
 	[0fdf3122bf7c]
 
+	* README.md, experiments/erb_scope_bleed.rb:
+	Fleshing out the README, adding scope-bleedover example
+	[f44b597af8bd]
+
+	* lib/inversion.rb:
+	Removing checked-in revision value
+	[773feca505b8]
+
 2011-04-06  Michael Granger  <ged@FaerieMUD.org>
 
 	* .irbrc, Rakefile, experiments/ripper_spike.rb, lib/inversion.rb,
@@ -1096,18 +1200,6 @@
 	Checkpoint, fleshing out Tags.
 	[4a4fc3f1dc14]
 
-2011-04-12  Michael Granger  <ged@FaerieMUD.org>
-
-	* README.md, experiments/erb_scope_bleed.rb:
-	Fleshing out the README, adding scope-bleedover example
-	[f44b597af8bd]
-
-	* lib/inversion.rb:
-	Removing checked-in revision value
-	[773feca505b8]
-
-2011-02-07  Mahlon E. Smith  <mahlon@martini.nu>
-
 	* lib/inversion.rb, lib/inversion/template.rb,
 	spec/inversion/template_spec.rb, spec/inversion_spec.rb:
 	Totally awesome templating system DONE. Now: profit!

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.5.0 [2012-01-05] Michael Granger <ged@FaerieMUD.org>
+
+Added an encoding option to Inversion::Template.load for
+specifying the encoding of the template source.
+
+
 == v0.4.0 [2011-10-05] Michael Granger <ged@FaerieMUD.org>
 
 Reworked render toggling so the before/after rendering hooks are

data/README.rdoc

@@ -5,15 +5,17 @@
 
 == Description
 
-Inversion is a templating system for Ruby. It uses the "Inversion of Control" principle to decouple
-the contents and structure of the template from the code that uses it, making it easier to use,
-test-friendly, and clean.
+Inversion is a templating system for Ruby. It uses the "Inversion of Control"
+principle to decouple the contents and structure of templates from the code
+that uses them, making it easier to separate concerns, keep your tests simple,
+and avoid polluting scopes with ephemeral data.
 
 
 === Details
 
-Inversion, like most other templating systems, works by giving you a way of defining the static
-parts of your output, and then letting you combine that at a later point with the dynamic parts:
+Inversion, like most other templating systems, works by giving you a way of
+defining the static parts of your output, and then letting you combine that at
+a later point with the dynamic parts:
 
 Create the template and use it to render an exciting message:
 
@@ -21,31 +23,35 @@ Create the template and use it to render an exciting message:
 	tmpl.name = "World"
 	puts tmpl.render
 
-The <tt><?attr name ?></tt> tag defines the _name_ accessor on the template object, the value of
-which is substituted for any occurrences of +name+ in the template:
+The <tt><?attr name ?></tt> tag defines the _name_ accessor on the template
+object, the value of which is substituted for any occurrences of +name+ in the
+template:
 
     Hello, World!
 
-This by itself isn't fantastically useful, but it does illustrate one of the ways in which Inversion
-is different: the program and the template share data through an API, instead of through a complex
-data structure, which establishes a clear delineation between what responsibility is the program's
-and which is the template's. The program doesn't have to know how the view uses the data it's given,
-and tests of the controller can substitute a Mock Object for the template to test the interaction
-between the two instead of having to match patterns in the eventual output like an integration test.
+This by itself isn't fantastically useful, but it does illustrate one of the
+ways in which Inversion is different: the program and the template share data
+through an API, instead of through a complex data structure, which establishes
+a clear delineation between what responsibility is the program's and which is
+the template's. The program doesn't have to know how the view uses the data
+it's given, and tests of the controller can substitute a Mock Object for the
+template to test the interaction between the two instead of having to match
+patterns in the eventual output like an integration test.
 
 You can also interact with the values set in the template:
 
     Name: <?attr employee.full_name ?>
 
-This will call the +#full_name+ method on whatever is set as the +employee+ attribute when 
-rendered, and the result will take the place of the tag.
+This will call the +#full_name+ method on whatever is set as the +employee+
+attribute when rendered, and the result will take the place of the tag.
 
-Inversion also comes with a collection of other tags that provide flow control, exception-handling,
-etc.
+Inversion also comes with a collection of other tags that provide flow
+control, exception-handling, etc.
 
-Here's a slightly more complex example: Say we have a layout template that contains all the
-boilerplate, navigation, etc. for the site, and then an `<?attr body ?>` somewhere in the content
-area for the content specific to each view:
+Here's a slightly more complex example: Say we have a layout template that
+contains all the boilerplate, navigation, etc. for the site, and then an
+`<?attr body ?>` somewhere in the content area for the content specific to
+each view:
 
     layout = Inversion::Template.load( 'templates/layout.tmpl' )
 
@@ -60,9 +66,10 @@ Then there's a view template that displays a bulleted list of article titles:
       </ul>
     </section>
 
-Loading this template results in a Ruby object whose API contains one method: `#articles`. To render
-the view, we just call that accessor with instances of an `Article` domain class we defined
-elsewhere, and then drop the 'alist' template into the layout and render them:
+Loading this template results in a Ruby object whose API contains one method:
+`#articles`. To render the view, we just call that accessor with instances of
+an `Article` domain class we defined elsewhere, and then drop the 'alist'
+template into the layout and render them:
 
     alist = Inversion::Template.load( 'templates/alist.tmpl' )
     alist.articles = Articles.latest( 10 )
@@ -70,16 +77,21 @@ elsewhere, and then drop the 'alist' template into the layout and render them:
     layout.body = alist
     puts layout.render
 
-The `for` tag in the alist will iterate over the enumerable Articles and generate an `<li>` for each
-one. The resulting template object will be set as the body of the layout template, and stringified
-when the enclosing template is rendered. Templates can be nested this way as deeply as you like.
+The `for` tag in the alist will iterate over the enumerable Articles and
+generate an `<li>` for each one. The resulting template object will be set as
+the body of the layout template, and stringified when the enclosing template
+is rendered. Templates can be nested this way as deeply as you like.
+
+For detailed tag documentation and examples, see the {online
+manual}[http://deveiate.org/code/Inversion-manual/] or browse {the API
+docs}[http://deveiate.org/code/inversion].
 
 
 == References
 
-* Inversion of Control: http://en.wikipedia.org/wiki/Inversion_of_control
-* Passive View: http://martinfowler.com/eaaDev/PassiveScreen.html
-* Supervising Controller: http://martinfowler.com/eaaDev/SupervisingPresenter.html
+* {Inversion of Control}[http://en.wikipedia.org/wiki/Inversion_of_control]
+* {Passive View}[http://martinfowler.com/eaaDev/PassiveScreen.html]
+* {Supervising Controller}[http://martinfowler.com/eaaDev/SupervisingPresenter.html]
 
 
 == Installation

data/Rakefile

@@ -21,17 +21,17 @@ hoespec = Hoe.spec 'inversion' do
 	self.developer 'Mahlon E. Smith', 'mahlon@martini.nu'
 
 	self.dependency 'ripper',        '~> 1.0',    :development unless defined?( Encoding )
-	self.dependency 'rspec',         '~> 2.6.0',  :development
-	self.dependency 'tilt',          '~> 1.3.2',  :development
-	self.dependency 'sinatra',       '~> 1.2.6',  :development
-	self.dependency 'rack-test',     '~> 0.6.0',  :development
-	self.dependency 'simplecov',     '~> 0.4.2',  :development
-	self.dependency 'hoe-manualgen', '~> 0.2.0',  :development
+	self.dependency 'rspec',         '~> 2.6',  :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.2', :development
-	self.dependency 'highline',      '~> 1.6.2',  :development
-	self.dependency 'sysexits',      '~> 1.0.2',  :development
+	self.dependency 'trollop',       '~> 1.16', :development
+	self.dependency 'highline',      '~> 1.6',  :development
+	self.dependency 'sysexits',      '~> 1.0',  :development
 
 	self.spec_extras[:licenses] = ["BSD"]
 	self.require_ruby_version( '>=1.9.2' )

data/lib/inversion.rb

@@ -26,10 +26,10 @@ module Inversion
 	require 'inversion/monkeypatches'
 
 	# Library version constant
-	VERSION = '0.4.0'
+	VERSION = '0.5.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 5b1e645db600 $
+	REVISION = %q$Revision: 11fb6ed08994 $
 
 	#
 	# Logging

data/lib/inversion/template.rb

@@ -96,7 +96,12 @@ class Inversion::Template
 		end
 
 		# We trust files read from disk
-		source = tmpl.read
+		encoding = opts.delete( :encoding )
+		source = if encoding
+				tmpl.read( encoding: encoding )
+			else
+				tmpl.read
+			end
 		source.untaint
 
 		# Load the instance and set the path to the source

data/spec/inversion/template_spec.rb

@@ -76,13 +76,21 @@ describe Inversion::Template do
 		tmpl.foo.should == :bar
 	end
 
+	it "can pass an encoding option to IO.open through the template constructor" do
+		content = 'some stuff'.encode( 'utf-8' )
+		IO.should_receive( :read ).with( '/a/utf8/template.tmpl', encoding: 'utf-8' ).and_return( content )
+		template = Inversion::Template.load( '/a/utf8/template.tmpl', encoding: 'utf-8' )
+
+		template.render.encoding.should == Encoding::UTF_8
+	end
+
 
 	context "loaded from a file" do
 
 		before( :each ) do
 			@timestamp = Time.now
 			content = 'file contents'.taint
-			IO.should_receive( :read ).with( '/tmp/hooowat' ).and_return( content )
+			IO.stub( :read ).with( '/tmp/hooowat' ).and_return( content )
 			@template = Inversion::Template.load( '/tmp/hooowat' )
 		end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inversion
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -49,11 +49,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-10-06 00:00:00.000000000Z
+date: 2012-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70307924560640 !ruby/object:Gem::Requirement
+  requirement: &70112213964960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +61,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70307924560640
+  version_requirements: *70112213964960
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
-  requirement: &70307924560080 !ruby/object:Gem::Requirement
+  requirement: &70112213964400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +72,10 @@ dependencies:
         version: 0.2.0
   type: :development
   prerelease: false
-  version_requirements: *70307924560080
+  version_requirements: *70112213964400
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70307924559340 !ruby/object:Gem::Requirement
+  requirement: &70112213963860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,109 +83,120 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70307924559340
+  version_requirements: *70112213963860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70307924558580 !ruby/object:Gem::Requirement
+  requirement: &70112213961800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70307924558580
+  version_requirements: *70112213961800
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70307924557980 !ruby/object:Gem::Requirement
+  requirement: &70112213960480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70307924557980
+  version_requirements: *70112213960480
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70307924557420 !ruby/object:Gem::Requirement
+  requirement: &70112213959200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70307924557420
+  version_requirements: *70112213959200
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70307924556780 !ruby/object:Gem::Requirement
+  requirement: &70112213974620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70307924556780
+  version_requirements: *70112213974620
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70307924556160 !ruby/object:Gem::Requirement
+  requirement: &70112213973840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70307924556160
+  version_requirements: *70112213973840
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
-  requirement: &70307924555720 !ruby/object:Gem::Requirement
+  requirement: &70112213973160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
   type: :development
   prerelease: false
-  version_requirements: *70307924555720
+  version_requirements: *70112213973160
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70307924555160 !ruby/object:Gem::Requirement
+  requirement: &70112213972500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.16.2
+        version: '1.16'
   type: :development
   prerelease: false
-  version_requirements: *70307924555160
+  version_requirements: *70112213972500
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70307924554240 !ruby/object:Gem::Requirement
+  requirement: &70112213971560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70307924554240
+  version_requirements: *70112213971560
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70307924553020 !ruby/object:Gem::Requirement
+  requirement: &70112213970920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70307924553020
+  version_requirements: *70112213970920
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70112213970460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: *70112213970460
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70307924552300 !ruby/object:Gem::Requirement
+  requirement: &70112213970040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -193,14 +204,15 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70307924552300
+  version_requirements: *70112213970040
 description: ! 'Inversion is a templating system for Ruby. It uses the "Inversion
-  of Control" principle to decouple
+  of Control"
+
+  principle to decouple the contents and structure of templates from the code
 
-  the contents and structure of the template from the code that uses it, making it
-  easier to use,
+  that uses them, making it easier to separate concerns, keep your tests simple,
 
-  test-friendly, and clean.'
+  and avoid polluting scopes with ephemeral data.'
 email:
 - ged@FaerieMUD.org
 - mahlon@martini.nu