utopia 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06bfc0c157a2d299e5fdd106a9019259f3736260
-  data.tar.gz: 351eba6309457b94fa01d76e99ba54583ff5e3db
+  metadata.gz: e5d3bad1cc6eafa3b637ec345dbf41746913f24b
+  data.tar.gz: 96aea9ef97e0c21f93d8dbfdb8f72d1402953cb3
 SHA512:
-  metadata.gz: 32c28e94c6c673e2c0f1b727d991e3457e48bbe3c5b44c440d218220abb92be0d284fa5dd2f6cbda8c5b5bae59135d58d00b0ca716cc5310c854179a83fda93f
-  data.tar.gz: dec4cec1acb51120a6dc8b72f35912127225b600a9c70573b6faeede6f98153c50d539ae3152c42992c977b61cda2f863e45e096683c51ff9f1fa444abee85d5
+  metadata.gz: eeeb9104beea3a7f993463718dcb28133946a05221eb467d9817cb5a029aa9c85d9af1b98ee597de212be9d97dfea76a959f948d878d531c541ada446ca6388e
+  data.tar.gz: ca824228d45a83c93ad27b5790325e74a79624ac1f02fec21498a7b21d1c812d0a86adbd5f09b695c2b81e9d60a1c90b11ad9aea1480cf6b818cb0ce51d634e5

data/lib/utopia/content.rb

@@ -22,7 +22,7 @@ require_relative 'middleware'
 require_relative 'localization'
 
 require_relative 'content/node'
-require_relative 'content/processor'
+require_relative 'content/markup'
 
 require 'trenni/template'
 

data/lib/utopia/content/{processor.rb → markup.rb}

@@ -48,11 +48,12 @@ module Utopia
 			end
 		end
 		
-		class Processor
-			def self.parse_markup(markup, delegate)
-				processor = self.new(delegate)
+		class Markup
+			def self.parse!(markup, delegate)
+				# This is for compatibility with the existing API which passes in a string:
+				markup = Buffer.new(markup) if markup.is_a? String
 				
-				processor.parse(markup)
+				self.new(markup, delegate).parse!
 			end
 
 			class UnbalancedTagError < StandardError
@@ -62,8 +63,8 @@ module Utopia
 					@current_tag = current_tag
 					@closing_tag = closing_tag
 					
-					@starting_line = Trenni::Parser::Location.new(@scanner.string, @start_position)
-					@ending_line = Trenni::Parser::Location.new(@scanner.string, @scanner.pos)
+					@starting_line = Trenni::Location.new(@scanner.string, @start_position)
+					@ending_line = Trenni::Location.new(@scanner.string, @scanner.pos)
 				end
 
 				attr :scanner
@@ -76,15 +77,14 @@ module Utopia
 				end
 			end
 
-			def initialize(delegate)
+			def initialize(buffer, delegate)
+				@buffer = buffer
 				@delegate = delegate
 				@stack = []
-
-				@parser = Trenni::Parser.new(self)
 			end
 
-			def parse(input)
-				@parser.parse(input)
+			def parse!
+				Trenni::Parser.new(@buffer, self).parse!
 				
 				unless @stack.empty?
 					current_tag, current_position = @stack.pop

data/lib/utopia/content/node.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'processor'
+require_relative 'markup'
 require_relative 'links'
 require_relative 'transaction'
 
@@ -110,7 +110,7 @@ module Utopia
 				template = @controller.fetch_template(@file_path)
 				
 				context = Context.new(transaction, state)
-				markup = template.evaluate(context)
+				markup = template.to_buffer(context)
 				
 				transaction.parse_markup(markup)
 			end

data/lib/utopia/content/transaction.rb

@@ -60,7 +60,7 @@ module Utopia
 			end
 
 			def parse_markup(markup)
-				Processor.parse_markup(markup, self)
+				Markup.parse!(markup, self)
 			end
 
 			# The Rack::Request for this transaction.

data/lib/utopia/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Utopia
-	VERSION = "1.5.2"
+	VERSION = "1.6.0"
 end

data/spec/utopia/content/{processor_spec.rb → markup_spec.rb}

@@ -20,9 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'utopia/content/link'
+require 'utopia/content/markup'
 
-module Utopia::Content::ProcessorSpec
+module Utopia::Content::MarkupSpec
 	class TestDelegate
 		def initialize
 			@events = []
@@ -35,7 +35,7 @@ module Utopia::Content::ProcessorSpec
 		end
 	end
 	
-	describe Utopia::Content::Processor do
+	describe Utopia::Content::Markup do
 		it "should format open tags correctly" do
 			foo_tag = Utopia::Content::Tag.new("foo", bar: nil, baz: 'bob')
 			
@@ -45,11 +45,18 @@ module Utopia::Content::ProcessorSpec
 			expect(foo_tag.to_s('content')).to be == '<foo bar baz="bob">content</foo>'
 		end
 		
-		it "should parse single tag" do
+		def parse(string)
 			delegate = TestDelegate.new
-			processor = Utopia::Content::Processor.new(delegate)
 			
-			processor.parse %Q{<foo></foo>}
+			buffer = Trenni::Buffer.new(string)
+			Utopia::Content::Markup.new(buffer, delegate).parse!
+			
+			return delegate
+		end
+		
+		it "should parse single tag" do
+			
+			delegate = parse %Q{<foo></foo>}
 			
 			foo_tag = Utopia::Content::Tag.new("foo")
 			expected_events = [
@@ -63,10 +70,7 @@ module Utopia::Content::ProcessorSpec
 		end
 		
 		it "should parse and escape text" do
-			delegate = TestDelegate.new
-			processor = Utopia::Content::Processor.new(delegate)
-			
-			processor.parse %Q{<foo>Bob &amp; Barley<!-- Comment --><![CDATA[Hello & World]]></foo>}
+			delegate = parse %Q{<foo>Bob &amp; Barley<!-- Comment --><![CDATA[Hello & World]]></foo>}
 			
 			foo_tag = Utopia::Content::Tag.new("foo")
 			expected_events = [
@@ -81,17 +85,11 @@ module Utopia::Content::ProcessorSpec
 		end
 		
 		it "should fail with incorrect closing tag" do
-			delegate = TestDelegate.new
-			processor = Utopia::Content::Processor.new(delegate)
-			
-			expect{processor.parse %Q{<p>Foobar</dl>}}.to raise_exception(Utopia::Content::Processor::UnbalancedTagError)
+			expect{parse %Q{<p>Foobar</dl>}}.to raise_exception(Utopia::Content::Markup::UnbalancedTagError)
 		end
 		
 		it "should fail with unclosed tag" do
-			delegate = TestDelegate.new
-			processor = Utopia::Content::Processor.new(delegate)
-			
-			expect{processor.parse %Q{<p>Foobar}}.to raise_exception(Utopia::Content::Processor::UnbalancedTagError)
+			expect{parse %Q{<p>Foobar}}.to raise_exception(Utopia::Content::Markup::UnbalancedTagError)
 		end
 	end
 end

data/spec/utopia/setup_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe "utopia executable" do
 	
 	before(:all) do
 		# We need to build a package to test deployment:
-		system("rake", "build")
+		system("rake", "build") or abort("Could not build package for setup spec!")
 		
 		ENV.delete 'BUNDLE_BIN_PATH'
 		ENV.delete 'BUNDLE_GEMFILE'

data/utopia.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 	
 	spec.required_ruby_version = '~> 2.0'
 	
-	spec.add_dependency 'trenni', '~> 1.5.0'
+	spec.add_dependency 'trenni', '~> 1.6.0'
 	spec.add_dependency 'mime-types', '~> 2.0'
 	
 	spec.add_dependency 'rack', '~> 1.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -191,8 +191,8 @@ files:
 - lib/utopia/content.rb
 - lib/utopia/content/link.rb
 - lib/utopia/content/links.rb
+- lib/utopia/content/markup.rb
 - lib/utopia/content/node.rb
-- lib/utopia/content/processor.rb
 - lib/utopia/content/tag.rb
 - lib/utopia/content/transaction.rb
 - lib/utopia/content_length.rb
@@ -265,6 +265,7 @@ files:
 - spec/utopia/content/localized/three/index.xnode
 - spec/utopia/content/localized/two.en.xnode
 - spec/utopia/content/localized/two.zh.xnode
+- spec/utopia/content/markup_spec.rb
 - spec/utopia/content/node/ordered/first.xnode
 - spec/utopia/content/node/ordered/index.xnode
 - spec/utopia/content/node/ordered/links.yaml
@@ -273,7 +274,6 @@ files:
 - spec/utopia/content/node/related/foo.ja.xnode
 - spec/utopia/content/node/related/links.yaml
 - spec/utopia/content/node_spec.rb
-- spec/utopia/content/processor_spec.rb
 - spec/utopia/content_spec.rb
 - spec/utopia/content_spec.ru
 - spec/utopia/controller/action_spec.rb
@@ -379,6 +379,7 @@ test_files:
 - spec/utopia/content/localized/three/index.xnode
 - spec/utopia/content/localized/two.en.xnode
 - spec/utopia/content/localized/two.zh.xnode
+- spec/utopia/content/markup_spec.rb
 - spec/utopia/content/node/ordered/first.xnode
 - spec/utopia/content/node/ordered/index.xnode
 - spec/utopia/content/node/ordered/links.yaml
@@ -387,7 +388,6 @@ test_files:
 - spec/utopia/content/node/related/foo.ja.xnode
 - spec/utopia/content/node/related/links.yaml
 - spec/utopia/content/node_spec.rb
-- spec/utopia/content/processor_spec.rb
 - spec/utopia/content_spec.rb
 - spec/utopia/content_spec.ru
 - spec/utopia/controller/action_spec.rb