datagnan 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5a0ec06c2a125c4ad17814577c507cc9ef89b99
-  data.tar.gz: af543be0c33c5a149802a8b3c9029fe0f00bdd23
+  metadata.gz: 956fd71bee82b2660ebe07ec675371f81cdd097a
+  data.tar.gz: 8003be78cd8f36df3f5d209d274e65df3340ea7d
 SHA512:
-  metadata.gz: 38bde6c095066e835795ed3950cc5fbc93990e50f60d8f786562f8f1d84a3ece6e1ac54b0c4ba5c78cab681f9e0938804f16bb10f3e224848bf81f1530f37d15
-  data.tar.gz: bc0c93d748cd7adf1b1a9a3dc8816d5eacbf1469f35da59ff24e3cecb880c31f1a3139754fcbe120252a3311942add7cb84d98d3edcbb5fea2f631404479b421
+  metadata.gz: 4a74d41638671209b792ecceb88c2ac64834744d23bca7ece6c866c73b36406fcd3faa116f0422cc51a29678eda7a02dc61b6e9f90edd3f7ffe0f49ea2bc75a4
+  data.tar.gz: fb3b1c1409cc42c0d3b11aed7b591d85d6f6211720afb87e763bf4576ca8641cd4648a66ff995a439af39f7d02c4c502202efc674b1f1357c3ba8d7b685fb4e8

data/lib/datagnan.rb

@@ -6,12 +6,15 @@ class Datagnan
 	attr_accessor :doc, :vars
 
 	## Constructor
-	# @param [String] file_path   path to .html-template file
-	# @param [Hash] options   options for parsing and filling the template
+	# @param [String] file_path
+	#   path to .html-template file
+	# @param [Hash] options
+	#   options for parsing and filling the template
 	#   @option options [String] :attrs_sep (";") Separate string for 'data-attrs' attribute
 	#   @option options [Object] :scope (self) Scope for variables
 	#   @option options [Hash] :locals (locals || {}) Local variables for filling the template
-	# @param [Hash] locals   local variables for filling the template
+	# @param [Hash] locals
+	#   local variables for filling the template
 	def initialize(file_path, options = {}, locals = {})
 		@doc = Oga.parse_html(File.read(file_path))
 		## debug
@@ -27,12 +30,15 @@ class Datagnan
 	## Create Datagnan instance and return this.
 	## Can receive implicity block for 'yield.
 	## Like File.open(file_path)
-	# @param [String] file_path   path to .html-template file
-	# @param [Hash] options   options for parsing and filling the template
+	# @param [String] file_path
+	#   path to .html-template file
+	# @param [Hash] options
+	#   options for parsing and filling the template
 	#   @option options [String] :attrs_sep (";") Separate string for 'data-attrs' attribute
 	#   @option options [Object] :scope (self) Scope for variables
 	#   @option options [Hash] :locals (locals || {}) Local variables for filling the template
-	# @param [Hash] locals   local variables for filling the template
+	# @param [Hash] locals
+	#   local variables for filling the template
 	def self.open(file_path, options = {}, locals = {})
 		obj = Datagnan.new(file_path, options, locals).write
 		yield obj if block_given?
@@ -41,12 +47,15 @@ class Datagnan
 
 	## Create Datagnan instance and return the filling with variables HTML-template as String.
 	## Like File.read(file_path)
-	# @param [String] file_path   path to .html-template file
-	# @param [Hash] options   options for parsing and filling the template
+	# @param [String] file_path
+	#   path to .html-template file
+	# @param [Hash] options
+	#   options for parsing and filling the template
 	#   @option options [String] :attrs_sep (";") Separate string for 'data-attrs' attribute
 	#   @option options [Object] :scope (self) Scope for variables
 	#   @option options [Hash] :locals (locals || {}) Local variables for filling the template
-	# @param [Hash] locals   local variables for filling the template
+	# @param [Hash] locals
+	#   local variables for filling the template
 	def self.read(file_path, options = {}, locals = {})
 		Datagnan.new(file_path, options, locals).write.read
 	end
@@ -60,8 +69,10 @@ class Datagnan
 
 	## Parse and replace
 	## Like File.new.write
-	# @param [Hash] vars   variables for filling the template
-	# @param [Oga::XML::Document] root   HTML-element for fill it
+	# @param [Hash] vars
+	#   variables for filling the template
+	# @param [Oga::XML::Document] root
+	#   HTML-element for fill it
 	def write(vars = {}, root = nil)
 		## debug
 		# puts "Datagnan.write ( vars = #{vars} )"
@@ -225,8 +236,8 @@ private
 					# puts "-- Datagnan.data_each each ( node.to_xml after insert = #{node.to_xml} )"
 					# puts "-- Datagnan.data_each each ( node.parent = #{node.parent.to_xml} )"
 				end
-				node.remove
 			end
+			node.remove
 		end
 	end
 
@@ -269,24 +280,27 @@ private
 end
 
 ## Helper function (for Sinatra, primarily)
-# @param [String] file_path   path to .html-template file
-# @param [Hash] options   options for parsing and filling the template
+# @param [String] file_path
+#   path to .html-template file
+# @param [Hash] options
+#   options for parsing and filling the template
 #   @option options [Object] :scope (self) Scope for variables
 #   @option options [String] :views (scope.settings.views || "./views") Path to views directory
 #   @option options [Hash] :locals (locals || {}) Local variables for filling the template
-# @param [Hash] locals   local variables for filling the template
+# @param [Hash] locals
+#   local variables for filling the template
 def datagnan(template_file, options = {}, locals = {})
 	## default options
 	scope = options.delete(:scope) || self
 	views = File.realpath(options.delete(:views) || scope.settings.views || "./views")
 	locals = options.delete(:locals) || locals || {}
 
-	html = Datagnan.read(views+'/'+template_file.to_s+'.html', :scope => scope, :locals => locals)
+	html = Datagnan.read(File.join(views, template_file.to_s+'.html'), :scope => scope, :locals => locals)
 	## debug
 	# puts "-- datagnan ( template = #{html} )"
-	if File.exist?(views+'/layout.html')
+	if File.exist? File.join(views, 'layout.html')
 		locals['template'] = {'html' => html}
-		html = Datagnan.read(views+'/layout.html', :scope => scope, :locals => locals)
+		html = Datagnan.read(File.join(views, 'layout.html'), :scope => scope, :locals => locals)
 		## debug
 		# puts "-- datagnan ( layout = #{html} )"
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagnan
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Alexander Popov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga