rhcf-timeseries 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWQ4ZTdkNzAzNDA4YWQ4YWUzOGM1NDYxM2QwZWQ5OTJmMDBjZTI4Nw==
+    YTZjZTY2NzI1MjUxNjZjZWUzYzE2OTA4ODQ5NTU0YmFkYmVhMzQ4OA==
   data.tar.gz: !binary |-
-    MTkwZGY4OWM3NzM0MDRlZTY1ZjlhNTM4YzVmNWYyM2JiMTdlY2YzZA==
+    ZTNkMTkwNzA5OTQzYjBkMmIwNzU3YmRjYzQ1ODhlNTNkYTQ1OTYwYg==
 SHA512:
   metadata.gz: !binary |-
-    NWUxMjM2Y2RjNDdhYzdiYTA5MmM4NTkyZjIxODkzOTM3OGE0NWM2OWRlZmFk
-    ZmRjZjYxZWIwMjBlN2VjYmVhNjk1NmM2OGI5NmZjNTNkNmM1NjE5ZWFlM2M4
-    NzNmNzhiZDM0YmI4YzBkNDNiN2I4YjE4YzZiZjg5NDRkOWQzNTA=
+    MDA0MjRlZTBmNTNjYzNiY2ExMGEzZGM4ZjJlMzc0MmI1YjdjMmIwZTkzZDUw
+    Mjg4MDA2ODVhNDE3YzEzMWE1YzkwNDQ0OGZjZDVlMjZjOGViMGNkZWEzNDQ2
+    NTMyMThkNzdkZDQ2Y2YyMDJkYzAyOWQ5YzEwZGU5M2Y1NmM3ODM=
   data.tar.gz: !binary |-
-    MDU0Yzk5MGE4ZjdmOTA1MWUyMGQ0NDA1MzA5YjIwYjYyYjAzMGIxYjViOGM4
-    YTg5NzcxNjY3ZTgwY2RhMTI1NzU1YmI1ODQyMmY5YWYwMmQwMDUzOTUzNWE0
-    ODMxODQ3MTlhMzRiYzM5YTM1YTQ5Mzk5YjdkNjQ5Y2IzYzgxMmI=
+    MmIxMzBlMTJhYWI5ZDAxNjkzM2M2ZDdmMTFmYzVjMDRlMTljODNjYTBjNmEw
+    ZDI5ZWM2YjcwYjdjOWJhM2Y1NDIwMjU3ZmFiZTY4NjRmZDcwYWRjYTJiOTE1
+    ZmM5YmM4ZWJmMTI0NjUwYjZhZmU0NjU0NjllNjllODU5NDkyZjQ=

data/lib/rhcf/timeseries/redis.rb

@@ -1,6 +1,3 @@
-#require 'active_support/core_ext/numeric/time'
-
-require 'micon'
 require 'date'
 
 class Fixnum
@@ -42,7 +39,7 @@ module Rhcf
     class Result
       def initialize(subject, from, to, series)
         if from > to
-          raise ArgumentError, "Argument 'from' can not be bigger then 'to'"
+          fail ArgumentError, "Argument 'from' can not be bigger then 'to'"
         end
         @series = series
         @subject = subject
@@ -100,13 +97,12 @@ module Rhcf
         span = @to - @from
         resolutions = @series.resolutions.sort_by{|h| h[:span]}.reverse
         better = resolutions.find{|r| r[:span] < span / 5} || resolutions.last
+        return better
       end
     end
 
 
     class Redis
-      inject :logger
-      inject :redis_connection
 
       RESOLUTIONS_MAP={
         :ever => {span:Float::INFINITY, formatter: "ever", ttl: (2 * 366).days},
@@ -123,25 +119,26 @@ module Rhcf
 
       }
       DEFAULT_RESOLUTIONS = RESOLUTIONS_MAP.keys
-      DEFAULT_MAX_POINTS = 1_024
       NAMESPACE_SEPARATOR = '|'
 
+      attr_reader :logger
 
-      def initialize(options = {})
+      def initialize(logger, redis,  options = {})
         @resolution_ids = options[:resolutions] || DEFAULT_RESOLUTIONS
-        @max_points = options[:max_points] || DEFAULT_MAX_POINTS
         @prefix = options[:prefix] || self.class.name
