Project: Ruport-util

Revision: 47

Author: sandal

Date: 24 Mar 2008 22:13:54

• /trunk/test/helper.rb

  ......	@@ -1,6 +1,6 @@
  1	1	begin
  2	2	require "rubygems"
  3		gem "ruport", "=1.2.3"
  	3	gem "ruport", "=1.5.0"
  4	4	rescue LoadError
  5	5	nil
  6	6	end

• /trunk/lib/ruport/util/graph.rb

  ......	@@ -1,29 +1,22 @@
  1		# renderer/graph.rb
  	1	# graph.rb
  2	2	# Generalized graphing support for Ruby Reports
  3	3	#
  4	4	# Written by Gregory Brown, Copright December 2006, All Rights Reserved.
  5	5	#
  6	6	# This is free software. See LICENSE and COPYING for details.
  7	7	#
  8		begin
  9		require "rubygems"
  10		gem "ruport", ">= 1.2.2"
  11		rescue LoadError
  12		nil
  13		end
  14
  15	8	module Ruport
  16	9
  17		module Renderer::Hooks
  	10	module Controller::Hooks
  18	11	module ClassMethods
  19	12	def renders_as_graph(options={})
  20		renders_with Ruport::Renderer::Graph, options
  	13	renders_with Ruport::Controller::Graph, options
  21	14	end
  22	15	end
  23	16	end
  24	17
  25		class Renderer
  26		class Graph < Renderer
  	18	class Controller
  	19	class Graph < Controller
  27	20
  28	21	prepare :graph
  29	22	stage :graph

• /trunk/lib/ruport/util/graph/scruffy.rb

  ......	@@ -2,7 +2,7 @@
  2	2	module Graph
  3	3	class Scruffy < Ruport::Formatter
  4	4
  5		renders :svg, :for => Ruport::Renderer::Graph
  	5	renders :svg, :for => Ruport::Controller::Graph
  6	6
  7	7	# a hash of Scruffy themes.
  8	8	#

