kpi 0.5.6 → 0.6.0

data/app/models/kpi/merged_report.rb

@@ -6,6 +6,8 @@ module KPI
       raise ArgumentError, "Should have any argument" if args.length == 0
       raise Exception unless block_given?
       @_mode = options[:mode] || :&
+      @_title = options[:title] 
+
       @_reports = args
       @_merge = block
     end
@@ -19,7 +21,7 @@ module KPI
     end
   
     def title
-      self.class.name
+      @_title || @_reports.first.title
     end
     
     def defined_kpis

data/app/models/kpi/report/dynamic_definitions.rb

@@ -10,7 +10,10 @@ module KPI
         end
 
         def method_blacklisted?(name)
-          not_kpi_methods.include?(name) || name =~ /_unmemoized_/ || !self.instance_methods(true).map(&:to_sym).include?(name)
+          KPI::Report.not_kpi_methods.include?(name) ||
+          not_kpi_methods.include?(name) ||
+          name =~ /_unmemoized_/ ||
+          !self.instance_methods(true).map(&:to_sym).include?(name)
         end
 
         def blacklist(*methods)

data/app/models/kpi/report.rb

@@ -10,8 +10,9 @@ module KPI
     def initialize(*args)
       @options = args.extract_options!
       @time = @options[:time] || Time.now
+      @title = @options[:title] || self.class.name
     end
-    attr_reader :time
+    attr_reader :time, :title
  
     def collect!
       self.defined_kpis.each {|kpi_method| send(kpi_method) }
@@ -26,10 +27,6 @@ module KPI
       end
     end
  
-    def title
-      self.class.name
-    end
- 
     def defined_kpis
       self.class.defined_kpis.map(&:to_sym)
     end

data/test/unit/kpi/merged_report_test.rb

@@ -145,6 +145,22 @@ describe "KPI::MergedReport" do
     end
   end
 
+  describe :title do
+    before do
+      @partial_report = TestKpi.new
+    end
+
+    it "should return title passed in options" do
+      report = KPI::MergedReport.new(@partial_report, :title => "my title") {}
+      assert_equal "my title", report.title
+    end
+
+    it "should return title of first report by default" do
+      report = KPI::MergedReport.new(@partial_report) {}
+      assert_equal @partial_report.title, report.title
+    end
+  end
+
   describe "when different reports given for merge" do
     before do
       @report1 = TestKpi.new(2)

data/test/unit/kpi/report_test.rb

@@ -67,6 +67,19 @@ describe "KPI::Report" do
     it "should return class name by default" do
       assert_equal "TestKpi", @kpi.title
     end
+    
+    it "should allow to override title in definition" do
+      class AnotherKpi < KPI::Report
+        def title; "title"; end
+      end
+      @kpi = AnotherKpi.new
+      assert_equal "title", @kpi.title
+      assert !@kpi.defined_kpis.include?(:title), 'report should not have :title KPI'
+    end
+    
+    it "should allow to override title in options" do
+      assert_equal "my title", TestKpi.new(:title => "my title").title
+    end
   end
   
   describe :time do

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 5
   - 6
-  version: 0.5.6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Artur Roszczyk
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 +02:00
+date: 2011-05-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency