analytics_charts 1.4.2 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f666dab595381b9af701f88f98329f02ce1714ff
-  data.tar.gz: a42abe86eaaf6f33fc874aed314970f2fbae0184
+  metadata.gz: 9b1aee1598609af56b20328ccc22451913d4095d
+  data.tar.gz: 3873937e937b37ff6fd7de8bbd0565306d928723
 SHA512:
-  metadata.gz: c96ec1ee30c9426a67a7e6f31a75b155362bd0fecb1dab848387d5a2873df61cc2631a63816680f111d8d17c4b04e9b73598cf2bc28313c8bfeee090f35b5ffc
-  data.tar.gz: ee3f09010f0485a937d6589b6418663484ddbed4e4c1d0774190a95a569ba0e887d43a03bffc3c6e147b0462d6a443dfa3f5177fc764f702cff22e055ba47e0c
+  metadata.gz: ed00db05c185e80ea38552936d3eb99b9f67c682519a7af245d77a39cde1b0ac83a233d19052c4011b69aedd3017da27ccee86b3317592ff553e91b86befdf28
+  data.tar.gz: 5d2b51fe68eeaed5790253a51574effd6dbe52355a3526c3f0b7ab45b006c097afae2766302a9e4937769cae425794d6720aaa37d494f0c584503204a9ee36f8

data/lib/analytics_charts/custom_module.rb

@@ -6,7 +6,7 @@ class AnalyticsCharts::CustomModule
     @d = Draw.new
     @d.fill = 'white'
     @d.font = 'Helvetica'
-    @pointsize = 18
+    @pointsize = 14
     @d.pointsize = @pointsize
     @d.font_weight = 500
     @composite_image = Image.read(image_path)[0]
@@ -19,7 +19,9 @@ class AnalyticsCharts::CustomModule
       puts "Had some error in CustomModule, probably a nil calling each"
       return
     end
-    @height = @composite_rows + @rows_of_text.size * @pointsize
+    num_separators = @rows_of_text.count {|row| row.empty? }
+    @sep_offset = 7
+    @height = @composite_rows + (@rows_of_text.size - num_separators) * @pointsize + num_separators * @sep_offset
     @base_image = Image.new(@composite_columns, @height) {
       self.background_color = "black"
     }
@@ -33,11 +35,17 @@ class AnalyticsCharts::CustomModule
       text = text.gsub(/['%]/, '%' => '%%', "'" => "\'")
       if text.include? "@$$" # No paragraph break if we insert this uncommonly used word
         text.sub!("@$$", "")
+        y_offset -= @sep_offset
         @d.annotate(@base_image, 0 ,0, @pointsize, y_offset, text)
+        y_offset += @pointsize
         next
       else
         @d.annotate(@base_image, 0 ,0, @pointsize, y_offset, text)
-        y_offset += @pointsize
+        if text.empty?
+          y_offset += @sep_offset
+        else
+          y_offset += @pointsize
+        end
       end
     end
     @base_image.write(output_path)
@@ -49,7 +57,7 @@ class AnalyticsCharts::CustomModule
     carriage_split_lines.each do |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")
+      line_tokens.push("")
     end
     line_tokens
   end
@@ -70,7 +78,7 @@ class AnalyticsCharts::CustomModule
   end
 
   def fits_in_a_line(text)
-    return @d.get_type_metrics(@dummy_image,text).width < @composite_image.columns - @pointsize * 2
+    return @d.get_type_metrics(@dummy_image,text).width < @composite_image.columns - 36
   end
 end
 #Reference: Draw defaults[ font: "Helvetica", pointsize:12, x/y resolution 72 DPI, font_weight: 400]

data/lib/analytics_charts/custom_pie.rb

@@ -95,8 +95,8 @@ 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....",
-        @label_hash.merge({'fill'=> '#000000', 'font_weight'=> 700 }))
+      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
@@ -233,7 +233,7 @@ class AnalyticsCharts::CustomPie
       y_offset += @label_offset
     end
     insert_text_with_circle(x_offset, y_offset, '= purchased by you',
-      @label_hash.merge({'fill'=> '#FFFFFF', 'font_weight'=> 900 }))
+      @label_hash.merge({'fill'=> '#252525', 'font_weight'=> 900 }))
   end
 
   def draw_pie_label(center_x, center_y, angle, radius, percent, index)
@@ -251,16 +251,16 @@ class AnalyticsCharts::CustomPie
     # Imagine the text box around the text
     # Shift text box so a corner is tangent to circle
     if x > center_x
-      x += width / 2.0
+      x += width / 2.0 + 6
     end
     if x < center_x
-      x -= width / 2.0
+      x -= width / 2.0 + 6
     end
     if y > center_y
-      y += ascent / 2.0
+      y += ascent / 2.0 + 6
     end
     if y < center_y
-      y -= (ascent / 2.0 - descent) # descent to account for '$' descent,
+      y -= ascent / 2.0 + 6
       # descent value retrieved is negative, so sub instead of add
     end
     @d.align = CenterAlign

data/lib/analytics_charts/pie_and_labels.rb

@@ -12,9 +12,11 @@ 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_texts = tokenize_text_by_lines(organization)
     @org_text_size = 14
+    @org_texts = tokenize_text_by_lines(organization,
+      {'fill' => '#FFFFFF', 'pointsize'=> @org_text_size, 'font_weight'=> 500  })
     @label_size = 16
     org_text_offset = @org_texts.size * @org_text_size
     # (num_labels + 1) to account for white key on bottom of labels
@@ -129,7 +131,10 @@ class AnalyticsCharts::PieAndLabels < AnalyticsCharts::CustomPie
     @d.line(0,@height_with_no_disclaimer,@composite_columns,@height_with_no_disclaimer)
   end
 
-  def tokenize_text_by_lines(text)
+  def tokenize_text_by_lines(text, features = {})
+    features.each { |feature, attribute|
+      set_feature(feature, attribute)
+    }
     # First split the text by the line carriage element
     carriage_split_lines = text.split("\r\n")
     line_tokens = Array.new

data/lib/analytics_charts/version.rb

@@ -1,3 +1,3 @@
 module AnalyticsCharts
-  VERSION = "1.4.2"
+  VERSION = "1.4.5"
 end

metadata

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