datagnan 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c71b936e47fb8e7e80ea5cf3ea76978cce826dc3
-  data.tar.gz: 7c972510249bdfad1f5bdfdd4de8dbb9a3f883dc
+  metadata.gz: 4ff29956adae77378e8f4d320693f2319e3995bb
+  data.tar.gz: e1401f2e12ed8faa80beb219b701145a0a0f0c97
 SHA512:
-  metadata.gz: e14b7a4b3efb821b07fa868a6fe72260bd1c8ecbf35a0d8a183fad251b183f93ccaff92623342f11e42fbc05bb00ee41980687a0c7485b92e90f30c77df3d48a
-  data.tar.gz: fd24893e237415ad72462619f6f6183a4684286d78f83e0a9984d8c9e48cab6f538e70e6f9b57695c6d4ba81bd7e4b77b2cb2d7aee8e8d30cfc646f705d9e3b8
+  metadata.gz: abf4aa468a7d5ac4d0242f61239fa9da1555d10f5c1996e1661c5f8e4cd1e44a353ccb796381929c8a759fc798454dd6926248b2d81c084568134f634f20f02b
+  data.tar.gz: d982e33c22ebafc62fc1820e9e170038769a41d61f34c1da2f6145acda568815c55eb8ba1925c30e5ec25260721390b56e4c87543bb5a64e4b7fc4c4709702a8

data/lib/datagnan.rb

@@ -124,44 +124,49 @@ private
 		## debug
 		# puts "-- Datagnan.find_value ( path = #{path} )"
 		# puts "-- Datagnan.find_value ( vars = #{vars} )"
+		# beginning_time = Time.now
 		var = vars
-		path.split('.').each do |dot_key|
+		dot_keys = path.split('.')
+		dot_keys = dot_keys.drop_while do |dot_key|
 			## debug
-			# puts "dot_key.split ( dot_key = #{dot_key} )"
-			# puts "dot_key.split ( dot_key.split = #{dot_key.split(/\[\'?([^\[\]]*[^\'])\'?\]/).reject(&:empty?)} )"
-			dot_key.split(/\[\'?([^\[\]\']+)\'?\]/).reject(&:empty?).each do |key|
-				## var exist
+			# puts "-- Datagnan.find_value drop_while ( dot_key = #{dot_key} )"
+			# puts "-- Datagnan.find_value drop_while ( var.has_key?(dot_key) = #{var.has_key?(dot_key)} )" if var.is_a?(Hash)
+			var.is_a?(Hash) ?
+				(var.has_key?(dot_key) ?
+					var = var[dot_key] :
+					false
+				) :
+				false
+		end
+		## debug
+		# puts "-- Datagnan.find_value after drop_while ( var = #{var} )"
+		# puts "-- Datagnan.find_value after drop_while ( dot_keys = #{dot_keys} )"
+		# puts "-- Datagnan.find_value before eval ( dot_keys = #{dot_keys} )"
+		
+		
+		begin
+			## debug
+			# puts "-- Datagnan.find_value before eval ( var.instance_eval(dot_keys.join('.')) = #{var.instance_eval(dot_keys.join('.'))} )"
+			var = var.instance_eval(dot_keys.join('.'))
+		rescue Exception => e
+			begin
 				## debug
-				# puts "-- Datagnan.find_value split ( key = #{key} )"
-				# puts "-- Datagnan.find_value split ( var = #{var} )"
-				# puts "-- Datagnan.find_value split ( var[key].nil? = #{var[key].nil?} )" if var.is_a?(Hash)
-				# 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)
-				# puts "-- Datagnan.find_value split ( var.respond_to?(key) = #{var.respond_to?(key)} )"
-				# puts "-- Datagnan.find_value split ( var.send(key) = #{var.send(key)} )" if var.respond_to?(key)
-				# puts "-- Datagnan.find_value split ( class_exists?(key) = #{class_exists?(key)} )"
-				# puts "-- Datagnan.find_value split ( Module.const_get(key) = #{Module.const_get(key)} )" if class_exists?(key)
-				var = ( var.is_a?(Hash) ?
-					( var[key].nil? ?
-						( @scope.respond_to?(key) ?
-							@scope.send(key) :
-							( class_exists?(key) ?
-								Module.const_get(key) :
-								nil
-							)
-						) :
-						var[key]
-					) :
-					( var.respond_to?(key) ?
-						var.send(key) :
-						nil
-					)
-				)
+				# puts "-- Datagnan.find_value before eval ( @scope.instance_eval('var.'+dot_keys.join('.')) = #{@scope.instance_eval('var.'+dot_keys.join('.'))} )" if dot_keys.any?
+				var = @scope.instance_eval('var.'+dot_keys.join('.'))
+			rescue Exception => e
+				begin
+					## debug
+					# puts "-- Datagnan.find_value before eval ( @scope.instance_eval(dot_keys.join('.')) = #{@scope.instance_eval(dot_keys.join('.'))} )"
+					var = @scope.instance_eval(dot_keys.join('.'))
+				rescue
+					var = nil
+				end
 			end
-		end
-		# puts "-- Datagnan.find_value ( var = #{var} )"
-		# var = find_value(path, @vars) if var.nil? && vars != @vars
-		# puts "-- Datagnan.find_value after recursive with @vars ( var = #{var} )"
+		end if dot_keys.any?
+		## debug
+		# puts "-- Datagnan.find_value result ( var = #{var} )"
+		# end_time = Time.now
+		# puts "Time elapsed for find_value #{(end_time - beginning_time)*1000} milliseconds"
 		var
 	end
 
@@ -307,6 +312,7 @@ end
 # @param [Hash] locals
 #   local variables for filling the template
 def datagnan(template_file, options = {}, locals = {})
+	# beginning_time = Time.now
 	## default options
 	scope = options.delete(:scope) || self
 	views = File.realpath(options.delete(:views) || scope.settings.views || "./views")
@@ -322,5 +328,8 @@ def datagnan(template_file, options = {}, locals = {})
 		# puts "-- datagnan ( layout = #{html} )"
 	end
 
+	# end_time = Time.now
+	# puts "Time elapsed for datagnan #{(end_time - beginning_time)*1000} milliseconds"
+
 	return html
 end

metadata

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