datagnan 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 881e2804b0516deffd9baa0fdd07a6b4dd9e5aa6
-  data.tar.gz: 3435fc4132a7ad4f77c84a0f8f78906bf058c527
+  metadata.gz: f088e30bfb4123a90aeb0a53ccdc911ee805c572
+  data.tar.gz: 6ed257beac94a08f8dc9e485a32086188384234c
 SHA512:
-  metadata.gz: 65388ecda133e1669acf4cfea36067b8b203ab2fe67ed15ac25c91e40300957970f5c797621bfcd8af71bd778c2f5bba37c4b8f089b119620a3f06a3201fb674
-  data.tar.gz: 17245b721d824eef3654a2acce9a1cb7736019329f1a8d113e4f5834564750212f618157847508a26bdabd03fd23289b04363777bd6d55e50c20b6850976f499
+  metadata.gz: 1131dcf4d53e201502c926da2881870f87cabc5e6777643dd4342605a2fb641c284248da42db7928c1198f1d7f73f99092958ce19616f318456b7797d7d5c482
+  data.tar.gz: 6b3fa249e0972186eae0f50c1bff35ba2bc5c34d235d19c6ca5d135cab2b8b7521858560ed8c3742257bbd71a4bd7201734af36977d476d0632283afd95b420c

data/lib/datagnan.rb

@@ -94,10 +94,14 @@ 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} )"
+		## replace data-attr-*
+		data_attr(vars, root)
+		## debug
+		# puts "Datagnan.write after attr ( vars = #{vars} )"
+		# puts "Datagnan.write after attr ( root = #{root.to_xml} )"
 		## result
 		return self
 	end
@@ -127,7 +131,7 @@ private
 		## :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
@@ -199,12 +203,17 @@ private
 		root.xpath("//@*[starts-with(name(), 'data-attr-')]").each do |attr|
 			node = attr.element
 
-			key = attr.name.sub!('data-attr-', '')
+			key = attr.name.sub(/^data\-attr\-/, '')
 			val = attr.value
 
 			var = find_value(val, vars)
+			## debug
+			# puts "-- Datagnan.data_attr each after find_value ( var = #{var} )"
+			# puts "-- Datagnan.data_attr each after find_value ( var.to_s = #{var.to_s} )"
 
-			unless var.nil?
+			unless var.nil? || var == false
+				## debug
+				# puts "-- Datagnan.data_attr each before insert ( node.to_xml = #{node.to_xml} )"
 				node.attributes.insert(
 					node.attributes.index(attr),
 					Oga::XML::Attribute.new(
@@ -213,9 +222,15 @@ private
 						:element => node
 					)
 				)
+				## debug
+				# puts "-- Datagnan.data_attr each after insert ( node.to_xml = #{node.to_xml} )"
 			end
 			node.unset(attr.name)
+			## debug
+			# puts "-- Datagnan.data_attr each ( node.to_xml = #{node.to_xml} )"
 		end
+		## debug
+		# puts "-- Datagnan.data_attr after ( root.to_xml = #{root.to_xml} )"
 	end
 
 	## node attributes
@@ -240,7 +255,7 @@ private
 				## debug
 				# puts "-- Datagnan.data_attrs each attr ( var = #{var} )"
 
-				unless var.nil?
+				unless var.nil? || var == false
 					node.attributes.insert(
 						node.attributes.index(node_data_attrs),
 						Oga::XML::Attribute.new(
@@ -346,7 +361,7 @@ def datagnan(template_file, options = {}, local_vars = {})
 	# beginning_time = Time.now
 	## default options
 	options[:scope] ||= self
-	options[:views_dir] = File.realpath(options[:views_dir] || (options[:scope].settings.views if options[:scope].settings) || "./views")
+	options[:views_dir] = File.realpath(options[:views_dir] || (options[:scope].settings.views if options[:scope].respond_to? :settings) || "./views")
 	options[:layout_file] = File.join(options[:views_dir], options[:layout_file] || 'layout.html')
 	(options[:local_vars] ||= {}).merge! local_vars
 

metadata

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