prisma 0.2.2 → 0.2.3

data/lib/prisma/group.rb

@@ -31,20 +31,22 @@ module Prisma
     #     group.daily(5.days.ago.to_date..Date.today)
     # @param [Range] range of days
     # @return [Hash]
-    def range(range)
-      range = range..range if range.is_a? Date
-      data = {}
-      range.each do |date|
+    def range(range, options={})
+      range = (range..range) if range.is_a? Date
+      data = range.map do |date|
         case type
         when :counter
-          data[date] = Prisma.redis.get(Prisma.redis_key(name, date)).to_i
+          value = Prisma.redis.get(Prisma.redis_key(name, date)).to_i
         when :bitmap
           bitstring = Prisma.redis.get(Prisma.redis_key(name, date)) || ''
           string = bitstring.unpack('b*').first
-          data[date] = string.count('1')
+          value = options[:skip_bitmap_count] ? string : string.count('1')
         end
+
+        [date, value]
       end
-      data
+
+      Hash[data]
     end
     alias_method :daily, :range
 
@@ -53,10 +55,15 @@ module Prisma
     # @param [Range] range of days
     # @return [Hash]
     def weekly(range)
-      data = range(range)
+      data = range(range, :skip_bitmap_count => true)
 
       data = data.group_by { |date, value| date.beginning_of_week }
-      sum_up_grouped_data(data)
+      case self.type
+      when :counter
+        sum_up_grouped_data(data)
+      when :bitmap
+        bitmap_or_grouped_data(data)
+      end
     end
 
     # Get a +Hash+ with the +Date+ as key and amount of items as the value. Grouped by month, key represents a +Date+ object of the first day of the month.
@@ -64,18 +71,37 @@ module Prisma
     # @param [Range] range of days
     # @return [Hash]
     def monthly(range)
-      data = range(range)
+      data = range(range, :skip_bitmap_count => true)
 
       data = data.group_by { |date, value| date.beginning_of_month }
-      sum_up_grouped_data(data)
+      case self.type
+      when :counter
+        sum_up_grouped_data(data)
+      when :bitmap
+        bitmap_or_grouped_data(data)
+      end
     end
 
     private
 
     def sum_up_grouped_data(data)
-      data.each do |date, values|
-        data[date] = values.map { |value| value.second }.inject{ |sum, count| sum + count }
+      data = data.map do |date, values|
+        value = values.inject(0) { |sum, value| sum + value.second.to_i }
+
+        [date, value]
       end
+
+      Hash[data]
+    end
+
+    def bitmap_or_grouped_data(data)
+      data = data.map do |date, values|
+        value = values.map { |value| value.second.to_i }.inject(:|)
+        value = value.to_s.count('1')
+        [date, value]
+      end
+
+      Hash[data]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prisma
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-14 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -337,7 +337,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4548465822785429403
+      hash: -2365970208530084805
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: