kpi 0.5.3 → 0.5.4

data/README.rdoc

@@ -84,10 +84,10 @@ You can create merged report from two or more reports of the same type. Look at
     > yesterday.today_income.value
     # => 250
     > diff = KPI::MergedReport.new(today, yesterday) do |today, yesterday|
-    >   KPI::Entry.new "$$ (change)", today - yesterday
+    >   KPI::Entry.new "$$ (change)", today.value - yesterday.value
     > end
     > avg = KPI::MergedReport.new(today, yesterday) do |*entries|
-    >   KPI::Entry.new "$$ (avg)", entries
+    >   KPI::Entry.new "$$ (avg)", entries.map(&:value).inject(:+) / entries.size
     > end
     > diff.users_count.value
     # => 4
@@ -122,7 +122,7 @@ More reports can be passed to constructor of Merged report:
 == Todo
 
 * Generators for configuration and reports
-* Database persistence - storing reports in different databases: PostgreSQL & Mongo prioritized
+* Database persistence - storing reports in different databases: PostgreSQL & Mongo prioritized - should be done in external gems
 * Support for "result" helper in block passed to constructor of MergedReport
 * Remove ActiveSupport requirement
 

data/lib/kpi.rb

@@ -3,7 +3,10 @@ require 'array/extract_options'
 module KPI
   require 'engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
   require 'kpi/18compatibility' if RUBY_VERSION < '1.9'
-
-  require 'kpi/configuration'
-  include KPI::Configuration
+  
+  require File.join(File.dirname(__FILE__), '..', 'app/models/kpi/entry')
+  require File.join(File.dirname(__FILE__), '..', 'app/models/kpi/report/dynamic_definitions')
+  require File.join(File.dirname(__FILE__), '..', 'app/models/kpi/report/suppress_memoization')
+  require File.join(File.dirname(__FILE__), '..', 'app/models/kpi/report')
+  require File.join(File.dirname(__FILE__), '..', 'app/models/kpi/merged_report')
 end

data/test/test_helper.rb

@@ -9,11 +9,3 @@ require 'kpi'
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 # Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-require File.join(File.dirname(__FILE__), '..', 'lib/kpi/configuration')
-require File.join(File.dirname(__FILE__), '..', 'app/models/kpi/entry')
-require File.join(File.dirname(__FILE__), '..', 'app/models/kpi/report/dynamic_definitions')
-require File.join(File.dirname(__FILE__), '..', 'app/models/kpi/report/suppress_memoization')
-require File.join(File.dirname(__FILE__), '..', 'app/models/kpi/report')
-require File.join(File.dirname(__FILE__), '..', 'app/models/kpi/merged_report')
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kpi
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Artur Roszczyk
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-14 00:00:00 +02:00
+date: 2011-05-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -128,7 +128,6 @@ files:
 - lib/generators/kpi/kpi_generator.rb
 - lib/kpi.rb
 - lib/kpi/18compatibility.rb
-- lib/kpi/configuration.rb
 - LICENSE.txt
 - README.rdoc
 - test/test_helper.rb

data/lib/kpi/configuration.rb

@@ -1,22 +0,0 @@
-module KPI
-  module Configuration
-    def self.included(base)
-      base.class_eval do
-        
-        mattr_accessor :app_name
-        @@app_name = "Your app"
-
-        mattr_accessor :mail_from
-        @@mail_from = "example@example.com"
-
-        mattr_accessor :mail_to
-        @@mail_to = "example@example.com"
-
-        def self.configure
-          yield self
-        end
-        
-      end
-    end
-  end
-end