datagnan 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4abc2c60f6c8ae2c9080a8304ab25feec4aa8eb1
-  data.tar.gz: 69b188a1ff8ef210349a10d3f96d0c1ee15091dc
+  metadata.gz: f425736e18d39486f8e1fc680fd8450bde7a4d1a
+  data.tar.gz: 46b8bdba14ff01e2dd64cedf69828fe7acb8458a
 SHA512:
-  metadata.gz: dad826a6a3a5f9571de819e2b2f0558ca745e25f0da031099a393e633aff5111aedb41961cdf8ff91ee1c187749c757de93cdcec9d2eadf502336ac8e17389e8
-  data.tar.gz: 05ca6420a97a40d88dba20c5c5e8d8d41e404e1577268c332aabf71da242f28479d28ddaac6359760630f44c4357b82358cd6d5c84f649354d7836408abdd6c8
+  metadata.gz: 96bd8819def16e59acc2223cdb23bdea2bf16cd9089238f1ddd3b9d6142fd06082e56fe526acab30f0a9f470d2bacdcdfeedf4b0c8f87e2a5dd813edb23167c1
+  data.tar.gz: 01eaa06ae0cd544c99123af7757e93e0ddea66dab4b7f97ed119e60e23fbf2d4ba5c5fe35c96b3fa4004852d923642cafeab19971495e81eafc960ec481a9765

data/lib/datagnan.rb

@@ -75,22 +75,44 @@ class Datagnan
 
 private
 
+	## find value in vars and scope
+	def find_value(path, vars)
+		## recursive access to property
+		## debug
+		# puts "-- Datagnan.find_value ( path = #{path} )"
+		# puts "-- Datagnan.find_value ( vars = #{vars} )"
+		var = vars
+		path.split('.').each do |key|
+			## var exist
+			# puts "-- Datagnan.find_value split ( key = #{key} )"
+			# puts "-- Datagnan.find_value split ( @scope.respond_to?(key) = #{@scope.respond_to?(key)} )"
+			# puts "-- Datagnan.find_value split ( @scope.send(key) = #{@scope.send(key)} )" if @scope.respond_to?(key)
+			var = ( var.is_a?(Hash) ?
+				( var[key].nil? ? 
+					( @scope.respond_to?(key) ?
+						@scope.send(key) :
+						nil
+					) :
+					var[key]
+				) :
+				( var.respond_to?(key) ?
+					var.send(key) :
+					nil
+				)
+			)
+		end
+		# puts "-- Datagnan.find_value ( var = #{var} )"
+		var
+	end
+
 	## node content
 	def data_var(vars, root)
 		## debug
 		# 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_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_var each ( var = #{var} )"
+
+			var = find_value(node.get('data-var'), vars)
 
 			unless var.nil?
 				node.children = Oga.parse_html(var.to_s).children
@@ -118,12 +140,8 @@ private
 				val = key_val.size.odd? ? key_val[0] : key_val[1]
 				## debug
 				# puts "-- Datagnan.data_attrs each attr ( key = #{key}, val = #{val} )"
-				var = vars
-				val.split('.').each do |val_part|
-					## 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} )"
+				var = find_value(val, vars)
+
 				unless var.nil?
 					node.attributes.insert(
 						node.attributes.index(node.attribute('data-attrs')),
@@ -144,15 +162,9 @@ private
 		# 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|
-			# 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} )"
+
+			var = find_value(node.get('data-each'), vars)
+
 			unless var.nil?
 			# --------
 				node.unset('data-each')
@@ -186,16 +198,8 @@ private
 		# puts "Datagnan.data_when ( vars = #{vars} )"
 		# puts "Datagnan.data_when ( root = #{root} )"
 		root.css('*[data-when]').each do |node|
-			## recursive access to property
-			## debug
-			# puts "-- Datagnan.data_when each ( vars = #{vars} )"
-			# puts "-- Datagnan.data_when each ( node = #{node} )"
-			var = vars
-			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} )"
+
+			var = find_value(node.get('data-when'), vars)
 
 			unless var.nil?
 				var ? node.unset('data-when') : node.remove

metadata

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