analytics_charts 1.3.5 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ffc208c657b21353a664ada4ed4fec601b346c2
-  data.tar.gz: 34ab319ed9f7d9c1d0d7783b13415a0056928be1
+  metadata.gz: 560cfd775caca338fcc64c9c31ca41fa3ae2f579
+  data.tar.gz: 7cdc37b4d833273ee9cc78140fdaec0804a8d752
 SHA512:
-  metadata.gz: 92d50986fc755bed5e4c73f2009c23a1fe84471cc612d639b7ab1ddf4e9a08d0f53dd1ea54d46b7d51ffc5148916bd3a8090d5394d9aabc6a73d8b735dc39b16
-  data.tar.gz: e60b4a4d3031e9cf590ff1513b599f907caf5cc42e779fbd3213847a20fd874e1d614b7df57fe596dc103d22e5fbfbcb7a5490461531512754f2427d2ea39b16
+  metadata.gz: 5b9cb90391084cc7aeec0070665991a7817e99fa9195cfe14e03727b89037ac6709db349f809fca8d48926f79a3fc29a365317724d374fdea3cf57406a05b9ea
+  data.tar.gz: 099a6abce765a6eb45f7df431c190644970e15d6a3b56878c24a76ae240ac4b67351f7734db0a3c4431dff53206608a91ae46669207a7bf1a80368d254c43cbf

data/lib/analytics_charts/custom_module.rb

@@ -6,7 +6,8 @@ class AnalyticsCharts::CustomModule
     @d = Draw.new
     @d.fill = 'white'
     @d.font = 'Helvetica'
-    @d.pointsize = 22
+    @pointsize = 18
+    @d.pointsize = @pointsize
     @d.font_weight = 500
     @composite_image = Image.read(image_path)[0]
     @dummy_image = Image.new(1,1)
@@ -18,7 +19,7 @@ class AnalyticsCharts::CustomModule
       puts "Had some error in CustomModule, probably a nil calling each"
       return
     end
-    @height = @composite_rows + @rows_of_text.size * 22
+    @height = @composite_rows + @rows_of_text.size * @pointsize
     @base_image = Image.new(@composite_columns, @height) {
       self.background_color = "black"
     }
@@ -27,16 +28,16 @@ class AnalyticsCharts::CustomModule
     @d.stroke_width(1)
     @d = @d.line(0, @composite_rows, @composite_columns, @composite_rows)
     @d.draw(@base_image)
-    y_offset = 22 + @composite_rows + @d.get_type_metrics(@dummy_image,"a").height / 2
+    y_offset = @pointsize + @composite_rows + @d.get_type_metrics(@dummy_image,"a").height / 2
     @rows_of_text.each do |text|
       text = text.gsub(/['%]/, '%' => '%%', "'" => "\'")
       if text.include? "@$$" # No paragraph break if we insert this uncommonly used word
         text.sub!("@$$", "")
-        @d.annotate(@base_image, 0 ,0, 22, y_offset, text)
+        @d.annotate(@base_image, 0 ,0, @pointsize, y_offset, text)
         next
       else
-        @d.annotate(@base_image, 0 ,0, 22, y_offset, text)
-        y_offset += 22
+        @d.annotate(@base_image, 0 ,0, @pointsize, y_offset, text)
+        y_offset += @pointsize
       end
     end
     @base_image.write(output_path)
@@ -69,7 +70,7 @@ class AnalyticsCharts::CustomModule
   end
 
   def fits_in_a_line(text)
-    return @d.get_type_metrics(@dummy_image,text).width < @composite_image.columns - 44
+    return @d.get_type_metrics(@dummy_image,text).width < @composite_image.columns - @pointsize * 2
   end
 end
 #Reference: Draw defaults[ font: "Helvetica", pointsize:12, x/y resolution 72 DPI, font_weight: 400]

data/lib/analytics_charts/custom_pie.rb

@@ -57,7 +57,8 @@ class AnalyticsCharts::CustomPie
       end
     end
   end
-  def insert_text_with_arrow(x_offset, y_offset, text, features = {})
+
+  def insert_text_with_circle(x_offset, y_offset, text, features = {})
     features.each { |feature, attribute|
       set_feature(feature, attribute)
     }
@@ -66,13 +67,14 @@ class AnalyticsCharts::CustomPie
     @d.annotate(@base_image, 0 ,0, x_offset, y_offset, text)
     height = @d.get_type_metrics(@base_image, text).ascent
     y_offset -= height / 2
-    arrow_xpos = x_offset + @d.get_type_metrics(@base_image, text).width + 5
-    @d.stroke_width(4)
-    @d.stroke features["fill"]
-    @d = @d.line(arrow_xpos+1,y_offset,arrow_xpos+12,y_offset+6)
-    @d = @d.line(arrow_xpos,y_offset,arrow_xpos+30,y_offset)
-    @d = @d.line(arrow_xpos+1,y_offset,arrow_xpos+12,y_offset-6)
+    circle_xpos = x_offset - 10
+    radius = 5
+    @d.stroke_width(radius)
+    @d.stroke features["fill"] unless features["fill"].nil?
+    @d = @d.ellipse(circle_xpos, y_offset,
+      radius / 2.0, radius / 2.0, 0, 360 + 1.0) # <= +0.5 'fudge factor' gets rid of the ugly gaps
   end
+
   def insert_text(x_offset, y_offset, text, features = {})
     features.each { |feature, attribute|
       set_feature(feature, attribute)
@@ -88,19 +90,13 @@ class AnalyticsCharts::CustomPie
       @d = @d.stroke "#FFFFFF"
       @d = @d.ellipse(@pie_center_x, @pie_center_y,
                   @pie_radius / 2.0, @pie_radius / 2.0,
-                  0, 360 + 0.5) # <= +0.5 'fudge factor' gets rid of the ugly gaps
-      @d = @d.stroke "#000000"
-      @d.stroke_width(5)
-      @d = @d.line(@pie_center_x-30,@pie_center_y-30,@pie_center_x-14,@pie_center_y-14)
-      @d = @d.line(@pie_center_x-30,@pie_center_y-14,@pie_center_x-14,@pie_center_y-30)
-      @d = @d.line(@pie_center_x+14,@pie_center_y-30,@pie_center_x+30,@pie_center_y-14)
-      @d = @d.line(@pie_center_x+14,@pie_center_y-14,@pie_center_x+30,@pie_center_y-30)
-      @d.stroke_width(10)
-      @d = @d.ellipse(@pie_center_x, @pie_center_y + 20,
-                  5,5,
-                  0, 360) # <= +0.5 'fudge factor' gets rid of the ugly gaps
-      draw_pie_label(@pie_center_x,@pie_center_y, 45,
-          @pie_radius, "$0", 4)
+               0, 360 + 0.5) # <= +0.5 'fudge factor' gets rid of the ugly gaps
+      @d.draw(@base_image)
+      # 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....",
+        @label_hash.merge({'fill'=> '#000000', 'font_weight'=> 700 }))
       return
     end
     if @data.size > 0
@@ -172,7 +168,7 @@ class AnalyticsCharts::CustomPie
       @aggregate.each_with_index do |data_row, i|
         next if degrees[i] == 0
         half_angle = prev_degrees + degrees[i] / 2
-        label_string = '$' + data_row.round(2).to_s
+        label_string = '$' + data_row.round(0).to_s
         draw_pie_label(@pie_center_x,@pie_center_y, half_angle + label_offset_degrees[i],
           @pie_radius, label_string, i)
         prev_degrees += degrees[i]
@@ -189,7 +185,7 @@ class AnalyticsCharts::CustomPie
   def draw_labels
     @d.align = LeftAlign
     sorted_data = @data.sort_by{|key,value| -value[1]} # Sort by descending quality
-    x_offset = @label_start_x
+    x_offset = @label_start_x + 15
     y_offset = @label_start_y
     for data in sorted_data
       has_data = false
@@ -205,16 +201,16 @@ class AnalyticsCharts::CustomPie
         case data[1][1]
         when 3
           # label_hash gets merged and overrided by fill and font_weight.
-          insert_text_with_arrow(x_offset, y_offset, text,
+          insert_text_with_circle(x_offset, y_offset, text,
             @label_hash.merge({'fill'=> '#1E753B', 'font_weight'=> font_weight }))
         when 2
-          insert_text_with_arrow(x_offset, y_offset, text,
+          insert_text_with_circle(x_offset, y_offset, text,
             @label_hash.merge({'fill'=> '#C1B630', 'font_weight'=> font_weight }))
         when 1
-          insert_text_with_arrow(x_offset, y_offset, text,
+          insert_text_with_circle(x_offset, y_offset, text,
            @label_hash.merge({'fill'=> '#BE6428', 'font_weight'=> font_weight }))
         when 0
-          insert_text_with_arrow(x_offset, y_offset, text,
+          insert_text_with_circle(x_offset, y_offset, text,
             @label_hash.merge({'fill'=> '#AD1F25', 'font_weight'=> font_weight }))
         end
       else
@@ -236,6 +232,8 @@ class AnalyticsCharts::CustomPie
       end
       y_offset += @label_offset
     end
+    insert_text_with_circle(x_offset, y_offset, '= purchased by you',
+      @label_hash.merge({'fill'=> '#FFFFFF', 'font_weight'=> 900 }))
   end
 
   def draw_pie_label(center_x, center_y, angle, radius, percent, index)

data/lib/analytics_charts/pie_and_labels.rb

@@ -6,30 +6,47 @@ class AnalyticsCharts::PieAndLabels < AnalyticsCharts::CustomPie
     @organization = organization
     @legend_data = Array.new(["","","",""])
     @thresholds = Array(["","","",""]) # Will populate with integer thresholds
-    @columns = 450
     @composite_image = Image.read(meme)[0]
-    @composite_columns = @composite_image.columns
-    @composite_rows = @composite_image.rows
-    @rows_with_no_disclaimer = [200 + 20, 20 + 16 * num_labels + 20].max + @composite_rows
-    @dummy_image = Image.new(1,1)
     @d = Draw.new
     @d.pointsize = 12
     @d.font_weight = 700
-    @rows_of_text = tokenize_text_by_lines(disclaimer)
-    @rows = @rows_with_no_disclaimer + @rows_of_text.size * 12 + 5
+    @dummy_image = Image.new(1,1)
+    @composite_columns = @composite_image.columns
+    @composite_rows = @composite_image.rows
+    @org_texts = tokenize_text_by_lines(organization)
+    @org_text_size = 14
+    @label_size = 16
+    org_text_offset = @org_texts.size * @org_text_size
+    # (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
+    @disclaimer_texts = tokenize_text_by_lines(disclaimer)
+    @height = @height_with_no_disclaimer + @disclaimer_texts.size * 12 + 5
     @data = Hash.new # Value is array with two items
     @aggregate = Array([0,0,0,0]) # Cluster brands into categories
-    @label_hash = {'pointsize'=> 16,'font_weight'=> 700 }
+    @label_hash = {'pointsize'=> @label_size,'font_weight'=> 700 }
     @pie_label_hash = {'pointsize'=> 14, 'font_weight' => 600 }
     set_pie_colors(%w(#AD1F25 #BE6428 #C1B630 #1E753B #FFFFFF))
-   	@base_image = Image.new(@columns, @rows) {
+   	@base_image = Image.new(@composite_columns, @height) {
       self.background_color = "black"
     }
     @base_image.composite!(@composite_image,0,0,OverCompositeOp)
     set_pie_geometry(325, 60+ @composite_rows, 50)
-    set_label_values(22, 20+@composite_rows, 16)
-    y_offset = @rows_with_no_disclaimer + @d.get_type_metrics(@dummy_image,"a").height + 5
-    @rows_of_text.each do |text|
+    set_label_values(22, 20+@composite_rows, @label_size)
+    annotate_organization(org_text_offset)
+    annotate_disclaimer
+  end
+  def annotate_organization(offset)
+    y_offset = @height_with_no_disclaimer - offset
+    @org_texts.each do |text|
+      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
+    end
+  end
+  def annotate_disclaimer
+    y_offset = @height_with_no_disclaimer + @d.get_type_metrics(@dummy_image,"a").height + 5
+    @disclaimer_texts.each do |text|
       if text.include? "@$$" # No paragraph break if we insert this uncommonly used word
         text.sub!("@$$", "")
         insert_text(22, y_offset ,text,
@@ -47,22 +64,12 @@ class AnalyticsCharts::PieAndLabels < AnalyticsCharts::CustomPie
   def write(filename='graph.png')
     draw
     draw_labels
-    draw_organization
     draw_legend
     draw_line
     @d.draw(@base_image)
     @base_image.write(filename)
   end
 
-  def draw_organization
-    insert_text(22, @rows_with_no_disclaimer - 20,  @organization,
-      @label_hash.merge({'fill' => '#FFFFFF', 'pointsize'=> 10 }))
-    category_disclaimer = "(categories only for demo purposes)"
-    insert_text(22, @rows_with_no_disclaimer - 10, category_disclaimer,
-      @label_hash.merge({'fill' => '#FFFFFF', 'pointsize'=> 10 }))
-
-  end
-
   def insert_legend(label, quality, color)
     case color
     when "green"
@@ -115,20 +122,26 @@ class AnalyticsCharts::PieAndLabels < AnalyticsCharts::CustomPie
       end
     end
   end
+
   def draw_line
     @d.stroke('white')
     @d.stroke_width(1)
-    @d.line(0,@rows_with_no_disclaimer,@columns,@rows_with_no_disclaimer)
+    @d.line(0,@height_with_no_disclaimer,@composite_columns,@height_with_no_disclaimer)
   end
 
   def tokenize_text_by_lines(text)
     # First split the text by the line carriage element
     carriage_split_lines = text.split("\r\n")
+    puts carriage_split_lines
     line_tokens = Array.new
     carriage_split_lines.each do |carriage_split_line|
+      puts carriage_split_line
       line_wrap_lines = line_wrap(carriage_split_line)
-      line_wrap_lines.each { |line| line_tokens.push(line) }
-      line_tokens.push("\r\n")
+      begin
+        line_wrap_lines.each { |line| line_tokens.push(line) }
+        line_tokens.push("\r\n")
+      rescue
+      end
     end
     line_tokens
   end
@@ -149,7 +162,7 @@ class AnalyticsCharts::PieAndLabels < AnalyticsCharts::CustomPie
   end
 
   def fits_in_a_line(text)
-    return @d.get_type_metrics(@dummy_image,text).width < @columns - 44
+    return @d.get_type_metrics(@dummy_image,text).width < @composite_columns - 44
   end
 
 end

data/lib/analytics_charts/version.rb

@@ -1,3 +1,3 @@
 module AnalyticsCharts
-  VERSION = "1.3.5"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: analytics_charts
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0
 platform: ruby
 authors:
 - STEPHEN YU
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler