datagnan 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05607710b99a729b6621ee1ed606791acca3d926
-  data.tar.gz: 19fe21526067a3c30121ff0548f788ebd2d2db76
+  metadata.gz: 51727d19fe0ccfcc902d890b88206a1183e39ccb
+  data.tar.gz: 6fd8ef869f5545f1f273a5d27d9cf921e2492b5e
 SHA512:
-  metadata.gz: d20055d75d94aac632aebeaf7f443c620a68477d1c999993a44a7f8e9674502b2352116bf0da9aaf1515966c548358fa4110a6f1bd00b38bf5fd863cb2ee1cd4
-  data.tar.gz: fc27c125b3c574a2a82074b95bea1e633f83ae7f673475d24be93b22dcf055ba737ab443da67fef1ae1e7f356184a0ec5dcd44c79664c8daf9d8f89f4cde8183
+  metadata.gz: 9a8b138290a6c01440e21ec088aefc04c54f91850fc1af35f98e43507c4df24dc809a8c5b872a528fb77c28d5aacad12b2c70017c04c170d3deba0a801bc0621
+  data.tar.gz: 2459f8e06704ee97e6e6d645348906dcc321c1fc5afc2f5cefc559c843d1af3c14707ef445f180bb54ecd3e3806f81cfad62607b3e1b1a68ebb50068a31ec417

data/lib/datagnan.rb

@@ -20,7 +20,7 @@ class Datagnan
 		@options[:attrs_sep] = options[:attrs_sep] || ";"
 		@options[:path_filters] = options[:path_filters] || {}
 		@scope = options[:scope] || self
-		@vars = (options[:local_vars] || {}).merge! local_vars
+		@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} )"
@@ -188,7 +188,11 @@ private
 			var = find_value(node.get('data-var'), vars)
 
 			unless var.nil?
-				node.children = Oga.parse_html(var.to_s).children
+				begin
+					node.children = Oga.parse_html(var.to_s).children
+				rescue
+					node.inner_text = var.to_s
+				end
 				node.unset('data-var')
 			end
 			## TODO: if var not exist remember it (maybe return to model)
@@ -346,10 +350,16 @@ private
 		# puts "Datagnan.data_when_not ( root = #{root} )"
 		root.css('*[data-when-not]').each do |node|
 
-			var = find_value(node.get('data-when-not'), vars)
+			var = node.get('data-when-not').split(@options[:attrs_sep]).each do |key|
+				## debug
+				# puts "-- Datagnan.data_when_not each split ( key = #{key} )"
+				var = find_value(key, vars)
+				# puts "-- Datagnan.data_when_not each split ( var = #{var} )"
+				break var unless var
+			end
 
 			## allow for nil
-			var ? node.remove : node.unset('data-when')
+			var ? node.remove : node.unset('data-when-not')
 			## TODO: if var not exist remember it (maybe return to model)
 		end
 		## debug
@@ -371,7 +381,7 @@ def datagnan(template_files, options = {}, local_vars = {})
 	options[:scope] ||= self
 	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
+	vars = (options[:local_vars] || {}).merge local_vars
 
 	html = ""
 	template_files = [template_files] unless template_files.is_a? Array
@@ -381,15 +391,15 @@ def datagnan(template_files, options = {}, local_vars = {})
 		template_file += '.html' unless File.exist? template_file
 
 		## render template
-		html += Datagnan.read(template_file, options)
+		html += Datagnan.read(template_file, options, vars)
 		## debug
 		# puts "-- datagnan ( template = #{html} )"
 	end
 
 	## 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)
+		vars['template'] = { 'html' => html }
+		html = Datagnan.read(options[:layout_file], options, vars)
 		## debug
 		# puts "-- datagnan ( layout = #{html} )"
 	end

metadata

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