rhosync 2.0.8 → 2.0.9

data/lib/rhosync/console/app/views/result.erb

@@ -7,5 +7,5 @@
 	<%end%>
 </div>		
 <div class='panel'>
-	<a href='<%= @back_href%>' class='nav_button'>Back</a>
+	<a href='javascript:void(0);' onclick="loadXMLDoc('<%= @back_href%>','main_box');" class='nav_button'>Back</a>
 </div>

data/lib/rhosync/console/app/views/rightboxlinks.erb

@@ -0,0 +1,15 @@
+<!-- div, links[]{ :url, :title, :selected }> -->
+
+<div id="right-box_links">
+	<ul class="right-box_links">
+		<% i=1 %>
+		<% links.each do |link| %>
+		<li><a id="link<%=i%>" 
+				<%= 'class="selected"' if link[:selected] %> 
+				onclick="javascript:loadXMLDoc('<%=link[:url]%>','<%= div %>');switch_tab(this.id); this.blur();" 
+				href="javascript:void(0);"><%=link[:title]%></a>
+		</li>
+		<% i = i + 1 %>
+		<% end %>
+	</ul>
+</div>

data/lib/rhosync/console/app/views/select_doc.erb

@@ -1,8 +1,6 @@
 <h1>Document <%= @dbkey%></h1>
 <%=show_errors%>
-<div class='panel'>
-	<a href='<%= url('/')%>' class='nav_button'>Back</a>
-</div>	
+
 <form action=<%= url('doc/select')%> method='GET'>
 	<table>
 		<tr>

data/lib/rhosync/console/app/views/user.erb

@@ -1,8 +1,5 @@
 <h1>User: <%=params[:user_id]%></h1>
 <%=show_errors%>
-<div class="panel">
-	<a href="<%=url('users')%>" class='nav_button'>Back</a>
-</div>
 <div class="panel">
 	<a href='<%=url("user/delete?user_id=#{CGI.escape(params[:user_id])}")%>' class='nav_button'>Delete user</a>
 </div>
@@ -13,18 +10,18 @@
 
 [
 <%@sources.each_index do |i|%>
-	<a href="<%=url("docs?source_id=#{@sources[i]}&user_id=#{CGI.escape(params[:user_id])}")%>"><%=i==0?'':','%>"<%=@sources[i]%>"</a>
+	<a href='javascript:void(0);' onclick="loadXMLDoc('<%=url("docs?source_id=#{@sources[i]}&user_id=#{CGI.escape(params[:user_id])}")%>','main_box');"><%=i==0?'':','%>"<%=@sources[i]%>"</a>
 <%end%>
 ]
 
 <h2>Registered Devices</h2>
 
