datagnan 0.2.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61cb1a3b24ff1ca759c01d5a5934f92ed8feaf21
-  data.tar.gz: 212dc29ae4e8d7c479b4ff13c207a5dddc4a8607
+  metadata.gz: 1d32649719dee617ba923822bc39757c91f8a32c
+  data.tar.gz: c11b7755410a0417d5b472d95e021baed11cc37e
 SHA512:
-  metadata.gz: 39be95e5c5db5a4551ed636b9f516eb0239261286af2c2c50ca195a96094b0682f15c10367b0721d8e4310935b3ebbe48a8796453a8f86c476a2eee687e089ec
-  data.tar.gz: 2b364f95fe17e9ff0c58943fa131b69209488df1304a31ec4024d55ee8a92de0253688b4a12c24854970ea5214ab4836a9b4b6aa7e07f6633f9b2f548bea9717
+  metadata.gz: 5be96919d376b2e7a54493fba841ad2eae1c00733cea685d27470b9984d072f7cd70b2a778a7720c0f7ae2fd09effda4db84ef1c57e38faec3062d82860c65f6
+  data.tar.gz: ac1197a9f5551fa1a14ac97495733cc4432ad62df1fb2e920ff0e997c89da095664c6300ca7c142485cdf399396ee2af3e3ee1096261e523161483d648244518

data/lib/datagnan.rb

@@ -1,5 +1,5 @@
-## Nokogiri for HTML parsing
-require 'nokogiri'
+## Oga for HTML parsing (Yeah, no Nokogiri!)
+require 'oga'
 
 class Datagnan
 
@@ -8,11 +8,7 @@ class Datagnan
 	## Constructor
 	def initialize(file_path, options = {}, locals = {})
 		## TODO: return fragment, not full html with auto-tags
-		@doc = Nokogiri::HTML(File.read(file_path)) do |config|
-			## Because "Tag header invalid" and many other HTML5 tags
-			config.noerror
-		end
-		puts @doc.errors if (@doc.errors.any?)
+		@doc = Oga.parse_html(File.read(file_path))
 		## debug
 		# puts "-- @doc = #{@doc}"
 		@attrs_sep = options.delete(:attrs_sep) || ";"
@@ -39,7 +35,7 @@ class Datagnan
 	def read
 		## debug
 		# puts "-- Datagnan.read ( @doc = #{@doc} )"
-		@doc.to_html
+		@doc.to_xml
 	end
 
 	## Parse and replace
@@ -52,23 +48,27 @@ class Datagnan
 		root = @doc if root.nil?
 		## debug
 		# puts "-- Datagnan.write ( vars = #{vars} )"
-		# puts "-- Datagnan.write ( root = #{root} )"
+		# puts "-- Datagnan.write ( root = #{root.to_xml} )"
 		## replace data-each
 		data_each(vars, root)
 		## debug
-		# puts "-- Datagnan.write ( vars = #{vars} )"
-		# puts "-- Datagnan.write ( root = #{root} )"
+		# puts "-- Datagnan.write after each ( vars = #{vars} )"
+		# puts "-- Datagnan.write after each ( root = #{root.to_xml} )"
 		## replace data-when
 		data_when(vars, root)
 		## debug
-		# puts "Datagnan.write after each ( vars = #{vars} )"
-		# puts "Datagnan.write after each ( root = #{root} )"
+		# puts "-- Datagnan.write after when ( vars = #{vars} )"
+		# puts "-- Datagnan.write after when ( root = #{root.to_xml} )"
 		## replace data-var
 		data_vars(vars, root)
 		## debug
-		# puts "Datagnan.write after vars ( root = #{root} )"
+		# puts "Datagnan.write after vars ( vars = #{vars} )"
+		# puts "Datagnan.write after vars ( root = #{root.to_xml} )"
 		## replace data-attrs
 		data_attrs(vars, root)
+		## debug
+		# puts "Datagnan.write after attrs ( vars = #{vars} )"
+		# puts "Datagnan.write after attrs ( root = #{root.to_xml} )"
 		## result
 		return self
 	end
