all_seeing_eye 0.0.12 → 0.0.13

data/Gemfile

@@ -6,6 +6,7 @@ gem 'rbtree'
 gem 'sinatra'
 gem 'vegas'
 gem 'activesupport', '>=2.3.12'
+gem 'i18n'
 
 group :development do
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -4,6 +4,7 @@ GEM
     activesupport (3.0.9)
     chronic (0.6.2)
     git (1.2.5)
+    i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -27,6 +28,7 @@ DEPENDENCIES
   activesupport (>= 2.3.12)
   bundler (~> 1.0.0)
   chronic
+  i18n
   jeweler (~> 1.6.4)
   rbtree
   rcov

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/all_seeing_eye.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{all_seeing_eye}
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Symonds"]
@@ -68,6 +68,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
       s.add_runtime_dependency(%q<vegas>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.12"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
@@ -78,6 +79,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<vegas>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 2.3.12"])
+      s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -89,6 +91,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sinatra>, [">= 0"])
     s.add_dependency(%q<vegas>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 2.3.12"])
+    s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/lib/all_seeing_eye/model.rb

@@ -93,7 +93,7 @@ class AllSeeingEye::Model
     self.find(AllSeeingEye.redis.zrange("allseeingeye:#{self.model_name}:fields:created_at", -1, -1))
   end
   
-  def self.search(query)
+  def self.search(query, options = {})
     if query =~ /^[\sa-zA-Z0-9,-]*? to [\sa-zA-Z0-9,-]*?$/
       start = Chronic.parse(query.split(' to ').first, :context => :past)
       stop = Chronic.parse(query.split(' to ').last, :context => :past)
@@ -133,6 +133,22 @@ class AllSeeingEye::Model
     tree.to_a
   end
   
+  def self.created_count(start = '-inf', stop = '+inf')
+    start ||= Chronic.parse(start).to_i
+    stop ||= Chronic.parse(stop).to_i
+    
+    raw_list = AllSeeingEye.redis.zrangebyscore("allseeingeye:#{self.model_name}:fields:created_at:count", start, stop, :with_scores => true)
+    list = []
+    raw_list.each_with_index do |value, index|
+      if index % 2 == 0
+        list << [value]
+      else
+        list.last[1] = value.to_i
+      end
+    end
+    list
+  end
+  
   def initialize
     self.class.field_names.each do |key|
       self.class.send(:attr_accessor, key.to_sym)
@@ -152,6 +168,7 @@ class AllSeeingEye::Model
       next if value.nil? || (value.respond_to?(:empty?) && value.empty?)
       if value.is_a?(Time) || value.is_a?(DateTime) || value.is_a?(Date)
         AllSeeingEye.redis.zadd("allseeingeye:#{self.class.model_name}:fields:#{field}", value.to_i, id)
+        AllSeeingEye.redis.zincrby("allseeingeye:#{self.class.model_name}:fields:#{field}:count", 1, (value.to_i / 60) * 60)
       else
         AllSeeingEye.redis.lpush("allseeingeye:#{self.class.model_name}:fields:#{field}:#{value}", id)
         AllSeeingEye.redis.zincrby("allseeingeye:#{self.class.model_name}:fields:#{field}", 1, value)

data/lib/all_seeing_eye/server.rb

@@ -73,8 +73,7 @@ class AllSeeingEye
     end
     
     get '/total' do
-      @requests = AllSeeingEye::Request.search("one month ago to now")
-      @counts = AllSeeingEye::Request.conglomerate(@requests)
+      @counts = AllSeeingEye::Request.created_count
       show :total
     end
     

data/test/model_test.rb

@@ -226,6 +226,7 @@ end
 
 context 'many objects' do
   setup do
+    AllSeeingEye.redis.flushall
     @time = Time.now
     
     2000.times do |n|
@@ -237,10 +238,18 @@ context 'many objects' do
     results = AllSeeingEye::Model.all
     counts = AllSeeingEye::Model.conglomerate(results)
     
-    assert_equal 500, counts.count
+    assert_equal 100, counts.count
     assert_equal 2000, counts.inject(0) {|sum, k| sum + k.last}
     assert_equal @obj999.created_at.to_i, counts.first.first
   end
+  
+  test 'get the created count' do
+    counts = AllSeeingEye::Model.created_count
+    
+    assert_equal (@obj999.created_at.to_i / 60) * 60, counts.first.first.to_i
+    assert_equal (@obj0.created_at.to_i / 60) * 60, counts.last.first.to_i
+    assert_equal 2000, counts.inject(0) {|sum, k| sum + k.last}
+  end
 end
 
 context 'instance methods' do  

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: all_seeing_eye
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Josh Symonds
@@ -105,8 +105,22 @@ dependencies:
   version_requirements: *id006
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: i18n
+  version_requirements: *id007
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -118,11 +132,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  version_requirements: *id007
+  version_requirements: *id008
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -134,11 +148,11 @@ dependencies:
         - 4
         version: 1.6.4
   name: jeweler
-  version_requirements: *id008
+  version_requirements: *id009
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -148,7 +162,7 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  version_requirements: *id009
+  version_requirements: *id010
   prerelease: false
 description: AllSeeingEye observes all requests, with parameters that you specify, to Redis. Then it composes them into graphs for you to see.
 email: veraticus@gmail.com