rhoconnect 3.0.5 → 3.0.6

data/installer/unix-like/create_texts.rb

@@ -166,17 +166,33 @@ redis_stop() {
 }
 
 redis_usage() {
-  echo -e "Usage: $0 {start,stop}"
+  echo -e "Usage: $0 {start,stop,restart,status}"
   exit 1
 }
 
+redis_status() {
+  "$redis_cli" -p ${port} INFO > /dev/null 2>&1
+  info=$?
+  if (( $info )) ; then
+    echo "Redis server not running";
+  else
+    echo "Redis server running";
+  fi
+  exit $info
+}
+
 #
 # CLI logic.
 #
 case "$1" in
-  start) redis_start ;;
-  stop)  redis_stop  ;;
-  *)     redis_usage ;;
+  start)  redis_start  ;;
+  stop)   redis_stop   ;;
+  restart)
+          $0 stop
+          $0 start
+          ;;
+  status) redis_status ;;
+  *)      redis_usage   ;;
 esac
 _REDIS_INIT_SCRIPT_
 
@@ -310,7 +326,7 @@ _NGINX_LOGRORATE_CONF_
   File.open('/etc/logrotate.d/nginx', 'w') { |f| f << nginx_logrorate_conf }
 end
 
-def create_nginx_conf_files
+def create_nginx_conf_files(app_name)
   nginx_server_conf = <<'_NGINX_CONF_'
 user              nginx;
 
@@ -350,12 +366,13 @@ _NGINX_CONF_
   File.open('/opt/nginx/conf/nginx.conf', 'w' ) { |f| f << nginx_server_conf }
 
   Dir.mkdir "/opt/nginx/conf/conf.d" unless File.exist? "/opt/nginx/conf/conf.d"
-  rho_vhost_conf = <<'_VHOST_CONF_'
+  rho_vhost_conf = <<_VHOST_CONF_
 server {
   listen      80;
-#  server_name www.yourhost.com;           # <-- your server domain name!
-  root  /opt/nginx/html/rhoapp/public;    # <--- be sure to point to 'public' folder of your application!
+  root  /opt/nginx/html/#{app_name}/public; # <-- be sure to point to 'public' folder of your application!
   passenger_enabled on;
+#  access_log off;                           # <-- disable access logging
+#  error_log /dev/null crit;                 # <-- disable error logging, but critical errors only
 }
 _VHOST_CONF_
   File.open('/opt/nginx/conf/conf.d/rhoconnect.conf', 'w' ) { |f| f << rho_vhost_conf }
@@ -550,6 +567,24 @@ def generate_rhoapp(rho_path)
   end
 end
 
+def copy_benchapp(rho_path)
+  puts "Copy bench rhoconnect application to /opt/nginx/html directory ..."
+  Dir.chdir "#{rho_path}/installer"
+  `tar xzf bench.tar.gz -C #{rho_path}`
+  `rm -rf bench.tar.gz`
+
+  `#{rho_path}/bin/gem install ffaker --no-ri --no-rdoc`
+  `#{rho_path}/bin/gem install thor --no-ri --no-rdoc`
+
+  Dir.chdir "#{rho_path}/bench"
+  `cp -r benchapp /opt/nginx/html`
+  Dir.chdir "/opt/nginx/html/benchapp"
+  `rm -rf Gemfile.lock`
+  `#{rho_path}/bin/bundle install --without=test development`
+  Dir.chdir "../"
+  `chown -R nginx:nginx benchapp/`
+end
+
 def create_texts
   if @redis
     create_redis_init 
@@ -558,9 +593,17 @@ def create_texts
 
   if @server == 'nginx'
     create_nginx_init
+
     create_nginx_logrotate
-    create_nginx_conf_files
-    generate_rhoapp @prefix
+    @use_bench_app = File.exist? "#{@prefix}/installer/bench.tar.gz"
+    if @use_bench_app
+      create_nginx_conf_files "benchapp"
+      copy_benchapp @prefix
+    else
+      create_nginx_conf_files "rhoapp"
+      generate_rhoapp @prefix
+    end
+
     distro_info = nginx_readme
   else
     create_passenger_load
@@ -584,9 +627,20 @@ To finish this setup, please complete the following...
 
 _IT_SHOULD_BE_DONE_
 