-        @connection_to_use = nil
+        @logger = logger
+        @connection_to_use = redis
       end
 
       def on_connection(conn)
+        old_connection = @connection_to_use
         @connection_to_use = conn
         yield self
-        @connection_to_use = nil
+        @connection_to_use = old_connection
       end
 
       def redis_connection_to_use
-        @connection_to_use || redis_connection
+        @connection_to_use || fail("No redis connection given")
       end
 
       def store(subject, event_point_hash, moment = Time.now)
@@ -180,7 +177,7 @@ module Rhcf
         when Proc
           time_resolution_formater.call(moment)
         else
-          raise ArgumentError, "Unexpected moment formater type #{time_resolution_formater.class}"
+          fail ArgumentError, "Unexpected moment formater type #{time_resolution_formater.class}"
         end
       end
 
@@ -226,7 +223,7 @@ module Rhcf
       end
 
       def keys(*a_key)
-        raise "GIVEUP"
+        fail "GIVEUP"
         a_key = [@prefix, a_key].flatten.join(NAMESPACE_SEPARATOR)
         logger.debug("FINDING KEY #{a_key}")
         redis_connection_to_use.keys(a_key).collect{|k| k.split(NAMESPACE_SEPARATOR)[1,1000].join(NAMESPACE_SEPARATOR) }
@@ -241,7 +238,7 @@ module Rhcf
 
       def resolution(id)
         res = RESOLUTIONS_MAP[id]
-        raise ArgumentError, "Invalid resolution name #{id} for this time series" if res.nil?
+        fail ArgumentError, "Invalid resolution name #{id} for this time series" if res.nil?
         res.merge(:id => id)
       end
       def resolutions

data/lib/rhcf/timeseries/version.rb

@@ -1,5 +1,5 @@
 module Rhcf
   module Timeseries
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/rhcf-timeseries.gemspec

@@ -28,5 +28,4 @@ Gem::Specification.new do |spec|
   #spec.add_development_dependency "simplecov"
   spec.add_development_dependency "timecop"
   #spec.add_dependency "activesupport"
-  spec.add_dependency "micon"
 end

data/spec/lib/rhcf/timeseries/redis_spec.rb

@@ -1,16 +1,14 @@
 require 'spec_helper'
 require 'timecop'
 require 'redis'
-require 'micon'
 require 'rhcf/timeseries/redis'
 require 'benchmark'
 require 'logger'
-micon.register(:logger){Logger.new('/dev/null')}
-#micon.register(:logger){Logger.new(STDOUT)}
-micon.register(:redis_connection){Redis.new}
-
 
 describe Rhcf::Timeseries::Redis do
+  let(:null_logger){Logger.new('/dev/null')}
+  let(:redis_connection){Redis.new}
+  subject{Rhcf::Timeseries::Redis.new(null_logger, redis_connection)}
 
   before(:each) do
     Timecop.return
@@ -21,16 +19,16 @@ describe Rhcf::Timeseries::Redis do
     subject.flush!
     total = 0
     start_time = Time.now
-    
+
     bench = Benchmark.measure {
-        10000.times do 
-          total +=1
-          subject.store("a", {"b" => 1} ) #, time)
-        end
+      10000.times do
+        total +=1
+        subject.store("a", {"b" => 1} ) #, time)
+      end
     }
 
-    
-#pp    subject.find("a", start_time - 11100, Time.now + 11100).points(:second)
+
+    #pp    subject.find("a", start_time - 11100, Time.now + 11100).points(:second)
     qbench = Benchmark.measure {
       subject.find("a", start_time - 11100, Time.now + 11100).total['b'].to_i.should == total
     }
@@ -38,7 +36,7 @@ describe Rhcf::Timeseries::Redis do
     qbench_year = Benchmark.measure {
       subject.find("a", start_time - 100000, Time.now + 100000).total(:year)['b'].to_i.should == total
     }
-    
+
     puts "Write speed %d points/seg | points:%d, duration:%0.3fs | query_time %0.3fs" % [speed = (1.0 * total / (bench.total + 0.00000001)), total, bench.total, qbench.total]
     speed.should > 400
   end
