inversion 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4b8da84f00dd67a57f9f261339c2f8fd0dad397
-  data.tar.gz: 21dbe5879f682b3b5b4a8c955bc48619cd6636ab
+  metadata.gz: 7cf0ec8317d7f79b22a9794a8e2a3b76bb07997a
+  data.tar.gz: 1f764e3040c76d9bd77a11bd724e810f0ef130f9
 SHA512:
-  metadata.gz: 586cf26085d8dc43c9034c686428009ba5d55d12c9c8bdeb2ad9a888aa8a8b5b5eefb305a0be3485b74d1d3e7a08d14ec9ac9e0a668ddc412f547883be426ca4
-  data.tar.gz: 7c5995c50244a22c035242a5363901fb110ac84fc541e6feea4ca172a954598e570ca0b75b11a452fe8d448f6330496cd009fcabe42189398720d979b2fd8b9d
+  metadata.gz: 4556f52e5440ce70bc43fe4be3a6a554e744fd256b02e4db46fa0e1076f6c2b54cfda8a9dca688e8b9ca5155b4401bb13eb4a22c7ad5ee8645c0b966bcbbbdb3
+  data.tar.gz: 622843dfcd26395a459000bbe0e9639d50ebd0f88a0a3ae5be6d10f9369c6cf248ef6cbc6703ca2e91e8619c635f61fbc727fbfda4065caf3c9469f9aa9289ef

data/History.rdoc

@@ -1,3 +1,14 @@
+== v1.1.0 [2017-08-17] Mahlon E. Smith <mahlon@martini.nu>
+
+Mark as stable, update dependencies.
+
+- Allow the use of the '!' operator in conditional tags, logically
+  inverting the evaluated body.
+
+- Provide a method for children tags to inherit and append to their
+  parents matcher patterns.
+
+
 == v1.0.0 [2017-01-16] Michael Granger <ged@FaerieMUD.org>
 
 Mark as stable, update dependencies.

data/Manifest.txt

@@ -1,4 +1,3 @@
-ChangeLog
 Examples.rdoc
 GettingStarted.rdoc
 Guide.rdoc

data/lib/inversion.rb

@@ -26,10 +26,10 @@ module Inversion
 	warn ">>> Inversion requires Ruby 2.2.0 or later. <<<" if RUBY_VERSION < '2.2.0'
 
 	# Library version constant
-	VERSION = '1.0.0'
+	VERSION = '1.1.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: a4b621e66915 $
+	REVISION = %q$Revision: ee12b27acbe2 $
 
 
 	### Get the Inversion version.

data/lib/inversion/template/codetag.rb

@@ -100,6 +100,15 @@ class Inversion::Template::CodeTag < Inversion::Template::Tag
 	end
 
 
+	### Declarative that forces a tag to inherit existing patterns from
+	### its parent, rather than replacing them.  Afterwards, you can use
+	### +tag_pattern+ regularly, appending to the list.
+	def self::inherit_tag_patterns
+		raise ScriptError, "Patterns already exist for this tag." if defined?( @tag_patterns )
+		@tag_patterns = self.superclass.tag_patterns
+	end
+
+
 	#################################################################
 	###	I N S T A N C E   M E T H O D S
 	#################################################################

data/lib/inversion/template/elsiftag.rb

@@ -24,7 +24,31 @@ require 'inversion/template/iftag' unless
 #
 class Inversion::Template::ElsifTag < Inversion::Template::AttrTag
 
-	# Inherits AttrTag's tag patterns
+	# Inherit AttrTag's tag patterns first.
+	inherit_tag_patterns
+
+	# Append a 'not' tag matcher.
+	# <?elsif ! foo ?>, <?elsif !foo ?>
+	#
+	tag_pattern '$(op) sp* $(ident)' do |tag, match|
+		op = match.string( 1 )
+		raise Inversion::ParseError, "expected '!', got %p instead" % [ op ] unless op == '!'
+
+		tag.send( :log ).debug "  Identifier is: %p (inverted)" % [ match.string(2) ]
+		tag.name = match.string( 2 ).untaint.to_sym
+		tag.inverted = true
+	end
+
+
+	### Create a new ElsifTag.
+	def initialize( body, linenum=nil, colnum=nil )
+		@inverted = false
+		super
+	end
+
+	# Invert the tag's renderstate if created with the 'not' operator.
+	attr_accessor :inverted
+
 
 	### Parsing callback -- check to be sure the node tree can have an
 	### 'elsif' tag appended to it (i.e., it has an opening 'if' tag).
@@ -46,19 +70,23 @@ class Inversion::Template::ElsifTag < Inversion::Template::AttrTag
 	end
 
 
-	### Always remder as an empty string.
+	### Always render as an empty string.
 	def render( * )
 		nil
 	end
 
 
