twistage_stats_reports 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d737cd560150a778ae87a2f04098d1ab505c6435
+  data.tar.gz: 07cec7ffd48ffaa9d28dcb21606d1dd3f687672c
+SHA512:
+  metadata.gz: 830a3a72c02f4d04c2824d35721e18124a1854cf53141c8e032c5d95dd2abf96dce04430a927d3f3bb2a3ad8799a5b4c377db9a2bffd456ea8726c1f49b44777
+  data.tar.gz: eacbe0673e88cc27af1f7f58f0feabcd052808aa766126e9e1b833575d860215bb18c2fd8dc35cafddcdb6db8ea983b3e639d1da7c7873ad4d8255ef049abfbe

data/lib/stats/disk_usage_report.rb

@@ -4,6 +4,8 @@ class Stats::DiskUsageReport < Stats::EventReport
   set_attributes         [ :id, :obj_id, :group, :name, :nickname, :title, :label, :name, :query_time, :start_date, :end_date ]
   set_numeric_attributes [ :actual_bytes, :actual_average_bytes, :bytes, :average_bytes, :objects, :average_objects ]
 
+  TIME_BASED_GROUPS = /daily|weekly|monthly/
+
   def initialize(options = {})
     @label                = "stats" # video unless date
     @obj_id               = options[:obj_id    ] unless options[:obj_id    ].blank?
@@ -30,8 +32,14 @@ class Stats::DiskUsageReport < Stats::EventReport
     keys += [ :start_date, :end_date, :actual_bytes, :actual_average_bytes, :objects, :average_objects ]
   end
 
+  def the_csv_keys
+    arr = self.class.csv_keys
+    arr = strip_keys_by_label(arr, @label)
+    arr -= [ :actual_average_bytes, :average_objects ] if @group !~ TIME_BASED_GROUPS
+    arr
+  end
+
   def to_csv(options = {})
-    the_csv_keys = strip_keys_by_label(self.class.csv_keys, @label)
     the_csv_keys.map do |k|
       self.class.format_csv_value(send(k))
     end.join(',')
@@ -46,23 +54,23 @@ class Stats::DiskUsageReport < Stats::EventReport
       xml.start_date    @start_date.strftime("%Y/%m/%d") unless @start_date.nil?
       xml.end_date      @end_date.strftime("%Y/%m/%d")   unless @end_date.nil?
       xml.bytes         @actual_bytes
-      xml.average_bytes @actual_average_bytes if @group =~ /daily|weekly|monthly/
+      xml.average_bytes @actual_average_bytes if @group =~ TIME_BASED_GROUPS
       xml.objects         @objects
-      xml.average_objects @average_objects if @group =~ /daily|weekly|monthly/
+      xml.average_objects @average_objects if @group =~ TIME_BASED_GROUPS
     end
   end
 
-  def to_json(options = {})
+  def as_json(options = {})
     report                  = HashWithIndifferentAccess.new
     report['id']      = @nickname                        unless @nickname.nil?
     report['start_date']    = @start_date.strftime("%Y/%m/%d") unless @start_date.nil?
     report['end_date']      = @end_date.strftime("%Y/%m/%d")   unless @end_date.nil?
     report['bytes']         = @actual_bytes
-    report['average_bytes'] = @actual_average_bytes if @group =~ /daily|weekly|monthly/
+    report['average_bytes'] = @actual_average_bytes if @group =~ TIME_BASED_GROUPS
     report['objects']         = @objects
-    report['average_objects'] = @average_objects if @group =~ /daily|weekly|monthly/
+    report['average_objects'] = @average_objects if @group =~ TIME_BASED_GROUPS
 
-    report.to_json
+    report
   end
   
   def self.to_amcharts(reports, show_date, show_date_range, options = {})

data/lib/stats/report.rb

@@ -25,17 +25,21 @@ class Stats::Report
     report_array.to_xml options.merge({:root => 'statistics-reports'})
   end
 
+  def the_csv_keys
+    arr = self.class.csv_labels
+    Stats::EventReport::SUPPRESSED_LABELS.each do |key, labels|
+      arr = strip_label(key, arr) if labels.include?(label)
+    end
+    arr.split(',')
+  end
+
   def self.array_to_csv(report_array, options = {})
     buf = ""
 
     unless report_array.first.nil?
       label          = report_array.first.label
       new_options    = options.merge( { :label => label } )
-      the_csv_labels = options[:images] ? Stats::ImageReport.csv_labels : report_array[0].class.csv_labels
-      Stats::EventReport::SUPPRESSED_LABELS.each do |key, labels|
-        the_csv_labels = strip_label(key, the_csv_labels) if labels.include?(label)
-      end
-      
+      the_csv_labels = options[:images] ? Stats::ImageReport.csv_labels : report_array.first.the_csv_keys.join(',')
 
       buf << the_csv_labels + "\n" unless report_array.empty?
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twistage_stats_reports
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - David Wegman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies: []
 description: Shared data structures and logic for interacting with the Twistage Stats
   service
@@ -18,7 +17,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/twistage_stats_reports.rb
 - lib/stats/breakdown_report.rb
 - lib/stats/disk_usage_report.rb
 - lib/stats/event_report.rb
@@ -29,28 +27,29 @@ files:
 - lib/stats/report.rb
 - lib/stats/source_report.rb
 - lib/stats/tzinfo_extensions.rb
+- lib/twistage_stats_reports.rb
 homepage: http://rubygems.org/gems/twistage_stats_reports
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Twistage Stats Reports
 test_files: []
+has_rdoc: