report_html 0.4.6 → 0.5.7

data/lib/report_html/report_html.rb

@@ -137,8 +137,7 @@ class Report_html
 	# DATA MANIPULATION METHODS
 	#-------------------------------------------------------------------------------------	
 	def get_data(options)
-		data = []
-		data = extract_data(options)
+		data, smp_attr, var_attr = extract_data(options)
 		if !data.empty?
 			if @data_from_files # If data on container is loaded using html_report as lib, we don't care about data format
 								# if data comes from files and is loaded as strings. We need to format correctly the data.
@@ -155,9 +154,14 @@ class Report_html
 				end
 			end
 			add_header_row_names(data, options)
-			data = data.transpose if options[:transpose]
+			if options[:transpose]
+				data = data.transpose
+				smp_attr_bkp = smp_attr
+				smp_attr = var_attr
+				var_attr = smp_attr_bkp
+			end
 		end
-		return data
+		return data, smp_attr, var_attr
 	end
 
 	def add_header_row_names(data, options)
@@ -176,6 +180,8 @@ class Report_html
 
 	def extract_data(options)
 		data = []
+		smp_attr = nil
+		var_attr = nil
 		ids = options[:id]
 		fields = options[:fields]
 		ids = ids.split(',') if ids.class == String && ids.include?(',') # String syntax
@@ -193,16 +199,25 @@ class Report_html
 			end
 		else
 			fields = fields.first if fields.class == Array
-			data = extract_fields(ids, options[:fields])
+			smp_attr = process_attributes(extract_fields(ids, options[:smp_attr]), options[:var_attr], aggregated = true) if !options[:smp_attr].nil? && !options[:smp_attr].empty?
+			var_attr = process_attributes(extract_rows(ids, options[:var_attr]), options[:smp_attr], aggregated = false) if !options[:var_attr].nil? && !options[:var_attr].empty?
+			data = extract_fields(ids, options[:fields], del_fields = options[:smp_attr], del_rows = options[:var_attr])
 		end
-		return data
+		return data, smp_attr, var_attr
 	end
 
-	def extract_fields(id, fields)
+	def extract_fields(id, fields, del_fields = [], del_rows = [])
 		data = []
-		@hash_vars[id].each do |row|
+		@hash_vars[id].each_with_index do |row, i|
+			next if !del_rows.nil? && del_rows.include?(i)
 			if fields.empty?
-				data << row.dup # Dup generates a array copy that avoids to modify original objects on data manipulation creating graphs
+				row = row.dup # Dup generates a array copy that avoids to modify original objects on data manipulation creating graphs
+				if !del_fields.nil? 
+					del_fields.sort.reverse_each do |j|
+						row.delete_at(j)
+					end
+				end
+				data << row
 			else
 				data << fields.map{|field| row[field]} #Map without bang do the same than dup
 			end
@@ -210,6 +225,35 @@ class Report_html
 		return data
 	end
 
+	def extract_rows(id, rows)
+		table = @hash_vars[id]
+		data = rows.map{|field| table[field]}
+		return data
+	end
+
+	def process_attributes(attribs, delete_items, aggregated = false)
+		parsed_attr = []
+		if aggregated
+			if !delete_items.nil? && !delete_items.empty?
+				(1..delete_items.length).reverse_each do |ind|
+					attribs.delete_at(1)
+				end
+			end
+			attribs.first.length.times do |i|
+				parsed_attr << attribs.map{|at| at[i]}
+			end
+		else
+			attribs.each do |attrib|
+				if !delete_items.nil? && !delete_items.empty?
+					(1..delete_items.length).reverse_each do |ind|
+						attrib.delete_at(ind)
+					end
+				end
+				parsed_attr << attrib
+			end			
+		end
+		return parsed_attr
+	end
 	# TABLE METHODS
 	#-------------------------------------------------------------------------------------
 	def table(user_options = {}, &block)
@@ -220,13 +264,15 @@ class Report_html
 			add_header_row_names: false,
 			transpose: false,
 			fields: [],
+			smp_attr: [],
+			var_attr: [],			
 			border: 1,
 			cell_align: [],
 			attrib: {}
 		}
 		options.merge!(user_options)
 		table_attr = prepare_table_attribs(options[:attrib])
-		array_data = get_data(options)
+		array_data, _, _ = get_data(options)
 		block.call(array_data) if !block.nil?
 		rowspan, colspan = get_col_n_row_span(array_data)
 		table_id = 'table_' + @count_objects.to_s
@@ -329,7 +375,7 @@ class Report_html
 	def add_sample_attributes(data_structure, options)
 		parsed_sample_attributes = {}
 		options[:sample_attributes].each do |key, col|
-			data = get_data({id: options[:id], fields: [col], text: true})
+			data, _, _ = get_data({id: options[:id], fields: [col], text: true})
 			data.shift if options[:header]
 			parsed_sample_attributes[key] = data.flatten 
 		end
