rhoconnect 3.3.1.beta4 → 3.3.1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.3.1 (2012-07-19)
+* #33021139 - ping test page doesn't send sound parameter
+* disable sqlite3 dependency by default so applications deploy on heroku without modification
+* #28696971 - select which models to bulk sync
+* cleaner layout on statistics page
+
 ## 3.3.1.beta4 (2012-07-17)
 * #32952425/EMBPD00067402/EMBPD00067382 - rhoconnect startbg fails on windows
 

data/CREDITS

@@ -2375,3 +2375,19 @@ RhoConnect uses or references the following open source software:
  
  warbler 1.3.5 (https://github.com/jruby/warbler)
  License: MIT license (http://caldersphere.rubyforge.org/warbler/LICENSE_txt.html)
+
+ nodejs 0.8.1 http://nodejs.org/
+ License: MIT License (https://github.com/joyent/node/blob/master/LICENSE)
+
+ node_redis 0.7.1 http://search.npmjs.org/#/redis
+ License: MIT License (https://github.com/mranney/node_redis#license---mit-license)
+ 
+ redis-url 0.1.0 http://search.npmjs.org/#/redis-url
+ License: MIT License (https://github.com/ddollar/redis-url#license)
+ 
+ npm 1.1.30 http://npmjs.org/
+ License: MIT License (https://github.com/isaacs/npm/blob/master/LICENSE)
+ 
+ commander.js 1.0.0 http://visionmedia.github.com/commander.js/
+ License: MIT License (https://github.com/visionmedia/commander.js/#license)
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.3.1.beta4)
+    rhoconnect (3.3.1)
       bundler (~> 1.0)
       json (~> 1.6.0)
       rake (~> 0.9.2.2)
@@ -117,7 +117,7 @@ GEM
     rspec-mocks (2.10.1)
     ruby-hmac (0.4.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.24.0)
+    selenium-webdriver (2.25.0)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)

data/bench/lib/bench/test_data.rb

@@ -39,32 +39,7 @@ module Bench
       end
       users
     end
-
-    private
-
-    PREFIX = ["Account", "Administrative", "Advertising", "Assistant", "Banking", "Business Systems", 
-      "Computer", "Distribution", "IT", "Electronics", "Environmental", "Financial", "General", "Head", 
-      "Laboratory", "Maintenance", "Medical", "Production", "Quality Assurance", "Software", "Technical", 
-      "Chief", "Senior"] unless defined? PREFIX
-    SUFFIX = ["Clerk", "Analyst", "Manager", "Supervisor", "Plant Manager", "Mechanic", "Technician", "Engineer", 
-      "Director", "Superintendent", "Specialist", "Technologist", "Estimator", "Scientist", "Foreman", "Nurse", 
-      "Worker", "Helper", "Intern", "Sales", "Mechanic", "Planner", "Recruiter", "Officer", "Superintendent",
-      "Vice President", "Buyer", "Production Supervisor", "Chef", "Accountant", "Executive"] unless defined? SUFFIX
-
-    IMAGE_FILES = %w{
-      icon.ico                loading-LandscapeLeft.png   loading-PortraitUpsideDown.png
-      icon.png                loading-LandscapeRight.png  loading.png
-      loading-Landscape.png   loading-Portrait.png        loading@2x.png }
-
-    EXCLUDE_LIST = %w{ id  mock_id  img_file-rhoblob  img_file_size  filename }
-
-    def title
-      prefix = PREFIX[rand(PREFIX.length)]
-      suffix = SUFFIX[rand(SUFFIX.length)]
- 
-      "#{prefix} #{suffix}"
-    end
-
+    
     def generate_fake_data(num, generate_blob)
       res = {}
       num.times do |n|
@@ -94,5 +69,30 @@ module Bench
       end
       res
     end
+
+    private
+
+    PREFIX = ["Account", "Administrative", "Advertising", "Assistant", "Banking", "Business Systems", 
+      "Computer", "Distribution", "IT", "Electronics", "Environmental", "Financial", "General", "Head", 
+      "Laboratory", "Maintenance", "Medical", "Production", "Quality Assurance", "Software", "Technical", 
+      "Chief", "Senior"] unless defined? PREFIX
+    SUFFIX = ["Clerk", "Analyst", "Manager", "Supervisor", "Plant Manager", "Mechanic", "Technician", "Engineer", 
+      "Director", "Superintendent", "Specialist", "Technologist", "Estimator", "Scientist", "Foreman", "Nurse", 
+      "Worker", "Helper", "Intern", "Sales", "Mechanic", "Planner", "Recruiter", "Officer", "Superintendent",
+      "Vice President", "Buyer", "Production Supervisor", "Chef", "Accountant", "Executive"] unless defined? SUFFIX
+
+    IMAGE_FILES = %w{
+      icon.ico                loading-LandscapeLeft.png   loading-PortraitUpsideDown.png
+      icon.png                loading-LandscapeRight.png  loading.png
+      loading-Landscape.png   loading-Portrait.png        loading@2x.png }
+
+    EXCLUDE_LIST = %w{ id  mock_id  img_file-rhoblob  img_file_size  filename }
+
+    def title
+      prefix = PREFIX[rand(PREFIX.length)]
+      suffix = SUFFIX[rand(SUFFIX.length)]
+ 
+      "#{prefix} #{suffix}"
+    end
   end
 end

data/bench/scripts/cud_script.rb

@@ -48,7 +48,7 @@ Bench.test do |config,session|
   session.client_id = JSON.parse(session.last_result.body)['client']['client_id']
   create_objs = @create_objects[session.thread_id][session.iteration]
   session.post "create-object",
-    "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{config.adapter_name}/queue_updates", 
+    "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{config.adapter_name}", 
     {:content_type => :json, 'X-RhoConnect-CLIENT-ID' => session.client_id} do
       {:create => create_objs}.to_json
     end  

data/bench/scripts/test_query_script.rb

@@ -69,18 +69,24 @@ Bench.test do |config,session|
     token = JSON.parse(session.last_result.body)[1]['token']
     session.last_result.verify_code(200)
   end
-
-  obj_to_delete = @expected.keys[rand(@datasize - 1)]
-  @expected.delete(obj_to_delete)
-  @datasize = @datasize - 1
+  
+  # now , create 2 records and then, delete them
+  # we also generate 2 random records for CUD calls
+  expected_for_cud = Bench.generate_fake_data(2, false)
+  session.post "create-object",
+    "#{config.host}/app/#{Rhoconnect::API_VERSION}/RhoInternalBenchmarkAdapter", 
+    {:content_type => :json, 'X-RhoConnect-CLIENT-ID' => session.client_id} do
+      {:create => expected_for_cud}.to_json
+    end  
+  session.last_result.verify_code(200)
+  
+  obj_to_delete = expected_for_cud.keys[0]
   session.delete "delete_object",
     "#{config.host}/app/#{Rhoconnect::API_VERSION}/RhoInternalBenchmarkAdapter/#{obj_to_delete}",
     {'X-RhoConnect-CLIENT-ID' => session.client_id}
   session.last_result.verify_code(200)
   
-  obj_to_delete = @expected.keys[rand(@datasize - 1)]
-  @expected.delete(obj_to_delete)
-  @datasize = @datasize - 1
+  obj_to_delete = expected_for_cud.keys[1]
   session.post "push_deletes", 
     "#{config.host}/app/#{Rhoconnect::API_VERSION}/RhoInternalBenchmarkAdapter/push_deletes",
       {'X-RhoConnect-API-TOKEN' => config.token, :content_type => :json} do

data/doc/bulk-sync.txt

@@ -30,6 +30,17 @@ For example, your settings/settings.yml might have:
 
 ## Setup
 
+### Setup DB Library
+Bulk sync prepares database files inside of a job, therefore it needs access to sqlite3's ruby library.  To enable this library, uncomment or add the following line to your RhoConnect app's Gemfile:
+
+	:::ruby
+	gem 'sqlite3', ">= 1.3.3", :platforms => [:ruby, :mswin, :mingw]
+
+Then install the gem:
+
+	:::term
+	$ bundle install
+
 ### Enabling Bulk Sync in Rhodes
 In the device rhodes application, setting `bulksync_state` to 0 in rhoconfig.txt will trigger bulk sync next time sync is performed:
 

data/doc/supported-platforms.txt

@@ -16,7 +16,7 @@ Supported Platforms
   <tr>
     <td class='cap'>Linux</td>
     <td> CentOS / RHEL 5 & 6,<br/>Ubuntu 11,<br/>Amazon Linux</td>
-    <td> ruby-1.8.7-p358 </td>
+    <td> ruby-1.8.7-p370 </td>
     <td> ree-1.8.7-2012.02 </td>
     <td> ruby-1.9.2-p320 </td>
     <td> ruby-1.9.3-p194 </td>
@@ -26,7 +26,7 @@ Supported Platforms
   <tr>
     <td class='cap'>Mac OS </td>
     <td> Mac OS X 10.6/10.7 </td>
-    <td> ruby-1.8.7-p358 </td>
+    <td> ruby-1.8.7-p370 </td>
     <td> ree-1.8.7-2012.02 </td>
     <td> ruby-1.9.2-p320 </td>
     <td> ruby-1.9.3-p194 </td>
@@ -36,7 +36,7 @@ Supported Platforms
   <tr>
     <td class='cap'>Windows</td>
     <td> Windows 7 </td>
-    <td> ruby-1.8.7-p358 </td>
+    <td> ruby-1.8.7-p370 </td>
     <td class='tbd'> TBD </td>
     <td class='tbd'> TBD </td>
     <td> ruby-1.9.3-p194 </td>

data/generators/templates/application/Gemfile

@@ -4,7 +4,6 @@ gem 'rhoconnect', '<%=gem_version%>'
 
 # Helps with some of the limitations of green threads, not needed in ruby 1.9.x
 gem 'SystemTimer', '~> 1.2.3', :platforms => :ruby_18
-gem 'windows-pr', '1.2.1', :platforms => [:mswin, :mingw]
 gem 'win32-process', :platforms => [:mswin, :mingw]
 
 # use thin and eventmachine everywhere except JRuby
@@ -30,7 +29,8 @@ platforms :jruby do
   gem 'warbler'
 end
 
-gem 'sqlite3', ">= 1.3.3", :platforms => [:ruby, :mswin, :mingw]
+# uncomment the line below to use bulk sync: http://docs.rhomobile.com/rhoconnect/bulk-sync
+# gem 'sqlite3', ">= 1.3.3", :platforms => [:ruby, :mswin, :mingw]
 
 group :development do
   gem 'rhomobile-debug', ">= 1.0.2"

data/lib/rhoconnect/api/app/bulk_data.rb

@@ -1,6 +1,6 @@
 Server.api4 :bulk_data, :post, "/rc/#{Rhoconnect::API_VERSION}/app/bulk_data", \
             false, {:verb => :get, :url => ['/application/bulk_data', '/api/application/bulk_data']} do |params,user,server|
   server.content_type :json
-  data = ClientSync.bulk_data(params[:partition].to_sym,server.current_client)
+  data = ClientSync.bulk_data(params[:partition].to_sym,server.current_client, params[:sources])
   data.to_json
 end

data/lib/rhoconnect/api/client/list_client_docs.rb

@@ -1,13 +1,15 @@
 Server.api4 :list_client_docs, :get, "/rc/#{Rhoconnect::API_VERSION}/clients/:client_id/sources/:source_id/docnames", \
                 true, {:verb => :post, :url => ['/api/list_client_docs', '/api/client/list_client_docs']} do |params,user|
-  c = Client.load(params[:client_id],{:source_name => params[:source_id]})
-  res = {}
-  [:cd,:cd_size,:create,:update,:delete,
-   :page,:delete_page,:create_links,:create_links_page,:page_token,
-   :create_errors,:update_errors,:delete_errors,:login_error,:logoff_error,
-   :search,:search_token,:search_errors].each do |doc|
-    db_key = c.docname(doc)
-    res.merge!(doc => db_key)
+  Rhoconnect::Stats::Record.update('clientdocs') do
+    c = Client.load(params[:client_id],{:source_name => params[:source_id]})
+    res = {}
+    [:cd,:cd_size,:create,:update,:delete,
+     :page,:delete_page,:create_links,:create_links_page,:page_token,
+     :create_errors,:update_errors,:delete_errors,:login_error,:logoff_error,
+     :search,:search_token,:search_errors].each do |doc|
+      db_key = c.docname(doc)
+      res.merge!(doc => db_key)
+    end
+    res.to_json
   end
-  res.to_json
 end

data/lib/rhoconnect/api/system/get_license_info.rb

@@ -1,9 +1,9 @@
 Server.api4 :get_license_info, :get, "/rc/#{Rhoconnect::API_VERSION}/system/license", \
             true, {:verb => :post, :url => ['/api/get_license_info', '/api/admin/get_license_info']} do |params,user|
-  {:rhoconnect_version => Rhoconnect.license.rhoconnect_version, 
-   :licensee => Rhoconnect.license.licensee, 
-   :seats => Rhoconnect.license.seats, 
-   :issued => Rhoconnect.license.issued,
-   :available => Rhoconnect.license.available }.to_json
+    {:rhoconnect_version => Rhoconnect.license.rhoconnect_version, 
+     :licensee => Rhoconnect.license.licensee, 
+     :seats => Rhoconnect.license.seats, 
+     :issued => Rhoconnect.license.issued,
+     :available => Rhoconnect.license.available }.to_json
 end
 

data/lib/rhoconnect/bulk_data/bulk_data.rb

@@ -10,7 +10,8 @@ module Rhoconnect
     field :refresh_time, :integer
     field :dbfile,:string
     list  :sources, :string
-    validates_presence_of :app_id, :user_id, :sources
+    list  :partition_sources, :string
+    validates_presence_of :app_id, :user_id, :sources, :partition_sources
     
     def completed?
       if state.to_sym == :completed
@@ -64,6 +65,7 @@ module Rhoconnect
         fields[:id] = fields[:name]
         fields[:state] ||= :inprogress
         fields[:sources] ||= []
+        fields[:partition_sources] ||= []
         super(fields)
       end
       

data/lib/rhoconnect/client_sync.rb

@@ -262,12 +262,13 @@ module Rhoconnect
         res
       end
       
-      def bulk_data(partition,client)
+      def bulk_data(partition,client,sources=nil)
         raise ArgumentError.new(UNKNOWN_CLIENT) unless client
         name = BulkData.get_name(partition,client.user_id)
         data = BulkData.load(name)
 
-        sources = client.app.partition_sources(partition,client.user_id)
+        partition_sources = client.app.partition_sources(partition,client.user_id)	
+        sources ||= partition_sources
         return {:result => :nop} if sources.length <= 0
 
         do_bd_sync = data.nil?
@@ -279,6 +280,7 @@ module Rhoconnect
           data = BulkData.create(:name => name,
             :app_id => client.app_id,
             :user_id => client.user_id,
+            :partition_sources => partition_sources,
             :sources => sources,
             :refresh_time => Time.now.to_i + Rhoconnect.bulk_sync_poll_interval)
           BulkData.enqueue("data_name" => name)

data/lib/rhoconnect/graph_helper.rb

@@ -1,15 +1,16 @@
 module GraphHelper
   
+   
    def source_timing(params)
       #name,data,options
-      puts "display is #{params}"
       @displayname = params['display_name']
       names = []
-      begin
-        names = get_sources('all') #RhoconnectApi::list_sources(session[:server],session[:token],:all)
-      rescue Exception => e
-        puts "errror #{e.message}"
-      end
+      # begin
+      #     names = get_sources('all')
+      #   rescue Exception => e
+      #     puts "errror #{e.message}"
+      #   end
+      names = [params['display_name']]
       @sources = []
       
       names.each do |name|
@@ -18,18 +19,21 @@ module GraphHelper
         series = []
         options = { :legend => { :show => true }, :title => name }
         s['name'] = name
+        s['data'] = []
 
-        keys = get_user_count("source:*:#{name}") #RhoconnectApi::stats(session[:server],session[:token], :names => "source:*:#{name}")
-
+        @keys = get_user_count("source:*:#{name}")
+        @keyname = params['key'] || @keys.first
+        
         xmin = 9999999999999999
         xmax = -1
         ymin = 9999999999999999
         ymax = -1
-        keys.each do |key|
-          method = key.gsub(/source:/,"").gsub(/:.*/,"")
+        
+        if @keyname
+          method = @keyname.gsub(/source:/,"").gsub(/:.*/,"")
           series << {:showLabel => true, :label => method }
-          
-          range = get_user_count(nil,key,0,-1) #RhoconnectApi::stats(session[:server],session[:token], {:metric => key, :start => 0, :finish => -1})
+        
+          range = get_user_count(nil,@keyname,0,-1)
           thisdata = []
           range.each do |value|
             count = value.split(',')[0]
@@ -46,98 +50,177 @@ module GraphHelper
           data << thisdata
           xmin = thisdata[0][0].to_i if thisdata[0] && thisdata[0][0].to_i < xmin
           xmax = thisdata[-1][0].to_i if thisdata[-1]  && thisdata[-1][0].to_i > xmax
-        end
+      
         
-        options[:axes] = {
-          :yaxis => { :tickOptions => { :formatString =>'%.3f'}, :autoscale => true, :min => 0, :max => ymax + (ymax * 0.05), :label  => 'Seconds', :labelRenderer => '$.jqplot.CanvasAxisLabelRenderer'  }, 
-          :xaxis => { :autoscale => true, :renderer=>'$.jqplot.DateAxisRenderer',
-            :tickOptions => {:formatString => '%m/%d/%y'}}
-        }
-
-        s['data'] = data
-        options[:series] = series
-        options[:cursor] = {:zoom => true, :showTooltip => true} 
+          options[:axes] = {
+            :yaxis => { :tickOptions => { :formatString =>'%.3f'}, :autoscale => true, :min => 0, :max => ymax + (ymax * 0.05), :label  => 'Seconds', :labelRenderer => '$.jqplot.CanvasAxisLabelRenderer'  }, 
+            :xaxis => { :autoscale => true, :renderer=>'$.jqplot.DateAxisRenderer',
+              :tickOptions => {:formatString => '%m/%d/%y'}}
+          }
 
-        s['options'] = options
+          s['data'] = data
+          options[:series] = series
+          options[:cursor] = {:zoom => true, :showTooltip => true} 
 
+          s['options'] = options
+        end
+        
         @sources << s
       end
       @graph_t = 'source'
       @data = [[[1,2],[3,4],[5,6]]].to_json
       erb :jqplot, :layout => false
-    end
-
+   end
 
-   def http_timing(params)
-      @uri   = 'timing/httptiming'
 
-      #name,data,options
-      @displayname = params['display_name']
-      names = ["GET","POST"]
-      begin
-        names = get_sources('all') #RhoconnectApi::list_sources(session[:server],session[:token],:all)
-      rescue Exception => e
-        puts "errror #{e.message}"
-      end
-      names << "ALL"
-      @sources = []
+   def http_timing_key(params)
+       @uri   = 'timing/httptiming'
+   
+       #name,data,options
+       @displayname = params['display_name']
+       #names = ["GET","POST"]
+       # begin
+       #          names = get_sources('all')
+       #        rescue Exception => e
+       #          puts "errror #{e.message}"
+       #        end
+       @sources = []
+       name = key = params['display_name']
+       
+       s = {}
+       data = []
+       series = []
+       options = { :legend => { :show => true, :location => 'ne' }, :title => name }
+       s['name'] = name
+ 
+       xmin = 9999999999999999
+       xmax = -1
+       ymin = 9999999999999999
+       ymax = -1
+       
+       method = key.gsub(/http:.*?:/,"")
+       #method.gsub!(/:.*/,"")
+       series << {:showLabel => true, :label => method}
+       range = get_user_count(nil,key,0,-1)
+       thisdata = []
+       range.each do |value|
+         count = value.split(',')[0]
+         value.gsub!(/.*,/,"")
+         thisdata << value.split(":").reverse
+         thisdata[-1][0] = thisdata[-1][0].to_i * 1000
+         thisdata[-1][1] = thisdata[-1][1].to_f
+         thisdata[-1][1] /= count.to_f
 
-      names.each do |name|
-        s = {}
-        data = []
-        series = []
-        options = { :legend => { :show => true }, :title => name }
-        s['name'] = name
+         ymin = thisdata[-1][1].to_f if thisdata[-1][1] && thisdata[-1][1].to_f < ymin
+         ymax = thisdata[-1][1].to_f if thisdata[-1][1] && thisdata[-1][1].to_f > ymax
 
-        name = "*" if name == "ALL"
-        keys = get_user_count("http:*:#{name}") #RhoconnectApi::stats(session[:server],session[:token], :names => "http:*:#{name}")
+       end
+       data << thisdata
+       xmin = thisdata[0][0].to_i if thisdata[0] && thisdata[0][0].to_i < xmin
+       xmax = thisdata[-1][0].to_i if thisdata[-1]  && thisdata[-1][0].to_i > xmax
 
-        xmin = 9999999999999999
-        xmax = -1
-        ymin = 9999999999999999
-        ymax = -1
-        keys.each do |key|
-          method = key.gsub(/http:.*?:/,"")
-          method.gsub!(/:.*/,"") unless name == "*"
-          series << {:showLabel => true, :label => method }
-          
-          range = get_user_count(nil,key,0,-1) #RhoconnectApi::stats(session[:server],session[:token], {:metric => key, :start => 0, :finish => -1})
-          thisdata = []
-          range.each do |value|
-            count = value.split(',')[0]
-            value.gsub!(/.*,/,"")
-            thisdata << value.split(":").reverse
-            thisdata[-1][0] = thisdata[-1][0].to_i * 1000
-            thisdata[-1][1] = thisdata[-1][1].to_f
-            thisdata[-1][1] /= count.to_f
+ 
+       options[:axes] = {
+         :yaxis => { :tickOptions => { :formatString =>'%.3f'}, :autoscale => true, :min => 0, :max => ymax + (ymax * 0.05), :label  => 'Seconds', :labelRenderer => '$.jqplot.CanvasAxisLabelRenderer'  }, 
+         :xaxis => { :autoscale => true, :renderer=>'$.jqplot.DateAxisRenderer',
+           :tickOptions => {:formatString => '%m/%d/%y'}}
+       }
+ 
+       s['data'] = data
+       options[:series] = series
+       options[:cursor] = {:zoom => true, :showTooltip => true}  
+       s['options'] = options
+ 
+       @sources << s
+       
+       @graph_t = 'http'
+       @data = [[[1,2],[3,4],[5,6]]].to_json
+       erb :jqplot, :layout => false
+   end
+    
+  def http_timing(params)
+    @uri   = 'timing/httptiming'
 
-            ymin = thisdata[-1][1].to_f if thisdata[-1][1] && thisdata[-1][1].to_f < ymin
-            ymax = thisdata[-1][1].to_f if thisdata[-1][1] && thisdata[-1][1].to_f > ymax
+    #name,data,options
+    
+    @displayname  = params['display_name']
+    names = ["GET","POST"]
+    
+    @sources = []
+    names = [params['display_name']]
 
-          end
-          data << thisdata
-          xmin = thisdata[0][0].to_i if thisdata[0] && thisdata[0][0].to_i < xmin
-          xmax = thisdata[-1][0].to_i if thisdata[-1]  && thisdata[-1][0].to_i > xmax
-        end
+    names.each do |name|
+      s = {}
+      data = []
+      series = []
+      options = { :legend => { :show => true, :location => 'ne' }, :title => name }
+      s['name'] = name
 
-        options[:axes] = {
-          :yaxis => { :tickOptions => { :formatString =>'%.3f'}, :autoscale => true, :min => 0, :max => ymax + (ymax * 0.05), :label  => 'Seconds', :labelRenderer => '$.jqplot.CanvasAxisLabelRenderer'  }, 
-          :xaxis => { :autoscale => true, :renderer=>'$.jqplot.DateAxisRenderer',
-            :tickOptions => {:formatString => '%m/%d/%y'}}
-        }
+      name = "*" if name == "ALL"
+      keys = get_user_count("http:*:#{name}")
+      xmin = 9999999999999999
+      xmax = -1
+      ymin = 9999999999999999
+      ymax = -1
+      keys.each_with_index do |key,index|
+        method = key.gsub(/http:.*?:/,"")
+        method.gsub!(/:.*/,"") unless name == "*"
+        series << {:showLabel => true, :label => method}
 
-        s['data'] = data
-        options[:series] = series
-        options[:cursor] = {:zoom => true, :showTooltip => true} 
+        range = get_user_count(nil,key,0,-1)
+        thisdata = []
+        range.each do |value|
+          count = value.split(',')[0]
+          value.gsub!(/.*,/,"")
+          thisdata << value.split(":").reverse
+          thisdata[-1][0] = thisdata[-1][0].to_i * 1000
+          thisdata[-1][1] = thisdata[-1][1].to_f
+          thisdata[-1][1] /= count.to_f
 
-        s['options'] = options
+          ymin = thisdata[-1][1].to_f if thisdata[-1][1] && thisdata[-1][1].to_f < ymin
+          ymax = thisdata[-1][1].to_f if thisdata[-1][1] && thisdata[-1][1].to_f > ymax
 
-        @sources << s
+        end
+        data << thisdata
+        xmin = thisdata[0][0].to_i if thisdata[0] && thisdata[0][0].to_i < xmin
+        xmax = thisdata[-1][0].to_i if thisdata[-1]  && thisdata[-1][0].to_i > xmax
       end
-      @graph_t = 'http'
-      @data = [[[1,2],[3,4],[5,6]]].to_json
-      erb :jqplot, :layout => false
+
+      options[:axes] = {
+        :yaxis => { :tickOptions => { :formatString =>'%.3f'}, :autoscale => true, :min => 0, :max => ymax + (ymax * 0.05), :label  => 'Seconds', :labelRenderer => '$.jqplot.CanvasAxisLabelRenderer'  }, 
+        :xaxis => { :autoscale => true, :renderer=>'$.jqplot.DateAxisRenderer',
+          :tickOptions => {:formatString => '%m/%d/%y'}}
+      }
+
+      s['data'] = data
+      options[:series] = series
+      options[:cursor] = {:zoom => true, :showTooltip => true}  
+      s['options'] = options
+
+      @sources << s
     end
+    
+    @graph_t = 'http'
+    @data = [[[1,2],[3,4],[5,6]]].to_json
+    erb :jqplot, :layout => false
+  end
+  
+  def get_http_routes()
+    keys = get_user_count("http:*:*")
+    method = key.gsub(/http:.*?:/,"")
+    #sources = get_sources('all')
+    
+    #loop through arrays and remove any regex matches
+    # keysf = keys.inject([]) do |keys_final, element|
+    #      found = true
+    #      sources.each do |s|
+    #        found = false if element.match(s)
+    #      end
+    #      keys_final << element.strip if found
+    #      keys_final
+    #    end
+    
+  end
   
   def count_graph(uri,title,name,metric)
   	start = 0
@@ -178,13 +261,13 @@ module GraphHelper
   end
   
   def get_user_count(name=nil,metric_p=nil,start=nil,finish=nil)
-   begin
+    begin
        if Rhoconnect.stats == true
            names = name
            if names
              Rhoconnect::Stats::Record.keys(names)
            else
-             metric = metric_p
+             metric = metric_p.strip
              rtype = Rhoconnect::Stats::Record.rtype(metric)
              if rtype == 'zset'
                # returns [] if no results
@@ -198,10 +281,9 @@ module GraphHelper
        else
          raise ApiException.new(500, "Stats not enabled")
        end
-     rescue Exception => e
-       puts "error #{e.message} -- #{metric}"
+    rescue Exception => e
        usercount = ["0:#{Time.now.to_i}"]
-     end
+    end
   end
   
   def get_sources(partition_type)