gem_velocity 0.0.6 → 0.0.7

data/README.md

@@ -4,6 +4,14 @@ A way to see gem velocity. Right now it's just aggregated totals.
 
 So, not a number of downloads each day, but rather just the general timeline of total downloads.
 
+## Note
+
+The data is currently somewhat incorrect, due to inconstancies outlined in:
+
+[https://gist.github.com/shaiguitar/d2af997b7f58e24fd305](https://gist.github.com/shaiguitar/d2af997b7f58e24fd305)
+
+I'm investigating though with the help of the rubygems team as per [this](https://github.com/rubygems/rubygems.org/pull/606) and will hopefully have some progress soon.
+
 ## Requirements
 
 It draws graphs. So...you'll need imagemagick/rmagick. I'm sure you'll survive. Any problems with installation let me know and I'll try to help out.
@@ -15,7 +23,7 @@ Here's one: [celluloid](https://gist.github.com/shaiguitar/7e6d95971c5254fa3665)
 Here's some more:
 
 <pre>
-  velocitator = Velocitator.new("rails", ["4.0.0","3.2.14","2.3.5"])
+  velocitator = MultipleVelocitator.new("rails", ["4.0.0","3.2.14","2.3.5"])
   file = velocitator.graph("/tmp")
 </pre>
 
@@ -26,7 +34,7 @@ Produces:
 Notice the date range:
 
 <pre>
-  velocitator = Velocitator.new("rails", ["4.0.0","3.2.14","0.9.1"])
+  velocitator = MultipleVelocitator.new("rails", ["4.0.0","3.2.14","0.9.1"])
   file = velocitator.graph("/tmp", [3.months.ago, Time.now])
 </pre>
 

data/TODO

@@ -1,29 +1,14 @@
-move VCR to an :around spec
-change readme.md to have one example with different options to populate
-Add an aggregate method to add #graph for a point version? (e.g, 0.n.x graph for all n versions. maybe just major, maybe minor, whatever).
-
-web ui/embeddable links with those images.
+Web ui/embeddable links with those images.
   can't remove images
   have uniq name: hash the date_range,max,min,name,versions. (and time?)
   shard the directories of where the image goes so it doesn't bomb out?
 
-SingleVersionsVelocitator takes versions
-SingleVersionsVelocitator has a shortcut for displaying all versions in a major?
-MajorVersionsVelocitator takes one major version
-AllVersionsVelocitator takes no version, dispalys all stats
-
-I want to be able to have a line be one version, or a few versions in one, mix those/not, then decide to display them in the end
-  line_datas needs to be abstracted away. actually the versions concepts should be eliminated??
-    so I need to have something abstract a version but it could be a few of them...
-      move all the logic of changing version -> line_data into something and have that able to handle 1 or n.
-
-      the only thing that it implmeents is .graph() which returns the line_data result/info whatever.
-      then there's something in the middle that takes that and calls out to gruff builder.
-
+Add a Version?
 
-all derived classes need to pass back to base class, so we can pass on to builder:
+currently, the versions in the base class are single versions, but they are essentially used for representing a specific line
+in default_line_datas.
+(and then used for titles, abd bs).
 
-  line_data => title,version(s) 
-  n times whatever.
+if rubygems 606 isn't solved, why not just put a total on there and let the inconsistnecies just be with some notice?
 
-  Add a Version?
+rename time_format_str_small alias

data/lib/gem_velocity/gem_data.rb

@@ -1,8 +1,11 @@
 require 'gems'
 
 class GemData
-  def initialize(name)
-    @name = name
+
+  attr_reader :gem_name
+
+  def initialize(gem_name)
+    @gem_name = gem_name
   end
 
   def versions
@@ -15,28 +18,9 @@ class GemData
     h
   end
 
-  # todo rename method? aggregated downloads per day
-  def downloads_day(version, start_time = nil, end_time = Time.now)
-    start_time = start_time || versions_built_at[version]
-    total_so_far = 0
-    found_first_download = false
-    ret = downloads_metadata(version, start_time, end_time).map do |day,downloads_that_day|
-      if found_first_download
-        total_so_far += downloads_that_day
-        [day, total_so_far]
-      else
-        if !downloads_that_day.zero?
-          found_first_download = true
-          total_so_far += downloads_that_day
-          nil
-        end
-      end
-    end.compact
-  end
-
   def versions_metadata
     # cache api call.
-    @versions_metadata ||= Gems.versions(@name)
+    @versions_metadata ||= Gems.versions(gem_name)
     # it should be a hash
     if @versions_metadata.is_a?(String)
       if @versions_metadata.match(/This rubygem could not be found/)
@@ -46,13 +30,19 @@ class GemData
     @versions_metadata
   end
 
-  private
+  def total_for_version(version)
+    @total_for_version ||= {}
+    key = "#{version}"
+    return @total_for_version[key] if @total_for_version[key]
+    @total_for_version[key] ||= Gems.total_downloads(gem_name, version)
+  end
 
   def downloads_metadata(version, start_time, end_time)
     # cache api call.
     @downloads_metadata ||= {}
-    return @downloads_metadata[version] if @downloads_metadata[version]
-    @downloads_metadata[version] ||= Gems.downloads(@name, version, start_time, end_time).to_a
+    key = "#{version}-#{start_time}-#{end_time}"
+    return @downloads_metadata[key] if @downloads_metadata[key]
+    @downloads_metadata[key] ||= Gems.downloads(gem_name, version, start_time, end_time).to_a
   end
 
 

data/lib/gem_velocity/gruff_builder.rb

@@ -11,7 +11,7 @@ class GruffBuilder
   MAX_VALUE = 300
 
   attr_accessor :root, :relative_path, :versions, :gem_name
-  attr_accessor :title, :labels, :line_datas, :min_value, :max_value
+  attr_accessor :title, :labels, :line_datas, :min_value, :max_value, :hide_legend
 
   def initialize(root, relative_path, versions, gem_name, gruff_options = {})
     @root = root || raise(ArgumentError,"you must set a root. default is root/public/images")
@@ -23,6 +23,7 @@ class GruffBuilder
     @line_datas = gruff_options[:line_datas]
     @min_value = gruff_options[:min_value] || MIN_VALUE
     @max_value = gruff_options[:max_value] || MAX_VALUE
+    @hide_legend = gruff_options[:hide_legend] || false
   end
 
   def relative_filename
@@ -47,6 +48,7 @@ class GruffBuilder
     end
     gruff.minimum_value = @min_value
     gruff.maximum_value = @max_value
+    gruff.hide_legend = @hide_legend
     gruff.write(absolute_filename)
     absolute_filename
   end

data/lib/gem_velocity/velocitators/aggregated_velocitator.rb

@@ -0,0 +1,48 @@
+class AggregatedVelocitator < BaseVelocitator
+
+  attr_reader :aggregated_versions
+  def initialize(gem_name, top_level_ver)
+    @gem_name = gem_name
+    @top_level_ver = top_level_ver
+    @aggregated_versions = gem_data.versions.select{|v| v.match(/^#{Regexp.escape(top_level_ver)}/) }
+    super(gem_name, @aggregated_versions)
+  end
+
+  def default_start
+    base_earliest_time_for(@aggregated_versions)
+  end
+
+  def default_max_value
+    base_max_for(@aggregated_versions) * @aggregated_versions.size
+  end
+
+  def graph_options
+    opts = {
+      :title => title,
+      :labels => ({1 => time_format_str_small(effective_start_time), (line_datas.first.size-2) => time_format_str_small(effective_end_time) }),
+      :max_value => effective_max_value,
+      :min_value => effective_min_value,
+      :line_datas => line_datas,
+      :hide_legend => true
+    }
+  end
+
+  def line_datas
+    ret = Hash.new(0)
+    @aggregated_versions.each do |v|
+      effective_days_in_range.each do |d|
+        ret[d] += downloads_per_day(v)[d] || 0
+      end
+    end
+    [effective_days_in_range.map{|d| ret[d] }]
+  end
+
+  def title
+    "#{@gem_name}: #{@top_level_ver}X"
+  end
+
+  def totals
+    super.map {|x| x[:version_downloads]}.sum
+  end
+
+end

data/lib/gem_velocity/velocitators/all.rb

@@ -1,3 +1,4 @@
 require "gem_velocity/velocitators/base_velocitator"
 require "gem_velocity/velocitators/single_velocitator"
 require "gem_velocity/velocitators/multiple_velocitator"
+require "gem_velocity/velocitators/aggregated_velocitator"

data/lib/gem_velocity/velocitators/base_velocitator.rb

@@ -15,15 +15,30 @@ class BaseVelocitator
     gruff_builder.write
   end
 
-  # modifiers on the end result image being rendered.
+  # modifiers on the end result image being rendered. Essentially these are the boundries
+  # of the graph
   attr_reader :date_range, :max_value, :min_value, :root
-  def date_range=(args); @date_range = args && args.map{|t| time_format_str(t) } ;end
-  def max_value=(max); @max_value = max ;end
-  def min_value=(min); @min_value = min ;end
+  def date_range=(args); @passed_date_range = args && args.map{|t| time_format_str(t) } ;end
+  def max_value=(max); @passed_max_value = max ;end
+  def min_value=(min); @passed_min_value = min ;end
   def root=(path); @root = path ;end
 
   def effective_date_range
-    @date_range || [ default_start, default_end ]
+    @passed_date_range || default_date_range
+  end
+
+  def effective_max_value
+    @passed_max_value || default_max_value
+  end
+
+  def effective_min_value
+    @passed_min_value || default_min_value
+  end
+
+  def totals
+    versions.map do |v|
+      gem_data.total_for_version(v)
+    end
   end
 
   private
@@ -46,8 +61,6 @@ class BaseVelocitator
     gem_data.versions_metadata
   end
 
-   # if it's nil, the defaults will be used
-  # basically these are the graph boundries
   def set_overwritable_attrs(root_arg,range,min,max)
     self.date_range = range
     self.root = root_arg
@@ -59,32 +72,60 @@ class BaseVelocitator
     default_end = time_format_str(Time.now)
   end
 
+  def default_date_range
+    [ default_start, default_end ]
+  end
+
   def default_min_value
     0
   end
 
   def default_line_datas
-    # refactor me?
     versions.map do |v|
-      specific_days_in_range.map do |day_in_range|
-        day_in_range = time_format_str_small(day_in_range) #conform to rubygems api format
-        if gem_data.downloads_day(v).map {|day,total| day}.include?(day_in_range)
-          # get the total for that day
-          total = Hash[gem_data.downloads_day(v)][day_in_range]
-        else
-          0
-        end
+      effective_days_in_range.map do |d|
+        downloads_per_day(v)[d] || 0
       end
     end
   end
 
+  def base_earliest_time_for(verzionz)
+    earliest_start = verzionz.map{|v| Date.parse(time_built(v)) }.min
+    default_start = time_format_str(earliest_start)
+  end
+
+  def base_max_for(verzionz)
+    totals = []
+    verzionz.each {|v|
+      totals << downloads_per_day(v).map {|day,total| total}
+    }
+    totals.flatten.compact.max
+  end
+
+  def downloads_per_day(version)
+    # returns # "2013-10-10" => 45
+    accumulated_downloads_per_day(version)
+  end
+
+  def accumulated_downloads_per_day(version)
+    # downloads_metadata comes back ordered by date
+    ret = Hash.new(0)
+    gem_data.downloads_metadata(version, default_start, default_end).each_cons(2) do |p,n|
+      #day,total pairs
+      curr_total = n.last
+      day = n.first
+      previous_day = p.first
+      ret[day] = curr_total + ret[previous_day]
+    end
+    ret
+  end
+
   # a little sugar
   def effective_start_time; effective_date_range.first ;end
   def effective_end_time; effective_date_range.last ;end
 
   # helper method to convert [start,end] into a 
-  # start..end range of day instances
-  def specific_days_in_range
+  # start..end range of days like "2013-10-10"
+  def effective_days_in_range
     all_days = []
     s = Date.parse(effective_start_time)
     e = Date.parse(effective_end_time)
@@ -93,7 +134,7 @@ class BaseVelocitator
       all_days << i
       i += 1.day
     end
-    all_days
+    all_days.map{|d| time_format_str_small(d)}
   end
 
   def gem_data

data/lib/gem_velocity/velocitators/multiple_velocitator.rb

@@ -5,24 +5,19 @@ class MultipleVelocitator < BaseVelocitator
   end
 
   def default_start
-    earliest_start = versions.map{|v| Date.parse(time_built(v)) }.min
-    default_start = time_format_str(earliest_start)
+    base_earliest_time_for(versions)
   end
 
   def default_max_value
-    totals = []
-    versions.each {|v|
-      totals << gem_data.downloads_day(v).map {|day,total| total}
-    }
-    totals.flatten.compact.max
+    base_max_for(versions)
   end
 
   def graph_options
     opts = {
       :title => title,
       :labels => ({1 => time_format_str_small(effective_start_time), (line_datas.first.size-2) => time_format_str_small(effective_end_time) }),
-      :max_value => max_value || default_max_value,
-      :min_value => min_value || default_min_value,
+      :max_value => effective_max_value,
+      :min_value => effective_min_value,
       :line_datas => line_datas
     }
   end
@@ -32,7 +27,7 @@ class MultipleVelocitator < BaseVelocitator
   end
 
   def title
-    "MutlipleVelocitator:#{gem_name}"
+    "#{gem_name}"
   end
 
 

data/lib/gem_velocity/velocitators/single_velocitator.rb

@@ -1,25 +1,33 @@
 class SingleVelocitator < BaseVelocitator
 
+  attr_reader :version
+
   def initialize(gem_name, version)
     @version = version
     super(gem_name, [version])
   end
 
   def default_start
-    time_format_str(Date.parse(time_built(@version)))
+    time_format_str(Date.parse(time_built))
+  end
+
+  def time_built
+    super(@version)
   end
 
   def default_max_value
-    gem_data.downloads_day(@version).map {|day,total| total}.max
+    accumulated_downloads_per_day(@version).map {|day,total| total}.max
   end
 
   def graph_options
     opts = {
       :title => title,
+      # todo change the -2 to -4? so if ifits in? if it's abvoe 4 fcors
       :labels => ({1 => time_format_str_small(effective_start_time), (line_datas.first.size-2) => time_format_str_small(effective_end_time) }),
-      :max_value => max_value || default_max_value,
-      :min_value => min_value || default_min_value,
-      :line_datas => line_datas
+      :max_value => effective_max_value,
+      :min_value => effective_min_value,
+      :line_datas => line_datas,
+      :hide_legend => true
     }
   end
 
@@ -28,7 +36,11 @@ class SingleVelocitator < BaseVelocitator
   end
 
   def title
-    "SingleVelocitator:#{gem_name}"
+    "#{gem_name}-#{version}"
+  end
+
+  def totals
+    super.first
   end
 
 end

data/lib/gem_velocity/version.rb

@@ -1,3 +1,3 @@
 module GemVelocity
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/gem_data_spec.rb

@@ -10,8 +10,9 @@ describe GemData do
   end
 
   it "can show download information" do
-    result = GemData.new("haml-i18n-extractor").downloads_day("0.0.17")
-    result.should == [["2013-06-17", 54], ["2013-06-18", 57], ["2013-06-19", 58], ["2013-06-20", 62], ["2013-06-21", 63], ["2013-06-22", 68], ["2013-06-23", 70], ["2013-06-24", 73], ["2013-06-25", 82], ["2013-06-26", 243], ["2013-06-27", 246], ["2013-06-28", 248], ["2013-06-29", 248], ["2013-06-30", 248], ["2013-07-01", 248], ["2013-07-02", 255], ["2013-07-03", 258], ["2013-07-04", 260], ["2013-07-05", 260], ["2013-07-06", 263], ["2013-07-07", 263], ["2013-07-08", 265], ["2013-07-09", 266], ["2013-07-10", 268], ["2013-07-11", 271], ["2013-07-12", 273], ["2013-07-13", 274], ["2013-07-14", 274], ["2013-07-15", 276], ["2013-07-16", 278], ["2013-07-17", 284], ["2013-07-18", 284], ["2013-07-19", 287], ["2013-07-20", 288], ["2013-07-21", 288], ["2013-07-22", 290], ["2013-07-23", 291], ["2013-07-24", 297], ["2013-07-25", 297], ["2013-07-26", 297], ["2013-07-27", 297], ["2013-07-28", 297], ["2013-07-29", 298], ["2013-07-30", 300], ["2013-07-31", 302], ["2013-08-01", 302], ["2013-08-02", 302], ["2013-08-03", 302], ["2013-08-04", 302], ["2013-08-05", 304], ["2013-08-06", 304], ["2013-08-07", 304], ["2013-08-08", 307], ["2013-08-09", 307], ["2013-08-10", 307], ["2013-08-11", 307], ["2013-08-12", 308], ["2013-08-13", 310], ["2013-08-14", 311], ["2013-08-15", 313], ["2013-08-16", 313], ["2013-08-17", 314], ["2013-08-18", 314], ["2013-08-19", 314], ["2013-08-20", 314], ["2013-08-21", 315], ["2013-08-22", 317], ["2013-08-23", 321], ["2013-08-24", 321], ["2013-08-25", 322], ["2013-08-26", 322], ["2013-08-27", 324], ["2013-08-28", 324], ["2013-08-29", 326], ["2013-08-30", 326], ["2013-08-31", 326], ["2013-09-01", 328], ["2013-09-02", 330], ["2013-09-03", 331], ["2013-09-04", 331], ["2013-09-05", 333], ["2013-09-06", 335], ["2013-09-07", 335], ["2013-09-08", 335], ["2013-09-09", 336], ["2013-09-10", 336], ["2013-09-11", 336], ["2013-09-12", 341], ["2013-09-13", 341], ["2013-09-14", 341], ["2013-09-15", 341], ["2013-09-16", 342], ["2013-09-17", 342], ["2013-09-18", 342], ["2013-09-19", 343], ["2013-09-20", 344]]
+    gem_data = GemData.new("haml-i18n-extractor")
+    result = gem_data.downloads_metadata("0.0.17", gem_data.versions_built_at["0.0.17"],Time.now)
+    result.should == [["2013-06-16", 38], ["2013-06-17", 16], ["2013-06-18", 3], ["2013-06-19", 1], ["2013-06-20", 4], ["2013-06-21", 1], ["2013-06-22", 5], ["2013-06-23", 2], ["2013-06-24", 3], ["2013-06-25", 9], ["2013-06-26", 161], ["2013-06-27", 3], ["2013-06-28", 2], ["2013-06-29", 0], ["2013-06-30", 0], ["2013-07-01", 0], ["2013-07-02", 7], ["2013-07-03", 3], ["2013-07-04", 2], ["2013-07-05", 0], ["2013-07-06", 3], ["2013-07-07", 0], ["2013-07-08", 2], ["2013-07-09", 1], ["2013-07-10", 2], ["2013-07-11", 3], ["2013-07-12", 2], ["2013-07-13", 1], ["2013-07-14", 0], ["2013-07-15", 2], ["2013-07-16", 2], ["2013-07-17", 6], ["2013-07-18", 0], ["2013-07-19", 3], ["2013-07-20", 1], ["2013-07-21", 0], ["2013-07-22", 2], ["2013-07-23", 1], ["2013-07-24", 6], ["2013-07-25", 0], ["2013-07-26", 0], ["2013-07-27", 0], ["2013-07-28", 0], ["2013-07-29", 1], ["2013-07-30", 2], ["2013-07-31", 2], ["2013-08-01", 0], ["2013-08-02", 0], ["2013-08-03", 0], ["2013-08-04", 0], ["2013-08-05", 2], ["2013-08-06", 0], ["2013-08-07", 0], ["2013-08-08", 3], ["2013-08-09", 0], ["2013-08-10", 0], ["2013-08-11", 0], ["2013-08-12", 1], ["2013-08-13", 2], ["2013-08-14", 1], ["2013-08-15", 2], ["2013-08-16", 0], ["2013-08-17", 1], ["2013-08-18", 0], ["2013-08-19", 0], ["2013-08-20", 0], ["2013-08-21", 1], ["2013-08-22", 2], ["2013-08-23", 4], ["2013-08-24", 0], ["2013-08-25", 1], ["2013-08-26", 0], ["2013-08-27", 2], ["2013-08-28", 0], ["2013-08-29", 2], ["2013-08-30", 0], ["2013-08-31", 0], ["2013-09-01", 2], ["2013-09-02", 2], ["2013-09-03", 1], ["2013-09-04", 0], ["2013-09-05", 2], ["2013-09-06", 2], ["2013-09-07", 0], ["2013-09-08", 0], ["2013-09-09", 1], ["2013-09-10", 0], ["2013-09-11", 0], ["2013-09-12", 5], ["2013-09-13", 0], ["2013-09-14", 0], ["2013-09-15", 0], ["2013-09-16", 1], ["2013-09-17", 0], ["2013-09-18", 0], ["2013-09-19", 1], ["2013-09-20", 1]]
   end
 
 

data/spec/gruff_builder_spec.rb

@@ -48,6 +48,7 @@ describe GruffBuilder do
       :line_datas => [1,2,3,10,8,12],
       :min_value => 0,
       :max_value => 20,
+      :hide_legend => true
     }
     builder = GruffBuilder.new(@tmp_dir,nil,["0.0.17"],"foo-baz", gruff_options)
     builder.write

data/spec/no_time_cop_spec.rb

@@ -5,16 +5,55 @@ describe 'with no time stubbing', :do_not_use_time_cop do
   # hax slow internet connections make this slow.
   if ENV['VELOCITATOR_REAL_LONG']
     it "has a shortcut graph method #1" do
-      velocitator = Velocitator.new("rails", ["4.0.0","3.2.14","2.3.5"])
+      velocitator = SingleVelocitator.new("rails", "2.3.5")
+      # WTF all is shit
+      # https://rubygems.org/gems/rails/versions/2.3.5
+      # should be close to 1m!!
+      #
+      # gb = velocitator.send(:gruff_builder)
+      # gb.line_datas.first.index{|z| z.nonzero?}
+      # => 1199
+      # gb.line_datas.first.size #[1199]
+      # => 1417
+      # 1417 - 1199
+      # => 218
+      #
+      # velocitator.send(:gem_data).send(:downloads_metadata, velocitator.versions.first,velocitator.effective_date_range.first, velocitator.effective_date_range.last).size
+      # => 1417
+      # velocitator.send(:gem_data).downloads_day(velocitator.versions.first,velocitator.effective_date_range.first, velocitator.effective_date_range.last).size
+      # => 218
+      # x = Gems.downloads(velocitator.gem_name, velocitator.versions.first, velocitator.effective_date_range.first, velocitator.effective_date_range.last)
+      # x.to_a.index{|z| z.last.nonzero?}
+      # => 1198
+      velocitator = SingleVelocitator.new("rails", "2.3.5")
+      #x.to_a.index{|z| z.last.nonzero?}
+      #binding.pry
       file = velocitator.graph("/tmp")
-      File.exist?(file).should be_true
+      raise 'wtf'
     end
 
     it "has a shortcut graph method #2" do
-      velocitator = Velocitator.new("rails", ["4.0.0","3.2.14","0.9.1"])
+      velocitator = MultipleVelocitator.new("rails", ["4.0.0","3.2.14","0.9.1"])
       file = velocitator.graph("/tmp", [3.months.ago, Time.now])
       File.exist?(file).should be_true
     end
+
+    it "has a shortcut graph method #3" do
+      velocitator = AggregatedVelocitator.new("rails", "4")
+      puts velocitator.versions
+      puts velocitator.totals.inspect
+      file = velocitator.graph("/tmp")
+      File.exist?(file).should be_true
+    end
+
+    it "has a shortcut graph method #4" do
+      velocitator = AggregatedVelocitator.new("haml-i18n-extractor", "0") # all of it
+      puts velocitator.aggregated_versions
+      puts velocitator.versions
+      file = velocitator.graph("/tmp")
+      puts file.inspect
+      File.exist?(file).should be_true
+    end
   end
 
 end

data/spec/spec_helper.rb

@@ -19,6 +19,17 @@ end
 
 RSpec.configure do |c|
   c.treat_symbols_as_metadata_keys_with_true_values = true
+
+  c.around(:each) do |example|
+    example_hashified = example.metadata[:description_args].first.unpack("s").first
+    puts "\nRunning example: #{example.metadata[:description_args]}\n"
+    orig_time = Time.now
+    VCR.use_cassette("rspec-example-#{(example_hashified)}") do
+      example.run
+    end
+    puts "finished in ~#{Time.now.to_i - orig_time.to_i}s"
+  end
+
   c.around(:each) do |example|
     #freeze time unless explicitly said not to!
     unless example.metadata[:do_not_use_time_cop]
@@ -31,14 +42,6 @@ RSpec.configure do |c|
     end
   end
 
-  c.around(:each) do |example|
-    example_hashified = example.metadata[:description_args].first.unpack("s").first
-    puts "\nRunning example: #{example.metadata[:description_args]}\n"
-    VCR.use_cassette("rspec-example-#{(example_hashified)}") do
-      example.run
-    end
-  end
-
   c.after(:suite) do
     FileUtils.rm_rf(SpecHelper.tmpdir)
   end

data/spec/velocitator_spec.rb

@@ -1,7 +1,51 @@
 require 'spec_helper'
 
-describe SingleVelocitator do
+# https://github.com/shaiguitar/rubygems.org/compare/api_not_returning_all_results_over_90_days?expand=1
+
+describe "a Velocitator rendering graphs" do
+
+  # testing single_velocitator is enough to test base
+  it "can render a graph" do
+    velocitator = SingleVelocitator.new("haml-i18n-extractor", "0.0.17")
+    velocitator.date_range = [ 7.days.ago, 3.days.ago ]
+    velocitator.root = SpecHelper.tmpdir
+
+    # Plausible to change this?
+    # the values for the two days mentioned in the date range.
+    # should this be the specific date range values?? aggregated since when? not aggregated?
+    velocitator.graph_options[:line_datas].should == [[303, 303, 303, 304, 304]]
+
+    velocitator.graph_options[:title].should == "haml-i18n-extractor-0.0.17"
+    velocitator.graph_options[:labels].should == ({1=>"2013-09-13", (velocitator.line_datas.first.size-2) =>"2013-09-17"})
+    velocitator.graph_options[:max_value].should == 306 # the max in the range (time.now)
+    velocitator.graph_options[:min_value].should == 0
+
+    file = velocitator.graph
+    File.exist?(file).should be_true
+    #`open #{file} -a preview.app`
+    #Kernel.sleep(10)
+  end
 
+  it "has a shortcut graph method #1" do
+    velocitator = SingleVelocitator.new("haml-i18n-extractor", "0.0.17")
+    file = velocitator.graph(SpecHelper.tmpdir,[1.day.ago, Time.now])
+    File.exist?(file).should be_true
+  end
+
+  it "has a shortcut graph method #2" do
+    velocitator = SingleVelocitator.new("haml-i18n-extractor", "0.0.17")
+    file = velocitator.graph
+    File.exist?(file).should be_true
+  end
+
+  it "has a shortcut graph metho #3" do
+    velocitator = SingleVelocitator.new("haml-i18n-extractor", "0.0.17")
+    file = velocitator.graph(nil,nil,0,1000)
+    File.exist?(file).should be_true
+  end
+end
+
+describe SingleVelocitator do
   it 'raises if you dont pass name and version(s)' do
     lambda { SingleVelocitator.new(nil,nil) }.should raise_error ArgumentError
   end
@@ -14,6 +58,12 @@ describe SingleVelocitator do
     lambda { SingleVelocitator.new("haml-i18n-extractor","100.999.42.666.pre") }.should raise_error NoSuchVersion
   end
 
+  it "holds the totals of the gem" do
+    velocitator = SingleVelocitator.new("haml-i18n-extractor", "0.0.17")
+    velocitator.totals.should == {:total_downloads=>5355, :version_downloads=>377}
+    #binding.pry
+  end
+
   it "sets a specific date range according to the gem's info" do
     velocitator = SingleVelocitator.new("haml-i18n-extractor", "0.0.17")
     velocitator.effective_date_range.should eq ["2013-06-16T00:00:00Z", "2013-09-20T00:00:00Z"]
@@ -38,46 +88,11 @@ describe SingleVelocitator do
     velocitator.line_datas.size.should eq (velocitator.versions.size)
   end
 
-  it "can render a graph" do
-    velocitator = SingleVelocitator.new("haml-i18n-extractor", "0.0.17")
-    velocitator.date_range = [1.day.ago, Time.now]
-    velocitator.root = SpecHelper.tmpdir
-    # FIX spec don't call out to gruff_builder, check the specific attrs in graph_options or such.
-    builder = velocitator.gruff_builder
-    # https://github.com/shaiguitar/rubygems.org/compare/api_not_returning_all_results_over_90_days?expand=1
-    builder.line_datas.should == [[343, 344]]
-    builder.title.should == "haml-i18n-extractor-0.0.17"
-    builder.labels.should == ({1=>"2013-09-19", (builder.line_datas.first.size-2) =>"2013-09-20"})
-    builder.max_value.should == 344
-    builder.min_value.should == 0
-
-    file = builder.write
-    File.exist?(file).should be_true
-    #`open #{file} -a preview.app`
-    #Kernel.sleep(10)
-  end
-
-  it "has a shortcut graph method #1" do
-    velocitator = SingleVelocitator.new("haml-i18n-extractor", "0.0.17")
-    file = velocitator.graph(SpecHelper.tmpdir,[1.day.ago, Time.now])
-    File.exist?(file).should be_true
-  end
-
-  it "has a shortcut graph method #2" do
-    velocitator = SingleVelocitator.new("haml-i18n-extractor", "0.0.17")
-    file = velocitator.graph
-    File.exist?(file).should be_true
-  end
-
-  it "has a shortcut graph metho #3" do
-    velocitator = SingleVelocitator.new("haml-i18n-extractor", "0.0.17")
-    file = velocitator.graph(nil,nil,0,1000)
-    File.exist?(file).should be_true
-  end
 end
 
+
 describe MultipleVelocitator do
-  before do 
+  before do
     @some_versions = ["0.0.17", "0.0.5","0.0.10"]
   end
 
@@ -86,6 +101,11 @@ describe MultipleVelocitator do
     velocitator.versions.should == @some_versions
   end
 
+  it "holds the totals of the gem" do
+    velocitator = MultipleVelocitator.new("haml-i18n-extractor", ["0.0.17"])
+    velocitator.totals.should eq [{:total_downloads=>5355, :version_downloads=>377}]
+  end
+
   it "sets the earliest start range from to all of the versions info" do
     # some_versions.map{|v| GemData.new("haml-i18n-extractor").versions_built_at[v]}
     # => ["2013-06-16T00:00:00Z", "2013-03-22T00:00:00Z", "2013-05-06T00:00:00Z"]
@@ -117,3 +137,53 @@ describe MultipleVelocitator do
   end
 end
 
+describe AggregatedVelocitator do
+  before do
+    @gem_name = "haml-i18n-extractor"
+    @major_version = "0"
+    @minor_version = "0.4"
+  end
+
+  it "can initialize and find out about all versions in a major" do
+    velocitator = AggregatedVelocitator.new(@gem_name, @major_version)
+    velocitator.aggregated_versions.should == ["0.5.9", "0.5.8", "0.5.6", "0.5.5", "0.5.4", "0.5.3", "0.5.2", "0.5.1", "0.5.0", "0.4.3", "0.4.2", "0.4.1", "0.4.0", "0.3.5", "0.3.4", "0.3.2", "0.3.0", "0.2.1", "0.2.0", "0.1.0", "0.0.21", "0.0.20", "0.0.19", "0.0.18", "0.0.17", "0.0.16", "0.0.15", "0.0.12", "0.0.10", "0.0.9", "0.0.5"]
+  end
+
+  it "can initialize and find out about all versions in specific a minor" do
+    velocitator = AggregatedVelocitator.new(@gem_name, @minor_version)
+    velocitator.aggregated_versions.should == ["0.4.3", "0.4.2", "0.4.1", "0.4.0"]
+  end
+
+  it "sends the first and last version passed as versions though" do
+    velocitator = AggregatedVelocitator.new(@gem_name, @minor_version)
+    velocitator.versions = ["0.4.3","0.4.0"]
+  end
+
+  it "sends only one graph that is the total of those versions" do
+    velocitator = AggregatedVelocitator.new(@gem_name, @minor_version)
+    velocitator.line_datas.first.size == 1 # [[1,2,3]] but not [[1,2,3][1,4,8]]
+  end
+
+  it "sets the max to the multiple of one of its members max * the amount of versions" do
+    velocitator = AggregatedVelocitator.new(@gem_name, @minor_version)
+    velocitator.default_max_value.should eq 356
+  end
+
+  it "sends only one graph and can draw a graph of it" do
+    velocitator = AggregatedVelocitator.new(@gem_name, @minor_version)
+    file = velocitator.graph
+  end
+
+  it "hides the legend caption" do
+    velocitator = AggregatedVelocitator.new(@gem_name, "0.0.17")
+    velocitator.graph_options[:hide_legend].should == true
+  end
+
+  it "should accumlate the same data as a single_velocitator" do
+    a_velocitator = AggregatedVelocitator.new(@gem_name, "0.0.17")
+    s_velocitator = SingleVelocitator.new(@gem_name, "0.0.17")
+    a_velocitator.versions.should == s_velocitator.versions
+    a_velocitator.graph_options[:line_datas].should == s_velocitator.graph_options[:line_datas]
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gem_velocity
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Shai Rosenfeld
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-12 00:00:00 Z
+date: 2013-10-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gruff
@@ -211,6 +211,7 @@ files:
 - lib/gem_velocity/gem_data.rb
 - lib/gem_velocity/gruff_builder.rb
 - lib/gem_velocity/helpers.rb
+- lib/gem_velocity/velocitators/aggregated_velocitator.rb
 - lib/gem_velocity/velocitators/all.rb
 - lib/gem_velocity/velocitators/base_velocitator.rb
 - lib/gem_velocity/velocitators/multiple_velocitator.rb