datagnan 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d32649719dee617ba923822bc39757c91f8a32c
-  data.tar.gz: c11b7755410a0417d5b472d95e021baed11cc37e
+  metadata.gz: 4abc2c60f6c8ae2c9080a8304ab25feec4aa8eb1
+  data.tar.gz: 69b188a1ff8ef210349a10d3f96d0c1ee15091dc
 SHA512:
-  metadata.gz: 5be96919d376b2e7a54493fba841ad2eae1c00733cea685d27470b9984d072f7cd70b2a778a7720c0f7ae2fd09effda4db84ef1c57e38faec3062d82860c65f6
-  data.tar.gz: ac1197a9f5551fa1a14ac97495733cc4432ad62df1fb2e920ff0e997c89da095664c6300ca7c142485cdf399396ee2af3e3ee1096261e523161483d648244518
+  metadata.gz: dad826a6a3a5f9571de819e2b2f0558ca745e25f0da031099a393e633aff5111aedb41961cdf8ff91ee1c187749c757de93cdcec9d2eadf502336ac8e17389e8
+  data.tar.gz: 05ca6420a97a40d88dba20c5c5e8d8d41e404e1577268c332aabf71da242f28479d28ddaac6359760630f44c4357b82358cd6d5c84f649354d7836408abdd6c8

data/lib/datagnan.rb

@@ -47,7 +47,7 @@ class Datagnan
 		vars = @vars if vars.is_a?(Hash) && vars.empty?
 		root = @doc if root.nil?
 		## debug
-		# puts "-- Datagnan.write ( vars = #{vars} )"
+		# puts "-- Datagnan.write ( vars = #{vars.inspect} )"
 		# puts "-- Datagnan.write ( root = #{root.to_xml} )"
 		## replace data-each
 		data_each(vars, root)
@@ -60,7 +60,7 @@ class Datagnan
 		# puts "-- Datagnan.write after when ( vars = #{vars} )"
 		# puts "-- Datagnan.write after when ( root = #{root.to_xml} )"
 		## replace data-var
-		data_vars(vars, root)
+		data_var(vars, root)
 		## debug
 		# puts "Datagnan.write after vars ( vars = #{vars} )"
 		# puts "Datagnan.write after vars ( root = #{root.to_xml} )"
@@ -76,21 +76,21 @@ class Datagnan
 private
 
 	## node content
-	def data_vars(vars, root)
+	def data_var(vars, root)
 		## debug
-		# puts "Datagnan.data_vars ( vars = #{vars} )"
-		# puts "Datagnan.data_vars ( root = #{root} )"
+		# puts "-- Datagnan.data_var ( vars = #{vars} )"
+		# puts "-- Datagnan.data_var ( root.to_xml = #{root.to_xml} )"
 		root.css('*[data-var]').each do |node|
 			## recursive access to property
 			## debug
-			# puts "-- Datagnan.data_vars each ( vars = #{vars} )"
-			# puts "-- Datagnan.data_vars each ( node = #{node} )"
+			# puts "-- Datagnan.data_var each ( vars = #{vars} )"
+			# puts "-- Datagnan.data_var each ( node.to_xml = #{node.to_xml} )"
 			var = vars
 			node.get('data-var').split('.').each do |key|
 				## var exist
 				var = ( var.is_a?(Hash) ? var[key] : (var.respond_to?(key) ? var.send(key) : nil ) )
 			end
-			# puts "-- Datagnan.data_vars each ( var = #{var} )"
+			# puts "-- Datagnan.data_var each ( var = #{var} )"
 
 			unless var.nil?
 				node.children = Oga.parse_html(var.to_s).children
@@ -99,7 +99,7 @@ private
 			## TODO: if var not exist remember it (maybe return to model)
 		end
 		## debug
-		# puts "Datagnan.data_vars end ( root = #{root} )"
+		# puts "Datagnan.data_var end ( root = #{root} )"
 	end
 
 	## node attributes
@@ -125,7 +125,10 @@ private
 				end
 				# puts "-- Datagnan.data_attrs each ( var = #{var} )"
 				unless var.nil?
-					node.set(key, var.to_s)
+					node.attributes.insert(
+						node.attributes.index(node.attribute('data-attrs')),
+						Oga::XML::Attribute.new(:name => key, :value => var.to_s)
+					)
 				end
 				# puts "-- Datagnan.data_attrs each ( node.to_xml = #{node.to_xml} )"
 				## TODO: if attr not exist remember it (maybe return to model)
@@ -156,7 +159,7 @@ private
 				var.each do |item|
 					# puts "-- Datagnan.data_each each ( item = #{item} )"
 					# puts "-- Datagnan.data_each each ( item.inspect = #{item.inspect} )"
-					new_node = Oga.parse_html(node.to_xml).children.pop
+					new_node = Oga.parse_html(node.to_xml)
 					# puts "-- Datagnan.data_each each ( node after clone = #{node} )"
 					# puts "-- Datagnan.data_each each ( node.to_xml after clone = #{node.to_xml} )"
 					# puts "-- Datagnan.data_each each ( node.parent.to_xml = #{node.parent.to_xml} )"
@@ -167,7 +170,7 @@ private
 					# puts "-- Datagnan.data_each each ( new_node.to_xml after write = #{new_node.to_xml} )"
 					# puts "-- Datagnan.data_each each ( node after write= #{node} )"
 					# puts "-- Datagnan.data_each each ( node.to_xml after write= #{node.to_xml} )"
-					node.before(new_node)
+					node.before(new_node.children.pop)
 					# puts "-- Datagnan.data_each each ( node = #{node} )"
 					# puts "-- Datagnan.data_each each ( node.to_xml after insert = #{node.to_xml} )"
 					# puts "-- Datagnan.data_each each ( node.parent = #{node.parent.to_xml} )"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagnan
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Alexander Popov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga
@@ -25,7 +25,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Make HTML-templates without strange tags.
+description: HTML-templates engine, without specific (often ugly) tags. Based on 'data-'
+  attributes.
 email: alex.wayfer@gmail.com
 executables: []
 extensions: []