@@ -358,6 +404,9 @@ class Report_html
 		options = {
 			id: nil,
 			fields: [],
+			smp_attr: [],
+			var_attr: [],
+			segregate: [],
 			data_format: 'one_axis',
 			responsive: true,
 			height: '600px',
@@ -386,7 +435,7 @@ class Report_html
 		# Data manipulation
 		#------------------------------------------
 		no_data_string = ERB.new("<div width=\"#{options[:width]}\" height=\"#{options[:height]}\" > <p>NO DATA<p></div>").result(binding)
-		data_array = get_data(options)
+		data_array, smp_attr, var_attr = get_data(options)
 		return no_data_string if data_array.empty?
 		block.call(data_array) if !block.nil?
 		object_id = "obj_#{@count_objects}_"
@@ -402,6 +451,8 @@ class Report_html
 
 		x = {}
 		z = {}
+		add_canvas_attr(x, var_attr) if !var_attr.nil? && !var_attr.empty?
+		add_canvas_attr(z, smp_attr) if !smp_attr.nil? && !smp_attr.empty?
 		yield(options, config, samples, vars, values, object_id, x, z)
 		# Build JSON objects and Javascript code
 		#-----------------------------------------------
@@ -426,6 +477,7 @@ class Report_html
 		end
 		add_sample_attributes(data_structure, options) if !options[:sample_attributes].empty?
 		extracode = "#{options[:extracode]}\n"
+		extracode << segregate_data("C#{object_id}", options[:segregate]) if !options[:segregate].empty?
 		extracode << "C#{object_id}.groupSamples(#{options[:group_samples]})\n" if !options[:group_samples].nil?
 		plot_data = "
 		var data = #{data_structure.to_json};
@@ -442,6 +494,25 @@ class Report_html
 		return ERB.new(html).result(binding)
 	end
 
+	def segregate_data(obj_id, segregate)
+		string =""
+		segregate.each do |data_type, names|
+			if data_type == :var
+				string << "#{obj_id}.segregateVariables(#{names.inspect});\n"
+			elsif data_type == :smp
+				string << "#{obj_id}.segregateSamples(#{names.inspect});\n"
+			end
+		end
+		return string
+	end
+
+	def add_canvas_attr(hash_attr, attr2add)
+		attr2add.each do |attrs|
+			attr_name = attrs.shift
+			hash_attr[attr_name] = attrs
+		end
+	end
+
 	def line(user_options = {}, &block)
 		default_options = {
 			row_names: true			
@@ -505,14 +576,58 @@ class Report_html
 		}.merge!(user_options)
 		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id, x, z|
 			config['graphType'] = 'Boxplot'
-			options[:mod_data_structure] = 'boxplot'
-			if options[:extracode].nil?
+			if default_options[:group].nil?
+				options[:mod_data_structure] = 'boxplot'
+			else
+				if default_options[:group].class == String
+					reshape(samples, vars, x, values)
+					group = default_options[:group]
+					series = 'factor'
+				else
+					series, group = default_options[:group]
+				end
+				if config["groupingFactors"].nil? # if config is defined, we assume that the user set this property to the value that he/she desires
+					if group.nil?
+						config["groupingFactors"] = [series]
+					else
+						config["groupingFactors"] = [series, group]
+					end
+				end
+				config["colorBy"] = series if config["colorBy"].nil?
+                config["segregateSamplesBy"] = [group] if !group.nil? && config["segregateSamplesBy"].nil?
+			end
+			if options[:extracode].nil? && default_options[:group].nil?
 				options[:extracode] = "C#{object_id}.groupSamples([\"Factor\"]);"
 			end
 		end
 		return html_string
 	end
 
+	def reshape(samples, vars, x, values)
+		item_names = samples.dup
+		(vars.length - 1).times do |n|
+			samples.concat(item_names.map{|i| i+"_#{n}"})
+		end
+		x.each do |factor, annotations|
+			current_annotations = annotations.dup
+			(vars.length - 1).times do 
+				annotations.concat(current_annotations)
+			end
+		end
+		series_annot = []
+		vars.each do |var|
+			item_names.each do 
+				series_annot << var
+			end
+		end
+		x['factor'] = series_annot
+		vars.select!{|v| v.nil?}
+		vars << 'vals'
+		vals = values.flatten
+		values.select!{|v| v.nil?}
+		values << vals
+	end
+
 	def pie(user_options = {}, &block) 
 		default_options = {
 			transpose: false
@@ -633,7 +748,7 @@ class Report_html
 			end
 			if !default_options[:links].nil?
 				if !@hash_vars[default_options[:links]].nil? && !@hash_vars[default_options[:links]].empty?
-					link_data = get_data({id: default_options[:links], fields: [], add_header_row_names: false, text: true, transpose: false}) 
+					link_data, _, _ = get_data({id: default_options[:links], fields: [], add_header_row_names: false, text: true, transpose: false}) 
 					config['connections'] = assign_rgb(link_data)
 				end
 			end

data/lib/report_html/version.rb

@@ -1,3 +1,3 @@
 module ReportHtml
-  VERSION = "0.4.6"
+  VERSION = "0.5.7"
 end

data/report_html.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["seoanezonjic@hotmail.com"]
 
   spec.summary       = %q{Gem to build html interactive reports.}
-  spec.description   = %q{Html reports based on erb, HTML5 and javascript libraries.}
+  spec.description   = %q{iDEPRECATED PROJECT. MIGRATED TO PYTHON: https://github.com/seoanezonjic/py_report_html\n.Html reports based on erb, HTML5 and javascript libraries.}
   spec.homepage      = ""
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: report_html
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.7
 platform: ruby
 authors:
 - seoanezonjic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2025-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,7 +38,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Html reports based on erb, HTML5 and javascript libraries.
+description: 'iDEPRECATED PROJECT. MIGRATED TO PYTHON: https://github.com/seoanezonjic/py_report_html\n.Html
+  reports based on erb, HTML5 and javascript libraries.'
 email:
 - seoanezonjic@hotmail.com
 executables:
@@ -87,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Gem to build html interactive reports.