reporter 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -0,0 +1,26 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.1)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
+    builder (2.1.2)
+    i18n (0.4.2)
+    tzinfo (0.3.29)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.0.0)
+  activesupport (~> 3.0.0)
+  arel (~> 1.0.1)

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/.gitignore

@@ -0,0 +1 @@
+.idea

data/lib/reporter/data_source/active_record_source.rb

@@ -1,6 +1,3 @@
-# ActiveRecordSource supplies information about the datasources and executes the queries upon it.
-# The source holds the active record model to build queries upon.
-#
 class Reporter::DataSource::ActiveRecordSource
 
 	def initialize(data_source, active_record)
@@ -11,13 +8,17 @@ class Reporter::DataSource::ActiveRecordSource
 
 	attr_reader :active_record, :name
 
-	# returns all date columns
+	# scope detection methods
+	def references
+		load_columns if @references.nil?
+		@references
+	end
+
 	def date_columns
 		load_columns if @date_columns.nil?
 		@date_columns
 	end
 
-	# returns all associations, grouped by the type of model linked to.
 	def relations_to_objects
 		load_columns if @object_links.nil?
 		@object_links
@@ -32,12 +33,8 @@ class Reporter::DataSource::ActiveRecordSource
 		active_record.name
 	end
 
-	VALID_CALCULATIONS = %w(count sum average minimum maximum)
-
 	# retrieve data from source
 	def calculate calculation, *args, &block
-		raise "invalid calculation: #{calculation}" unless VALID_CALCULATIONS.include? calculation.to_s
-		# TODO: include check for valid calculations and required parameters
 		options = args.extract_options!.dup
 		scope_options = extract_scope_options_from options
 		source = source_with_applied_scopes(scope_options)
@@ -45,7 +42,6 @@ class Reporter::DataSource::ActiveRecordSource
 		source.send *([calculation] + args + [options])
 	end
 
-	# performs a calculation for an entire period, in groups of months, years, weeks, quarters or days
 	def calculate_for_period calculation, period, filter, scope, *args, &block
 		options = args.extract_options!.dup
 		# remove the time scope from the default scopes
@@ -53,26 +49,16 @@ class Reporter::DataSource::ActiveRecordSource
 		scope_options[:ignore_scopes] << scope.name.to_sym
 		scope_options[:ignore_scopes].uniq!
 		source = source_with_applied_scopes(scope_options)
-
 		source = block.call(source, data_source.scopes) if block_given?
-
 		# add time scope seperately with full period
 		source = scope.apply_on source, period
 
-		# group on the given filters (year and month, in case of months)
 		grouping = filter.collect { |f| scope.group_on source, f }
 		source = source.group grouping.join(", ")
-
-		# set the columns for the selection. We have to do this in manual SQL, since Rails does not
-		# support multiple group by's in the calculation functions.
 		select = []
 		select << calculation_function(calculation, args)
 		filter.each_with_index { |f, index| select << "#{grouping[index]} as #{f.to_s}" }
-		source = source.select select
-		#Rails.logger.info source.to_sql
-
-		# execute the query and collect the results
-		# place all results in an collection hash with their filter attributes as key
+    source = source.select select
 		result = source.collect do |r|
 			result = r.result.to_f
 			result = result.to_i if result.floor == result
@@ -80,10 +66,10 @@ class Reporter::DataSource::ActiveRecordSource
 			filter.each { |f| res[f] = r[f.to_s].to_i }
 			res
 		end
+		#Rails.logger.info source.to_sql
 		result
 	end
 
-	# apply all scopes on the active record model
 	def source_with_applied_scopes(options)
 		#Rails.logger.info options.inspect
 		data_source.scopes.apply_on(active_record, options)
@@ -93,16 +79,18 @@ class Reporter::DataSource::ActiveRecordSource
 
 	attr_reader :data_source
 
-	# examine the active record model and store all relevant data for scoping
 	def load_columns
+		@references = []
 		@date_columns = []
+		@object_links = {}
 		active_record.columns.collect do |column|
-			if [Time, Date].include? column.klass
+			if column.name =~ /^(.*)_id$/ and column.klass == Fixnum
+				@references << $1
+			elsif [Time, Date].include? column.klass
 				@date_columns << column.name
 			end
 		end.compact
 
-		@object_links = {}
 		active_record.reflect_on_all_associations.each do |reflection|
 			@object_links[reflection.klass] ||= []
 			@object_links[reflection.klass] << reflection.name.to_s
