prisma 0.1.2 → 0.2.0

data/bin/prisma-web

@@ -9,7 +9,6 @@ rescue LoadError
 end  
 require 'prisma/server'
 
-
 Vegas::Runner.new(Prisma::Server, 'prisma-web') do |runner, opts, app|
   opts.on('-N NAMESPACE', "--namespace NAMESPACE", "set the Redis namespace") {|namespace|
     runner.logger.info "Using Redis namespace '#{namespace}'"

data/lib/prisma.rb

@@ -1,5 +1,6 @@
 require 'rails/all'
 require 'redis-namespace'
+require 'bitset'
 
 require 'prisma/group'
 require 'prisma/railtie'
@@ -36,7 +37,7 @@ module Prisma
   # Configure prisma. Example usage:
   #     Prisma.setup do |config|
   #       config.group :active_api_clients { |controller| controller.current_client.id }
-  #       config.redis = Redis.new(:db => 1)
+  #       config.redis = Redis.new(db: 1)
   #       config.redis_namespace = 'stats'
   #       config.redis_expiration_duration = 2.days
   #     end
@@ -47,15 +48,15 @@ module Prisma
 
   # Configures a group. The instance of the current {http://api.rubyonrails.org/classes/ActionController/Base.html ActionController} is being passed as an argument into the block.
   # As an example, tracking daily active users could be as simple as:
-  #     Prisma.setup |config|
+  #     Prisma.setup do |config|
   #       config.group :logged_in { |controller| controller.current_user.id }
   #     end
   #
   # @param [Symbol/String] name for identifying the group, it is used as part of the redis key.
-  # @param [String] description for describing the gorup, it is used in the admin interface.
+  # @param [Hash] options where +:type+ is either +:counter+ (default) or +:bitmap+, and where +:description+ is an optional description (used in the admin UI)
   # @param [Block] block returning a String (or a meaningful +.to_s output+) which is used for identifying a counter inside a group, Prisma doesn't count a request if block returns +nil+ or +false+
-  def self.group(name, description=nil, &block)
-    @@groups[name] = Group.new(:name => name, :description => description, :block => block)
+  def self.group(name, options={}, &block)
+    @@groups[name] = Group.new(options.merge(name: name, block: block))
   end
 
   # Returns a default or configured +Redis+ instance wrapped in a +Redis::Namespace+
@@ -65,14 +66,14 @@ module Prisma
       case @@redis
       when String
         if @@redis =~ /redis\:\/\//
-          redis = Redis.connect(:url => @@redis, :thread_safe => true)
+          redis = Redis.connect(url: @@redis, thread_safe: true)
         else
           host, port, db = @@redis.split(':')
-          redis = Redis.new(:host => host, :port => port, :thread_safe => true, :db => db)
+          redis = Redis.new(host: host, port: port, thread_safe: true, db: db)
         end
-        Redis::Namespace.new(redis_namespace, :redis => redis)
+        Redis::Namespace.new(redis_namespace, redis: redis)
       else
-        Redis::Namespace.new(redis_namespace, :redis => @@redis)
+        Redis::Namespace.new(redis_namespace, redis: @@redis)
       end
     end.call
   end
@@ -101,7 +102,9 @@ module Prisma
   def self.store_configuration
     redis.del 'configuration'
     groups.values.each do |group|
-      redis.hset 'configuration', group.name, group.description
+      redis.rpush 'configuration', group.name
+      redis.set "configuration:description:#{group.name}", group.description if group.description
+      redis.set "configuration:type:#{group.name}", group.type
     end
   end
 end

data/lib/prisma/filter.rb

@@ -13,8 +13,16 @@ module Prisma
       Prisma.groups.each do |name, group|
         redis_key = Prisma.redis_key(name)
         value = group.block.call(self)
-        Prisma.redis.hincrby redis_key, value, 1 if value
 
+        case group.type
+        when :bitmap
+          next if value.to_i == 0
+          setbit_key = Redis::Namespace::COMMANDS.include?('setbit') ? redis_key : "#{Prisma.redis_namespace}:#{redis_key}"
+          Prisma.redis.setbit setbit_key, value.to_i, 1
+        when :counter
+          next unless value
+          Prisma.redis.incr redis_key
+        end
         Prisma.redis.expire redis_key, Prisma.redis_expire if Prisma.redis_expiration_duration
       end
     end

data/lib/prisma/group.rb

@@ -4,15 +4,24 @@ module Prisma
     # The name of the group, typically a +Symbol+
     attr_accessor :name
 
+    # The type of the group, +:counter+ or +:bitmap+
+    attr_accessor :type
+
     # The description of the group, typcially a +String+
     attr_accessor :description
 
-    # The block which evaluates to a +String+ or meaningful +Object.to_s+
+    # Block which gets called to evaluate if request should be counted and depending on the type how the request should be counted.
+    # When +type+ is +:counter+ the request is getting counted as long as the return value is not nil or false.
+    # When +type+ is +:bitmap+ the request is getting counted as long as the return value is an integer.
     attr_accessor :block
 
     # Initialize +Group+ from a hash
     def initialize(options={})
+      options.reverse_merge!(type: :counter)
+      raise ArgumentError.new("Type #{options[:type].inspect} not allowed") unless [:counter, :bitmap].include? options[:type]
+
       self.name = options[:name]
+      self.type = options[:type]
       self.description = options[:description]
       self.block = options[:block]
     end
@@ -26,7 +35,15 @@ module Prisma
       range = range..range if range.is_a? Date
       data = {}
       range.each do |date|
-        data[date] = Prisma.redis.hlen Prisma.redis_key(name, date)
+        case type
+        when :counter
+          data[date] = 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
+          bitmap = Bitset.from_s(string)
+          data[date] = bitmap.cardinality
+        end
       end
       data
     end

data/lib/prisma/server.rb

@@ -45,8 +45,10 @@ module Prisma
     private
 
     def groups
-      Prisma.redis.hgetall('configuration').map do |name, description|
-        Prisma::Group.new(:name => name, :description => description)
+      Prisma.redis.lrange('configuration', 0, -1).map do |name|
+        type = Prisma.redis.get("configuration:type:#{name}").to_sym
+        description = Prisma.redis.get("configuration:description:#{name}")
+        Prisma::Group.new(name: name, type: type, description: description)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prisma
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +91,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: bitset
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -320,7 +352,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4578263424559141618
+      hash: 2186605231112697474
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: