rhoconnect 3.4.5 → 4.0.0.beta.10

data/lib/rhoconnect/web-console/server.rb

@@ -3,36 +3,51 @@ require 'erb'
 require 'json'
 require 'rhoconnect/graph_helper'
 
-module RhoconnectConsole
+module RhoconnectConsole  
   class << self
     ROOT_DIR = File.dirname(File.expand_path(__FILE__)) unless defined? ROOT_DIR
     def root_path(*args)
       File.join(ROOT_DIR, *args)
     end
-  end
+  end  
 
   class Server < Sinatra::Base
     set :views,   RhoconnectConsole.root_path('templates')
     set :public_folder, RhoconnectConsole.root_path
-    set :static,        true
-    use Rack::Session::Cookie, :key => 'rhoconnect.console', :secret => SecureRandom.hex(64)
+    set :static,        true    
+    use Rack::Session::Cookie
     HEROKU_NAV = ENV['INSTANCE_ID'] ? RestClient.get('http://nav.heroku.com/v1/providers/header') : nil
     before do
       headers['Expires'] = 'Sun, 19 Nov 1978 05:00:00 GMT'
-      headers['Cache-Control'] = 'no-store, no-cache, must-revalidate'
+      headers['Cache-Control'] = 'no-store, no-cache, must-revalidate'  
       headers['Pragma'] = 'no-cache'
     end
     include GraphHelper
-
+    
     get '/' do
       #if heroku instance single sign will already have logged in a have token in session
       @token = session[:token] if ENV['INSTANCE_ID']
       @heroku = RestClient.get('http://nav.heroku.com/v1/providers/header') if @token
       @version = Rhoconnect::VERSION
       @domain =  ENV['RHODES_URL'] || request.host_with_port
-      @domain += "/application" if @domain
+      @domain += "/application" if @domain and !ENV['RHODES_URL']
       erb :index
     end
+    
+    get "/heroku/resources/:id" do
+      begin
+        # check heroku addon started app
+        halt 403 unless ENV['INSTANCE_ID'] == params[:id]  && params[:token] == ENV['API_TOKEN']
+        # rhoconnect authentication
+        session[:login] = 'rhoadmin'     
+        session[:token] = User.load(session[:login]).token.value
+      rescue Exception => e
+        session[:token] = nil
+        halt 403 
+      end
+      response.set_cookie('heroku-nav-data', :value => params[:nav], :path => '/')
+      redirect '/'
+    end
 
     post "/get_user_graph" do
       count_graph('timing/usercount', "User Count", "Users", "users")
@@ -45,7 +60,7 @@ module RhoconnectConsole
     post '/http_timing' do
       http_timing(params)
     end
-
+    
     post '/http_timing_key' do
       http_timing_key(params)
     end
@@ -53,16 +68,16 @@ module RhoconnectConsole
     post '/device_count' do
       count_graph('timing/devicecount', "Device Count", "Devices", "clients")
     end
-
+    
     get '/get_sources' do
       sources = App.load(APP_NAME).sources
       sources.to_json
     end
-
+    
     get '/get_http_routes' do
       # keys = get_user_count("http:*:*")
       #   sources = get_sources('all')
-      #
+      #   
       #   #loop through arrays and remove any regex matches
       #   keysf = keys.inject([]) do |keys_final, element|
       #     found = true
@@ -72,11 +87,11 @@ module RhoconnectConsole
       #     keys_final << element.strip if found
       #     keys_final
       #   end
-
+      
       keysf = get_http_routes()
-
+      
       keysf.to_json
     end
-
+    
   end
 end

data/lib/rhoconnect/web-console/views/home.js

