rhoconnect 4.0.0.beta.12 → 4.0.0.beta.24

data/spec/spec_helper.rb

@@ -2,17 +2,16 @@ require 'rubygems'
 require 'rspec'
 require 'webmock/rspec'
 require 'rspec/autorun' # Required for Rcov to run with rspec '~> 2.8.0'
-if RUBY_VERSION =~ /1.9/ || defined?(JRUBY_VERSION)
-  require 'simplecov'
-  require 'simplecov-rcov'
-  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-  SimpleCov.start do
-    add_filter '/spec/'
-  end
+
+require 'simplecov'
+require 'simplecov-rcov'
+SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+SimpleCov.start do
+  add_filter '/spec/'
 end
 
 # all specs are Async'd in new ruby
-if RUBY_VERSION =~ /1.9/ and not defined?(JRUBY_VERSION)
+if not defined?(JRUBY_VERSION)
   require 'eventmachine'
   require 'fiber'
 
@@ -137,11 +136,7 @@ module TestHelpers
   end
 
   def setup_post_yield(response)
-    if RUBY_VERSION =~ /1.9/ or defined?(JRUBY_VERSION)
-      RestClient.stub!(:post).and_yield(response, nil, nil)
-    else
-      RestClient.stub!(:post).and_yield(response)
-    end
+    RestClient.stub!(:post).and_yield(response, nil, nil)
   end
 
   def set_state(state,append=false)

data/spec/store_spec.rb

@@ -200,7 +200,7 @@ describe "Store" do
       end
 
       it "should put_zdata and get_zdata" do
-        create_doc = {'1' => {'foo' => 'bar'}}
+        create_doc = [[@s.name, [['1', {'foo' => 'bar'}]]]]
         assoc_key = 'my_assoc_key'
         Store.put_zdata('doc1',assoc_key,create_doc)
         zdata,keys = Store.get_zdata('doc1')
@@ -215,7 +215,7 @@ describe "Store" do
       end
       
       it "should append duplicate data in put_zdata" do
-        create_doc = {'1' => {'foo' => 'bar'}}
+        create_doc = [[@s.name, [['1', {'foo' => 'bar'}]]]]
         assoc_key = 'my_assoc_key'
         Store.put_zdata('doc1',assoc_key,create_doc)
         Store.put_zdata('doc1',assoc_key,create_doc, true)
@@ -225,14 +225,16 @@ describe "Store" do
       end
       
       it "should flush_zdata" do
-        create_doc = {'1' => {'foo' => 'bar'}}
+        create_doc = [[@s.name, [['1', {'foo' => 'bar'}]]]]
         assoc_key = 'my_assoc_key'
         Store.put_zdata('doc1',assoc_key,create_doc)
+        zdocs = Store.get_data("doc1:1:my_assoc_key:#{@s.name}:0")
+        zdocs.should == {'0_1' => {'foo' => 'bar'}}
         Store.flush_zdata('doc1')
         zdata,keys = Store.get_zdata('doc1')
         zdata.should == []
         keys.should == []
-        zdocs = Store.get_data('doc1:1:my_assoc_key:1')
+        zdocs = Store.get_data("doc1:1:my_assoc_key:#{@s.name}:0")
         zdocs.should == {}
       end
       

data/spec/test_methods_spec.rb

@@ -89,14 +89,14 @@ describe "TestMethods" do
     it "should include test_update helper" do
       record = {'4'=> { 'price' => '199.99' }}
       test_update(record)
-      verify_source_queue_data(@s, :update => [])
+      verify_source_queue_data(@s, "update:post:/" => [])
     end
     
     it "should include test_update helper when pass through" do
       record = {'4'=> { 'price' => '199.99' }}
       @s.pass_through = 'true'
       test_update(record).should == {'processed' => ["4"]}.to_json
-      verify_source_queue_data(@s, :update => [])
+      verify_source_queue_data(@s, "update:post:/" => [])
     end
 
     it "should include update_errors helper" do
@@ -108,14 +108,14 @@ describe "TestMethods" do
     it "should include test_delete helper" do
       record = {'4'=> { 'price' => '199.99' }}
       test_delete(record)
-      verify_source_queue_data(@s, :delete => [])
+      verify_source_queue_data(@s, "delete:post:/" => [])
     end
     
     it "should include test_delete helper when pass through" do
       record = {'4'=> { 'price' => '199.99' }}
       @s.pass_through = 'true'
       test_delete(record).should == {'processed' => ["4"]}.to_json
-      verify_source_queue_data(@s, :delete => [])
+      verify_source_queue_data(@s, "delete:post:/" => [])
     end
 
     it "should include delete_errors helper" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhoconnect
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta.12
+  version: 4.0.0.beta.24
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -210,7 +210,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,23 +218,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.0
-- !ruby/object:Gem::Dependency
-  name: ohm
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.18.0
 description: RhoConnect App Integration Server and related command-line utilities
 email: dev@rhomobile.com
 executables:
@@ -336,6 +320,7 @@ files:
 - commands/rhoconnect/config.rb
 - commands/rhoconnect/web.rb
 - commands/rhoconnect/set_admin_password.rb
+- commands/rhoconnect/routes.rb
 - commands/rhoconnect/startbg.rb
 - commands/rhoconnect/flushdb.rb
 - commands/rhoconnect/startdebug.rb
@@ -346,17 +331,16 @@ files:
 - commands/rhoconnect_attach/attach.rb
 - commands/rhoconnect_spec/spec.rb
 - commands/utilities/redis_runner.rb
-- commands/utilities/utilities.rb
 - commands/utilities/blank_app.ru
 - commands/generators/app.rb
 - commands/generators/controller.rb
 - commands/generators/model.rb
 - commands/generators/source.rb
 - commands/generators/update.rb
-- commands/execute.rb
 - commands/rhoconnect_war/war.rb
 - commands/rhoconnect_console/console.rb
 - commands/rhoconnect_console/console_helper.rb
+- commands/parser.rb
 - commands/redis/redis_download.rb
 - commands/redis/redis_make.rb
 - commands/redis/redis_restart.rb
@@ -444,7 +428,6 @@ files:
 - generators/templates/application/spec/spec_helper.rb
 - generators/templates/application/spec/application_controller_spec.rb
 - generators/templates/application/config.ru
-- generators/templates/application/controllers/application_controller.rb
 - generators/templates/application/controllers/js/application_controller.js
 - generators/templates/application/controllers/ruby/application_controller.rb
 - generators/templates/application/Rakefile
@@ -517,6 +500,7 @@ files:
 - lib/rhoconnect/handler/changes/pass_through_runner.rb
 - lib/rhoconnect/handler/changes/execute_methods.rb
 - lib/rhoconnect/handler/changes/runner.rb
+- lib/rhoconnect/handler/changes/hooks.rb
 - lib/rhoconnect/handler/changes/engine.rb
 - lib/rhoconnect/lock_ops.rb
 - lib/rhoconnect/utilities.rb
@@ -525,9 +509,11 @@ files:
 - lib/rhoconnect/document.rb
 - lib/rhoconnect/license.rb
 - lib/rhoconnect/test_methods.rb
+- lib/rhoconnect/model/helpers/find_duplicates_on_update.rb
 - lib/rhoconnect/model/dynamic_adapter_model.rb
 - lib/rhoconnect/model/base.rb
 - lib/rhoconnect/model/js_base.rb
+- lib/rhoconnect/model/helpers.rb
 - lib/rhoconnect/server.rb
 - lib/rhoconnect/middleware/body_content_type_parser.rb
 - lib/rhoconnect/middleware/cors.rb
@@ -536,7 +522,6 @@ files:
 - lib/rhoconnect/middleware/stats.rb
 - lib/rhoconnect/middleware/current_app.rb
 - lib/rhoconnect/middleware/x_domain_session_wrapper.rb
-- lib/rhoconnect/js_adapter.rb
 - lib/rhoconnect/client.rb
 - lib/rhoconnect/rho_indifferent_access.rb
 - lib/rhoconnect/controller/sources_controller.rb
@@ -556,6 +541,7 @@ files:
 - lib/rhoconnect/bulk_data/bulk_data.rb
 - lib/rhoconnect/condition/verbs.rb
 - lib/rhoconnect/condition/verify_success.rb
+- lib/rhoconnect/condition/add_parameter.rb
 - lib/rhoconnect/condition/admin_required.rb
 - lib/rhoconnect/condition/client_required.rb
 - lib/rhoconnect/condition/source_required.rb
@@ -636,6 +622,7 @@ files:
 - js-adapters/rhoconnect_helpers.js
 - js-adapters/request.js
 - js-adapters/response.js
+- js-adapters/exceptions.js
 - tasks/jasmine.rake
 - tasks/redis.rake
 - spec/jobs/source_job_spec.rb
@@ -675,7 +662,7 @@ files:
 - spec/perf/store_perf_spec.rb
 - spec/rhoconnect_spec.rb
 - spec/user_spec.rb
-- spec/models/js_model_spec.rb
+- spec/models/js_base_spec.rb
 - spec/server/cors_spec.rb
 - spec/server/x_domain_session_wrapper_spec.rb
 - spec/server/stats_spec.rb
@@ -788,7 +775,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -420963856285787510
+      hash: 3543928944342720211
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -839,7 +826,7 @@ test_files:
 - spec/perf/store_perf_spec.rb
 - spec/rhoconnect_spec.rb
 - spec/user_spec.rb
-- spec/models/js_model_spec.rb
+- spec/models/js_base_spec.rb
 - spec/server/cors_spec.rb
 - spec/server/x_domain_session_wrapper_spec.rb
 - spec/server/stats_spec.rb

data/commands/execute.rb

@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'thor'
-require 'json'
-require 'uri'
-$:.unshift File.join(File.dirname(__FILE__), '.')
-$:.unshift File.join(File.dirname(__FILE__), '..')
-require 'lib/rhoconnect/utilities'
-require 'lib/rhoconnect'
-require 'utilities/utilities'
-require 'utilities/redis_runner'
-
-include Utilities
-
-settings_file = File.join(File.dirname(__FILE__), '..', 'generators', 'templates', 'application', 'settings', "settings.yml")
-options = load_settings(settings_file)[Rhoconnect.environment]
-RHOCONNECT_PORT = URI.parse(options[:syncserver]).port
-REDIS_SERVER_URL = options[:redis]
-PUSH_SERVER_URL = options[:push_server]
-API_TOKEN = options[:api_token]
-
-class Execute < Thor
-  no_tasks {
-    def self.define_task(&block)
-      Execute.class_eval(&block)
-    end
-  }
-
-  tasks = [ 'generators', 'rhoconnect', 'redis' ]
-  unless windows?
-    tasks << 'dtach'
-    tasks << 'rhoconnect_attach' unless jruby?
-  end
-  tasks << if jruby? then "rhoconnect_war" else "rhoconnect_console" end
-  # 'rhoconnect spec' command is available only if it called from root of 
-  # rhoconnect app and its bundle includes 'rspec' gem
-  if File.exists?(File.join(Dir.pwd,'Gemfile'))
-    require 'bundler'
-    tasks << 'rhoconnect_spec' if Bundler.load.specs.find{ |s| s.name == 'rspec' }
-  end
-  
-  tasks.each do |dir|
-    Dir.glob(File.join(File.dirname(__FILE__), "#{dir}", "*.rb")) do |file|
-      require file
-    end
-  end
-end

data/commands/utilities/utilities.rb

@@ -1,6 +0,0 @@
-module Utilities
-  def dtach_installed?
-    return false if windows? # dtach n/a on Windows
-    `which dtach` != ''
-  end
-end

data/generators/templates/application/controllers/application_controller.rb

@@ -1,17 +0,0 @@
-class ApplicationController < Rhoconnect::Controller::AppBase
-  register Rhoconnect::EndPoint
-
-  post "/login", :rc_handler => :authenticate,
-                 :deprecated_route => {:verb => :post, :url => ['/application/clientlogin', '/api/application/clientlogin']} do
-    login = params[:login]
-    password = params[:password]
-    true # do some interesting authentication here...
-  end
-
-  get "/rps_login", :rc_handler => :rps_authenticate, 
-                    :login_required => true do
-    login = params[:login]
-    password = params[:password]
-    true # optionally handle rhoconnect push authentication...
-  end
-end

data/lib/rhoconnect/js_adapter.rb

@@ -1,79 +0,0 @@
-# module Rhoconnect
-#   class JsAdapter < SourceAdapter
-#     attr_accessor :name
-#     
-#     def initialize(source)
-#       @source = source
-#       @name = source.name
-#     end
-#     
-#     def self.method_missing method_name, *args
-#       #grab function and args and publish to channel
-#       begin
-#         json = create_json_hash(method_name,args)
-#         NodeChannel.publish_channel_and_wait(json)
-#       rescue Exception => e
-#         puts "#{method_name error} - #{e.message}"
-#       end
-#     end
-#       
-#     def login(params=nil)
-#       begin
-#         json = create_json_hash('get',params)
-#         NodeChannel.publish_channel_and_wait(json)
-#       rescue Exception=>e
-#         puts "error login #{e.message}\n #{e.backtrace}"
-#       end
-#     end
-#   
-#     def query(params=nil)
-#       begin
-#         json = create_json_hash('get',params)
-#         @result = NodeChannel.publish_channel_and_wait(json)
-#         puts "res is ******* #{@result}"
-#         @result
-#       rescue Exception=>e
-#         puts "error query #{e.message}\n#{e.backtrace}"
-#       end
-#     end
-#     
-#     # def search(params=nil)
-#     #    json = create_json_hash('search',params)
-#     #    NodeChannel.publish_channel_and_wait(json)
-#     #  end
-#     
-#     # def sync
-#     #      @result
-#     #      super
-#     #    end
-#     
-#     def create(create_hash)
-#       json = create_json_hash('post',create_hash)
-#       NodeChannel.publish_channel_and_wait(json)  
-#     end
-# 
-#     def update(update_hash)
-#       puts "update hash is #{update_hash}"
-#       json = create_json_hash('put',update_hash)
-#       NodeChannel.publish_channel_and_wait(json)  
-#     end
-# 
-#     def delete(delete_hash)
-#       puts "create hash is #{delete_hash}"
-#       json = create_json_hash('delete',delete_hash)
-#       NodeChannel.publish_channel_and_wait(json)  
-#     end
-#     
-#     
-#     private
-#     
-#     def create_json_hash(operation,params)
-#       json = {
-#         :url     => "#{operation}-/#{@name}",
-#         :args       => params,
-#         :route      => 'request'
-#       }
-#     end
-#   end
-#   
-# end