rhosync 2.0.9 → 2.1.0.beta.1

data/spec/stats/record_spec.rb

@@ -1,6 +1,6 @@
 require 'rhosync'
-FOO_RECORD_RESOLUTION = 2
-FOO_RECORD_SIZE = 8
+STATS_RECORD_RESOLUTION = 2 unless defined? STATS_RECORD_RESOLUTION
+STATS_RECORD_SIZE = 8 unless defined? STATS_RECORD_SIZE
 
 include Rhosync
 include Rhosync::Stats
@@ -10,12 +10,13 @@ describe "Record" do
   before(:each) do
     @now = 9
     Store.db.flushdb
+    Store.stub!(:lock).and_yield
   end
   
   it "should add metric to the record and trim record size" do
     Time.stub!(:now).and_return { @now += 1; @now }
     10.times { Record.add('foo') }
-    Store.db.zrange('stat:foo', 0, -1).should == ["2:13", "2:15", "2:17", "2:19"]
+    Store.db.zrange('stat:foo', 0, -1).should == ["2:12", "2:14", "2:16", "2:18"]
   end
   
   it "should add single record" do
@@ -24,16 +25,35 @@ describe "Record" do
     Store.db.zrange('stat:foo', 0, -1).should == ["1:10"]
   end
   
+  it "should return type of metric" do
+    Record.add('foo')
+    Record.rtype('foo').should == 'zset'
+  end
+  
+  it "should set string metric" do
+    Record.set_value('foo', 'bar')
+    Store.db.get('stat:foo').should == 'bar'
+  end
+  
+  it "should get string metric" do
+    Store.db.set('stat:foo', 'bar')
+    Record.get_value('foo').should == 'bar'
+  end
+  
+  it "should get keys" do
+    Record.add('foo')
+    Record.add('bar')
+    Record.keys.sort.should == ['bar','foo']
+  end
+  
   it "should add absolute metric value" do
     Time.stub!(:now).and_return { @now += 1; @now }
     time = 0
     4.times do 
-      Record.add('foo',time) do |current,value|
-        Record.save_average(current, value)
-      end
+      Record.save_average('foo',time)
       time += 1
     end
-    Store.db.zrange('stat:foo', 0, -1).should == ["2.0,1.0:11", "2.0,5.0:13"]
+    Store.db.zrange('stat:foo', 0, -1).should == ["2.0,1.0:10", "2.0,5.0:12"]
   end
   
   it "should update metric" do
@@ -44,20 +64,19 @@ describe "Record" do
         # something interesting
       end
     end
-    Store.db.zrange('stat:foo', 0, -1).should == ["1,1.0:15", "1,1.0:18", "1,1.0:21"]
-    Rhosync.stats = nil
+    Store.db.zrange('stat:foo', 0, -1).should == ["1,1.0:14", "1,1.0:18", "1,1.0:20"]
   end
   
   it "should get range of metric values" do
     Time.stub!(:now).and_return { @now += 1; @now }
     10.times { Record.add('foo') }
-    Record.range('foo', 0, 1).should == ["2:13", "2:15"]
+    Record.range('foo', 0, 1).should == ["2:12", "2:14"]
   end
   
   it "should reset metric" do
     Time.stub!(:now).and_return { @now += 1; @now }
     10.times { Record.add('foo') }
-    Store.db.zrange('stat:foo', 0, -1).should == ["2:13", "2:15", "2:17", "2:19"]
+    Store.db.zrange('stat:foo', 0, -1).should == ["2:12", "2:14", "2:16", "2:18"]
     Record.reset('foo')
     Store.db.zrange('stat:foo', 0, -1).should == []
   end

data/spec/store_spec.rb

@@ -40,6 +40,11 @@ describe "Store" do
       Store.get_data(@s.docname(:md)).should == @data
     end
     
+    it "should set_data and get_data" do
+      Store.set_data('foo', @data)
+      Store.get_data('foo').should == @data
+    end
+    
     it "should add simple array data to new set" do
       @data = ['1','2','3']
       Store.put_data(@s.docname(:md),@data).should == true
