datagnan 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ff29956adae77378e8f4d320693f2319e3995bb
-  data.tar.gz: e1401f2e12ed8faa80beb219b701145a0a0f0c97
+  metadata.gz: 881e2804b0516deffd9baa0fdd07a6b4dd9e5aa6
+  data.tar.gz: 3435fc4132a7ad4f77c84a0f8f78906bf058c527
 SHA512:
-  metadata.gz: abf4aa468a7d5ac4d0242f61239fa9da1555d10f5c1996e1661c5f8e4cd1e44a353ccb796381929c8a759fc798454dd6926248b2d81c084568134f634f20f02b
-  data.tar.gz: d982e33c22ebafc62fc1820e9e170038769a41d61f34c1da2f6145acda568815c55eb8ba1925c30e5ec25260721390b56e4c87543bb5a64e4b7fc4c4709702a8
+  metadata.gz: 65388ecda133e1669acf4cfea36067b8b203ab2fe67ed15ac25c91e40300957970f5c797621bfcd8af71bd778c2f5bba37c4b8f089b119620a3f06a3201fb674
+  data.tar.gz: 17245b721d824eef3654a2acce9a1cb7736019329f1a8d113e4f5834564750212f618157847508a26bdabd03fd23289b04363777bd6d55e50c20b6850976f499

data/lib/datagnan.rb

@@ -10,18 +10,17 @@ class Datagnan
 	#   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
-	def initialize(file_path, options = {}, locals = {})
-		@doc = Oga.parse_html(File.read(file_path))
+	def initialize(file_path, options = {}, local_vars = {})
+		@doc = Oga.parse_html File.read(file_path)
 		## debug
 		# puts "-- @doc = #{@doc}"
-		@attrs_sep = options.delete(:attrs_sep) || ";"
-		@scope = options.delete(:scope) || self
-		@vars = options.delete(:locals) || locals || {}
+		@options = {}
+		@options[:attrs_sep] = options[:attrs_sep] || ";"
+		@options[:path_filters] = options[:path_filters] || {}
+		@scope = options[:scope] || self
+		@vars = (options[:local_vars] || {}).merge! local_vars
 		@vars.merge! Hash[@scope.instance_variables.map { |name| [name.to_s, @scope.instance_variable_get(name)] } ] unless @scope.nil?
 		## debug
 		# puts "-- Datagnan.new ( @vars = #{@vars} )"
@@ -34,13 +33,10 @@ class Datagnan
 	#   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
-	def self.open(file_path, options = {}, locals = {})
-		obj = Datagnan.new(file_path, options, locals).write
+	def self.open(file_path, options = {}, local_vars = {})
+		obj = Datagnan.new(file_path, options, local_vars).write
 		yield obj if block_given?
 		return obj
 	end
@@ -51,13 +47,10 @@ class Datagnan
 	#   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
-	def self.read(file_path, options = {}, locals = {})
-		Datagnan.new(file_path, options, locals).write.read
+	def self.read(file_path, options = {}, local_vars = {})
+		Datagnan.new(file_path, options, local_vars).write.read
 	end
 
 	## Return HTML-String. As File.new.read
@@ -101,6 +94,7 @@ class Datagnan
 		# puts "Datagnan.write after vars ( root = #{root.to_xml} )"
 		## replace data-attrs
 		data_attrs(vars, root)
+		data_attr(vars, root)
 		## debug
 		# puts "Datagnan.write after attrs ( vars = #{vars} )"
 		# puts "Datagnan.write after attrs ( root = #{root.to_xml} )"
@@ -126,6 +120,14 @@ private
 		# puts "-- Datagnan.find_value ( vars = #{vars} )"
 		# beginning_time = Time.now
 		var = vars
+
+		## path_filters for replace
+		## Example:
+		## path => '/foo/bar'
+		## :path_filters = { /^\// => '', '/' => '.' }
+		## path => 'foo.bar'
+		@options[:path_filters].each { |key, val| path.gsub!(key, val) }
+		
 		dot_keys = path.split('.')
 		dot_keys = dot_keys.drop_while do |dot_key|
 			## debug
@@ -142,23 +144,25 @@ private
 		# puts "-- Datagnan.find_value after drop_while ( var = #{var} )"
 		# puts "-- Datagnan.find_value after drop_while ( dot_keys = #{dot_keys} )"
 		# puts "-- Datagnan.find_value before eval ( dot_keys = #{dot_keys} )"
-		
-		
+
 		begin
 			## debug
+			# puts "-- Datagnan.find_value before eval var.instance_eval"
 			# puts "-- Datagnan.find_value before eval ( var.instance_eval(dot_keys.join('.')) = #{var.instance_eval(dot_keys.join('.'))} )"
 			var = var.instance_eval(dot_keys.join('.'))
 		rescue Exception => e
 			begin
 				## debug