-  puts afterwords +   
-  if  @server == 'nginx'
-    server_todo_list = <<_NGINX_TO_DO_
+  about_app =
+    if @use_bench_app
+      server_todo_list = <<_NGINX_TO_DO_
+2) Rhoconnect 'benchapp' application is created in /opt/nginx/html directory. To run it
+  A) As root user start redis and nginx servers:
+     /etc/init.d/redis start
+     /etc/init.d/nginx start
+  B) To verify that application up and running open web console in your browser:
+     http://localhost/console/
+
+_NGINX_TO_DO_
+    else
+      if  @server == 'nginx'
+        server_todo_list = <<_NGINX_TO_DO_
 2) Try rhoconnect 'rhoapp' application, created in /opt/nginx/html directory
   A) As root user start redis and nginx servers:
      /etc/init.d/redis start
@@ -595,8 +649,8 @@ _IT_SHOULD_BE_DONE_
      http://localhost/console/
 
 _NGINX_TO_DO_
-  else  
-    server_todo_list = <<_APACHE2_TO_DO_
+      else
+        server_todo_list = <<_APACHE2_TO_DO_
 2) Complete setup of Apache2 web server
    A) Configure virtual host for your rhoconnect application:
       Edit the file /etc/httpd/conf.d/rhoconnect.conf so that it reflects your specifications.
@@ -604,7 +658,10 @@ _NGINX_TO_DO_
       /sbin/service httpd start
        
 _APACHE2_TO_DO_
-  end  + "For more details see #{@prefix}/README file."
+      end
+    end
+
+  puts afterwords + about_app   + "For more details see #{@prefix}/README file."
 
 end #create_texts
 

data/installer/unix-like/pre_install.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ -d "/opt/rhoconnect" ]; then
-  rm -rf /opt.rhoconnect
+  rm -rf /opt/rhoconnect
 fi
 
 #if [ -d "/opt/nginx" ]; then

data/installer/unix-like/rho_connect_install_constants.rb

@@ -8,7 +8,7 @@ module Constants
                            "libaprutil1-dev",
                            "dtach"]
 
-  REDIS                   = "redis-2.4.1"
+  REDIS                   = "redis-2.4.2"
   SQLITE3                 = "sqlite-autoconf-3070701"
   RUBY                    = "ruby-enterprise-1.8.7-2011.03"
   Nginx                   = "nginx-1.0.6"

data/installer/utils/constants.rb

@@ -6,12 +6,12 @@ module Constants
 
   RC_VERSION      = Rhoconnect::VERSION
   REGION          = 'us-west-1'
-  SLEEP           = 45
+  SLEEP           = 60
   HOME_DIR        = `echo ~/`.strip.chomp("/")
   REMOTE_HOME     = '/home/ubuntu'
   PEM_FILE        = 'alexdevkey.pem'
   SSH_KEY         = "#{HOME_DIR}/.ssh/#{PEM_FILE}"
-  ACCESS_KEY_FILE = "#{HOME_DIR}/.ec2/credentials"
+  ACCESS_KEY_FILE = "#{HOME_DIR}/.ec2"
   UBUNTU_STACK    = { :image_id  => 'ami-3d491a78',
                       :flavor_id => 'm1.small',
                       :key_name  => 'alexdevkey',

data/installer/utils/nix_install_test.rb

@@ -36,22 +36,35 @@ def compile_stack_info
 
   # Append the rest of the file name according to distribution
   if @user == 'ubuntu'
-    @dist = { :package     => "rhoconnect_#{Constants::RC_VERSION}_all.deb",
-              :local_file  => "#{local_file}rhoconnect_#{Constants::RC_VERSION}_all.deb",
-              :pkg_mgr     => 'dpkg',
-              :pkg_type    => 'DEB',
-              :pkg_repo    => 'apt-get -y',
-              :deps        => Constants::DEB_DEPS }
+    @dist = { :flavor        => "ubuntu",
+              :package       => "rhoconnect_#{Constants::RC_VERSION}_all.deb",
+              :local_file    => "#{local_file}rhoconnect_#{Constants::RC_VERSION}_all.deb",
+              :pkg_mgr       => 'dpkg',
+              :pkg_type      => 'DEB',
+              :pkg_repo      => 'apt-get',
+              :deps          => Constants::DEB_DEPS,
+              :repo_src_file => '/etc/apt/sources.list',
+              :repo_str      => '\n' + 
+                                '# This is the repository for rhoconnect packages\n' + 
+                                'deb http://rhoconnect.s3.amazonaws.com/packages/deb rhoconnect main' }
   elsif @user == 'root'
-    @dist = { :package     => "rhoconnect-#{Constants::RC_VERSION}.noarch.rpm",
-              :local_file  => "#{local_file}rhoconnect-#{Constants::RC_VERSION}.noarch.rpm",
-              :pkg_mgr     => 'rpm',
-              :pkg_type    => 'RPM',
-              :pkg_repo    => 'yes | yum',
-              :deps        => Constants::RPM_DEPS }
+    @dist = { :flavor        => "centos",
+              :package       => "rhoconnect-#{Constants::RC_VERSION}.noarch.rpm",
+              :local_file    => "#{local_file}rhoconnect-#{Constants::RC_VERSION}.noarch.rpm",
+              :pkg_mgr       => 'rpm',
+              :pkg_type      => 'RPM',
+              :pkg_repo      => 'yum',
+              :deps          => Constants::RPM_DEPS,
+              :repo_src_file => '/etc/yum.repos.d/rhoconnect.repo',
+              :repo_str      => '[rhoconnect]\n' + 
+                                'name=Rhoconnect\n' + 
+                                'baseurl=http://rhoconnect.s3.amazonaws.com/packages/rpm\n' +
+                                'enabled=1\n' +
+                                'gpgcheck=0\n' }
+
   else
     puts "Incorrect user name"
-    exit
+    exit 3
   end #i
 end #compile_stack_info
 
@@ -66,8 +79,8 @@ end #create_ec2_instance
 # Retrieves the access key and secret access key from the above specified file.
 def get_access_keys
   lines = IO.readlines Constants::ACCESS_KEY_FILE
-  @access_key = lines.first.strip
-  @secret_access_key = lines.last.strip
+  @access_key = lines.first.strip.split("=")[1]
+  @secret_access_key = lines.last.strip.split("=")[1]
 end #get_access_keys
 
 # make_fog
@@ -105,7 +118,7 @@ def start_new_instance
     @server_id = @server.id
   else
     puts "Server timed out."
-    exit
+    exit 7
   end #if
 end #start_new_instance
 
@@ -115,29 +128,6 @@ def establish_ssh_connection
   @ssh = Fog::SSH.new( @host, @user, :keys => Constants::SSH_KEY )
 end #establish_ssh_connection
 
-# establish_scp_connection
-# Establishes a gateway through which to transfer data
-def establish_scp_connection
-  @scp = Fog::SCP.new( @host, @user, :keys => Constants::SSH_KEY )
-end #create_scp_connection
-
-# transfer 
-# transfers given data to remote machine via scp
-def transfer(local_data, remote_data)
-  puts "Attempting file transfer via SCP"
-  puts "Transferring #{local_data} to #{remote_data}..."
-  @scp.upload( local_data, remote_data ) do |cd, name, sent, total|
-    print "\r#{name}: #{(sent.to_f * 100 / total.to_f).to_i}%"
-  end #do
-  puts
-end #establish_scp_connection
-
-# transfer_rhoconnect
-# Transfers the rhoconnect package over SCP
-def transfer_rhoconnect
-  transfer @dist[:local_file], @dist[:remote_home]
-end #transfer_rhoconnect
-
 # destroy_ec2_instance
 # Terminates the current ec2 instance
 def destroy_ec2_instance
@@ -145,50 +135,71 @@ def destroy_ec2_instance
   puts "Terminating Instance."
 end #destroy_ec2_instance
 
-# install_dependencies
-# Installs all dependant packages on the remove machine
-def install_dependencies
-  dep_install_string = "sudo #{@dist[:pkg_repo]} install"
-  @dist[:deps].each do |dep|
-    dep_install_string << " #{dep}"
-  end #do
-  ssh_cmd "sudo #{@dist[:pkg_repo]} update"
-  ssh_cmd dep_install_string
-  puts
-end #install_dependencies
+# prepare_sources
+# Prepares the remote machine's repo source list to be able to download rhoconnect
+def prepare_sources
+  puts "preparing sources..."  
+
+  ssh_cmd "sudo touch #{@dist[:repo_src_file]}" if @dist[:flavor] == 'centos'
+  filename = @dist[:repo_src_file]
+  src_str  = @dist[:repo_str]
+
+  # Create file for yum rhoconnect sources
+  # Get current permissions of file
+  perms = @ssh.run("stat --format=%a #{filename}")[0].stdout.strip
+  
+  # Change permissions so that it can be edited by "others"
+  ssh_cmd "sudo chmod 0666 #{filename}"
+
+  ssh_cmd "echo -e \"#{src_str}\" >> #{filename}"
+
+  ssh_cmd "sudo chmod 0#{perms} #{filename}"
+
+  cat_src = @ssh.run("cat #{@dist[:repo_src_file]}")[0].stdout.strip
+ 
+  ssh_cmd "sudo #{@dist[:pkg_repo]} update" unless @dist[:flavor] == "centos"
+end #prepare_sources
 
 # install_package
 # Issues commands to the remote machine to start the installation
 def install_package
-  install_dependencies
-  ssh_cmd "sudo #{@dist[:pkg_mgr]} -i #{@dist[:package]}"
-  puts
+  prepare_sources
+  puts "Installing rhoconnect package.\n" + 
+       "This may take a while...\n\n"
+  ssh_cmd "yes | sudo #{@dist[:pkg_repo]} install rhoconnect"
 end #install_package
 
+# start_servers
+# Attempts to start redis and nginx servers
 def start_servers
+  puts "Waiting #{Constants::SLEEP} seconds for services to initialize."
+  Constants::SLEEP.times do |sec|
+    print '.'
+    STDOUT.flush
+    sleep 1
+  end #do
+  puts
+
   attempts = 0
   while @ssh.run("pgrep redis")[0].stdout.strip == ""
-   ssh_cmd "sudo /etc/init.d/redis start"
-   attempts += 0
+    ssh_cmd "sudo /etc/init.d/redis start"
+    attempts += 1
+    sleep 1
   end #while
   puts "Redis start took #{attempts} attempts"
   puts
   attempts = 0
   while @ssh.run("pgrep nginx")[0].stdout.strip == ""
     ssh_cmd "sudo /etc/init.d/nginx start"
-    attempts += 0
+    attempts += 1
+    sleep 1
   end #while
   puts "Nginx start took #{attempts} attempts."
   puts
-  puts "Waiting #{Constants::SLEEP} seconds for servers to initialize"
-  Constants::SLEEP.times do
-    sleep 1
-    print '.'
-    STDOUT.flush
-  end # do
-  puts
 end # start_servers
 
+# chack_rc_service
+# Makes an HTTP request to check that the rhoconnect service is working
 def check_rc_service
   request = Net::HTTP.get_response(@host, '/console')
   puts "Host: #{@host}"
@@ -196,10 +207,13 @@ def check_rc_service
   if request.code == '200'
     puts "Rhoconnect service up!"
   else
-    puts "Rhoconnect service down :("
+    puts "Failed to connect to rhoconnect service."
+    exit 13
   end #if
 end #check_rc_service
 
+# compute_time
+# General time computation method
 def compute_time(start_time, end_time)
   time_delta = (end_time - start_time)
 
@@ -224,24 +238,19 @@ Constants::STACKS.each do |stack|
   begin
     @stack = stack 
     compile_stack_info
-    puts
-    puts "================================================"
-    puts "Now starting test of #{@dist[:pkg_type]} package"
-    puts "================================================"
-    puts
+
+    puts "\n" +
+    "================================================\n" +
+    "Now starting test of #{@dist[:pkg_type]} package\n" +
+    "================================================\n" +
+    "\n\n"
 
     create_ec2_instance
  
     # Establish connections
     establish_ssh_connection
     @dist[:remote_home] = @ssh.run("echo ~")[0].stdout.strip
-    establish_scp_connection
 
-    # Transfer the Rhoconnect package to the remote machine
-    transfer_rhoconnect
- 
-    puts "Installing rhoconnect package.\n" + 
-         "This may take a while...\n\n"
     install_package
 
     # Start the redis and nginx servers on the remote machine
@@ -256,6 +265,7 @@ Constants::STACKS.each do |stack|
     puts "OH NOEZ, Exception!!"
     puts e.inspect
     puts e.backtrace
+    exit 15
   ensure
     if @server != nil
       destroy_ec2_instance

data/installer/utils/package_upload/repos.rake

@@ -1,5 +1,85 @@
 desc 'Creates and uploads apt and rpm repos.'
 task "build:repos" => ['build:deb', 'build:rpm'] do
-  # Run repos.rb
-  ruby "installer/utils/package_upload/repos.rb"
+  require 'find'
+
+  # CONSTANTS
+
+  PKG_DIR = '/packages'
+  START_DIR = PKG_DIR
+  BUCKET = 'rhoconnect'
+
+  def cmd(cmd)
+    puts cmd unless @raked
+    system(cmd)
+  end #cmd
+
+  def prepare_destination
+    # Prompt to remove the /deb directory if it exists
+    if File.directory?("#{PKG_DIR}/deb")
+      if !@raked
+        puts "Remove #{PKG_DIR}/deb?"
+        remove = STDIN.gets.strip.downcase.chars.first
+      else
+        remove = 'y'
+      end #if
+      if remove == 'y'
+        cmd "sudo rm -rf #{PKG_DIR}/deb"
+      end #if
+    end #if
+
+    # Create deb directory if it does not already exist
+    cmd "sudo mkdir -p #{PKG_DIR}/deb" unless File.directory?("#{PKG_DIR}/deb")
+
+    # Create configuration file "ditributions" in deb directory
+    filename = "#{PKG_DIR}/deb/conf/"
+    cmd "sudo mkdir -p #{filename}"
+    distributions = "Origin: Rhomobile, Inc.\n" +
+                    "Label: Rhomobile, Inc.\n" +
+                    "Codename: rhoconnect\n" +
+                    "Architectures: i386 amd64\n" +
+                    "Components: main\n" +
+                    "Description: Rhoconnect APT Repository"
+    cmd "touch #{filename}/distributions"
+
+    # Write distributions string to corresponding file 
+    dist_file = File.new("#{filename}/distributions", "w")
+    dist_file.write(distributions)
+    dist_file.close
+
+    # Create rpm directory if it does not already exist
+    cmd "sudo mkdir -p #{PKG_DIR}/rpm" unless File.directory?("#{PKG_DIR}/rpm")
+
+  end #prepare_destination
+
+  def copy_files
+    # Copy the packages to their respective directory
+    Find.find('./pkg') do |file|
+      if !FileTest.directory?(file)
+        dest_dir = File.extname(file)
+        #get rid of '.' before extension name
+        dest_dir[0] = ''
+        if dest_dir == 'deb' || dest_dir == 'rpm'
+          if dest_dir == 'deb'
+            @deb_pkg = File.basename(file)
+          end #if
+          file_path = File.expand_path(file)
+          cmd "sudo cp -rf #{file_path} #{PKG_DIR}/#{dest_dir}"
+        end #if
+      end #if
+    end #do
+  end #copy_files
+
+  @raked = true
+
+  prepare_destination
+
+  copy_files
+
+  # REPOIFY!
+  cmd "sudo reprepro -b #{PKG_DIR}/deb includedeb rhoconnect #{PKG_DIR}/deb/#{@deb_pkg}"
+  cmd "sudo createrepo #{PKG_DIR}/rpm"
+
+  # Call S3 upload script
+  cmd "ruby ./installer/utils/package_upload/s3_upload.rb #{START_DIR} #{BUCKET} #{@raked}"
+
 end #build:repos

data/installer/windows/rhosync.nsi

@@ -99,7 +99,7 @@ section "uninstall"
     Push "PATH" 
     Push "R" 
     Push "HKLM" 
-    Push "$INSTDIR\redis-2.4.1"
+    Push "$INSTDIR\redis-2.4.2"
     Call un.EnvVarUpdate
     Pop $R0
 
@@ -170,25 +170,25 @@ Section "Redis" redisSection
  
   SetOutPath $INSTDIR
  
-  File /r "redis-2.4.1"
+  File /r "redis-2.4.2"
  
   ;add to path here
 
   Push "PATH" 
   Push "P" 
   Push "HKLM" 
-  Push "$INSTDIR\redis-2.4.1"
+  Push "$INSTDIR\redis-2.4.2"
   Call EnvVarUpdate
   Pop $R0
 
   Push "REDIS_HOME" 
   Push "P" 
   Push "HKLM" 
-  Push "$INSTDIR\redis-2.4.1"
+  Push "$INSTDIR\redis-2.4.2"
   Call EnvVarUpdate
   Pop $R0
 
-  ExecWait '$INSTDIR\redis-2.4.1\redis-service.exe install' $0
+  ExecWait '$INSTDIR\redis-2.4.2\redis-service.exe install' $0
   StrCmp $0 "0" continue wrong
 
   wrong:

data/lib/rhoconnect/api/application/queue_updates.rb

@@ -1,4 +1,18 @@
 Server.api :queue_updates, :application, :post do |params,user,server|
+  begin
+    if params["cud"]
+      cud = JSON.parse(params["cud"])
+      params.delete("cud")
+      params.merge!(cud)
+    end     
+  rescue JSON::ParserError => jpe
+    log jpe.message + jpe.backtrace.join("\n")
+    throw :halt, [500, "Server error while processing client data"]
+  rescue Exception => e
+    log e.message + e.backtrace.join("\n")
+    throw :halt, [500, "Internal server error"]
+  end
+  
   server.catch_all do
     server.current_client_sync.receive_cud(params)
     server.status 200

data/lib/rhoconnect/api/source/set_db_doc.rb

@@ -2,7 +2,9 @@ Server.api :set_db_doc, :source do |params,user|
   if params[:data_type] and params[:data_type] == 'string'
     Store.put_value(params[:doc],params[:data])
   else
-    Store.put_data(params[:doc],params[:data])
+    append_to_doc = params[:append]
+    append_to_doc ||= false
+    Store.put_data(params[:doc],params[:data],append_to_doc)
   end  
   ''
 end

data/lib/rhoconnect/server.rb

@@ -220,19 +220,6 @@ module Rhoconnect
       cache_control :no_cache
       headers({'pragma'=>'no-cache'})
 
-      begin
-        if params["cud"]
-          cud = JSON.parse(params["cud"])
-          params.delete("cud")
-          params.merge!(cud)
-        end     
-      rescue JSON::ParserError => jpe
-        log jpe.message + jpe.backtrace.join("\n")
-        throw :halt, [500, "Server error while processing client data"]
-      rescue Exception => e
-        log e.message + e.backtrace.join("\n")
-        throw :halt, [500, "Internal server error"]
-      end
       if params[:version] and params[:version].to_i < 3
         throw :halt, [404, "Server supports version 3 or higher of the protocol."]
       end
@@ -251,19 +238,24 @@ module Rhoconnect
       erb :index
     end
 
-    # Collection routes
+    # old routes
     post '/login' do
       mark_deprecated_call_and_reroute(:login, :admin, self, params)
     end
-
-    # Member routes
     get '/application' do
       mark_deprecated_call_and_reroute(:query, :application, self, params)
     end
-
     post '/application' do
       mark_deprecated_call_and_reroute(:queue_updates, :application, self, params)
     end
+    # confusion routes - only because Rhodes didn't switch 
+    # to new style API yet
+    get '/api/application' do
+      mark_deprecated_call_and_reroute(:query, :application, self, params)
+    end
+    post '/api/application' do
+      mark_deprecated_call_and_reroute(:queue_updates, :application, self, params)
+    end
       
     def self.api(name, namespace = nil, verb = :post, &block)
       old_api_prefix = (namespace == :application) ? :application : :api

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.0.5'
+  VERSION = '3.0.6'
 end

data/rhoconnect.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('bundler', '~> 1.0')  
   s.add_dependency("sinatra", '~> 1.3')
-  s.add_dependency('rake', '0.9.2')
+  s.add_dependency('rake', '~> 0.9.2')
   s.add_dependency('json', '~> 1.5.0')
   s.add_dependency('rubyzip', '~> 0.9.4')
   s.add_dependency('uuidtools', '>= 2.1.1')

data/spec/api/admin/get_api_token_spec.rb

@@ -32,5 +32,11 @@ describe "RhoconnectApiGetApiToken" do
       post "/api/user/create_user", params
       last_response.status.should == 422
     end
+    
+    it "response should have cache-control and pragma headers set to no-cache" do
+      post "/login", :login => 'rhoadmin',:password => ''
+      last_response.headers['Cache-Control'].should == 'no-cache'
+      last_response.headers['Pragma'].should == 'no-cache'
+    end
   end  
 end