@@ -58,6 +63,15 @@ describe "Store" do
       Store.get_value('foo').should == 'bar'
     end
     
+    it "should incr a key" do
+      Store.incr('foo').should == 1
+    end
+    
+    it "should decr a key" do
+      Store.set_value('foo', 10)
+      Store.decr('foo').should == 9
+    end
+    
     it "should return true/false if element ismember of a set" do
       Store.put_data('foo',['a'])
       Store.ismember?('foo','a').should == true
@@ -139,7 +153,7 @@ describe "Store" do
     
     it "should lock key for timeout" do
       doc = "locked_data"
-      Store.db.set "#{doc}:lock", Time.now.to_i+3
+      Store.db.set "lock:#{doc}", Time.now.to_i+3
       Store.should_receive(:sleep).at_least(:once).with(1).and_return { sleep 1 }
       m_lock = Store.get_lock(doc,2)
     end

data/spec/user_spec.rb

@@ -1,5 +1,8 @@
 require File.join(File.dirname(__FILE__),'spec_helper')
 
+STATS_RECORD_RESOLUTION = 2 unless defined? STATS_RECORD_RESOLUTION
+STATS_RECORD_SIZE = 8 unless defined? STATS_RECORD_SIZE
+
 describe "User" do
   it_should_behave_like "SpecBootstrapHelper"
   it_should_behave_like "SourceAdapterHelper"
@@ -10,6 +13,7 @@ describe "User" do
     @u1.id.should == @u.id
     @u1.login.should == @u_fields[:login]
     @u1.email.should == @u_fields[:email]
+    Store.get_value('user:count').should == "1"
   end
   
   it "should delete seats for user's clients" do
@@ -66,6 +70,7 @@ describe "User" do
     @c.put_data(:cd,@data)
     cid = @c.id    
     @u.delete
+    Store.get_value('user:count').should == "0"
     User.is_exist?(@u_fields[:login]).should == false
     Client.is_exist?(cid).should == false
     @c.get_data(:cd).should == {}
@@ -76,4 +81,43 @@ describe "User" do
     @u.delete
     ApiToken.is_exist?(token).should == false
   end
+  
+  describe "User Stats" do
+    
+    before(:all) do
+      Store.stub!(:lock).and_yield
+    end
+    
+    before(:each) do
+      Rhosync::Stats::Record.reset('users')
+    end
+    
+    after(:each) do
+      Rhosync::Stats::Record.reset('users')
+    end
+    
+    after(:all) do
+      Store.flash_data('stat:users*')
+    end
+    
+    it "should increment user stats on create" do
+      Time.stub!(:now).and_return(10)
+      Rhosync.stats = true
+      User.create({:login => 'testuser2'})
+      Rhosync::Stats::Record.range('users',0,-1).should == ["2:10"]
+      Store.get_value('user:count').should == "2"
+      Rhosync.stats = false
+    end
+  
+    it "should decrement user stats on delete" do
+      Time.stub!(:now).and_return(10)
+      Rhosync.stats = true
+      u = User.create({:login => 'testuser1'})
+      Rhosync::Stats::Record.range('users',0,-1).should == ["2:10"]
+      u.delete
+      Rhosync::Stats::Record.range('users',0,-1).should == ["1:10"]
+      Store.get_value('user:count').should == "1"
+      Rhosync.stats = false
+    end
+  end
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 62196465
+  prerelease: true
   segments: 
   - 2
+  - 1
   - 0
-  - 9
-  version: 2.0.9
+  - beta
+  - 1
+  version: 2.1.0.beta.1
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -07:00
+date: 2010-11-07 00:00:00 -07:00
 default_executable: rhosync
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -311,6 +313,7 @@ files:
 - bench/benchapp/settings/settings.yml
 - bench/benchapp/sources/mock_adapter.rb
 - bench/benchapp/sources/queue_mock_adapter.rb
+- bench/benchapp/tmp/restart.txt
 - bench/lib/bench.rb
 - bench/lib/bench/cli.rb
 - bench/lib/bench/logging.rb