-<a href="<%=url("device/create?user_id=#{CGI.escape(params[:user_id])}")%>" class='nav_button'>Create Device</a>
+<a href="javascript:void(0);" onclick="loadXMLDoc('<%=url("device/create?user_id=#{CGI.escape(params[:user_id])}")%>','');loadXMLDoc('<%=url("user?user_id=#{CGI.escape(params[:user_id])}")%>','main_box');" class='nav_button'>Create Device</a>
 
 <div class="panel">
 [ 	
 <%@devices.each_index do |i|%>
-	<a href="<%=url("device?user_id=#{CGI.escape(params[:user_id])}&device_id=#{CGI.escape(@devices[i])}")%>">
+	<a href="javascript:void(0);" onclick="loadXMLDoc('<%=url("device?user_id=#{CGI.escape(params[:user_id])}&device_id=#{CGI.escape(@devices[i])}")%>','main_box');">
 		<%=i==0?'':','%>"<%=@devices[i]%>"
 	</a>
 <%end%>

data/lib/rhosync/console/app/views/users.erb

@@ -1,6 +1,4 @@
-<h1>Users</h1>
-<a href="<%=url('/')%>" class='nav_button'>Back</a>
-<a href="<%=url('user/new')%>" class='nav_button'>Create User</a>
+	<a href="javascript:void(0);" onclick="loadXMLDoc('<%=url('user/new')%>','main_box');" class='nav_button'>Create User</a>
 
 <h2>Registered users</h2>
 <%if is_errors?%>
@@ -8,7 +6,7 @@
 <%else%>
 	[ 	
 	<%@users.each_index do |i|%>
-		<a href="<%=url("user?user_id=#{CGI.escape(@users[i])}")%>"><%=i==0?'':','%>"<%=@users[i]%>"</a>
+		<a href="javascript:void(0);" onclick="loadXMLDoc('<%=url("user?user_id=#{CGI.escape(@users[i])}")%>','main_box');"><%=i==0?'':','%>"<%=@users[i]%>"</a>
 	<%end%>
 	]
 <%end%>

data/lib/rhosync/console/server.rb

@@ -19,6 +19,12 @@ module RhosyncConsole
     set :public, RhosyncConsole::root_path("app","public")
     set :static, true    
     use Rack::Session::Cookie
+    before do
+      headers['Expires'] = 'Sun, 19 Nov 1978 05:00:00 GMT'
+      headers['Cache-Control'] = 'no-store, no-cache, must-revalidate'  
+      headers['Pramga'] = 'no-cache'
+    end
+    
   end
 end
 

data/lib/rhosync/jobs/bulk_data_job.rb

@@ -16,6 +16,7 @@ module Rhosync
           ts = Time.now.to_i.to_s
           create_sqlite_data_file(bulk_data,ts)
           timer = lap_timer('create_sqlite_data_file',timer)
+          log " bulk_data.dbfile :  #{bulk_data.dbfile}"
           create_hsql_data_file(bulk_data,ts) if Rhosync.blackberry_bulk_sync
           lap_timer('create_hsql_data_file',timer)
           log "finished bulk data process"
@@ -54,13 +55,13 @@ module Rhosync
       data = source.get_data(:md)
       counter = {}
       columns,qm = [],[]
-      create_table = ['object varchar']
+      create_table = ["\"object\" varchar"]
       schema = JSON.parse(source.schema)
       
       db.transaction do |database|
         # Create a table with columns specified by 'property' array in settings
         schema['property'].each do |key,value|
-          create_table << "#{key} varchar default NULL" 
+          create_table << "\"#{key}\" varchar default NULL" 
           columns << key
           qm << '?'
         end
@@ -81,12 +82,24 @@ module Rhosync
         
         # Create indexes for specified columns in settings 'index'
         schema['index'].each do |key,value|
-          database.execute("CREATE INDEX #{key} on #{source.name} (#{value});")
+          val2 = ""
+          value.split(',').each do |col|
+            val2 += ',' if val2.length() > 0
+            val2 += "\"#{col}\""
+          end
+          
+          database.execute("CREATE INDEX #{key} on #{source.name} (#{val2});")
         end if schema['index']
         
         # Create unique indexes for specified columns in settings 'unique_index'
         schema['unique_index'].each do |key,value|
-          database.execute("CREATE UNIQUE INDEX #{key} on #{source.name} (#{value});")
+          val2 = ""
+          value.split(',').each do |col|
+            val2 += ',' if val2.length() > 0
+            val2 += "\"#{col}\""
+          end
+        
+          database.execute("CREATE UNIQUE INDEX #{key} on #{source.name} (#{val2});")
         end if schema['unique_index']
       end
     

data/lib/rhosync/ping/android.rb

@@ -0,0 +1,38 @@
+require 'net/https'
+require 'uri'
+module Rhosync
+  class Android
+    def self.ping(params)
+      begin
+        settings = get_config(Rhosync.base_directory)[Rhosync.environment]
+        authtoken = settings[:authtoken]
+
+        url = URI.parse('https://android.apis.google.com/c2dm/send')
+
+        req = Net::HTTP::Post.new url.path, 'Authorization' => "GoogleLogin auth=#{authtoken}" 
+        req.set_form_data c2d_message(params)
+
+        http = Net::HTTP.new(url.host, url.port)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        res = http.request(req)
+
+      rescue Exception => error
+        log "Error while sending ping: #{error}"
+        raise error
+      end
+    end
+    
+    def self.c2d_message(params)
+      data = {}
+      data['registration_id'] = params['device_pin']
+      data['collapse_key'] = (rand * 100000000).to_i.to_s
+      data['data.do_sync'] = params['sources'] ? params['sources'].join(',') : ''
+      data['data.alert'] = params['message'] if params['message']
+      data['data.vibrate'] = params['vibrate'] if params['vibrate']
+      data['data.sound'] = params['sound'] if params['sound']
+
+      data
+    end
+  end
+end

data/lib/rhosync/ping.rb

@@ -1,2 +1,3 @@
+require 'rhosync/ping/android'
 require 'rhosync/ping/apple'
-require 'rhosync/ping/blackberry'
+require 'rhosync/ping/blackberry'

data/lib/rhosync/server/views/index.erb

@@ -1,5 +1,8 @@
 <html>
   <head>
+	<script type="text/javascript">
+		window.location="/console/";
+	</script>
 	<title>Rhosync Server</title>
   </head>
   <body>

data/lib/rhosync/server.rb

@@ -21,12 +21,12 @@ module Rhosync
     set :public, "#{libdir}/server/public"
     set :static, true
     
-    set :secret, '<changeme>' unless defined? Server.secret
+    # default secret
+    @@secret = '<changeme>'
     
-    use Rack::Session::Cookie, :key => 'rhosync_session',
-                               :expire_after => 31536000,
-                               :secret => Server.secret
-                             
+    # stats middleware disabled by default
+    @@stats = false
+                                                                                         
     # Setup route and mimetype for bulk data downloads
     # TODO: Figure out why "mime :data, 'application/octet-stream'" doesn't work
     Rack::Mime::MIME_TYPES['.data'] = 'application/octet-stream'   
@@ -126,10 +126,29 @@ module Rhosync
         end
       end
     end
+    
+    # hook into new so we can enable middleware
+    def self.new
+      if @@stats == true
+        use Rhosync::Stats::Middleware 
+        Rhosync.stats = true
+      end
+      use Rack::Session::Cookie, 
+            :key => 'rhosync_session',
+            :expire_after => 31536000,
+            :secret => @@secret     
+      super
+    end
+    
+    def self.set(option, value=self, &block)
+      @@stats = value if option == :stats and (value.is_a?(TrueClass) or value.is_a?(FalseClass))
+      @@secret = value if option == :secret and value.is_a?(String)
+      super
+    end
         
     def initialize
       # Whine about default session secret
-      check_default_secret!(Server.secret)
+      check_default_secret!(@@secret)
       super
     end
     

data/lib/rhosync/source_sync.rb

@@ -11,15 +11,15 @@ module Rhosync
     
     # CUD Operations
     def create(client_id)
-      _process_cud('create',client_id)
+      _measure_and_process_cud('create',client_id)
     end
     
     def update(client_id)
-      _process_cud('update',client_id)
+      _measure_and_process_cud('update',client_id)
     end
     
     def delete(client_id)
-      _process_cud('delete',client_id)
+      _measure_and_process_cud('delete',client_id)
     end
     
     # Read Operation; params are query arguments
@@ -60,9 +60,11 @@ module Rhosync
     
     def do_query(params=nil)
       @source.if_need_refresh do
-        return if _auth_op('login') == false
-        self.read(nil,params)
-        _auth_op('logoff')
+        Stats::Record.update("source:query:#{@source.name}") do
+          return if _auth_op('login') == false
+          self.read(nil,params)
+          _auth_op('logoff')
+        end  
       end
     end
     
@@ -143,6 +145,12 @@ module Rhosync
       dels[key] = value
     end
     
+    def _measure_and_process_cud(operation,client_id)
+      Stats::Record.update("source:#{operation}:#{@source.name}") do
+        _process_cud(operation,client_id)
+      end
+    end
+    
     def _process_cud(operation,client_id)
       errors,links,deletes,creates,dels = {},{},{},{},{}
       client = Client.load(client_id,{:source_name => @source.name})

data/lib/rhosync/stats/middleware.rb

@@ -0,0 +1,22 @@
+module Rhosync
+  module Stats
+    class Middleware
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        start = Time.now.to_f
+        status, headers, body = @app.call(env)
+        finish = Time.now.to_f
+        metric = "http:#{env['REQUEST_METHOD']}:#{env['REQUEST_PATH']}"
+        source_id = env['rack.request.query_hash']["source_id"] if env['rack.request.query_hash']
+        metric << ":#{source_id}" if source_id
+        Record.add(metric,finish - start) do |counter,aggregate|
+          Record.save_average(counter,aggregate)
+        end
+        [status, headers, body]
+      end
+    end
+  end
+end

data/lib/rhosync/stats/record.rb

@@ -0,0 +1,83 @@
+module Rhosync
+  module Stats
+    class Record
+      class << self
+        
+        # Add a value to a metric.  If zset already has a member, 
+        # update the existing member with an incremented value by default.
+        # Also supports updating the value with a block (useful for averages)
+        def add(metric, value = 1)
+          start = Time.now.to_i
+          current, current_score = 0, start
+          range = Store.db.zrevrange(key(metric), 0, 0)
+          if !range.empty?
+            member = range[0]
+            m_current = member.split(':')[0]
+            m_current_score = Store.db.zscore(key(metric), member).to_i
+            if m_current_score > (start - resolution(metric))
+              Store.db.zrem(key(metric), member)
+              current, current_score = m_current, m_current_score
+            end
+          end
+          value = block_given? ? yield(current, value) : (current.to_i + value) 
+          Store.db.zadd(key(metric), current_score, "#{value}:#{start}")
+          Store.db.zremrangebyscore(key(metric), 0, start - record_size(metric))
+        end
+        
+        # Saves the accumulated average for a resolution in a metric
+        def save_average(current, value)
+          sum = value
+          if current.is_a?(String)
+            current,sum = current.split(',')
+            current = current.to_f
+            sum = sum.to_f+value
+          end
+          "#{current + 1},#{sum}"
+        end
+        
+        def update(metric)
+          if Rhosync.stats
+            start = Time.now.to_f
+            # perform the operations
+            yield
+            finish = Time.now.to_f
+            add(metric, finish - start) do |counter, aggregate|
+              save_average(counter, aggregate)
+            end
+          else
+            yield
+          end
+        end
+        
+        def reset(metric)
+          Store.db.del(key(metric))
+        end
+        
+        def reset_all
+          Store.flash_data('stat:*')
+        end
+      
+        # Returns the metric data, uses array indexing
+        def range(metric, start, finish = -1)
+          Store.db.zrange(key(metric), start, finish)
+        end
+        
+        # Returns the resolution for a given metric, default 60 seconds
+        def resolution(metric)
+          resolution = Object.const_get("#{metric.upcase}_RECORD_RESOLUTION") rescue nil
+          resolution || 60 #=> 1 minute aggregate
+        end
+        
+        # Returns the # of records to save for a given metric
+        def record_size(metric)
+          size = Object.const_get("#{metric.upcase}_RECORD_SIZE") rescue nil
+          size || 60 * 24 * 31 #=> 44640 minutes
+        end
+        
+        def key(metric)
+          "stat:#{metric}"
+        end
+      end
+    end
+  end
+end

data/lib/rhosync/version.rb

@@ -1,3 +1,3 @@
 module Rhosync
-  VERSION = '2.0.8'
+  VERSION = '2.0.9'
 end

data/lib/rhosync.rb

@@ -21,7 +21,8 @@ require 'rhosync/source_sync'
 require 'rhosync/rho_indifferent_access'
 require 'rhosync/jobs/source_job'
 require 'rhosync/jobs/ping_job'
-require 'rhosync/monitoring/record'
+require 'rhosync/stats/record'
+require 'rhosync/stats/middleware'
 require 'rhosync/bulk_data'
 
 REDIS_URL = 'REDIS' unless defined? REDIS_URL
@@ -41,7 +42,7 @@ module Rhosync
   class << self
     attr_accessor :base_directory, :app_directory, :data_directory, 
       :vendor_directory, :blackberry_bulk_sync, :redis, :environment,
-      :log_disabled, :license, :bulk_sync_poll_interval
+      :log_disabled, :license, :bulk_sync_poll_interval, :stats
   end
   
   ### Begin Rhosync setup methods  
@@ -70,6 +71,7 @@ module Rhosync
     Rhosync.blackberry_bulk_sync ||= false
     Rhosync.bulk_sync_poll_interval ||= 3600
     Rhosync.log_disabled ||= false
+    Rhosync.stats ||= false
     Rhosync.license = License.new
     
     check_and_add(File.join(Rhosync.app_directory,'sources'))

data/spec/ping/android_spec.rb

@@ -0,0 +1,45 @@
+require File.join(File.dirname(__FILE__),'..','spec_helper')
+
+describe "Ping Android" do
+  it_should_behave_like "SpecBootstrapHelper"
+  it_should_behave_like "SourceAdapterHelper"
+  
+  before do
+    @params = {"device_pin" => @c.device_pin,
+      "sources" => [@s.name], "message" => 'hello world', 
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+    post = mock('post')
+    post.stub!(:new).and_return(post)
+    post.stub!(:set_form_data)
+    Net::HTTP::Post.stub!(:new).and_return(post)
+    
+    @http = mock('http')
+    @http.stub!(:request)
+    @http.stub!(:use_ssl=)
+    @http.stub!(:verify_mode=)
+    @http.stub!(:start).and_yield(@http)
+    Net::HTTP.stub!(:new).and_return(@http)
+  end
+  
+  it "should ping android" do
+    Android.ping(@params)
+  end
+  
+  it "should ping android with connection error" do
+    error = 'Connection refused'
+    @http.stub!(:request).and_return { raise SocketError.new(error) }
+    Android.should_receive(:log).once.with("Error while sending ping: #{error}")
+    lambda { Android.ping(@params) }.should raise_error(SocketError,error)
+  end
+  
+  it "should compute c2d_message" do
+    expected = {'registration_id' => @c.device_pin, 'collapse_key' => "RAND_KEY",
+      'data.do_sync' => @s.name,
+      'data.alert' => "hello world",
+      'data.vibrate' => '5',
+      'data.sound' => "hello.mp3"}
+    actual = Android.c2d_message(@params)
+    actual['collapse_key'] = "RAND_KEY" unless actual['collapse_key'].nil?
+    actual.should == expected
+  end
+end

data/spec/rhosync_spec.rb

@@ -16,6 +16,7 @@ describe "Rhosync" do
     Rhosync.blackberry_bulk_sync.should == false
     Rhosync.bulk_sync_poll_interval.should == 3600
     Rhosync.environment.should == :development  
+    Rhosync.stats.should == false
     App.is_exist?(@test_app_name).should be_true
   end
   

data/spec/server/server_spec.rb

@@ -57,6 +57,14 @@ describe "Server" do
     Rhosync::Server.secret.should == "secure!"
   end
   
+  it "should use Stats::Middleware if stats enabled" do
+    Rhosync::Server.enable :stats
+    Rhosync::Server.new
+    Rhosync.stats.should == true
+    Rhosync.stats = nil
+    Rhosync::Server.disable :stats
+  end
+  
   it "should update session secret to default" do
     Rhosync::Server.set :secret, "<changeme>"
     Rhosync::Server.secret.should == "<changeme>"

data/spec/spec.opts

@@ -0,0 +1,3 @@
+--color
+-fn
+-b

data/spec/spec_helper.rb

@@ -117,9 +117,9 @@ module TestHelpers
     db.execute("select source_id,name,sync_priority,partition,
       sync_type,source_attribs,metadata,blob_attribs,associations
       from sources where name='#{s.name}'").each do |row|
-      return false if row[0] != s.source_id.to_s
+      return false if row[0].to_s != s.source_id.to_s
       return false if row[1] != s.name
-      return false if row[2] != s.priority.to_s
+      return false if row[2].to_s != s.priority.to_s
       return false if row[3] != s.partition_type.to_s
       return false if row[4] != s.sync_type.to_s
       return false if row[5] != (s.schema ? "" : get_attrib_counter(data))
@@ -127,6 +127,7 @@ module TestHelpers
       return false if row[7] != s.blob_attribs
       return false if row[8] != s.has_many
     end
+
     data = json_clone(data)
     if s.schema
       schema = JSON.parse(s.schema)
@@ -145,7 +146,7 @@ module TestHelpers
     else
       db.execute("select * from object_values where source_id=#{s.source_id}").each do |row|
         object = data[row[2]]
-        return false if object.nil? or object[row[1]] != row[3] or row[0] != s.source_id.to_s
+        return false if object.nil? or object[row[1]] != row[3] or row[0].to_s != s.source_id.to_s
         object.delete(row[1])
         data.delete(row[2]) if object.empty?
       end

data/spec/stats/middleware_spec.rb

@@ -0,0 +1,32 @@
+require 'rhosync'
+FOO_RECORD_RESOLUTION = 2
+FOO_RECORD_SIZE = 8
+
+include Rhosync
+include Rhosync::Stats
+
+describe "Middleware" do
+  
+  before(:each) do
+    @now = 10.0
+    Store.db.flushdb
+    app = mock('app')
+    app.stub!(:call)
+    @middleware = Middleware.new(app)
+  end
+  
+  it "should compute http average" do
+    Time.stub!(:now).and_return { @now += 0.3; @now }
+    env = {
+      'rack.request.query_hash' => {
+        'source_id' => 'SampleAdapter'
+      },
+      'REQUEST_METHOD' => 'GET',
+      'REQUEST_PATH' => '/application'
+    }
+    10.times { @middleware.call(env) }
+    metric = 'http:GET:/application:SampleAdapter'
+    Record.key(metric).should == "stat:#{metric}"
+    Record.range(metric, 0, -1).should == ["10.0,3.0:19"]
+  end  
+end

data/spec/stats/record_spec.rb

@@ -0,0 +1,71 @@
+require 'rhosync'
+FOO_RECORD_RESOLUTION = 2
+FOO_RECORD_SIZE = 8
+
+include Rhosync
+include Rhosync::Stats
+
+describe "Record" do
+  
+  before(:each) do
+    @now = 9
+    Store.db.flushdb
+  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"]
+  end
+  
+  it "should add single record" do
+    Time.stub!(:now).and_return { @now += 1; @now }
+    Record.add('foo')
+    Store.db.zrange('stat:foo', 0, -1).should == ["1:10"]
+  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
+      time += 1
+    end
+    Store.db.zrange('stat:foo', 0, -1).should == ["2.0,1.0:11", "2.0,5.0:13"]
+  end
+  
+  it "should update metric" do
+    Rhosync.stats = true
+    Time.stub!(:now).and_return { @now += 1; @now }
+    4.times do
+      Record.update('foo') 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
+  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"]
+  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"]
+    Record.reset('foo')
+    Store.db.zrange('stat:foo', 0, -1).should == []
+  end
+  
+  it "should reset all metrics" do
+    Record.add('foo')
+    Record.add('bar')
+    Record.reset_all
+    Store.db.keys('stat:*').should == []
+  end
+end