-	### Toggle rendering for the iftag's container if rendering hasn't yet been
+	### Toggle rendering for the elsiftag's container if rendering hasn't yet been
 	### toggled.
 	def before_rendering( renderstate )
+
+		evaluated_state = self.evaluate( renderstate )
+		evaluated_state = ! evaluated_state if self.inverted
+
 		if renderstate.tag_data[ :rendering_was_enabled ]
 			self.log.debug "Rendering was previously enabled; disabling"
 			renderstate.disable_rendering
-		elsif self.evaluate( renderstate )
+		elsif evaluated_state
 			self.log.debug "Rendering was previously disabled, and condition is true; enabling"
 			renderstate.tag_data[ :rendering_was_enabled ] = true
 			renderstate.enable_rendering

data/lib/inversion/template/iftag.rb

@@ -18,28 +18,55 @@ require 'inversion/template/containertag'
 class Inversion::Template::IfTag < Inversion::Template::AttrTag
 	include Inversion::Template::ContainerTag
 
-	# Inherits AttrTag's tag patterns
+	# Inherit AttrTag's tag patterns first.
+	inherit_tag_patterns
+
+	# Append a 'not' tag matcher.
+	# <?if ! foo ?>, <?if !foo ?>
+	#
+	tag_pattern '$(op) sp* $(ident)' do |tag, match|
+		op = match.string( 1 )
+		raise Inversion::ParseError, "expected '!', got %p instead" % [ op ] unless op == '!'
+
+		tag.send( :log ).debug "  Identifier is: %p (inverted)" % [ match.string(2) ]
+		tag.name = match.string( 2 ).untaint.to_sym
+		tag.inverted = true
+	end
+
+
+	### Create a new IfTag.
+	def initialize( body, linenum=nil, colnum=nil )
+		@inverted = false
+		super
+	end
+
+	# Invert the tag's renderstate if created with the 'not' operator.
+	attr_accessor :inverted
+
 
 	### Render the tag's contents if the condition is true, or any else or elsif sections
 	### if the condition isn't true.
-	def render( state )
+	def render( renderstate )
+
+		evaluated_state = self.evaluate( renderstate )
+		evaluated_state = ! evaluated_state if self.inverted
 
 		# Start out with rendering enabled if the tag body evaluates trueishly
-		if self.evaluate( state )
+		if evaluated_state
 			self.log.debug "Initial state was TRUE; enabling rendering"
-			state.enable_rendering
+			renderstate.enable_rendering
 		else
 			self.log.debug "Initial state was FALSE; disabling rendering"
-			state.disable_rendering
+			renderstate.disable_rendering
 		end
 
 		# Set the tag state to track whether or not rendering has been enabled during the
 		# 'if' for an 'else' or 'elsif' tag.
-		state.with_tag_data( rendering_was_enabled: state.rendering_enabled? ) do
+		renderstate.with_tag_data( rendering_was_enabled: renderstate.rendering_enabled? ) do
 			super
 		end
 
-		state.enable_rendering
+		renderstate.enable_rendering
 		return nil
 	end
 

data/lib/inversion/template/unlesstag.rb

@@ -20,14 +20,40 @@ require 'inversion/template/elsetag'
 class Inversion::Template::UnlessTag < Inversion::Template::AttrTag
 	include Inversion::Template::ContainerTag
 
-	# Inherits AttrTag's tag patterns
+	# Inherit AttrTag's tag patterns first.
+	inherit_tag_patterns
+
+	# Append a 'not' tag matcher.
+	# <?unless ! foo ?>, <?unless !foo ?>
+	tag_pattern '$(op) sp* $(ident)' do |tag, match|
+		op = match.string( 1 )
+		raise Inversion::ParseError, "expected '!', got %p instead" % [ op ] unless op == '!'
+
+		tag.send( :log ).debug "  Identifier is: %p (inverted)" % [ match.string(2) ]
+		tag.name = match.string( 2 ).untaint.to_sym
+		tag.inverted = true
+	end
+
+
+	### Create a new UnlessTag.
+	def initialize( body, linenum=nil, colnum=nil )
+		@inverted = false
+		super
+	end
+
+	# Invert the tag's renderstate if created with the 'not' operator.
+	attr_accessor :inverted
+
 
 	### Render the tag's contents if the condition is true, or any else or elsif sections
 	### if the condition isn't true.
 	def render( state )
 
+		evaluated_state = self.evaluate( state )
+		evaluated_state = ! evaluated_state if self.inverted
+
 		# Start out with rendering *disabled* if the tag body evaluates trueishly
-		if self.evaluate( state )
+		if evaluated_state
 			self.log.debug "Initial state was TRUE; disabling rendering"
 			state.disable_rendering
 		else

data/spec/data/unknown-tag.tmpl

@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- $Id: unknown-tag.tmpl,v 1b4030ae65f3 2013/06/19 16:00:23 ged $ -->
 <?unknown This is an unknown tag type ?>
 <?comment Some stuff. ?>
 Stuff