@@ -336,10 +339,6 @@ files:
 - bench/spec/result_spec.rb
 - bench/spec/utils_spec.rb
 - bin/rhosync
-- doc/protocol.html
-- doc/public/css/print.css
-- doc/public/css/screen.css
-- doc/public/css/style.css
 - generators/rhosync.rb
 - generators/templates/application/Rakefile
 - generators/templates/application/application.rb
@@ -370,6 +369,7 @@ files:
 - lib/rhosync/api/reset.rb
 - lib/rhosync/api/set_db_doc.rb
 - lib/rhosync/api/set_refresh_time.rb
+- lib/rhosync/api/stats.rb
 - lib/rhosync/api/update_user.rb
 - lib/rhosync/api/upload_file.rb
 - lib/rhosync/api_token.rb
@@ -385,13 +385,26 @@ files:
 - lib/rhosync/console/app/helpers/helpers.rb
 - lib/rhosync/console/app/public/ThickBox.css
 - lib/rhosync/console/app/public/home.css
-- lib/rhosync/console/app/public/images/header_halo copy.jpg
+- lib/rhosync/console/app/public/images/foot_logo_rhosync.png
 - lib/rhosync/console/app/public/images/header_halo.jpg
 - lib/rhosync/console/app/public/images/land_separator.gif
 - lib/rhosync/console/app/public/images/landing_header.jpg
 - lib/rhosync/console/app/public/images/logo_rhosync.png
 - lib/rhosync/console/app/public/images/rhomobile_rhohub_logo.png
 - lib/rhosync/console/app/public/images/tabs_separator.png
+- lib/rhosync/console/app/public/jqplot/excanvas.min.js
+- lib/rhosync/console/app/public/jqplot/jqplot.barRenderer.min.js
+- lib/rhosync/console/app/public/jqplot/jqplot.canvasAxisLabelRenderer.js
+- lib/rhosync/console/app/public/jqplot/jqplot.canvasAxisTickRenderer.js
+- lib/rhosync/console/app/public/jqplot/jqplot.canvasTextRenderer.js
+- lib/rhosync/console/app/public/jqplot/jqplot.categoryAxisRenderer.min.js
+- lib/rhosync/console/app/public/jqplot/jqplot.cursor.js
+- lib/rhosync/console/app/public/jqplot/jqplot.dateAxisRenderer.js
+- lib/rhosync/console/app/public/jqplot/jqplot.dateAxisRenderer.min.js
+- lib/rhosync/console/app/public/jqplot/jqplot.pointLabels.min.js
+- lib/rhosync/console/app/public/jqplot/jquery-1.4.2.min.js
+- lib/rhosync/console/app/public/jqplot/jquery.jqplot.min.css
+- lib/rhosync/console/app/public/jqplot/jquery.jqplot.min.js
 - lib/rhosync/console/app/public/main.css
 - lib/rhosync/console/app/public/reset.css
 - lib/rhosync/console/app/public/style.css
@@ -410,6 +423,7 @@ files:
 - lib/rhosync/console/app/views/headermenu.erb
 - lib/rhosync/console/app/views/home.erb
 - lib/rhosync/console/app/views/index.erb
+- lib/rhosync/console/app/views/jqplot.erb
 - lib/rhosync/console/app/views/layout.erb
 - lib/rhosync/console/app/views/login.erb
 - lib/rhosync/console/app/views/newuser.erb
@@ -471,6 +485,7 @@ files:
 - spec/api/rhosync_api_spec.rb
 - spec/api/set_db_doc_spec.rb
 - spec/api/set_refresh_time_spec.rb
+- spec/api/stats_spec.rb
 - spec/api/update_user_spec.rb
 - spec/api/upload_file_spec.rb
 - spec/api_token_spec.rb
@@ -552,12 +567,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -588,6 +605,7 @@ test_files:
 - spec/api/rhosync_api_spec.rb
 - spec/api/set_db_doc_spec.rb
 - spec/api/set_refresh_time_spec.rb
+- spec/api/stats_spec.rb
 - spec/api/update_user_spec.rb
 - spec/api/upload_file_spec.rb
 - spec/api_token_spec.rb