@@ -62,7 +60,7 @@ describe Rhcf::Timeseries::Redis do
 
     Timecop.travel(15.minutes) #00:00:00
     subject.store("views/product/11", {"web/ie/5" => 2})
-    
+
     Timecop.travel(15.minutes) #00:00:15
     subject.store("views/product/11", {"web/chrome/11"=> 4})
 
@@ -70,7 +68,7 @@ describe Rhcf::Timeseries::Redis do
     subject.store("views/product/11", {"web/chrome/11"=> 2})
 
     subject.find("views/product", start_time, start_time + 55.minutes).total(:ever).should == {
-     "web" => 16.0,
+      "web" => 16.0,
       "web/chrome" => 6.0,
       "web/chrome/11" => 6.0,
       "web/firefox" => 3.0,
@@ -81,7 +79,7 @@ describe Rhcf::Timeseries::Redis do
     }
 
     subject.find("views/product", start_time, start_time + 55.minutes).total(:year).should == {
-     "web" => 16.0,
+      "web" => 16.0,
       "web/chrome" => 6.0,
       "web/chrome/11" => 6.0,
       "web/firefox" => 3.0,
@@ -127,40 +125,40 @@ describe Rhcf::Timeseries::Redis do
     ]
 
     subject.find("views", start_time).points(:hour).should == [{:moment=>"2000-01-01T00",
-         :values=>
-          {"web/ie"=>5.0,
-           "web"=>8.0,
-           "web/firefox"=>3.0,
-           "web/ie/6"=>5.0,
-           "web/firefox/3"=>3.0}},
-        {:moment=>"2000-01-01T01",
-         :values=>
-          {"web/ie"=>2.0,
-           "web/chrome"=>6.0,
-           "web/chrome/11"=>6.0,
-           "web"=>8.0,
-           "web/ie/5"=>2.0}}]
+                                                                :values=>
+    {"web/ie"=>5.0,
+     "web"=>8.0,
+     "web/firefox"=>3.0,
+     "web/ie/6"=>5.0,
+     "web/firefox/3"=>3.0}},
+     {:moment=>"2000-01-01T01",
+      :values=>
+    {"web/ie"=>2.0,
+     "web/chrome"=>6.0,
+     "web/chrome/11"=>6.0,
+     "web"=>8.0,
+     "web/ie/5"=>2.0}}]
 
 
   end
 
-  it "causes no stack overflow" do 
-     params_hash = {
-        sender_domain: 'example.com',
-        realm: 'realm',
-        destination_domain: 'lvh.me',
-        mail_server: 'aserver',
-         bind_interface: '11.1.1.11'
-     }
-
-     {
-            'sender_domain' => '%{sender_domain}',
-            'realm_and_sender_domain' => '%{realm}/%{sender_domain}',
-            'mail_server_and_interface' => '%{mail_server}/%{bind_interface}',
-            'realm_and_destination_domain' => '%{realm}/%{destination_domain}',
-            'destination_domain' => '%{destination_domain}'
-     }.each do |known, unknown|
-          subject.store(known % params_hash, {[(unknown % params_hash),'sent'].join('/') => 1})
+  it "causes no stack overflow" do
+    params_hash = {
+      sender_domain: 'example.com',
+      realm: 'realm',
+      destination_domain: 'lvh.me',
+      mail_server: 'aserver',
+      bind_interface: '11.1.1.11'
+    }
+
+    {
+      'sender_domain' => '%{sender_domain}',
+      'realm_and_sender_domain' => '%{realm}/%{sender_domain}',
+      'mail_server_and_interface' => '%{mail_server}/%{bind_interface}',
+      'realm_and_destination_domain' => '%{realm}/%{destination_domain}',
+      'destination_domain' => '%{destination_domain}'
+    }.each do |known, unknown|
+      subject.store(known % params_hash, {[(unknown % params_hash),'sent'].join('/') => 1})
     end
   end
 end

data/spec/spec_helper.rb

@@ -5,7 +5,8 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 #require 'simplecov'
-#SimpleCov.start
+#SimpleCov.start_with?
+require 'timecop'
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhcf-timeseries
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Romeu Fonseca
@@ -80,20 +80,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: micon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Gem to allow your system to keep record of time series on rhcf
 email:
 - romeu.hcf@gmail.com