rhosync 2.1.1 → 2.1.2

data/CHANGELOG

@@ -1,3 +1,12 @@
+## 2.1.2
+* Use server-dir/redis.conf if not found at RedisRunner.prefix (via artemk) 
+* #8471337 - switch client user if it is not equal to current_user
+* Upgrade rest-client dependency which includes cookie escape fix
+* #10097347 - generate cryptographically secure secret key by default
+* Fixed 'application/json; charset=UTF-8' content handling in the server before filter
+* #11017509 - fixed sinatra 1.2 incompatibility with url() helper
+* #4569337 - use redis 2.2.2 by default
+
 ## 2.1.1
 * #7679395 - added support for gzipped bulk data files
 * #8167507 - fixed typo in console login page

data/CREDITS

@@ -0,0 +1,38 @@
+RhoSync uses following other projects:
+
+ Ruby language 1.8.7 (http://www.ruby-lang.org/en/downloads/)
+ License: GPL or Ruby own license (http://www.ruby-lang.org/en/about/license.txt)
+
+ Redis 1.2.6 or 2.2.1 (http://redis.io)
+ License: BSD (https://github.com/antirez/redis/blob/master/COPYING)
+
+ Resque 1.13.0 (https://github.com/defunkt/resque)
+ License: MIT-like (https://github.com/defunkt/resque/blob/master/LICENSE)
+
+ Sinatra 1.1.3 (http://www.sinatrarb.com/)
+ License: MIT-like (https://github.com/sinatra/sinatra/blob/master/LICENSE)
+
+ sqlite3-ruby 1.2.5 (http://github.com/luislavena/sqlite3-ruby)
+ License: MIT-like (https://github.com/luislavena/sqlite3-ruby/blob/master/LICENSE)
+
+ log4r 1.1.7 (http://log4r.rubyforge.org/)
+ License: GNU LGPLv3 (http://log4r.rubyforge.org/license.html)
+
+ uuidtools 2.1.1 (https://github.com/sporkmonger/uuidtools/)
+ License: MIT-like (https://github.com/sporkmonger/uuidtools/blob/master/LICENSE)
+
+ rest-client 1.6.1 (https://github.com/archiloque/rest-client)
+ License: MIT (http://www.opensource.org/licenses/mit-license.php)
+
+ json 1.4.6 (http://flori.github.com/json/)
+ License: GPL2 or Ruby (http://www.ruby-lang.org/en/LICENSE.txt)
+
+ templater 1.0.0 (https://github.com/jnicklas/templater)
+ License: MIT (https://github.com/jnicklas/templater)
+
+ Apache 2.2 (http://httpd.apache.org)
+ License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+
+ thin 1.2.8 (https://github.com/macournoyer/thin)
+ License: MIT (https://github.com/macournoyer/thin/blob/master/COPYING)
+

data/Rakefile

@@ -65,16 +65,16 @@ begin
 
     # TODO: Due to https://www.pivotaltracker.com/story/show/3417862, we can't use JSON 1.4.3
     gemspec.add_dependency "json", "~>1.4.2"
-    gemspec.add_dependency "log4r", "~>1.1.7"
     gemspec.add_dependency "sqlite3-ruby", "~>1.2.5"
     gemspec.add_dependency "rubyzip", "~>0.9.4"
     gemspec.add_dependency "uuidtools", ">=2.1.1"
-    gemspec.add_dependency "redis", "~>2.0.0"
-    gemspec.add_dependency "resque", ">=1.9.7"
-    gemspec.add_dependency "rest-client", ">=1.4.2"
-    gemspec.add_dependency "sinatra", "~>1.1"
+    gemspec.add_dependency "redis", "~>2.1.1"
+    gemspec.add_dependency "resque", "~>1.14.0"
+    gemspec.add_dependency "rest-client", "~>1.6.1"
+    gemspec.add_dependency "sinatra", "~>1.2"
     gemspec.add_dependency "templater", "~>1.0.0"
     gemspec.add_dependency "rake", ">=0.8.7"
+    gemspec.add_development_dependency "log4r", "~>1.1.7"
     gemspec.add_development_dependency "jeweler", ">=1.4.0"
     gemspec.add_development_dependency "rspec", ">=1.3.0"
     gemspec.add_development_dependency "rcov", ">=0.9.8"

data/generators/rhosync.rb

@@ -36,6 +36,8 @@ module Rhosync
     first_argument :name, :required => true, :desc => "application name"
     
     template :configru do |template|
+      require 'securerandom' rescue nil
+      @secret = SecureRandom.hex(64) rescue '<changeme>'
       template.source = 'config.ru'
       template.destination = "#{name}/config.ru"
     end    

data/generators/templates/application/config.ru

@@ -19,7 +19,7 @@ Rhosync::Server.disable :run
 Rhosync::Server.disable :clean_trace
 Rhosync::Server.enable  :raise_errors
 Rhosync::Server.set     :environment, :development
-Rhosync::Server.set     :secret,      '<changeme>'
+Rhosync::Server.set     :secret,      '<%= @secret %>'
 Rhosync::Server.set     :root,        ROOT_PATH
 Rhosync::Server.use     Rack::Static, :urls => ["/data"], :root => Rhosync::Server.root
 

data/generators/templates/source/source_adapter.rb

@@ -36,7 +36,7 @@ class <%=class_name%> < SourceAdapter
     raise "Please provide some code to update a single record in the backend data source using the update_hash"
   end
  
-  def delete(object_id)
+  def delete(delete_hash)
     # TODO: write some code here if applicable
     # be sure to have a hash key and value for "object"
     # for now, we'll say that its OK to not have a delete operation

data/lib/rhosync.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'base64'
 require 'zip/zip'
 require 'yaml'
+require 'cgi'
 require 'rhosync/license'
 require 'rhosync/version'
 require 'rhosync/document'

data/lib/rhosync/client.rb

@@ -59,6 +59,13 @@ module Rhosync
       super
     end
     
+    def switch_user(new_user_id)
+      flash_data('*')
+      User.load(self.user_id).clients.delete(self.id)
+      User.load(new_user_id).clients << self.id
+      self.user_id = new_user_id
+    end
+    
     def update_clientdoc(sources)
       # TODO: We need to store schema info and data info in bulk data
       # source masterdoc and source schema might have changed!

data/lib/rhosync/console/app/helpers/helpers.rb

@@ -1,9 +1,9 @@
 class RhosyncConsole::Server
   helpers do
-    def url(*path_parts)
+    def url_path(*path_parts)
       [ path_prefix, path_parts ].join("/").squeeze('/')
     end
-    alias_method :u, :url
+    alias_method :u, :url_path
 
     def path_prefix
       request.env['SCRIPT_NAME']

data/lib/rhosync/console/app/routes/auth.rb

@@ -18,12 +18,12 @@ class RhosyncConsole::Server
       report_error("Can't login to Rhosync server.")      
       #puts e.message + "\n" + e.backtrace.join("\n")
     end 
-    redirect url('/'), 303
+    redirect url_path('/'), 303
   end
   
   get '/logout' do
     session[:token] = nil
-    redirect url('/'), 303
+    redirect url_path('/'), 303
   end
   
 end

data/lib/rhosync/console/app/routes/client.rb

@@ -5,7 +5,7 @@ class RhosyncConsole::Server
     handle_api_error("Can't create new device") do  
       RhosyncApi::create_client(session[:server],session[:token],params[:user_id])
     end      
-    redirect url("/user?user_id=#{CGI.escape(params[:user_id])}"), 303  
+    redirect url_path("/user?user_id=#{CGI.escape(params[:user_id])}"), 303  
   end
   
   get '/device' do
@@ -25,7 +25,7 @@ class RhosyncConsole::Server
       RhosyncApi::delete_client(session[:server],session[:token],
         params[:user_id],params[:device_id])
     end    
-    redirect url(session[:errors] ? "/device?user_id=#{CGI.escape(params[:user_id])}&device_id=#{CGI.escape(params[:device_id])}" :
+    redirect url_path(session[:errors] ? "/device?user_id=#{CGI.escape(params[:user_id])}&device_id=#{CGI.escape(params[:device_id])}" :
       "/user?user_id=#{CGI.escape(params[:user_id])}"), 303
   end
 end

data/lib/rhosync/console/app/routes/docs.rb

@@ -6,9 +6,9 @@ class RhosyncConsole::Server
      @locals = {
        :div => "main_box",
        :links => [ 
-         { :url => url('/homepage'), :title => 'Info' },
-         { :url => url('/doc/select'), :selected => true, :title => 'Server Document' },
-         { :url => url('/users'), :title => 'Users' }
+         { :url => url_path('/homepage'), :title => 'Info' },
+         { :url => url_path('/doc/select'), :selected => true, :title => 'Server Document' },
+         { :url => url_path('/users'), :title => 'Users' }
        ]
      }
      erb :content
@@ -37,15 +37,15 @@ class RhosyncConsole::Server
       handle_api_error("Can't load list of the documents") do
         if params[:device_id]
           @docs_name = "device #{params[:device_id]}"
-          @back_href = url("device?user_id=#{CGI.escape(params[:user_id])}&device_id=#{CGI.escape(params[:device_id])}") 
+          @back_href = url_path("device?user_id=#{CGI.escape(params[:user_id])}&device_id=#{CGI.escape(params[:device_id])}") 
           @docs = RhosyncApi::list_client_docs(session[:server],session[:token],params[:source_id],params[:device_id])
         else   
           if params[:user_id]=='*'      
             @docs_name = "app partition"
-            @back_href = url('/')
+            @back_href = url_path('/')
           else
              @docs_name = "user #{params[:user_id]} partition"
-             @back_href = url("user?user_id=#{CGI.escape(params[:user_id])}")
+             @back_href = url_path("user?user_id=#{CGI.escape(params[:user_id])}")
           end   
           @docs = RhosyncApi::list_source_docs(session[:server],
             session[:token],params[:source_id],params[:user_id])
@@ -53,7 +53,7 @@ class RhosyncConsole::Server
       end
       erb :docs, :layout => false
     else
-      docs_render_page url("/docs" + hash_to_params(params))
+      docs_render_page url_path("/docs" + hash_to_params(params))
       
     end
   end
@@ -73,7 +73,7 @@ class RhosyncConsole::Server
       end
       erb :select_doc, :layout => false
     else
-      docs_render_page url("/doc/select" + hash_to_params(params))
+      docs_render_page url_path("/doc/select" + hash_to_params(params))
     end
   end
   
@@ -88,10 +88,10 @@ class RhosyncConsole::Server
       end
       @back_params = "source_id=#{CGI.escape(params[:source_id])}&user_id=#{CGI.escape(params[:user_id])}"
       @back_params += "&device_id=#{CGI.escape(params[:device_id])}" if params[:device_id] 
-      @back_href = url("docs?#{doc_params}")
+      @back_href = url_path("docs?#{doc_params}")
       erb :doc, :layout => false
     else
-      docs_render_page url("/doc" + hash_to_params(params))
+      docs_render_page url_path("/doc" + hash_to_params(params))
     end
         
   end 
@@ -106,11 +106,11 @@ class RhosyncConsole::Server
       @result_name = "Clear result"
       @status = "Successfully cleared: [#{CGI.unescape(params[:dbkey])}]"
       @back_href = params[:user_id] ?
-        url("doc?#{doc_params}&dbkey=#{CGI.escape(params[:dbkey])}") :
-        url("doc/select?dbkey=#{CGI.escape(params[:dbkey])}")     
+        url_path("doc?#{doc_params}&dbkey=#{CGI.escape(params[:dbkey])}") :
+        url_path("doc/select?dbkey=#{CGI.escape(params[:dbkey])}")     
       erb :result, :layout => false
     else
-       docs_render_page url("/doc/clear" + hash_to_params(params))
+       docs_render_page url_path("/doc/clear" + hash_to_params(params))
     end
   end
   
@@ -137,8 +137,8 @@ class RhosyncConsole::Server
     @result_name = "Upload result"
     @status = "Successfully uploadad data to: [#{CGI.unescape(params[:doc])}]"
     @back_href = params[:user_id] ?
-      url("doc?#{doc_params}&dbkey=#{params[:doc]}") :
-      url("doc/select?dbkey=#{params[:doc]}")
+      url_path("doc?#{doc_params}&dbkey=#{params[:doc]}") :
+      url_path("doc/select?dbkey=#{params[:doc]}")
     erb :result
   end
    

data/lib/rhosync/console/app/routes/home.rb

@@ -2,33 +2,33 @@ class RhosyncConsole::Server
   get '/' do
     if params[:xhr] or request.xhr?
       if login_required
-        redirect url('/loginpage')
+        redirect url_path('/loginpage')
       else
-        redirect url('/homepage')
+        redirect url_path('/homepage')
       end
     else
       @currentpage = "Console" #which page in menu
       if login_required
         @pagetitle = "Login" #H1 title
-        @initialcontent = url('/loginpage')
+        @initialcontent = url_path('/loginpage')
 
         @locals = {
           :div => "main_box",
           :links => [ 
-          #  { :url => url('/timing/bydevice'), :selected => true, :title => 'By Device' },
-          #  { :url => url('/timing/bysource'), :title => 'By Source' }
+          #  { :url => url_path('/timing/bydevice'), :selected => true, :title => 'By Device' },
+          #  { :url => url_path('/timing/bysource'), :title => 'By Source' }
           ]
         }
       else
         @pagetitle = "Rhosync Console" #H1 title
-        @initialcontent = url('/homepage')
+        @initialcontent = url_path('/homepage')
 
         @locals = {
           :div => "main_box",
           :links => [ 
-            { :url => url('/homepage'), :selected => true, :title => 'Info' },
-            { :url => url('/doc/select'), :title => 'Server Document' },
-            { :url => url('/users'), :title => 'Users' }
+            { :url => url_path('/homepage'), :selected => true, :title => 'Info' },
+            { :url => url_path('/doc/select'), :title => 'Server Document' },
+            { :url => url_path('/users'), :title => 'Users' }
           ]
         }
       end
@@ -56,6 +56,6 @@ class RhosyncConsole::Server
     handle_api_error("Can't reset server") do
       RhosyncApi::reset(session[:server],session[:token])
     end
-    redirect url('/'), 303
+    redirect url_path('/'), 303
   end
 end

data/lib/rhosync/console/app/routes/timing.rb

@@ -3,21 +3,21 @@ require 'json'
 class RhosyncConsole::Server
   get '/timing' do
     if login_required
-      redirect url('/')
+      redirect url_path('/')
       return
     end
     @currentpage = "Statistics"
     @pagetitle = "Statistics" #H1 title
     
-    @initialcontent = url('/timing/usercount')
+    @initialcontent = url_path('/timing/usercount')
     
     @locals = {
       :div => "main_box",
       :links => [ 
-        { :url => url('/timing/usercount'), :selected => true, :title => 'User Count' },
-        { :url => url('/timing/devicecount'), :title => 'Device Count' },
-        { :url => url('/timing/httptiming'), :title => 'HTTP Timing' },
-        { :url => url('/timing/bysource'), :title => 'Source Timing' }
+        { :url => url_path('/timing/usercount'), :selected => true, :title => 'User Count' },
+        { :url => url_path('/timing/devicecount'), :title => 'Device Count' },
+        { :url => url_path('/timing/httptiming'), :title => 'HTTP Timing' },
+        { :url => url_path('/timing/bysource'), :title => 'Source Timing' }
       ]
     }
     
@@ -69,7 +69,7 @@ class RhosyncConsole::Server
     s['data'] = [thisdata]
     s['options'] = options
     @sources << s
-    erb :jqplot, :layout => :false
+    erb :jqplot, :layout => false
   end
   
   get '/timing/usercount' do
@@ -156,7 +156,7 @@ class RhosyncConsole::Server
     end
     
     @data = [[[1,2],[3,4],[5,6]]].to_json
-    erb :jqplot, :layout => :false
+    erb :jqplot, :layout => false
   end
 
 
@@ -237,6 +237,6 @@ class RhosyncConsole::Server
     end
     
     @data = [[[1,2],[3,4],[5,6]]].to_json
-    erb :jqplot, :layout => :false
+    erb :jqplot, :layout => false
   end
 end

data/lib/rhosync/console/app/routes/user.rb

@@ -6,9 +6,9 @@ class RhosyncConsole::Server
      @locals = {
        :div => "main_box",
        :links => [ 
-         { :url => url('/homepage'), :title => 'Info' },
-         { :url => url('/doc/select'), :title => 'Server Document' },
-         { :url => url('/users'), :selected => true, :title => 'Users' }
+         { :url => url_path('/homepage'), :title => 'Info' },
+         { :url => url_path('/doc/select'), :title => 'Server Document' },
+         { :url => url_path('/users'), :selected => true, :title => 'Users' }
        ]
      }
      erb :content
@@ -23,7 +23,7 @@ class RhosyncConsole::Server
       erb :users, :layout => false
       
     else
-       render_page url("/users")
+       render_page url_path("/users")
      end 
   end
   
@@ -31,7 +31,7 @@ class RhosyncConsole::Server
     if params[:xhr] or request.xhr?
       erb :newuser, :layout => false
     else
-      render_page url("/user/new")
+      render_page url_path("/user/new")
     end 
       
   end
@@ -45,7 +45,7 @@ class RhosyncConsole::Server
           session[:token],params[:login],params[:password])
       end      
     end
-    redirect url(session[:errors] ? '/user/new' : '/users'), 303  
+    redirect url_path(session[:errors] ? '/user/new' : '/users'), 303  
   end
   
   get '/user' do
@@ -63,7 +63,7 @@ class RhosyncConsole::Server
       erb :user, :layout => false
     else
        params[:user_id] = CGI::escape(params[:user_id]) if params[:user_id]
-       render_page url("/user?user_id=#{params[:user_id]}")
+       render_page url_path("/user?user_id=#{params[:user_id]}")
     end     
   end
   
@@ -71,7 +71,7 @@ class RhosyncConsole::Server
     handle_api_error("Can't delete user #{params[:user_id]}") do 
       RhosyncApi::delete_user(session[:server],session[:token],params[:user_id])
     end    
-    redirect url(session[:errors] ? "/user?user_id=#{CGI.escape(params[:user_id])}" : '/users'), 303
+    redirect url_path(session[:errors] ? "/user?user_id=#{CGI.escape(params[:user_id])}" : '/users'), 303
   end
   
   get '/user/ping' do
@@ -83,7 +83,7 @@ class RhosyncConsole::Server
       end
       erb :ping, :layout => false
     else
-      render_page url("/user/ping?user_id=#{CGI.escape(params[:user_id])}")
+      render_page url_path("/user/ping?user_id=#{CGI.escape(params[:user_id])}")
     end
     
   end
@@ -94,6 +94,6 @@ class RhosyncConsole::Server
       RhosyncApi::ping(session[:server],session[:token],params[:user_id],params)
     end
     user = CGI.escape(params[:user_id])
-    redirect url(session[:errors] ? "/user/ping?user_id=#{user}" : "/user?user_id=#{user}"), 303
+    redirect url_path(session[:errors] ? "/user/ping?user_id=#{user}" : "/user?user_id=#{user}"), 303
   end
 end

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

@@ -1,7 +1,7 @@
 <h1>Device: <%=params[:device_id]%></h1>
 <%=show_errors%>
-<a href="javascript:void(0);" onclick="loadXMLDoc('<%=url("user?user_id=#{CGI.escape(params[:user_id])}")%>','main_box');" class='nav_button'>Back</a>
-<a href='<%=url("device/delete?user_id=#{CGI.escape(params[:user_id])}&device_id=#{CGI.escape(params[:device_id])}")%>' class='nav_button'>
+<a href="javascript:void(0);" onclick="loadXMLDoc('<%=url_path("user?user_id=#{CGI.escape(params[:user_id])}")%>','main_box');" class='nav_button'>Back</a>
+<a href='<%=url_path("device/delete?user_id=#{CGI.escape(params[:user_id])}&device_id=#{CGI.escape(params[:device_id])}")%>' class='nav_button'>
 	Delete device
 </a>
 
@@ -23,7 +23,7 @@
 
 [
 <%@sources.each_index do |i|%>
-	<a href='javascript:void(0);' onclick="loadXMLDoc('<%=url("docs?source_id=#{@sources[i]}&device_id=#{CGI.escape(params[:device_id])}&user_id=#{CGI.escape(params[:user_id])}")%>','main_box');">
+	<a href='javascript:void(0);' onclick="loadXMLDoc('<%=url_path("docs?source_id=#{@sources[i]}&device_id=#{CGI.escape(params[:device_id])}&user_id=#{CGI.escape(params[:user_id])}")%>','main_box');">
 		<%=i==0?'':','%>"<%=@sources[i]%>"
 	</a>
 <%end%>

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

@@ -2,7 +2,7 @@
 <div class='panel'>
 	<%if @data.size > 0%>
 		<div class='panel'>
-			<a href='javascript:void(0);' onclick="loadXMLDoc('<%=url("doc/clear?#{@back_params}&dbkey=#{CGI.escape(params[:dbkey])}")%>','main_box');" class='nav_button'>Clear document</a>
+			<a href='javascript:void(0);' onclick="loadXMLDoc('<%=url_path("doc/clear?#{@back_params}&dbkey=#{CGI.escape(params[:dbkey])}")%>','main_box');" class='nav_button'>Clear document</a>
 		</div>
 		<%if @is_string%>
 			<p>[<%=@data%>]</p>

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

@@ -22,7 +22,7 @@
 		<%@docs.each do |name,dbkey|%>
 			<tr>
 				<td>:<%=name%></td>
-				<td><a href='javascript:void(0);' onclick="loadXMLDoc('<%=url("doc?dbkey=#{CGI.escape(dbkey)}&#{@doc_params}")%>','main_box');" class='nav_button'><%=dbkey%></a></td>
+				<td><a href='javascript:void(0);' onclick="loadXMLDoc('<%=url_path("doc?dbkey=#{CGI.escape(dbkey)}&#{@doc_params}")%>','main_box');" class='nav_button'><%=dbkey%></a></td>
 			</tr>	
 		<%end%>
 	</table>

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

@@ -7,14 +7,14 @@
 	<% end %>
 
 	<% if currentpage == "Console" %>
-		<li id="current"><a href="<%=url("")%>" class="current">Console</a></li> 
+		<li id="current"><a href="<%=url_path("")%>" class="current">Console</a></li> 
 	<% else %>
-		<li ><a href="<%=url("")%>" >Console</a></li> 
+		<li ><a href="<%=url_path("")%>" >Console</a></li> 
 	<% end %>
 	<% if currentpage == "Statistics" %>
-		<li id="current"><a href="<%=url("timing")%>" class="current">Statistics</a></li> 
+		<li id="current"><a href="<%=url_path("timing")%>" class="current">Statistics</a></li> 
 	<% else %>
-		<li ><a href="<%=url("timing")%>" class="">Statistics</a></li> 
+		<li ><a href="<%=url_path("timing")%>" class="">Statistics</a></li> 
 	<% end %>
 	<!--	
 	
@@ -34,8 +34,8 @@
 		<img src="/console/images/tabs_separator.png"/> 
 	</li>
 	<% if session[:token] != nil %> 
-		<li><a href="<%=url("logout")%>" class="logout">Logout</a></li>
+		<li><a href="<%=url_path("logout")%>" class="logout">Logout</a></li>
 	<% else %>
-		<li><a href="<%=url("")%>" class="login">Login</a></li>
+		<li><a href="<%=url_path("")%>" class="login">Login</a></li>
 	<% end %>
 </ul>

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

@@ -6,7 +6,7 @@
 <%end%>	
 
 <div class='panel'>
-	<a href="<%=url('reset')%>" class='nav_button' onclick="return confirm('Are you sure? Resetting will remove all data. It will also return an error code to all existing devices when they connect!')">Reset</a>
+	<a href="<%=url_path('reset')%>" class='nav_button' onclick="return confirm('Are you sure? Resetting will remove all data. It will also return an error code to all existing devices when they connect!')">Reset</a>
 	
 </div>
 
@@ -15,7 +15,7 @@
 	<%unless @sources.nil? %>
 		[
 		<%@sources.each_index do |i|%>
-			<a href='javascript:void(0);' onclick="loadXMLDoc('<%=url("docs?source_id=#{@sources[i]}&user_id=*")%>','main_box');"><%=i==0?'':','%>"<%=@sources[i]%>"</a>
+			<a href='javascript:void(0);' onclick="loadXMLDoc('<%=url_path("docs?source_id=#{@sources[i]}&user_id=*")%>','main_box');"><%=i==0?'':','%>"<%=@sources[i]%>"</a>
 		<%end%>
 		]
 	<%end%>	

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

@@ -7,21 +7,21 @@
  		<%="Licensed to #{@license['licensee']} on #{@license['issued']}, available #{@license['available']} of #{@license['seats']} devices"%>
 	<%end%>	
 	<div class='panel'>
-		<a href="<%=url('logout')%>" class='nav_button'>Logout</a>
+		<a href="<%=url_path('logout')%>" class='nav_button'>Logout</a>
 	</div>	
 	<div class='panel'>
-		<a href="<%=url('reset')%>" class='nav_button' onclick="return confirm('Are you sure? Resetting will remove all data. It will also return an error code to all existing devices when they connect!')">Reset</a>
-		<a href="<%=url('doc/select')%>" class='nav_button'>Show server document</a>
+		<a href="<%=url_path('reset')%>" class='nav_button' onclick="return confirm('Are you sure? Resetting will remove all data. It will also return an error code to all existing devices when they connect!')">Reset</a>
+		<a href="<%=url_path('doc/select')%>" class='nav_button'>Show server document</a>
 	</div>
 	<div class='panel'>
-		<a href="<%=url('users')%>" class='nav_button'>Application users</a>
+		<a href="<%=url_path('users')%>" class='nav_button'>Application users</a>
 	</div>
 	<h2>App partition sources</h2>	
 	<div class='panel'>
 		<%unless @sources.nil? %>
 			[
 			<%@sources.each_index do |i|%>
-				<a href="<%=url("docs?source_id=#{@sources[i]}&user_id=*")%>"><%=i==0?'':','%>"<%=@sources[i]%>"</a>
+				<a href="<%=url_path("docs?source_id=#{@sources[i]}&user_id=*")%>"><%=i==0?'':','%>"<%=@sources[i]%>"</a>
 			<%end%>
 			]
 		<%end%>	
@@ -29,7 +29,7 @@
 <% else %>
 	<h1>Login</h1>
 	<%=show_errors%>
-	<form action="<%=url('login')%>" method='POST'>
+	<form action="<%=url_path('login')%>" method='POST'>
 		<table>
 			<tr>
 				<td>Connect to RhoSync:</td>

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

@@ -41,7 +41,7 @@ document.getElementById('chartdiv').style.display = '';plot = $.jqplot('chartdiv
 	<% end %>
 	
 	<a style="margin-right:5px" href="javascript:void(0);"
-	onclick="loadXMLDoc('<%= url(@uri + '?display='+ source['name'])%>','main_box');">
+	onclick="loadXMLDoc('<%= url_path(@uri + '?display='+ source['name'])%>','main_box');">
 	<%= source['name'] %>
 	</a>
 <% end%>

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

@@ -4,25 +4,25 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>Rhosync Console</title>
-	<!--<link rel="stylesheet" href="<%=url('main.css')%>" type="text/css" media="screen" /> -->
-	<link rel="stylesheet" href="<%=url('reset.css')%>" type="text/css" media="screen" /> 
-	<link rel="stylesheet" href="<%=url('home.css')%>" type="text/css" media="screen" /> 
-	<link rel="stylesheet" href="<%=url('style.css')%>" type="text/css" media="screen" /> 
-	<link rel="stylesheet" href="<%=url('ThickBox.css')%>" type="text/css" media="screen" /> 
+	<!--<link rel="stylesheet" href="<%=url_path('main.css')%>" type="text/css" media="screen" /> -->
+	<link rel="stylesheet" href="<%=url_path('reset.css')%>" type="text/css" media="screen" /> 
+	<link rel="stylesheet" href="<%=url_path('home.css')%>" type="text/css" media="screen" /> 
+	<link rel="stylesheet" href="<%=url_path('style.css')%>" type="text/css" media="screen" /> 
+	<link rel="stylesheet" href="<%=url_path('ThickBox.css')%>" type="text/css" media="screen" /> 
 	
-	<!--[if IE]><script language="javascript" type="text/javascript" src="<%=url('jqplot/excanvas.js')%>"></script><![endif]-->
-	<script language="javascript" type="text/javascript" src="<%=url('jqplot/jquery-1.4.2.min.js')%>"></script>
-	<script language="javascript" type="text/javascript" src="<%=url('jqplot/jquery.jqplot.min.js')%>"></script>
-	<script language="javascript" type="text/javascript" src="<%=url('jqplot/jqplot.categoryAxisRenderer.min.js')%>"></script>
-	<script language="javascript" type="text/javascript" src="<%=url('jqplot/jqplot.dateAxisRenderer.js')%>"></script>
-	<script language="javascript" type="text/javascript" src="<%=url('jqplot/jqplot.canvasTextRenderer.js')%>"></script>
-	<script language="javascript" type="text/javascript" src="<%=url('jqplot/jqplot.canvasAxisLabelRenderer.js')%>"></script>
-	<script language="javascript" type="text/javascript" src="<%=url('jqplot/jqplot.canvasAxisTickRenderer.js')%>"></script>
-	<script language="javascript" type="text/javascript" src="<%=url('jqplot/jqplot.cursor.js')%>"></script>
-	<!--<script language="javascript" type="text/javascript" src="<%=url('jqplot/jqplot.barRenderer.min.js')%>"></script>-->
-	<!--<script language="javascript" type="text/javascript" src="<%=url('jqplot/jqplot.pointLabels.min.js')%>"></script>-->
+	<!--[if IE]><script language="javascript" type="text/javascript" src="<%=url_path('jqplot/excanvas.js')%>"></script><![endif]-->
+	<script language="javascript" type="text/javascript" src="<%=url_path('jqplot/jquery-1.4.2.min.js')%>"></script>
+	<script language="javascript" type="text/javascript" src="<%=url_path('jqplot/jquery.jqplot.min.js')%>"></script>
+	<script language="javascript" type="text/javascript" src="<%=url_path('jqplot/jqplot.categoryAxisRenderer.min.js')%>"></script>
+	<script language="javascript" type="text/javascript" src="<%=url_path('jqplot/jqplot.dateAxisRenderer.js')%>"></script>
+	<script language="javascript" type="text/javascript" src="<%=url_path('jqplot/jqplot.canvasTextRenderer.js')%>"></script>
+	<script language="javascript" type="text/javascript" src="<%=url_path('jqplot/jqplot.canvasAxisLabelRenderer.js')%>"></script>
+	<script language="javascript" type="text/javascript" src="<%=url_path('jqplot/jqplot.canvasAxisTickRenderer.js')%>"></script>
+	<script language="javascript" type="text/javascript" src="<%=url_path('jqplot/jqplot.cursor.js')%>"></script>
+	<!--<script language="javascript" type="text/javascript" src="<%=url_path('jqplot/jqplot.barRenderer.min.js')%>"></script>-->
+	<!--<script language="javascript" type="text/javascript" src="<%=url_path('jqplot/jqplot.pointLabels.min.js')%>"></script>-->
 	
-	<link rel="stylesheet" type="text/css" href="<%=url('jqplot/jquery.jqplot.min.css')%>" />
+	<link rel="stylesheet" type="text/css" href="<%=url_path('jqplot/jquery.jqplot.min.css')%>" />
 	
     <script type="text/javascript">
     		$.jqplot.config.enablePlugins = true;
@@ -128,7 +128,7 @@
 				<div class="footer_content">
 					<div id="foot_lefts" class="foot_left">
 						<img src="/console/images/foot_logo_rhosync.png"></a>
-						<p>© 2010 <a href="http://www.rhomobile.com/">Rhomobile</a> All rights reserved.</p>
+						<p>© <a href="http://www.rhomobile.com/">Rhomobile</a> All rights reserved.</p>
 					</div>
 					<div class="foot_right">
 						<ul class="ul_footer">

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

@@ -1,4 +1,4 @@
-<form action="<%=url('login')%>" method='POST'>
+<form action="<%=url_path('login')%>" method='POST'>
 	<table>
 		<tr>
 			<td>Connect to RhoSync:</td>

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

@@ -1,6 +1,6 @@
 <h1>New user</h1>
 <%=show_errors%>
-<form action="<%=url('/user/create')%>" method='POST'>
+<form action="<%=url_path('/user/create')%>" method='POST'>
 	<table>
 		<tr>
 			<td>Login:</td>
@@ -13,5 +13,5 @@
 	</table>
 	<br/>
 	<input type='submit' value='Add'/>
-	<a href='javascript:void(0);' onclick="loadXMLDoc('<%=url('users')%>','main_box')">Back</a>
+	<a href='javascript:void(0);' onclick="loadXMLDoc('<%=url_path('users')%>','main_box')">Back</a>
 </form>

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

@@ -1,6 +1,6 @@
 <h1>Ping <%=params[:user_id]%></h1>
 <%=show_errors%>
-<form method="POST" action="<%=url('user/ping')%>">
+<form method="POST" action="<%=url_path('user/ping')%>">
   <input type="hidden" name="user_id" value="<%=params[:user_id]%>">
   <table>
 	<tr>

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

@@ -1,7 +1,7 @@
 <h1>Document <%= @dbkey%></h1>
 <%=show_errors%>
 
-<form action=<%= url('doc/select')%> method='GET'>
+<form action=<%= url_path('doc/select')%> method='GET'>
 	<table>
 		<tr>
 			<td>Doc DB key: </db>

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

@@ -1,6 +1,6 @@
 <h2>Upload document</h2>
 <div class='panel'>
-	<form action='<%=url("doc/upload?#{@back_params}")%>' method='post' enctype="multipart/form-data">
+	<form action='<%=url_path("doc/upload?#{@back_params}")%>' method='post' enctype="multipart/form-data">
 		<input type='hidden' name='doc' value='<%= "#{CGI.escape(params[:dbkey])}"%>'/>
 		<table>
 			<%if @is_string%>

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

@@ -1,27 +1,27 @@
 <h1>User: <%=params[:user_id]%></h1>
 <%=show_errors%>
 <div class="panel">
-	<a href='<%=url("user/delete?user_id=#{CGI.escape(params[:user_id])}")%>' class='nav_button'>Delete user</a>
+	<a href='<%=url_path("user/delete?user_id=#{CGI.escape(params[:user_id])}")%>' class='nav_button'>Delete user</a>
 </div>
 <div class="panel">	
-	<a href='<%=url("user/ping?user_id=#{CGI.escape(params[:user_id])}")%>' class='nav_button'>Ping User</a>
+	<a href='<%=url_path("user/ping?user_id=#{CGI.escape(params[:user_id])}")%>' class='nav_button'>Ping User</a>
 </div>
 <h2>User partition sources</h2>	
 
 [
 <%@sources.each_index do |i|%>
-	<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>
+	<a href='javascript:void(0);' onclick="loadXMLDoc('<%=url_path("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="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>
+<a href="javascript:void(0);" onclick="loadXMLDoc('<%=url_path("device/create?user_id=#{CGI.escape(params[:user_id])}")%>','');loadXMLDoc('<%=url_path("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="javascript:void(0);" onclick="loadXMLDoc('<%=url("device?user_id=#{CGI.escape(params[:user_id])}&device_id=#{CGI.escape(@devices[i])}")%>','main_box');">
+	<a href="javascript:void(0);" onclick="loadXMLDoc('<%=url_path("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,4 +1,4 @@
-	<a href="javascript:void(0);" onclick="loadXMLDoc('<%=url('user/new')%>','main_box');" class='nav_button'>Create User</a>
+	<a href="javascript:void(0);" onclick="loadXMLDoc('<%=url_path('user/new')%>','main_box');" class='nav_button'>Create User</a>
 
 <h2>Registered users</h2>
 <%if is_errors?%>
@@ -6,7 +6,7 @@
 <%else%>
 	[ 	
 	<%@users.each_index do |i|%>
-		<a href="javascript:void(0);" onclick="loadXMLDoc('<%=url("user?user_id=#{CGI.escape(@users[i])}")%>','main_box');"><%=i==0?'':','%>"<%=@users[i]%>"</a>
+		<a href="javascript:void(0);" onclick="loadXMLDoc('<%=url_path("user?user_id=#{CGI.escape(@users[i])}")%>','main_box');"><%=i==0?'':','%>"<%=@users[i]%>"</a>
 	<%end%>
 	]
 <%end%>

data/lib/rhosync/server.rb

@@ -112,7 +112,9 @@ module Rhosync
       def current_client
         if @client.nil? and params[:client_id]
           @client = Client.load(params[:client_id].to_s,
-            params[:source_name] ? {:source_name => current_source.name} : {:source_name => '*'}) 
+            params[:source_name] ? {:source_name => current_source.name} : {:source_name => '*'})
+          @client.switch_user(current_user.login) unless @client.user_id == current_user.login
+          @client
         end  
       end
       
@@ -164,7 +166,8 @@ module Rhosync
           params.delete("cud")
           params.merge!(cud)
         end
-        if request.env['CONTENT_TYPE'] == 'application/json'
+        #application/json; charset=UTF-8
+        if request.env['CONTENT_TYPE'] && request.env['CONTENT_TYPE'].match(/^application\/json/)
           params.merge!(JSON.parse(request.body.read))
           request.body.rewind
         end      

data/lib/rhosync/tasks.rb

@@ -272,6 +272,16 @@ namespace :rhosync do
       puts "Aborted..."
     end
   end
+  
+  desc "Generate a cryptographically secure secret session key"
+  task :secret do
+    begin
+      require 'securerandom' 
+      puts SecureRandom.hex(64)
+    rescue LoadError
+      puts "Missing secure random generator.  Try running `rake secret` in a rails application instead."
+    end
+  end
 end
 
 task :default => ['rhosync:spec']

data/lib/rhosync/version.rb

@@ -1,3 +1,3 @@
 module Rhosync
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

data/spec/client_spec.rb

@@ -53,6 +53,18 @@ describe "Client" do
     verify_result(docname => {})
   end
   
+  it "should switch client user and remove existing documents" do
+    docname = @c.docname(:cd)
+    set_state(docname => @data)
+    verify_result(@c.docname(:cd) => @data)
+    User.create({:login => 'user2'})
+    @c.switch_user('user2')    
+    verify_result(@c.docname(:cd) => {},docname => {})
+    @u.clients.members.should == []
+    @c.user_id.should == 'user2'
+    User.load('user2').clients.members.should == [@c.id]
+  end
+  
   it "should create cd as masterdoc clone" do
     set_state(@s.docname(:md_copy) => @data,
       @c.docname(:cd) => {'foo' => {'bar' => 'abc'}})

data/spec/generator/generator_spec.rb

@@ -21,6 +21,7 @@ describe "Generator" do
     end
     
     it "should create new application files" do
+      SecureRandom.should_receive(:hex).with(64).any_number_of_times
       [ 
         'config.ru',
         "application.rb",

data/spec/server/server_spec.rb

@@ -39,9 +39,23 @@ describe "Server" do
   end
   
   it "should login without app_name" do
-    post "/login", "login" => @u_fields[:login], "password" => 'testpass'
+    do_post "/login", "login" => @u_fields[:login], "password" => 'testpass'
     last_response.should be_ok
   end
+
+  it "should login if content-type contains extra parameters" do
+    User.load('new_user').should be_nil
+    post "/login", {"login" => 'new_user', "password" => 'testpass'}.to_json, {'CONTENT_TYPE'=>'application/json; charset=UTF-8'} 
+    last_response.should be_ok
+    User.load('new_user').should_not be_nil
+  end
+
+  it "should failt to login if wrong content-type" do
+    User.load('unknown').should be_nil
+    post "/login", {"login" => 'unknown', "password" => 'testpass'}.to_json, {'CONTENT_TYPE'=>'application/x-www-form-urlencoded'} 
+    last_response.should be_ok
+    User.load('unknown').should be_nil
+  end
   
   it "should login as rhoadmin user" do
     post "/login", "login" => 'rhoadmin', "password" => ''
@@ -164,6 +178,17 @@ describe "Server" do
       JSON.parse(last_response.body).should == @source_config
       verify_result(@c.docname(:cd) => {})
     end
+    
+    it "should switch client user if client user_id doesn't match session user" do
+      set_test_data('test_db_storage',@data)
+      get "/application",:client_id => @c.id,:source_name => @s.name,:version => ClientSync::VERSION
+      JSON.parse(last_response.body).last['insert'].should == @data
+      do_post "/application/clientlogin", "login" => 'user2', "password" => 'testpass'
+      data = {'1'=>@product1,'2'=>@product2}
+      set_test_data('test_db_storage',data)
+      get "/application",:client_id => @c.id,:source_name => @s.name,:version => ClientSync::VERSION
+      JSON.parse(last_response.body).last['insert'].should == data
+    end
   end
   
   describe "source routes" do
@@ -252,7 +277,7 @@ describe "Server" do
       last_response.status.should == 500
       last_response.body.should == "ERROR: Source 'Broken' requested by client doesn't exist.\n"
     end
-    
+        
     it "should get deletes json" do
       cs = ClientSync.new(@s,@c,1)
       data = {'1'=>@product1,'2'=>@product2}

data/spec/store_spec.rb

@@ -45,6 +45,12 @@ describe "Store" do
       Store.get_data('foo').should == @data
     end
     
+    it "should put_data with simple data" do
+      data = { '1' => { 'hello' => 'world' } }
+      Store.put_data('mydata', data)
+      Store.get_data('mydata').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

data/tasks/redis.rake

@@ -7,7 +7,7 @@ def windows?
 end
 
 if windows?
-	$redis_ver = "redis-1.2.6-windows"
+	$redis_ver = "redis-2.2.2"
 	$redis_zip = "C:/#{$redis_ver}.zip"
 	$redis_dest = "C:/"
 end
@@ -39,7 +39,7 @@ class RedisRunner
     server_dir = File.dirname(`which redis-server`)
     conf_file = "#{RedisRunner.prefix}etc/redis.conf"
     unless File.exists? conf_file
-      conf_file = "#{RedisRunner.prefix}etc/redis.conf"
+      conf_file = "#{server_dir}/redis.conf"
     end
     conf_file
   end
@@ -112,7 +112,7 @@ namespace :redis do
 	    mk_bin_dir(bin_dir)
 	    
 	    %w(redis-benchmark redis-cli redis-server).each do |bin|
-	      sh "cp /tmp/redis/#{bin} #{bin_dir}"
+	      sh "cp /tmp/redis/src/#{bin} #{bin_dir}"
 	    end
 	
 	    puts "Installed redis-benchmark, redis-cli and redis-server to #{bin_dir}"
@@ -136,31 +136,32 @@ namespace :redis do
   desc "Download package"
   task :download do
   	if windows?
-	  	require 'net/http'
-	  	require 'zip/zip'
-	  	
-	  	puts "Installing redis to #{redis_home}."
-	
-	    Net::HTTP.start("servicestack.googlecode.com") do |http|
-	      resp = http.get("/files/#{$redis_ver}.zip")
+      require 'net/http'
+      require 'zip/zip'
+      puts "Installing redis to #{redis_home}."
+
+	    Net::HTTP.start("cloud.github.com") do |http|
+	      resp = http.get("/downloads/dmajkic/redis/#{$redis_ver}-win32-win64.zip")
 	      open($redis_zip, "wb") do |file|
 	        file.write(resp.body)
 	      end
 	    end
-	    
+
 	    Zip::ZipFile.open($redis_zip) do |zip_file|
 	    	zip_file.each do |f|
-	    		f_path = File.join($redis_dest, f.name)
+	    		f_path = File.join(redis_home, f.name)
           FileUtils.mkdir_p(File.dirname(f_path))
           zip_file.extract(f, f_path) { true }
     		end
     	end
-    	
+
+    	FileUtils.mv Dir.glob(File.join(redis_home,'32bit','*')), redis_home
+    	FileUtils.rm_rf File.join(redis_home, '64bit')
     	FileUtils.rm_f $redis_zip
     else
       sh 'rm -rf /tmp/redis/' if File.exists?("#{RedisRunner.redisdir}")
       sh 'git clone git://github.com/antirez/redis.git /tmp/redis -n'
-      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout v2.0.4-stable"
+      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout 2.2.2"
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 2
   - 1
-  - 1
-  version: 2.1.1
+  - 2
+  version: 2.1.2
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 -08:00
+date: 2011-03-18 00:00:00 -07:00
 default_executable: rhosync
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,26 +34,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: log4r
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 1
-        - 7
-        version: 1.1.7
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,11 +49,11 @@ dependencies:
         - 5
         version: 1.2.5
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rubyzip
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,11 +65,11 @@ dependencies:
         - 4
         version: 0.9.4
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: uuidtools
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,74 +81,74 @@ dependencies:
         - 1
         version: 2.1.1
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: redis
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 9
         segments: 
         - 2
-        - 0
-        - 0
-        version: 2.0.0
+        - 1
+        - 1
+        version: 2.1.1
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: resque
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 47
         segments: 
         - 1
-        - 9
-        - 7
-        version: 1.9.7
+        - 14
+        - 0
+        version: 1.14.0
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
         - 1
-        - 4
-        - 2
-        version: 1.4.2
+        - 6
+        - 1
+        version: 1.6.1
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 1
-        - 1
-        version: "1.1"
+        - 2
+        version: "1.2"
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: templater
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -176,11 +160,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -192,6 +176,22 @@ dependencies:
         - 7
         version: 0.8.7
   type: :runtime
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: log4r
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 1
+        - 7
+        version: 1.1.7
+  type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: jeweler
@@ -300,6 +300,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - CHANGELOG
+- CREDITS
 - LICENSE
 - README.md
 - Rakefile
@@ -573,7 +574,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: RhoSync Synchronization Framework