data/spec/inversion/template/codetag_spec.rb

@@ -28,6 +28,46 @@ describe Inversion::Template::CodeTag do
 			expect( subclass.tag_patterns.first[1].call(:dummy, :king_dummy) ).to eq( :foo )
 		end
 
-	end
 
+		it "can explicitly declare pattern inheritence" do
+			parentclass = Class.new( Inversion::Template::CodeTag ) do
+				tag_pattern "$(ident)" do |tag, match|
+					:foo
+				end
+			end
+
+			subclass = Class.new( parentclass ) do
+				inherit_tag_patterns
+				tag_pattern "$(op) $(ident)" do |tag, match|
+					:bar
+				end
+			end
+
+			expect( subclass.tag_patterns.size ).to eq( 2 )
+			expect( subclass.tag_patterns.first[0] ).
+				to be_an_instance_of( Inversion::Template::CodeTag::TokenPattern )
+			expect( subclass.tag_patterns.last[0] ).
+				to be_an_instance_of( Inversion::Template::CodeTag::TokenPattern )
+			expect( subclass.tag_patterns.first[1].call(:dummy, :king_dummy) ).to eq( :foo )
+			expect( subclass.tag_patterns.last[1].call(:dummy, :king_dummy) ).to eq( :bar )
+		end
+
+
+		it "throws an error if trying to inherit patterns after they are declared" do
+			parentclass = Class.new( Inversion::Template::CodeTag ) do
+				tag_pattern "$(ident)" do |tag, match|
+					:foo
+				end
+			end
+
+			expect {
+				Class.new( parentclass ) do
+					tag_pattern "$(op) $(ident)" do |tag, match|
+						:bar
+					end
+					inherit_tag_patterns
+				end
+			}.to raise_exception( ScriptError, /patterns already exist/i )
+		end
+	end
 end

data/spec/inversion/template/elsiftag_spec.rb

@@ -58,6 +58,31 @@ describe Inversion::Template::ElsifTag do
 	end
 
 
+	it "inverts its attribute with a ! operator" do
+		template = Inversion::Template.new( <<-END_TEMPLATE )
+		<?if thing ?>
+			Thing!
+		<?elsif ! otherthing ?>
+			Otherthing!
+		<?else ?>
+			Nope.
+		<?end?>
+		END_TEMPLATE
+
+		template.thing = true
+		template.otherthing = true
+		expect( template.render ).to include( "Thing!" )
+
+		template.thing = false
+		template.otherthing = false
+		expect( template.render ).to include( "Otherthing!" )
+
+		template.thing = false
+		template.otherthing = true
+		expect( template.render ).to include( "Nope." )
+	end
+
+
 	it "renders as its attribute value if it's a simple attribute" do
 		renderstate = Inversion::RenderState.new( :bar => :the_attribute_value )
 		tag = Inversion::Template::ElsifTag.new( 'bar' )

data/spec/inversion/template/iftag_spec.rb

@@ -47,6 +47,17 @@ describe Inversion::Template::IfTag do
 		expect( renderstate.to_s ).to eq( '' )
 	end
 
+	it "inverts its attribute with a ! operator" do
+		template = Inversion::Template.new( <<-END_TEMPLATE )
+		<?if ! thing ?>Yep.<?else?>Nope.<?end?>
+		END_TEMPLATE
+
+		template.thing = false
+		expect( template.render ).to include( "Yep." )
+		template.thing = true
+		expect( template.render ).to include( "Nope." )
+	end
+
 	it "works inside an iterator (ticket #3)" do
 		template = Inversion::Template.new( <<-END_TEMPLATE )
 		<?for item in items ?>

data/spec/inversion/template/unlesstag_spec.rb

@@ -46,6 +46,17 @@ describe Inversion::Template::UnlessTag do
 		expect( renderstate.to_s ).to eq( '' )
 	end
 
+	it "inverts its attribute with a ! operator" do
+		template = Inversion::Template.new( <<-END_TEMPLATE )
+		<?unless ! thing ?>Yep.<?else?>Nope.<?end?>
+		END_TEMPLATE
+
+		template.thing = false
+		expect( template.render ).to include( "Nope." )
+		template.thing = true
+		expect( template.render ).to include( "Yep." )
+	end
+
 	context "with an 'else' clause" do
 
 		before( :each ) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inversion
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Granger
@@ -11,32 +11,27 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  SixmX0X3SOeYg4FRkblUIA==
   -----END CERTIFICATE-----
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -67,47 +62,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: hoe-deveiate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: hoe-highline
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: hoe-deveiate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -268,7 +249,6 @@ extra_rdoc_files:
 - README.rdoc
 - Tags.rdoc
 files:
-- ChangeLog
 - Examples.rdoc
 - GettingStarted.rdoc
 - Guide.rdoc
@@ -377,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Inversion is a templating system for Ruby