@@ -124,12 +112,6 @@ class Reporter::DataSource::ActiveRecordSource
 				"COUNT(*) AS result"
 			when :average :
 				"AVG(#{args.first}) AS result"
-			when :minimum :
-				"MIN(#{args.first}) AS result"
-			when :maximum :
-				"MAX(#{args.first}) AS result"
-			else
-				raise "Invalid calculation: #{calculation}"
 		end
 	end
 

data/lib/reporter/data_source/scoping.rb

@@ -1,6 +1,3 @@
-# The scoping class manages the active scopes applied on all datasources.
-# It takes care of serialization of the scopes when they are switched between iterations of the data.
-#
 class Reporter::DataSource::Scoping
 
 	SUPPORTED_SCOPES = {
@@ -17,7 +14,6 @@ class Reporter::DataSource::Scoping
 
 	public
 
-	# returns an array with all possible scopes between all datasources
 	def possible
 		return @possible_scopes if @possible_scopes
 		results = SUPPORTED_SCOPES.collect { |type_name, scope_type| scope_type.possible_scopes data_source.sources }.flatten
@@ -31,6 +27,7 @@ class Reporter::DataSource::Scoping
 		#Rails.logger.info "Added scope #{name}: #{scope_type}"
 		self
 	end
+
 	alias :add :<<
 
 	def limit_scope scope, *args

data/reporter.gemspec

@@ -0,0 +1,81 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "reporter"
+  s.version = "0.0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Matthijs Groen"]
+  s.date = "2011-09-19"
+  s.description = "\n      Reporter adds a consistent way to build reports.\n    "
+  s.email = "matthijs.groen@gmail.com"
+  s.extra_rdoc_files = [
+    "README.markdown"
+  ]
+  s.files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "MIT-LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "lib/.gitignore",
+    "lib/reporter/data_set.rb",
+    "lib/reporter/data_source.rb",
+    "lib/reporter/data_source/active_record_source.rb",
+    "lib/reporter/data_source/scoping.rb",
+    "lib/reporter/data_structure.rb",
+    "lib/reporter/field/average_field.rb",
+    "lib/reporter/field/base.rb",
+    "lib/reporter/field/calculation_field.rb",
+    "lib/reporter/field/count_field.rb",
+    "lib/reporter/field/field.rb",
+    "lib/reporter/field/formula_field.rb",
+    "lib/reporter/field/sum_field.rb",
+    "lib/reporter/formula.rb",
+    "lib/reporter/result_row.rb",
+    "lib/reporter/scope/base.rb",
+    "lib/reporter/scope/date_scope.rb",
+    "lib/reporter/scope/reference_scope.rb",
+    "lib/reporter/support/time_range.rb",
+    "lib/reporter/time_iterator.rb",
+    "lib/reporter/time_optimized_result_row.rb",
+    "lib/reporter/value.rb",
+    "reporter.gemspec"
+  ]
+  s.homepage = "http://github.com/matthijsgroen/reporter"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Report builder."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<arel>, ["~> 1.0.1"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<arel>, ["~> 1.0.1"])
+    else
+      s.add_dependency(%q<arel>, ["~> 1.0.1"])
+      s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
+      s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
+      s.add_dependency(%q<arel>, ["~> 1.0.1"])
+    end
+  else
+    s.add_dependency(%q<arel>, ["~> 1.0.1"])
+    s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
+    s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
+    s.add_dependency(%q<arel>, ["~> 1.0.1"])
+  end
+end
+

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: reporter
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors: 
 - Matthijs Groen
@@ -15,57 +10,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-16 00:00:00 +02:00
-default_executable: 
+date: 2011-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
+  name: arel
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+        version: 1.0.1
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
+  name: activerecord
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: arel
-  prerelease: false
+  name: activesupport
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
-        version: 1.0.1
+        version: 3.0.0
   type: :runtime
+  prerelease: false
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: arel
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
 description: "\n      Reporter adds a consistent way to build reports.\n    "
 email: matthijs.groen@gmail.com
 executables: []
@@ -76,10 +88,12 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.markdown
 - Rakefile
 - VERSION
+- lib/.gitignore
 - lib/reporter/data_set.rb
 - lib/reporter/data_source.rb
 - lib/reporter/data_source/active_record_source.rb
@@ -101,13 +115,13 @@ files:
 - lib/reporter/time_iterator.rb
 - lib/reporter/time_optimized_result_row.rb
 - lib/reporter/value.rb
-has_rdoc: true
+- reporter.gemspec
 homepage: http://github.com/matthijsgroen/reporter
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -115,23 +129,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Report builder.