@@ -86,15 +86,15 @@ private
 			# puts "-- Datagnan.data_vars each ( vars = #{vars} )"
 			# puts "-- Datagnan.data_vars each ( node = #{node} )"
 			var = vars
-			node['data-var'].split('.').each do |key|
+			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} )"
 
 			unless var.nil?
-				node.inner_html = var.to_s
-				node.remove_attribute('data-var')
+				node.children = Oga.parse_html(var.to_s).children
+				node.unset('data-var')
 			end
 			## TODO: if var not exist remember it (maybe return to model)
 		end
@@ -106,12 +106,13 @@ private
 	def data_attrs(vars, root)
 		## debug
 		# puts "-- Datagnan.data_attrs ( vars = #{vars} )"
-		# puts "-- Datagnan.data_attrs ( root = #{root} )"
+		# puts "-- Datagnan.data_attrs ( root = #{root.to_xml} )"
 		# puts "-- Datagnan.data_attrs ( @attrs_sep = #{@attrs_sep} )"
 		root.css('*[data-attrs]').each do |node|
 			## debug
 			# puts "-- Datagnan.data_attrs each ( node = #{node} )"
-			node['data-attrs'].split(@attrs_sep).each do |attr|
+			# puts "-- Datagnan.data_attrs each ( node.to_xml = #{node.to_xml} )"
+			node.get('data-attrs').split(@attrs_sep).each do |attr|
 				key_val = attr.split(':')
 				key = key_val[0]
 				val = key_val.size.odd? ? key_val[0] : key_val[1]
@@ -122,27 +123,54 @@ private
 					## var exist
 					var = ( var.is_a?(Hash) ? var[val_part] : (var.respond_to?(val_part) ? var.send(val_part) : nil ) )
 				end
+				# puts "-- Datagnan.data_attrs each ( var = #{var} )"
 				unless var.nil?
-					node[key] = var
+					node.set(key, 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)
 			end
-			node.remove_attribute('data-attrs')
+			node.unset('data-attrs')
 		end	
 	end
 
 	## fill template by array
 	def data_each(vars, root)
 		## debug
-		# puts "Datagnan.data_each ( vars = #{vars}, root.tag = #{root.name} )"
+		# puts "-- Datagnan.data_each ( vars = #{vars} )"
+		# puts "-- Datagnan.data_each ( root = #{root.to_xml} )"
+		# puts "-- Datagnan.data_each ( root.css('[data-each]') = #{root.css('[data-each]').inspect} )"
 		root.css('*[data-each]').each do |node|
-			## var exist
-			if vars.has_key? node['data-each']
-				vars[node['data-each']].each do |item|
-					node_clone = node.clone
-					write(item, node_clone)
-					node_clone.remove_attribute('data-each')
-					node.parent << node_clone
+			# puts "-- Datagnan.data_each each"
+			# --------
+			var = vars
+			node.get('data-each').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_each each ( var = #{var} )"
+			# puts "-- Datagnan.data_each each ( node = #{node.to_xml} )"
+			unless var.nil?
+			# --------
+				node.unset('data-each')
+				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
+					# 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} )"
+					# puts "-- Datagnan.data_each each ( new_node = #{new_node} )"
+					# puts "-- Datagnan.data_each each ( new_node.to_xml = #{new_node.to_xml} )"
+					write(item, new_node)
+					# puts "-- Datagnan.data_each each ( new_node after write = #{new_node} )"
+					# 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)
+					# 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} )"
 				end
 				node.remove
 			end
@@ -160,14 +188,14 @@ private
 			# puts "-- Datagnan.data_when each ( vars = #{vars} )"
 			# puts "-- Datagnan.data_when each ( node = #{node} )"
 			var = vars
-			node['data-when'].split('.').each do |key|
+			node.get('data-when').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_when each ( var = #{var} )"
 
 			unless var.nil?
-				var ? node.remove_attribute('data-when') : node.remove
+				var ? node.unset('data-when') : node.remove
 			end
 			## TODO: if var not exist remember it (maybe return to model)
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagnan
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.1
 platform: ruby
 authors:
 - Alexander Popov
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: oga
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Make HTML-templates without strange tags.