• /trunk/lib/ruport/util/ods.rb

  ......	@@ -8,7 +8,7 @@
  8	8	class Formatter::ODS < Formatter
  9	9	BLANK_ODS = File.join(Ruport::Util::BASEDIR, 'example', 'data', 'blank.ods')
  10	10
  11		renders :ods, :for => [ Renderer::Row, Renderer::Table]
  	11	renders :ods, :for => [ Controller::Row, Controller::Table]
  12	12
  13	13	def prepare_table
  14	14	output << %{<?xml version="1.0" encoding="UTF-8"?>
  ......	@@ -30,11 +30,11 @@
  30	30	end
  31	31
  32	32	def build_table_body
  33		render_data_by_row
  	33	data.each { |r| build_row(r) }
  34	34	end
  35	35
  36		def build_row
  37		table_row{ build_cells(data.to_a) }
  	36	def build_row(row=data)
  	37	table_row{ build_cells(row.to_a) }
  38	38	end
  39	39
  40	40	def table_row

• /trunk/lib/ruport/util/generator.rb

  ......	@@ -12,8 +12,8 @@
  12	12	raise "Report #{ARGV[1]} exists!"
  13	13	end
  14	14
  15		if File.exist? "lib/renderers/#{ARGV[1]}.rb"
  16		raise "Renderer #{ARGV[1]} exists!"
  	15	if File.exist? "lib/controllers/#{ARGV[1]}.rb"
  	16	raise "Controller #{ARGV[1]} exists!"
  17	17	end
  18	18	end
  19	19	end
  ......	@@ -80,14 +80,14 @@
  80	80	mkdir project
  81	81	puts "creating directories.."
  82	82	%w[ test config output data data/models lib lib/reports
  83		lib/renderers sql util ].each do |d|
  	83	lib/controllers sql util ].each do |d|
  84	84	m="#{project}/#{d}"
  85	85	puts " #{m}"
  86	86	mkdir(m)
  87	87	end
  88	88
  89	89	puts "creating files.."
  90		%w[reports helpers renderers templates].each { |f|
  	90	%w[reports helpers controllers templates].each { |f|
  91	91	m = "#{project}/lib/#{f}.rb"
  92	92	puts " #{m}"
  93	93	touch(m)
  ......	@@ -116,8 +116,8 @@
  116	116	task :build do
  117	117	if ENV['report']
  118	118	sh "ruby util/build report #{ENV['report']}"
  119		elsif ENV['renderer']
  120		sh "ruby util/build renderer #{ENV['renderer']}"
  	119	elsif ENV['controller']
  	120	sh "ruby util/build controller #{ENV['controller']}"
  121	121	elsif ENV['model']
  122	122	sh "ruby util/build model #{ENV['model']}"
  123	123	end
  ......	@@ -200,16 +200,16 @@
  200	200	puts "class name: #{class_name}"
  201	201	File.open("test/test_#{ARGV[1]}.rb","w") { |f| f << TEST }
  202	202
  203		elsif ARGV[0].eql? "renderer"
  	203	elsif ARGV[0].eql? "controller"
  204	204
  205	205	check_for_files
  206		File.open("lib/renderers.rb","a") { |f|
  207		f.puts("require \"lib/renderers/#{ARGV[1]}\"")
  	206	File.open("lib/controllers.rb","a") { |f|
  	207	f.puts("require \"lib/controllers/#{ARGV[1]}\"")
  208	208	}
  209	209	REP = <<EOR
  210	210	require "lib/init"
  211	211
  212		class #{class_name} < Ruport::Renderer
  	212	class #{class_name} < Ruport::Controller
  213	213	stage :#{class_name.downcase}
  214	214	end
  215	215
  ......	@@ -227,7 +227,7 @@
  227	227
  228	228	TEST = <<EOR
  229	229	require "test/unit"
  230		require "lib/renderers/#{ARGV[1]}"
  	230	require "lib/controllers/#{ARGV[1]}"
  231	231
  232	232	class Test#{class_name} < Test::Unit::TestCase
  233	233	def test_flunk
  ......	@@ -235,8 +235,8 @@
  235	235	end
  236	236	end
  237	237	EOR
  238		puts "renderer file: lib/renderers/#{ARGV[1]}.rb"
  239		File.open("lib/renderers/#{ARGV[1]}.rb", "w") { |f| f << REP }
  	238	puts "controller file: lib/contollers/#{ARGV[1]}.rb"
  	239	File.open("lib/controllers/#{ARGV[1]}.rb", "w") { |f| f << REP }
  240	240	puts "test file: test/test_#{ARGV[1]}.rb"
  241	241
  242	242	puts "class name: #{class_name}"
  ......	@@ -309,7 +309,7 @@
  309	309	labyrith/data/models
  310	310	labyrith/lib
  311	311	labyrith/lib/reports
  312		labyrith/lib/renderers
  	312	labyrith/lib/controllers
  313	313	labyrith/templates
  314	314	labyrith/sql
  315	315	labyrith/log
  ......	@@ -317,7 +317,7 @@
  317	317	creating files..
  318	318	labyrith/lib/reports.rb
  319	319	labyrith/lib/helpers.rb
  320		labyrith/lib/renderers.rb
  	320	labyrith/lib/controllers.rb
  321	321	labyrith/lib/init.rb
  322	322	labyrith/config/environment.rb
  323	323	labyrith/util/build
  ......	@@ -342,7 +342,7 @@
  342	342	* test : unit tests stored here can be auto-run
  343	343	* config : holds a configuration file which is shared across your applications
  344	344	* reports : when reports are autogenerated, they are stored here
  345		* renderers : autogenerated formatting system extensions are stored here
  	345	* controllers : autogenerated formatting system extensions are stored here
  346	346	* models : stores autogenerated activerecord models
  347	347	* templates : erb templates may be stored here
  348	348	* sql : SQL files can be stored here, which are pre-processed by erb
  ......	@@ -419,12 +419,12 @@
  419	419
  420	420	$ rope my_reverser
  421	421	$ cd my_reverser
  422		$ rake build renderer=reverser
  	422	$ rake build controller=reverser
  423	423
  424	424	Edit test/test_reverser.rb to look like the code below:
  425	425
  426	426	require "test/unit"
  427		require "lib/renderers/reverser"
  	427	require "lib/controllers/reverser"
  428	428
  429	429	class TestReverser < Test::Unit::TestCase
  430	430	def test_reverser
  ......	@@ -432,11 +432,11 @@
  432	432	end
  433	433	end
  434	434
  435		Now edit lib/renderers/reverser.rb to look like this:
  	435	Now edit lib/controllers/reverser.rb to look like this:
  436	436
  437	437	require "lib/init"
  438	438
  439		class Reverser < Ruport::Renderer
  	439	class Reverser < Ruport::Controller
  440	440	stage :reverser
  441	441	end
  442	442
  ......	@@ -450,7 +450,7 @@
  450	450
  451	451	end
  452	452
  453		The tests should pass. You can now generate a quick report using this renderer
  	453	The tests should pass. You can now generate a quick report using this controller
  454	454
  455	455	$ rake build report=reversed_report
  456	456
  ......	@@ -470,7 +470,7 @@
  470	470	edit lib/reports/reversed_report.rb as below and run the tests.
  471	471
  472	472	require "lib/init"
  473		require "lib/renderers/reverser"
  	473	require "lib/controllers/reverser"
  474	474	class ReversedReport < Ruport::Report
  475	475
  476	476	renders_with Reverser

• /trunk/lib/ruport/util/graph/amline.rb

  ......	@@ -1,7 +1,7 @@
  1	1	class Ruport::Formatter
  2	2	module Graph
  3	3	class Amline < Ruport::Formatter
  4		renders :amline, :for => Ruport::Renderer::Graph
  	4	renders :amline, :for => Ruport::Controller::Graph
  5	5
  6	6	def initialize
  7	7	Ruport.quiet { require "hpricot" }

• /trunk/lib/ruport/util/graph/o_f_c.rb

  ......	@@ -84,7 +84,7 @@
  84	84	# * build_graph
  85	85	# * finalize_graph
  86	86	class OFC < Ruport::Formatter
  87		renders :ofc, :for => Ruport::Renderer::Graph
  	87	renders :ofc, :for => Ruport::Controller::Graph
  88	88
  89	89	# Attribute of the OpenFlashChart object
  90	90	attr_reader :graph

• /trunk/lib/ruport/util/xls.rb

  ......	@@ -3,7 +3,7 @@
  3	3	require 'zip/zip'
  4	4
  5	5	module Ruport
  6		# This class provides Excel output for Ruport's Table renderers.
  	6	# This class provides Excel output for Ruport's Table controllers.
  7	7	# It can export to format :
  8	8	# * Excel 2003 (use spreadsheet/excel gems)
  9	9	# * Excel 2003 XML
  ......	@@ -17,7 +17,7 @@
  17	17	# * xlsxml => Excel 2003 XML
  18	18	#
  19	19	class Formatter::XLS < Formatter
  20		renders :xls, :for => [ Renderer::Row, Renderer::Table]
  	20	renders :xls, :for => [Controller::Row, Controller::Table]
  21	21
  22	22	def initialize
  23	23	Ruport.quiet {
  ......	@@ -81,7 +81,7 @@
  81	81	# Excel 2007 OpenXML
  82	82	class Formatter::XLSX < Formatter
  83	83	BLANK_XLSX = File.join(Ruport::Util::BASEDIR, 'example', 'data', 'blank.xlsx')
  84		renders :xlsx, :for => [ Renderer::Row, Renderer::Table]
  	84	renders :xlsx, :for => [ Controller::Row, Controller::Table]
  85	85
  86	86	def initialize
  87	87	end
  ......	@@ -219,7 +219,7 @@
  219	219
  220	220	# Excel 2003 XML
  221	221	class Formatter::XLSXML < Formatter
  222		renders :xlsxml, :for => [ Renderer::Row, Renderer::Table]
  	222	renders :xlsxml, :for => [ Controller::Row, Controller::Table]
  223	223
  224	224	def prepare_table
  225	225	output << %{<?xml version="1.0" encoding="UTF-8"?><?mso-application progid="Excel.Sheet"?>

• /trunk/test/test_graph_renderer.rb

  ......	@@ -3,7 +3,7 @@
  3	3	Ruport.quiet { testcase_requires 'scruffy' }
  4	4
  5	5	class MockGraphPlugin < Ruport::Formatter
  6		renders :mock, :for => Ruport::Renderer::Graph
  	6	renders :mock, :for => Ruport::Controller::Graph
  7	7	def prepare_graph
  8	8	output << "prepare"
  9	9	end
  ......	@@ -17,7 +17,7 @@
  17	17
  18	18	describe 'Graph Renderer' do
  19	19	before :all do
  20		@graph = Ruport::Renderer::Graph
  	20	@graph = Ruport::Controller::Graph
  21	21	@data = Graph(%w[a b c],[[1,2,3],[4,5,6]])
  22	22	end
  23	23

• /trunk/test/test_graph_ofc.rb

  ......	@@ -6,16 +6,16 @@
  6	6
  7	7	describe 'Graph OpenFlashCharts' do
  8	8	before :all do
  9		@renderer = Ruport::Renderer::Graph
  	9	@controller = Ruport::Controller::Graph
  10	10	end
  11	11
  12	12	it 'Render Bar chart' do
  13		@renderer = Ruport::Renderer::Graph
  14		@renderer.should_not be_nil
  	13	@controller = Ruport::Controller::Graph
  	14	@controller.should_not be_nil
  15	15	@table = Table(%w(name))
  16	16	@table << [[3,2,6,7,1,3,2,7,9,1,15,14]]
  17	17	@table.should_not be_nil
  18		@report = @renderer.render(:ofc, :data => @table,
  	18	@report = @controller.render(:ofc, :data => @table,
  19	19	:chart_types => [[:bar_glass, 50, '#9933CC', '#8010A0', 'PAGE VIEWS', 10]],
  20	20	:x_labels => %w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec),
  21	21	:title => 'Page views By Visitor',
  ......	@@ -37,15 +37,15 @@
  37	37	end
  38	38
  39	39	it 'Render Multiline' do
  40		@renderer = Ruport::Renderer::Graph
  	40	@controller = Ruport::Controller::Graph
  41	41	@table = Table(%w(name))
  42	42	@table << [(1..12).to_a.map{|x| x * 1.3}]
  43	43	@table << [(1..12).to_a.map{|x| Math.sin(x) + 3}]
  44	44	@table << [(1..6).to_a + (1..6).to_a.reverse]
  45	45	@table << [(1..2).to_a + (1..2).to_a.reverse + (3..8).to_a]
  46		@renderer.should_not be_nil
  	46	@controller.should_not be_nil
  47	47	@table.should_not be_nil
  48		@report = @renderer.render(:ofc, :data => @table,
  	48	@report = @controller.render(:ofc, :data => @table,
  49	49	:chart_types => [[:line, 2, '#9933CC', 'Page Views', 12],
  50	50	[:area_hollow, 2, 3, 25, '#CC3399', 'Visitors', 12],
  51	51	[:line_dot, 3,5,'0xCC3399', 'Downloads', 12],
  ......	@@ -70,12 +70,12 @@
  70	70	end
  71	71
  72	72	it 'Render Pie' do
  73		@renderer = Ruport::Renderer::Graph
  	73	@controller = Ruport::Controller::Graph
  74	74	@table = Table(%w(name))
  75	75	@table << [(1..12).to_a.map{|x| x * 1.3}]
  76		@renderer.should_not be_nil
  	76	@controller.should_not be_nil
  77	77	@table.should_not be_nil
  78		@report = @renderer.render(:ofc, :data => @table,
  	78	@report = @controller.render(:ofc, :data => @table,
  79	79	:chart_types => [[:pie, 80, '#9933CC', '#8010A0']],
  80	80	:x_labels => %w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec),
  81	81	:pie_slice_colors => ['#d01f3c','#356aa0','#C79810'])

• /trunk/lib/ruport/util/graph/gruff.rb

  ......	@@ -3,7 +3,7 @@
  3	3
  4	4	class Gruff < Ruport::Formatter
  5	5
  6		renders [:png,:jpg], :for => Ruport::Renderer::Graph
  	6	renders [:png,:jpg], :for => Ruport::Controller::Graph
  7	7
  8	8	def initialize
  9	9	Ruport.quiet { require 'gruff' }

• /trunk/lib/ruport/util/report.rb

  ......	@@ -44,7 +44,7 @@
  44	44	#
  45	45	class Report
  46	46	extend Forwardable
  47		include Renderer::Hooks
  	47	include Controller::Hooks
  48	48
  49	49	# This is a simplified interface to Ruport::Query.
  50	50	#

• /trunk/test/test_report.rb

  ......	@@ -2,7 +2,7 @@
  2	2	require 'net/smtp'
  3	3
  4	4	class SampleReport < Ruport::Report
  5		renders_with Ruport::Renderer::Table
  	5	renders_with Ruport::Controller::Table
  6	6
  7	7	def renderable_data(format)
  8	8	Table(%w[not abc]) << %w[o r] << %w[one two] << %w[thr ee]
  ......	@@ -57,11 +57,11 @@
  57	57	@report.save_as(filename).should_not be_nil
  58	58	end
  59	59
  60		it 'should yield the renderer object' do
  	60	it 'should yield the controller object' do
  61	61	file_mock(mode = 'w', filename = 'foo.csv',
  62	62	content = "not,abc\no,r\none,two\nthr,ee\n")
  63	63	@report.save_as(filename) do |r|
  64		r.should be_an_instance_of(Ruport::Renderer::Table)
  	64	r.should be_an_instance_of(Ruport::Controller::Table)
  65	65	end
  66	66	end
  67	67	end
  ......	@@ -79,14 +79,14 @@
  79	79	@my_report.data = table
  80	80	end
  81	81
  82		it 'should renders_with Renderer::Table' do
  83		MyReport.renders_with Ruport::Renderer::Table
  	82	it 'should renders_with Controller::Table' do
  	83	MyReport.renders_with Ruport::Controller::Table
  84	84	generate @table
  85	85	@my_report.to_csv.should == "a,b,c\n1,2,3\n4,5,6\n"
  86	86	end
  87	87
  88		it 'should renders_with Renderer::Table and optional headers' do
  89		MyReport.renders_with Ruport::Renderer::Table, :show_table_headers => false
  	88	it 'should renders_with Controller::Table and optional headers' do
  	89	MyReport.renders_with Ruport::Controller::Table, :show_table_headers => false
  90	90	generate @table
  91	91
  92	92	@my_report.to_csv.should == "1,2,3\n4,5,6\n"
  ......	@@ -118,6 +118,6 @@
  118	118	MyReport.renders_as_grouping
  119	119	generate Grouping(@table, :by => 'a')
  120	120
  121		@my_report.to_csv.should == "1\n\nb,c\n2,3\n\n4\n\nb,c\n5,6\n\n"
  	121	@my_report.to_csv.should == "1\n\nb,c\n2,3\n4\n\nb,c\n5,6\n\n"
  122	122	end
  123	123	end

• /trunk/lib/ruport/util/invoice.rb

  ......	@@ -1,6 +1,6 @@
  1		module Ruport
  2		class Renderer #:nodoc:
  3		class Invoice < Ruport::Renderer
  	1	module Ruport
  	2	class Controller #:nodoc:
  	3	class Invoice < Ruport::Controller
  4	4
  5	5	required_option :customer_info,:company_info,:order_info,:comments
  6	6
  ......	@@ -73,7 +73,7 @@
  73	73	class PDF < Ruport::Formatter::PDF
  74	74
  75	75	include InvoiceHelpers
  76		renders :pdf, :for => Renderer::Invoice
  	76	renders :pdf, :for => Controller::Invoice
  77	77
  78	78	def build_invoice_headers
  79	79	build_company_header

• /trunk/test/test_invoice.rb

  ......	@@ -2,13 +2,13 @@
  2	2
  3	3	describe 'Invoice' do
  4	4	before :all do
  5		@invoice = Ruport::Renderer::Invoice
  	5	@invoice = Ruport::Controller::Invoice
  6	6	@data = Table(%w[a b c]) << [1,2,3]
  7	7	end
  8	8
  9	9	it 'should raise if the required options are not set' do
  10	10	lambda{ @invoice.render_pdf }.
  11		should raise_error(Ruport::Renderer::RequiredOptionNotSet)
  	11	should raise_error(Ruport::Controller::RequiredOptionNotSet)
  12	12	end
  13	13
  14	14	it "shouldn't raise if options are given correct in hash form" do