-				# puts "-- Datagnan.find_value before eval ( @scope.instance_eval('var.'+dot_keys.join('.')) = #{@scope.instance_eval('var.'+dot_keys.join('.'))} )" if dot_keys.any?
+				# puts "-- Datagnan.find_value before eval @scope.instance_eval('var.')"
+				# puts "-- Datagnan.find_value before eval ( @scope.instance_eval('var.'+dot_keys.join('.')) = #{@scope.instance_eval('var.'+dot_keys.join('.'))} )"
 				var = @scope.instance_eval('var.'+dot_keys.join('.'))
 			rescue Exception => e
 				begin
 					## debug
+					# puts "-- Datagnan.find_value before eval @scope.instance_eval"
 					# puts "-- Datagnan.find_value before eval ( @scope.instance_eval(dot_keys.join('.')) = #{@scope.instance_eval(dot_keys.join('.'))} )"
 					var = @scope.instance_eval(dot_keys.join('.'))
-				rescue
+				rescue Exception => e
 					var = nil
 				end
 			end
@@ -189,17 +193,43 @@ private
 		# puts "Datagnan.data_var end ( root = #{root} )"
 	end
 
+	## node attributes (DOMtempl-comaptible)
+	# @since 1.2.0
+	def data_attr(vars, root)
+		root.xpath("//@*[starts-with(name(), 'data-attr-')]").each do |attr|
+			node = attr.element
+
+			key = attr.name.sub!('data-attr-', '')
+			val = attr.value
+
+			var = find_value(val, vars)
+
+			unless var.nil?
+				node.attributes.insert(
+					node.attributes.index(attr),
+					Oga::XML::Attribute.new(
+						:name => key,
+						:value => var.to_s,
+						:element => node
+					)
+				)
+			end
+			node.unset(attr.name)
+		end
+	end
+
 	## node attributes
 	def data_attrs(vars, root)
 		## debug
 		# puts "-- Datagnan.data_attrs ( vars = #{vars} )"
 		# puts "-- Datagnan.data_attrs ( root = #{root.to_xml} )"
-		# puts "-- Datagnan.data_attrs ( @attrs_sep = #{@attrs_sep} )"
+		# puts "-- Datagnan.data_attrs ( @options[:attrs_sep] = #{@options[:attrs_sep]} )"
 		root.css('*[data-attrs]').each do |node|
 			## debug
 			# puts "-- Datagnan.data_attrs each ( node = #{node} )"
 			# puts "-- Datagnan.data_attrs each ( node.to_xml = #{node.to_xml} )"
-			node.get('data-attrs').split(@attrs_sep).each do |attr|
+			node_data_attrs = node.attribute('data-attrs')
+			node_data_attrs.value.split(@options[:attrs_sep]).each do |attr|
 				key_val = attr.split(':')
 				key = key_val[0]
 				val = key_val.size.odd? ? key_val[0] : key_val[1]
@@ -212,15 +242,19 @@ private
 
 				unless var.nil?
 					node.attributes.insert(
-						node.attributes.index(node.attribute('data-attrs')),
-						Oga::XML::Attribute.new(:name => key, :value => var.to_s)
+						node.attributes.index(node_data_attrs),
+						Oga::XML::Attribute.new(
+							:name => key,
+							:value => var.to_s,
+							:element => node
+						)
 					)
 				end
 				# puts "-- Datagnan.data_attrs each ( node.to_xml = #{node.to_xml} )"
 				## TODO: if attr not exist remember it (maybe return to model)
 			end
 			node.unset('data-attrs')
-		end	
+		end
 	end
 
 	## fill template by array
@@ -306,24 +340,28 @@ end
 #   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
-def datagnan(template_file, options = {}, locals = {})
+def datagnan(template_file, options = {}, local_vars = {})
 	# beginning_time = Time.now
 	## default options
-	scope = options.delete(:scope) || self
-	views = File.realpath(options.delete(:views) || scope.settings.views || "./views")
-	locals = options.delete(:locals) || locals || {}
+	options[:scope] ||= self
+	options[:views_dir] = File.realpath(options[:views_dir] || (options[:scope].settings.views if options[:scope].settings) || "./views")
+	options[:layout_file] = File.join(options[:views_dir], options[:layout_file] || 'layout.html')
+	(options[:local_vars] ||= {}).merge! local_vars
+
+	## prepare template filename
+	template_file = File.join(options[:views_dir], template_file.to_s)
+	template_file += '.html' unless File.exist? template_file
 
-	html = Datagnan.read(File.join(views, template_file.to_s+'.html'), :scope => scope, :locals => locals)
+	## render template
+	html = Datagnan.read(template_file, options)
 	## debug
 	# puts "-- datagnan ( template = #{html} )"
-	if File.exist? File.join(views, 'layout.html')
-		locals['template'] = {'html' => html}
-		html = Datagnan.read(File.join(views, 'layout.html'), :scope => scope, :locals => locals)
+	## check for layout and wrap template if exist
+	if File.exist? options[:layout_file]
+		options[:local_vars]['template'] = { 'html' => html }
+		html = Datagnan.read(options[:layout_file], options)
 		## 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.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Alexander Popov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga