analytics_charts 1.6.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d9067379ba9f035efe9d800b9eaae2f2e34d5b7
-  data.tar.gz: 34f7044fceb4dec013c51c447f269341cf77b3f0
+  metadata.gz: 3591ea166bdaed5eb90ee72f9881c17f8b94f86c
+  data.tar.gz: 387073f74b7a5f8816ffbfa5f38c2cbc1491f5dc
 SHA512:
-  metadata.gz: 7692c627604cb402b15d1ef8d439114162ec79f5df83da543991e61594d440c9091381327d48b3fb38b0fd0053304a5298ae614a8a7281416dc784bdc15eb4cd
-  data.tar.gz: dd9a5594a70712e534d139ad887ef89f3c32f35dfe50d64b86552b8add62494c91ad4c2ec3c808cbe730fae28a8a73bc6bfa99a93d79ad7d0619ce0d76846c61
+  metadata.gz: 828091a522244d336487604fe644b8a429d65d9d16c3060ed962bc2f349ef00a6e41e992c8f8a7fecfbb0efebe65107f73f73150a0967c56f2110c118bfb0123
+  data.tar.gz: 8c59f8315e3ce67d40a2b0dcc15a22080efa8a60176d03de04fb06765fcfe89ac9d457b19c28cc2641b587d5303551125b68c1676540de2bb81a666980fc6458

data/lib/analytics_charts/custom_module.rb

@@ -14,7 +14,6 @@ class AnalyticsCharts::CustomModule
     @dummy_image = Image.new(1,1)
     @composite_columns = @composite_image.columns
     @composite_rows = @composite_image.rows
-    puts "@composite_columns: " + @composite_columns.to_s
     text = text.gsub(/['%]/, '%' => '%%', "'" => "\'")
     begin
       @rows_of_text = tokenize_text_by_lines(text)
@@ -24,9 +23,14 @@ class AnalyticsCharts::CustomModule
     end
 
     num_separators = @rows_of_text.count {|row| row.empty? }
-    @sep_offset = 7
-    starting_offset = @pointsize
-    @height = @composite_rows + (@rows_of_text.size - num_separators) * @pointsize + num_separators * @sep_offset + starting_offset
+    num_special_sep = @rows_of_text.count {|row| row.include? "@$$" }
+    @line_height = @pointsize + 2
+    @sep_offset = @line_height / 2
+    starting_offset = @line_height / 2
+    ending_offset = @line_height / 2
+    @height = @composite_rows + (@rows_of_text.size - num_separators) *
+      @line_height + (num_separators-num_special_sep) * @sep_offset +
+      starting_offset + ending_offset
     @base_image = Image.new(@composite_columns, @height) {
       self.background_color = "black"
     }
@@ -35,19 +39,19 @@ class AnalyticsCharts::CustomModule
     @d.stroke_width(1)
     @d = @d.line(0, @composite_rows, @composite_columns, @composite_rows)
     @d.draw(@base_image)
-    y_offset = starting_offset + @composite_rows
+    y_offset = @composite_rows + starting_offset
     @rows_of_text.each do |text|
       if text.include? "@$$" # No paragraph break if we insert this uncommonly used word
         text.sub!("@$$", "")
         y_offset -= @sep_offset
+        y_offset += @line_height
         @d.annotate(@base_image, 0 ,0, @pointsize, y_offset, text)
-        y_offset += @pointsize
         next
       else
         if text.empty?
           y_offset += @sep_offset
         else
-          y_offset += @pointsize
+          y_offset += @line_height
           @d.annotate(@base_image, 0 ,0, @pointsize, y_offset, text)
         end
       end
@@ -68,12 +72,12 @@ class AnalyticsCharts::CustomModule
   def line_wrap(text)
     tokens = text.split.reverse # Pop stuff off
     # Safety check, do not allow super long words.
-    tokens.each {|token| return "" if not fits_in_a_line(token) }
+    tokens.each {|token| return "" if not fits_in_a_line?(token) }
     line_wrap_tokens = Array.new
     line_builder = ""
     while tokens.size != 0
       line_builder = tokens.pop # Pop the first word in a line
-      while tokens.size != 0 and fits_in_a_line(line_builder + " " + tokens.last)
+      while tokens.size != 0 and fits_in_a_line?(line_builder + " " + tokens.last)
         line_builder += " " + tokens.pop
       end
       line_wrap_tokens.push(line_builder) # Add to list of lines
@@ -81,8 +85,7 @@ class AnalyticsCharts::CustomModule
     line_wrap_tokens
   end
 
-  def fits_in_a_line(text)
-    puts text + "   SIZE: " + @d.get_type_metrics(@dummy_image,text).width.to_s + "   COLUMNS: " + (@composite_image.columns - 36).to_s
+  def fits_in_a_line?(text)
     return @d.get_type_metrics(@dummy_image,text).width < @composite_image.columns - 36
   end
 end

data/lib/analytics_charts/custom_pie.rb

@@ -10,6 +10,7 @@ class AnalyticsCharts::CustomPie
   attr_accessor :label_start_x
   attr_accessor :label_start_y
   attr_accessor :label_offset
+
   def initialize(image_path, label_hash, pie_label_hash)
     @base_image = Image.read(image_path)[0]
     @columns = @base_image.columns
@@ -44,6 +45,7 @@ class AnalyticsCharts::CustomPie
   def highest_score(index, score)
     @thresholds[index] = score
   end
+
   def insert_pie_data(name, amount, quality)
     #convert all '' instances to an apostrophe
     name = name.gsub(/'/, "\'")
@@ -58,13 +60,24 @@ class AnalyticsCharts::CustomPie
     end
   end
 
+  def label_attributes=(label = {})
+    @label_attributes = label
+  end
+
+  def label_attributes
+    @label_attributes ||= {}
+  end
+
+  def label_height=(height)
+    @label_height = height
+  end
+
+  def label_height
+    @label_height ||= 12
+  end
+
   def insert_text_with_circle(x_offset, y_offset, text, features = {})
-    features.each { |feature, attribute|
-      set_feature(feature, attribute)
-    }
-    # Double quotes automatically escaped in rails db. Refer to Rmagick doc for escaping stuff
-    text = text.gsub(/['%]/, '%' => '%%', "'" => "\'")
-    @d.annotate(@base_image, 0 ,0, x_offset, y_offset, text)
+    insert_text(x_offset, y_offset, text, features)
     height = @d.get_type_metrics(@base_image, text).ascent
     y_offset -= height / 2
     circle_xpos = x_offset - 10
@@ -79,6 +92,7 @@ class AnalyticsCharts::CustomPie
     features.each { |feature, attribute|
       set_feature(feature, attribute)
     }
+    # Double quotes automatically escaped in rails db. Refer to Rmagick doc for escaping stuff
     text = text.gsub(/['%]/, '%' => '%%', "'" => "\'")
     @d.annotate(@base_image, 0 ,0, x_offset, y_offset, text)
   end
@@ -95,7 +109,7 @@ class AnalyticsCharts::CustomPie
       # If we don't refresh draw, future "@d.draw(@base_image)" will redraw the circle,
       # overlapping on the text written below
       @d = Draw.new
-      insert_text(@pie_center_x - 30, @pie_center_y, "No Data",
+      insert_text(@pie_center_x - 30, @pie_center_y, "(No Data)",
         @label_hash.merge({'fill'=> '#000000', 'font_weight'=> 700 }))
       return
     end
@@ -165,10 +179,10 @@ class AnalyticsCharts::CustomPie
         end
       end
       prev_degrees = 60.0 # Now focus on labels
-      @aggregate.each_with_index do |data_row, i|
+      @aggregate.each_with_index do |cluster_data_value, i|
         next if degrees[i] == 0
         half_angle = prev_degrees + degrees[i] / 2
-        label_string = '$' + data_row.round(0).to_s
+        label_string = process_pie_label_data(cluster_data_value)
         draw_pie_label(@pie_center_x,@pie_center_y, half_angle + label_offset_degrees[i],
           @pie_radius, label_string, i)
         prev_degrees += degrees[i]
@@ -176,6 +190,26 @@ class AnalyticsCharts::CustomPie
     end
   end
 
+  def process_pie_label_data(cluster_data_value)
+    if cluster_data_value < 10**3
+      return '$' + cluster_data_value.round(0).to_s
+    elsif cluster_data_value < 10**6
+      cluster_data_value /= 10**3 # Truncates decimals
+      return '$' + cluster_data_value.round(0).to_s + 'K'# Round is unnecessary, but add anyways
+    elsif cluster_data_value < 10**9
+      cluster_data_value /= 10**6
+      return '$' + cluster_data_value.round(0).to_s  + 'M'
+    elsif cluster_data_value < 10**12
+      cluster_data_value /= 10**9
+      return '$' + cluster_data_value.round(0).to_s + 'B'
+    elsif cluster_data_value < 10**15
+      cluster_data_value /= 10**12
+      return '$' + cluster_data_value.round(0).to_s + 'T'
+    else
+      return '>1T'
+    end
+  end
+
   def write(filename='graph.png')
     draw
     draw_labels
@@ -187,50 +221,49 @@ class AnalyticsCharts::CustomPie
     sorted_data = @data.sort_by{|key,value| -value[1]} # Sort by descending quality
     x_offset = @label_start_x + 15
     y_offset = @label_start_y
+    @label_hash = @label_hash.merge(label_attributes)
     for data in sorted_data
       has_data = false
       if data[1][0] > 0 # Amount > 0
-        font_weight = 900 # Very Bold
         text = data[0]
         has_data = true
       else
         text = data[0]
-        font_weight = 900 # Very Bold
       end
       if has_data
         case data[1][1]
         when 3
           # label_hash gets merged and overrided by fill and font_weight.
           insert_text_with_circle(x_offset, y_offset, text,
-            @label_hash.merge({'fill'=> '#1E753B', 'font_weight'=> font_weight }))
+            @label_hash.merge({'fill'=> '#1E753B'}))
         when 2
           insert_text_with_circle(x_offset, y_offset, text,
-            @label_hash.merge({'fill'=> '#C1B630', 'font_weight'=> font_weight }))
+            @label_hash.merge({'fill'=> '#C1B630'}))
         when 1
           insert_text_with_circle(x_offset, y_offset, text,
-           @label_hash.merge({'fill'=> '#BE6428', 'font_weight'=> font_weight }))
+           @label_hash.merge({'fill'=> '#BE6428'}))
         when 0
           insert_text_with_circle(x_offset, y_offset, text,
-            @label_hash.merge({'fill'=> '#AD1F25', 'font_weight'=> font_weight }))
+            @label_hash.merge({'fill'=> '#AD1F25'}))
         end
       else
         case data[1][1]
         when 3
           # label_hash gets merged and overrided by fill and font_weight.
           insert_text(x_offset, y_offset, text,
-            @label_hash.merge({'fill'=> '#1E753B', 'font_weight'=> font_weight }))
+            @label_hash.merge({'fill'=> '#1E753B'}))
         when 2
           insert_text(x_offset, y_offset, text,
-            @label_hash.merge({'fill'=> '#C1B630', 'font_weight'=> font_weight }))
+            @label_hash.merge({'fill'=> '#C1B630'}))
         when 1
           insert_text(x_offset, y_offset, text,
-           @label_hash.merge({'fill'=> '#BE6428', 'font_weight'=> font_weight }))
+           @label_hash.merge({'fill'=> '#BE6428'}))
         when 0
           insert_text(x_offset, y_offset, text,
-            @label_hash.merge({'fill'=> '#AD1F25', 'font_weight'=> font_weight }))
+            @label_hash.merge({'fill'=> '#AD1F25'}))
         end
       end
-      y_offset += @label_offset
+      y_offset += self.label_height
     end
     insert_text_with_circle(x_offset, y_offset, '= purchased by you',
       @label_hash.merge({'fill'=> '#252525', 'font_weight'=> 900 }))
@@ -269,6 +302,11 @@ class AnalyticsCharts::CustomPie
     insert_text(x, y, percent, {'fill'=> @colors[index]}.merge(@pie_label_hash))# {'fill'=> 'black', 'font_weight'=> 700, 'pointsize'=>48})
   end
 
+  def recalibrate_metrics_for_labels
+    label_attributes.each { |feature, attribute|
+      set_feature(feature, attribute)
+    }
+  end
   def set_feature(feature, attribute)
     begin
       case feature

data/lib/analytics_charts/pie_and_labels.rb

@@ -12,19 +12,24 @@ class AnalyticsCharts::PieAndLabels < AnalyticsCharts::CustomPie
     @d.font_weight = 700
     @dummy_image = Image.new(1,1)
     @composite_columns = @composite_image.columns
-    puts @composite_columns
     @composite_rows = @composite_image.rows
-    @org_text_size = 14
     organization = organization.gsub(/['%]/, '%' => '%%', "'" => "\'")
+    @org_text_size = 14
+    @org_height = @org_text_size + 1
     @org_texts = tokenize_text_by_lines(organization,
       {'fill' => '#FFFFFF', 'pointsize'=> @org_text_size, 'font_weight'=> 500  })
+    org_text_offset = @org_texts.size * @org_height
+
     @label_size = 16
-    org_text_offset = @org_texts.size * @org_text_size
+    self.label_attributes = {'pointsize' => @label_size, 'font_weight' => 900}
+    recalibrate_metrics_for_labels
+    self.label_height = @label_size + 1
+
     # (num_labels + 1) to account for white key on bottom of labels
-    @height_with_no_disclaimer = [200 + 20, 20 + @label_size * (num_labels + 1) + 20].max + @composite_rows + org_text_offset
+    @height_with_no_disclaimer = [200 + 20, 20 + self.label_height * (num_labels + 1) + 20].max + @composite_rows + org_text_offset
     disclaimer = disclaimer.gsub(/['%]/, '%' => '%%', "'" => "\'")
     @disclaimer_texts = tokenize_text_by_lines(disclaimer)
-    @height = @height_with_no_disclaimer + @disclaimer_texts.size * 12 + 5
+    @height = @height_with_no_disclaimer + @disclaimer_texts.size * 12
     @data = Hash.new # Value is array with two items
     @aggregate = Array([0,0,0,0]) # Cluster brands into categories
     @label_hash = {'pointsize'=> @label_size,'font_weight'=> 700 }
@@ -45,11 +50,11 @@ class AnalyticsCharts::PieAndLabels < AnalyticsCharts::CustomPie
       insert_text(22, y_offset ,text,
             @label_hash.merge({'fill' => '#FFFFFF', 'pointsize'=> @org_text_size, 'font_weight'=> 500  }))
       @d.annotate(@base_image, 0 ,0, 22, y_offset, text)
-      y_offset += @org_text_size
+      y_offset += @org_height
     end
   end
   def annotate_disclaimer
-    y_offset = @height_with_no_disclaimer + @d.get_type_metrics(@dummy_image,"a").height + 5
+    y_offset = @height_with_no_disclaimer + @d.get_type_metrics(@dummy_image,"a").height
     @disclaimer_texts.each do |text|
       if text.include? "@$$" # No paragraph break if we insert this uncommonly used word
         text.sub!("@$$", "")
@@ -153,12 +158,12 @@ class AnalyticsCharts::PieAndLabels < AnalyticsCharts::CustomPie
   def line_wrap(text)
     tokens = text.split.reverse # Pop stuff off
     # Safety check, do not allow super long words.
-    tokens.each {|token| return "" if not fits_in_a_line(token) }
+    tokens.each {|token| return "" if not fits_in_a_line?(token) }
     line_wrap_tokens = Array.new
     line_builder = ""
     while tokens.size != 0
       line_builder = tokens.pop # Pop the first word in a line
-      while tokens.size != 0 and fits_in_a_line(line_builder + " " + tokens.last)
+      while tokens.size != 0 and fits_in_a_line?(line_builder + " " + tokens.last)
         line_builder += " " + tokens.pop
       end
       line_wrap_tokens.push(line_builder) # Add to list of lines
@@ -166,7 +171,7 @@ class AnalyticsCharts::PieAndLabels < AnalyticsCharts::CustomPie
     line_wrap_tokens
   end
 
-  def fits_in_a_line(text)
+  def fits_in_a_line?(text)
     return @d.get_type_metrics(@dummy_image,text).width < @composite_columns - 44
   end
 

data/lib/analytics_charts/version.rb

@@ -1,3 +1,3 @@
 module AnalyticsCharts
-  VERSION = "1.6.3"
+  VERSION = "1.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: analytics_charts
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.0
 platform: ruby
 authors:
 - STEPHEN YU