datagnan 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f425736e18d39486f8e1fc680fd8450bde7a4d1a
-  data.tar.gz: 46b8bdba14ff01e2dd64cedf69828fe7acb8458a
+  metadata.gz: eb67371aa0b5e42c13faf09b9b89192bd758af17
+  data.tar.gz: 2f96688ca5ccb0b35f8ac2839431dab3b9b4bc30
 SHA512:
-  metadata.gz: 96bd8819def16e59acc2223cdb23bdea2bf16cd9089238f1ddd3b9d6142fd06082e56fe526acab30f0a9f470d2bacdcdfeedf4b0c8f87e2a5dd813edb23167c1
-  data.tar.gz: 01eaa06ae0cd544c99123af7757e93e0ddea66dab4b7f97ed119e60e23fbf2d4ba5c5fe35c96b3fa4004852d923642cafeab19971495e81eafc960ec481a9765
+  metadata.gz: a3805ac064b852bf470362406452b58deb4eefd1f1684d77c6bb6d4127beea75f1a24c30bf755ebbb6e1e745abda42c1983a76e6c47705b3a81010e7ac2afc77
+  data.tar.gz: 1bc54f6aab35831a7f21efe81ad1ba867900889e71742bca7c5af11610d6d5d29ef30e80aade05920ab5e52bed37a1ef2cff3fbf48cf216322775c00e856f6fa

data/lib/datagnan.rb

@@ -6,8 +6,16 @@ class Datagnan
 	attr_accessor :doc, :vars
 
 	## Constructor
+	# @param [String] file_path
+	#   path to .html-template file
+	# @param [Hash] options
+	#   options for parsing and filling the template
+	#     @option options [String] :attrs_sep (";") Separate string for 'data-attrs' attribute
+	#     @option options [Object] :scope (self) Scope for variables
+	#     @option options [Hash] :locals (locals || {}) Local variables for filling the template
+	# @param [Hash] locals
+	#   local variables for filling the template
 	def initialize(file_path, options = {}, locals = {})
-		## TODO: return fragment, not full html with auto-tags
 		@doc = Oga.parse_html(File.read(file_path))
 		## debug
 		# puts "-- @doc = #{@doc}"
@@ -19,19 +27,40 @@ class Datagnan
 		# puts "-- Datagnan.new ( @vars = #{@vars} )"
 	end
 
-	## aka File.open
+	## Create Datagnan instance and return this.
+	## Can receive implicity block for 'yield.
+	## Like File.open(file_path)
+	# @param [String] file_path
+	#   path to .html-template file
+	# @param [Hash] options
+	#   options for parsing and filling the template
+	#     @option options [String] :attrs_sep (";") Separate string for 'data-attrs' attribute
+	#     @option options [Object] :scope (self) Scope for variables
+	#     @option options [Hash] :locals (locals || {}) Local variables for filling the template
+	# @param [Hash] locals
+	#   local variables for filling the template
 	def self.open(file_path, options = {}, locals = {})
 		obj = Datagnan.new(file_path, options, locals).write
 		yield obj if block_given?
 		return obj
 	end
 
-	## aka File.read(file_path)
+	## Create Datagnan instance and return the filling with variables HTML-template as String.
+	## Like File.read(file_path)
+	# @param [String] file_path
+	#   path to .html-template file
+	# @param [Hash] options
+	#   options for parsing and filling the template
+	#     @option options [String] :attrs_sep (";") Separate string for 'data-attrs' attribute
+	#     @option options [Object] :scope (self) Scope for variables
+	#     @option options [Hash] :locals (locals || {}) Local variables for filling the template
+	# @param [Hash] locals
+	#   local variables for filling the template
 	def self.read(file_path, options = {}, locals = {})
 		Datagnan.new(file_path, options, locals).write.read
 	end
 
-	## aka File.read
+	## Return HTML-String. As File.new.read
 	def read
 		## debug
 		# puts "-- Datagnan.read ( @doc = #{@doc} )"
@@ -39,6 +68,11 @@ class Datagnan
 	end
 
 	## Parse and replace
+	## Like File.new.write
+	# @param [Hash] vars
+	#   variables for filling the template
+	# @param [Oga::XML::Document] root
+	#   HTML-element for fill it
 	def write(vars = {}, root = nil)
 		## debug
 		# puts "Datagnan.write ( vars = #{vars} )"
@@ -56,6 +90,7 @@ class Datagnan
 		# puts "-- Datagnan.write after each ( root = #{root.to_xml} )"
 		## replace data-when
 		data_when(vars, root)
+		data_when_not(vars, root)
 		## debug
 		# puts "-- Datagnan.write after when ( vars = #{vars} )"
 		# puts "-- Datagnan.write after when ( root = #{root.to_xml} )"
@@ -88,7 +123,7 @@ private
 			# 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? ? 
+				( var[key].nil? ?
 					( @scope.respond_to?(key) ?
 						@scope.send(key) :
 						nil
@@ -168,7 +203,8 @@ private
 			unless var.nil?
 			# --------
 				node.unset('data-each')
-				var.each do |item|
+				var.each do |key, item|
+					item ||= key
 					# puts "-- Datagnan.data_each each ( item = #{item} )"
 					# puts "-- Datagnan.data_each each ( item.inspect = #{item.inspect} )"
 					new_node = Oga.parse_html(node.to_xml)
@@ -200,22 +236,50 @@ private
 		root.css('*[data-when]').each do |node|
 
 			var = find_value(node.get('data-when'), vars)
+			# puts "Datagnan.data_when each ( var = #{var} )"
 
-			unless var.nil?
-				var ? node.unset('data-when') : node.remove
-			end
+			## allow for nil
+			var ? node.unset('data-when') : node.remove
 			## TODO: if var not exist remember it (maybe return to model)
 		end
 		## debug
 		# puts "Datagnan.data_when end ( root = #{root} )"
 	end
 
+	## display if false
+	# @since 1.1.0
+	def data_when_not(vars, root)
+		## debug
+		# puts "Datagnan.data_when_not ( vars = #{vars} )"
+		# puts "Datagnan.data_when_not ( root = #{root} )"
+		root.css('*[data-when-not]').each do |node|
+
+			var = find_value(node.get('data-when-not'), vars)
+
+			## allow for nil
+			var ? node.remove : node.unset('data-when')
+			## TODO: if var not exist remember it (maybe return to model)
+		end
+		## debug
+		# puts "Datagnan.data_when_not end ( root = #{root} )"
+	end
+
 end
 
+## Helper function (for Sinatra, primarily)
+# @param [String] file_path
+#   path to .html-template file
+# @param [Hash] options
+#   options for parsing and filling the template
+#     @option options [Object] :scope (self) Scope for variables
+#     @option options [String] :views (scope.settings.views || "./views") Path to views directory
+#     @option options [Hash] :locals (locals || {}) Local variables for filling the template
+# @param [Hash] locals
+#   local variables for filling the template
 def datagnan(template_file, options = {}, locals = {})
 	## default options
-	views = options.delete(:views) || "./views"
 	scope = options.delete(:scope) || self
+	views = File.realpath(options.delete(:views) || scope.settings.views || "./views")
 	locals = options.delete(:locals) || locals || {}
 
 	html = Datagnan.read(views+'/'+template_file+'.html', :scope => scope, :locals => locals)

metadata

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