@@ -9,18 +9,18 @@ App.Views.Home = Backbone.View.extend({
 	
     initialize: function() {
  	    var domain = $('input#domain').val();
-		this.model.get_license_info();
+			this.model.get_license_info();
 	    this.model.set('partition_type','app')
-		this.model.fetch({
-			error: function(model,resp)
-			{
-				if(resp.status == 422){
+			this.model.fetch({
+				error: function(model,resp)
+				{
+					if(resp.status == 422){
 					 new App.Views.Index()
+					}
 				}
-			}
-		});
-        this.render(domain);
-		this.options.model2.get_adapter();
+			});
+      this.render(domain);
+			this.options.model2.get_adapter();
     },  
 
     reset: function(){
@@ -101,7 +101,7 @@ App.Views.Home = Backbone.View.extend({
 		
 		out += "<table class='table table-bordered'>";
 		out += "<tr><td><p style='margin-top:10px'>Sync Server</p></td>";
-		out += "<td><p style='margin-top:10px'><code style='margin:0'>http://"+domain+"</code></p></td>";
+		out += "<td><p style='margin-top:10px'><code style='margin:0'>"+domain+"</code></p></td>";
 		out += "<td><p style='margin-top:10px'>Paste this url into your client app configuration to sync with this RhoConnect instance.</p></td>"
 		out += "<form>"
 		out += "<tr>"

data/lib/rhoconnect/web-console/views/new_ping.js

@@ -67,7 +67,7 @@ App.Views.NewPing = Backbone.View.extend({
 		out += "<td>allows you to play audio file if it exists on client</td></tr>"
 		out += "<tr><td>Badge</td><td><input id='pingbadge' type='text' name='badge' value='1' class='input-small'/></td>";
 		out += "<td>Number displayed on device next to app when push notification arrives. Available for iPhone</td></tr>"
-		out += "<tr><td>Vibrate</td><td><input id='pingvibrate' type='text' name='vibrate' value='2' class='input-small'/>&nbsp;(milliseconds)</td>"
+		out += "<tr><td>Vibrate</td><td><input id='pingvibrate' type='text' name='vibrate' value='2000' class='input-small'/>&nbsp;(milliseconds)</td>"
 		out += "<td>Duration of vibration when push notification is received</td></tr>"
 	    out += "<tr><td colspan=3><input type='submit' class='btn btn-primary' value='Ping!' /></td></tr>"
 	    out += "</table></form>";

data/lib/rhoconnect.rb

@@ -8,24 +8,28 @@ require 'rhoconnect/license'
 require 'rhoconnect/version'
 require 'rhoconnect/document'
 require 'rhoconnect/lock_ops'
-require 'rhoconnect/model'
-require 'rhoconnect/source'
 require 'rhoconnect/store'
+require 'rhoconnect/store_orm'
+require 'rhoconnect/source'
 require 'rhoconnect/user'
 require 'rhoconnect/api_token'
 require 'rhoconnect/app'
 require 'rhoconnect/client'
 require 'rhoconnect/read_state'
-require 'rhoconnect/client_sync'
-require 'rhoconnect/stats/record'
-require 'rhoconnect/source_adapter'
-require 'rhoconnect/source_sync'
-require 'rhoconnect/rho_indifferent_access'
 require 'rhoconnect/jobs/source_job'
 require 'rhoconnect/jobs/ping_job'
+require 'rhoconnect/middleware/helpers'
+require 'rhoconnect/stats/record'
+require 'rhoconnect/rho_indifferent_access'
 require 'rhoconnect/bulk_data'
 require 'rhoconnect/db_adapter'
-require 'rhoconnect/dynamic_adapter'
+require 'rhoconnect/model/base'
+require 'rhoconnect/model/dynamic_adapter_model'
+require 'rhoconnect/model/js_base'
+
+dir = File.join(File.dirname(__FILE__),'..','js-adapters')
+require "#{dir}/node"
+require "#{dir}/node_channel"
 
 REDIS_URL = 'REDIS' unless defined? REDIS_URL
 REDISTOGO_URL = 'REDISTOGO_URL' unless defined? REDISTOGO_URL
@@ -34,12 +38,14 @@ REDISTOGO_URL = 'REDISTOGO_URL' unless defined? REDISTOGO_URL
 module Rhoconnect
   APP_NAME = 'application' unless defined? APP_NAME
 
-  class InvalidArgumentError < RuntimeError; end
   class RhoconnectServerError < RuntimeError; end
 
   # Used by application authenticate to indicate login failure
   class LoginException < RuntimeError; end
 
+  # Used to indicate that the document doesn't belong to the entity
+  class InvalidDocumentException < RuntimeError; end
+
   API_VERSION = 'v1'.freeze
 
   extend self
@@ -49,8 +55,36 @@ module Rhoconnect
       :vendor_directory, :blackberry_bulk_sync, :redis,
       :log_disabled, :license, :bulk_sync_poll_interval, :stats, :appserver, :api_token,
       :raise_on_expired_lock, :lock_duration, :cookie_expire, :predefined_sources,
-      :connection_pool_size, :connection_pool_timeout, :redis_timeout,
-      :disable_resque_console, :disable_rc_console
+      :connection_pool_size, :connection_pool_timeout, :redis_timeout, :store_key_ttl,
+      :disable_resque_console, :disable_rc_console, :use_node
+  end
+
+  # this mixin adds the controller into the Application's URL Map
+  # register Rhoconnect::EndPoint in the controller's class definition
+  module EndPoint
+    def self.registered(app)
+      Rhoconnect.add_to_url_map(app)
+    end
+  end
+
+  # Rhoconnect API version
+  def add_to_url_map(subclass)
+    @controllers_map ||= Set.new
+    #puts " adding to URL map #{subclass.name}"
+    @controllers_map << subclass
+  end
+
+  def url_map
+    @controllers_map ||= Set.new
+    app_url_map = {}
+    @controllers_map.each do |klass|
+      if klass.respond_to?(:rest_path) and klass.rest_path.size > 0
+        app_url_map[klass.rest_path] = klass.new
+      end
+    end
+    app_url_map['/'] = Rhoconnect::DefaultServer.new
+    #puts " and we have URL Map #{app_url_map.inspect}"
+    app_url_map
   end
 
   ### Begin Rhoconnect setup methods
@@ -73,10 +107,11 @@ module Rhoconnect
     Rhoconnect.raise_on_expired_lock = get_setting(config,environment,:raise_on_expired_lock,false)
     Rhoconnect.lock_duration = get_setting(config,environment,:lock_duration)
     Rhoconnect.cookie_expire = get_setting(config,environment,:cookie_expire)  || 31536000
+    Rhoconnect.store_key_ttl = get_setting(config, environment, :store_key_ttl) ||  86400
     Rhoconnect.predefined_sources = {}
     yield self if block_given?
     Store.create(Rhoconnect.redis)
-    Resque.redis = Rhoconnect.redis
+    Resque.redis = Rhoconnect.redis.is_a?(Array) ? Rhoconnect.redis[0] : Rhoconnect.redis
     Rhoconnect.base_directory ||= File.join(File.dirname(__FILE__),'..')
     Rhoconnect.app_directory ||= Rhoconnect.base_directory
     Rhoconnect.data_directory ||= File.join(Rhoconnect.base_directory,'data')
@@ -85,8 +120,26 @@ module Rhoconnect
     Rhoconnect.license = License.new
     Rhoconnect.disable_rc_console ||= false
     Rhoconnect.disable_resque_console ||= false
+    Rhoconnect.use_node = Rhoconnect.use_node.nil? ? true : Rhoconnect.use_node
+    if File.directory?(File.join(Rhoconnect.app_directory,'sources'))
+      check_and_add(File.join(Rhoconnect.app_directory,'sources'))
+      # post deprecation warning !!!
+warning_for_deprecated_sources_dir = <<_MIGRATE_TO_NEW_RHOCONNECT
+
+***** WARNING *****
+RhoConnect has detected that you're using deprecated SourceAdapter classes.
+
+  SourceAdapter class support will be removed in RhoConnect 4.1.
+  Please, migrate your SourceAdapter classes into RhoConnect Models.
+
+  For more details, see RhoConnect Migration guidelines at
+  docs.rhomobile.com
+
+_MIGRATE_TO_NEW_RHOCONNECT
+      puts warning_for_deprecated_sources_dir
+    end
 
-    check_and_add(File.join(Rhoconnect.app_directory,'sources'))
+    check_and_add(File.join(Rhoconnect.app_directory,'models','ruby'))
     start_app(config)
     create_admin_user
     check_hsql_lib! if Rhoconnect.blackberry_bulk_sync
@@ -97,14 +150,20 @@ module Rhoconnect
   end
 
   def start_app(config)
+    app = nil
+    app_name = APP_NAME
+    if App.is_exist?(app_name)
+      app = App.load(app_name)
+    else
+      app = App.create(:name => app_name)
+    end
+    # load all pre-defined adapters files
+    Dir[File.join(File.dirname(__FILE__),'rhoconnect','predefined_adapters','*.rb')].each { |adapter| load adapter }
+    # load all Ruby Controller files
+    Dir[File.join(Rhoconnect.app_directory,'controllers','ruby','*.rb')].each { |controller_file| require controller_file }
+
+    # TODO: process sources not only from setting.yml file
     if config and config[Rhoconnect.environment]
-      app = nil
-      app_name = APP_NAME
-      if App.is_exist?(app_name)
-        app = App.load(app_name)
-      else
-        app = App.create(:name => app_name)
-      end
       sources = config[:sources] || []
       Source.delete_all
       app.delete_sources
@@ -114,16 +173,25 @@ module Rhoconnect
         source_config[:name] = source_name
         Source.create(source_config,{:app_id => app.name})
         app.sources << source_name
+        # check if RubyController class already exists
+        unless Object.const_defined?("#{source_name}Controller")
+          # add to url map
+          Rhoconnect::Controller::SourceAdapterBase.register_controller(source_name)
+        end
+
         # load ruby file for source adapter to re-load class
         load under_score(source_name+'.rb')
       end
+    end
 
-      # load all pre-defined adapters files
-      Dir[File.join(File.dirname(__FILE__),'rhoconnect','predefined_adapters','*.rb')].each { |adapter| load adapter }
+    start_nodejs_channels if Rhoconnect.use_node
+    # Create associations for all sources
+    Source.update_associations(app.sources)
+  end
 
-      # Create associations for all sources
-      Source.update_associations(app.sources)
-    end
+  def start_nodejs_channels
+    Node.shell_node
+    NodeChannel.bootstrap if Node.started
   end
 
   # Generate admin user on first load
@@ -145,7 +213,12 @@ module Rhoconnect
   def get_config(basedir)
     # Load settings
     settings_file = File.join(basedir,'settings','settings.yml') if basedir
-    YAML.load_file(settings_file) if settings_file and File.exist?(settings_file)
+    if settings_file and File.exist?(settings_file)
+      YAML.load_file(settings_file)
+    else # Otherwise use setting for blank app
+      settings_file = File.join(ENV['HOME'], '.rhoconnect.yml')
+      YAML.load_file(settings_file) if File.exist?(settings_file)
+    end
   end
 
   def source_config(source_name)
@@ -172,6 +245,8 @@ module Rhoconnect
     return if Rhoconnect.predefined_sources.has_key?(source_name)
 
     Rhoconnect.predefined_sources[source_name] = {:source_loaded => false}
+    # create Sinatra server for the predefined source here
+    Rhoconnect::Controller::SourceAdapterBase.register_controller(source_name)
   end
 
   def create_predefined_source(source_name,params)
@@ -227,13 +302,6 @@ module Rhoconnect
     ((Time.now.to_f - Time.mktime(2009,"jan",1,0,0,0,0).to_f) * 10**6).to_i
   end
 
-  # Computes token for a single client request
-  def compute_token(doc_key)
-    token = get_token
-    Store.put_value(doc_key,token)
-    token.to_s
-  end
-
   # Returns require-friendly filename for a class
   def under_score(camel_cased_word)
     camel_cased_word.to_s.gsub(/::/, '/').
@@ -287,6 +355,18 @@ module Rhoconnect
     end
   end
 
+  def which(command)
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    paths = ENV['PATH'].split(File::PATH_SEPARATOR)
+    paths.each do |path|
+      exts.each do |ext|
+        exe = File.join(path, "#{command}#{ext}")
+        return exe if File.executable? exe
+      end
+    end
+    return nil
+  end
+
   def lap_timer(msg,start)
     duration = timenow - start
     log "#{msg}: #{duration}"
@@ -304,7 +384,7 @@ module Rhoconnect
 
   def log(*args)
     now = Time.now.strftime('%I:%M:%S %p %Y-%m-%d')
-    puts "[#{now}] #{args.join}" unless Rhoconnect.log_disabled
+    puts "[#{Process.pid}][#{now}] #{args.join}" unless Rhoconnect.log_disabled
   end
 
   def self.appserver
@@ -319,23 +399,8 @@ module Rhoconnect
     @@settings ||= get_config(Rhoconnect.base_directory || ROOT_PATH)[Rhoconnect.environment]
   end
 
-  # Base rhoconnect application class
-  class Base
-    # Add everything in vendor to load path
-    # TODO: Integrate with 3rd party dependency management
-    def self.initializer(path=nil)
-      Dir["vendor/*"].each do |dir|
-        $:.unshift File.join(dir,'lib')
-      end
-      require 'rhoconnect'
-      require 'rhoconnect/server'
-      # Bootstrap Rhoconnect system
-      Rhoconnect.bootstrap(path || ENV['PWD'])
-    end
-
-    def self.store_blob(obj,field_name,blob)
-      blob[:tempfile].path if blob[:tempfile]
-    end
+  def self.shutdown
+    Rhoconnect::Node.kill_process if Rhoconnect::Node.started
   end
 
   protected
@@ -345,3 +410,7 @@ module Rhoconnect
     res || default
   end
 end
+
+at_exit do
+  Rhoconnect.shutdown
+end

data/rhoconnect.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.files       += Dir.glob("generators/templates/application/.rcgemfile")
   s.files       += Dir.glob("installer/**/*")
   s.files       += Dir.glob("lib/**/*")
+  s.files       += Dir.glob("js-adapters/**/*")
   s.files       += Dir.glob("tasks/**/*")
   s.test_files   = Dir.glob("spec/**/*")
   s.executables  = Dir.glob("bin/*").map{ |f| File.basename(f) }
@@ -41,15 +42,15 @@ Gem::Specification.new do |s|
   s.add_dependency('bundler', '~> 1.0')
   s.add_dependency("rack", '~> 1.5.2')
   s.add_dependency("sinatra", '~> 1.3')
-  s.add_dependency('rake', '~> 0.9.2.2')
+  s.add_dependency('rake', '~> 10.0.0')
   s.add_dependency('json', '~> 1.7.7')
   s.add_dependency('rubyzip', '~> 0.9.4')
   s.add_dependency('uuidtools', '>= 2.1.1')
-  # Locked 'connection_pool' version because latest releases (>= 0.9.3) not compatible with MRI 1.8.7
-  s.add_dependency('connection_pool', '0.9.2')
+  s.add_dependency('connection_pool', '~> 1.0.0')
   s.add_dependency('redis', '>= 3.0.1')
   s.add_dependency('resque', '>= 1.22.0')
   s.add_dependency('rest-client', '~> 1.6.1')
   s.add_dependency('templater', '~> 1.0.0')
   s.add_dependency('thor', '~> 0.15.0')
+  s.add_dependency('ohm', '~> 0.1.3')
 end

data/spec/api/api_helper.rb

@@ -2,14 +2,9 @@ require 'rack/test'
 require 'rspec'
 
 require File.join(File.dirname(__FILE__),'..','spec_helper')
+require File.join(File.dirname(__FILE__),'..','..','lib','rhoconnect.rb')
 require File.join(File.dirname(__FILE__),'..','..','lib','rhoconnect','server.rb')
 
-def app
-  Rhoconnect::Server.set :stats, false
-  Rhoconnect.stats = false
-  @app ||= Rhoconnect::Server.new
-end
-
 def compress(path)
   path.sub!(%r[/$],'')
   archive = File.join(path,File.basename(path))+'.zip'

data/spec/api/app/fast_delete_spec.rb

@@ -5,23 +5,23 @@ describe "RhoconnectApiFastDelete" do
     it "should delete an object from rhoconnect's :md" do
       data = {'1' => @product1, '2' => @product2, '3' => @product3}
       @s = Source.load(@s_fields[:name],@s_params)
-      set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
+      set_doc_state(@s, {:md => data, :md_size => '3'})
       post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_delete", 
         {:user_id => @u.id, :data => {'3' => @product3}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       data.delete('3')
-      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'2')
+      verify_doc_result(@s, {:md => data, :md_size =>'2'})
     end
 
     it "should not properly delete the object if fast_delete is called without all the attributes (because fast_delete doesn't ensure any data integrity)" do
       data = {'1' => @product1, '2' => @product2, '3' => @product3}
       delete_data = {'3' => {'price' => '1.99'}}
       @s = Source.load(@s_fields[:name],@s_params)
-      set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
+      set_doc_state(@s, {:md => data, :md_size => '3'})
       post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_delete", 
         {:user_id => @u.id, :data => delete_data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
-      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'2')
+      verify_doc_result(@s, {:md => data, :md_size=>'2'})
     end
   end  
 end

data/spec/api/app/fast_insert_spec.rb

@@ -5,24 +5,24 @@ describe "RhoconnectApiFastInsert" do
     it "should append new objects to rhoconnect's :md" do
       data = {'1' => @product1, '2' => @product2}
       @s = Source.load(@s_fields[:name],@s_params)
-      set_state(@s.docname(:md) => data,@s.docname(:md_size) => '2')
+      set_doc_state(@s, {:md => data, :md_size => '2'})
       post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_insert",
         {:user_id => @u.id, :data => {'3' => @product3}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       data.merge!({'3' => @product3})
-      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')
+      verify_doc_result(@s, {:md => data, :md_size=>'3'})
     end
 
     it "should incorrectly append data to existing object (because fast_insert doesn't ensure any data integrity)" do
       data = {'1' => @product1, '2' => @product2, '3' => @product3}
       incorrect_insert = {'3' => {'price' => '1.99', 'new_field' => 'value'}}
       @s = Source.load(@s_fields[:name],@s_params)
-      set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
+      set_doc_state(@s, {:md => data, :md_size => '3'})
       post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_insert",
         {:user_id => @u.id, :data => incorrect_insert}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       data['3'].merge!(incorrect_insert['3'])
-      verify_result(@s.docname(:md_size)=>'4')
+      verify_doc_result(@s, :md_size=>'4')
     end
   end  
 end

data/spec/api/app/fast_update_spec.rb

@@ -5,7 +5,7 @@ describe "RhoconnectApiFastUpdate" do
     it "should update an attribute and add new one for an object in rhoconnect's :md" do
       data = {'1' => @product1, '2' => @product2, '3' => @product3}
       @s = Source.load(@s_fields[:name],@s_params)
-      set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
+      set_doc_state(@s, {:md => data, :md_size => '3'})
       
       orig_obj_attrs = {'3' => {'price' => @product3['price']}}
       new_obj_attrs = {'3' => {'price' => '0.99', 'new_attr' => 'new_value'}}
@@ -14,13 +14,13 @@ describe "RhoconnectApiFastUpdate" do
         {:user_id => @u.id, :delete_data => orig_obj_attrs, :data => new_obj_attrs}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       data['3'].merge!(new_obj_attrs['3'])
-      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')
+      verify_doc_result(@s, {:md => data, :md_size=>'3'})
     end
     
     it "should update an attribute and add new one for an object in rhoconnect's :md using old route with deprecation warning" do
       data = {'1' => @product1, '2' => @product2, '3' => @product3}
       @s = Source.load(@s_fields[:name],@s_params)
-      set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
+      set_doc_state(@s, {:md => data, :md_size => '3'})
       
       orig_obj_attrs = {'3' => {'price' => @product3['price']}}
       new_obj_attrs = {'3' => {'price' => '0.99', 'new_attr' => 'new_value'}}
@@ -30,13 +30,13 @@ describe "RhoconnectApiFastUpdate" do
       last_response.should be_ok
       last_response.headers["Warning"].index('deprecated').should_not == nil
       data['3'].merge!(new_obj_attrs['3'])
-      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')
+      verify_doc_result(@s, {:md => data, :md_size=>'3'})
     end
     
     it "should update one attr, add one attr, and remove one attr for an object in rhoconnect's :md" do
       data = {'1' => @product1, '2' => @product2, '3' => @product3}
       @s = Source.load(@s_fields[:name],@s_params)
-      set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
+      set_doc_state(@s, {:md => data, :md_size => '3'})
       
       orig_obj_attrs = {'3' => {'name' => @product3['name'], 'price' => @product3['price']}}
       new_obj_attrs = {'3' => {'price' => '0.99', 'new_attr' => 'new_value'}}
@@ -46,13 +46,13 @@ describe "RhoconnectApiFastUpdate" do
       last_response.should be_ok
       data['3'].delete('name')
       data['3'].merge!(new_obj_attrs['3'])
-      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')
+      verify_doc_result(@s, {:md => data, :md_size=>'3'})
     end
     
     it "should remove all attributes , and properly adjust md_size" do
       data = {'1' => @product1, '2' => @product2, '3' => @product3}
       @s = Source.load(@s_fields[:name],@s_params)
-      set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
+      set_doc_state(@s, {:md => data, :md_size => '3'})
       
       orig_obj_attrs = {'3' => @product3}
       new_obj_attrs = {}
@@ -61,7 +61,7 @@ describe "RhoconnectApiFastUpdate" do
         {:user_id => @u.id, :delete_data => orig_obj_attrs, :data => new_obj_attrs}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       data.delete('3')
-      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'2')
+      verify_doc_result(@s, {:md => data, :md_size=>'2'})
     end
   end  
 end

data/spec/api/app/push_deletes_spec.rb

@@ -6,12 +6,12 @@ describe "RhoconnectApiPushDeletes" do
     it "should delete object from :md" do
       data = {'1' => @product1, '2' => @product2, '3' => @product3}
       @s = Source.load(@s_fields[:name],@s_params)
-      set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
+      set_doc_state(@s, {:md => data, :md_size => '3'})
       data.delete('2')
       post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/push_deletes",
         {:user_id => @u.id, :objects => ['2']}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
-      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'2')
+      verify_doc_result(@s, {:md => data, :md_size=>'2'})
     end
   
   end