rhoconnect 3.2.0.beta1 → 3.2.0.beta2

data/spec/spec_helper.rb

@@ -184,8 +184,8 @@ module TestHelpers
   end
   
   def validate_db_by_name(db,s,data)
-    db.execute("select source_id,name,sync_priority,partition,
-      sync_type,source_attribs,metadata,schema,blob_attribs,associations
+    db.execute("select source_id,name,sync_priority,partition,sync_type,source_attribs,
+      metadata,schema,blob_attribs,associations,last_inserted_size, backend_refresh_time
       from sources where name='#{s.name}'").each do |row|
       
       return false if row[0].to_s != s.source_id.to_s
@@ -198,6 +198,8 @@ module TestHelpers
       return false if row[7] != s.schema
       return false if row[8] != s.blob_attribs
       return false if row[9] != s.has_many
+      return false if row[10] != s.get_value(:md_size).to_i
+      return false if row[11] != s.read_state.refresh_time
     end
 
     data = json_clone(data)
@@ -293,6 +295,14 @@ module TestHelpers
 
   def get_sha1(str)
     Digest::SHA1.hexdigest(str)
-  end    
+  end
+
+  def do_bulk_data_job(params)
+    begin
+      BulkDataJob.perform(params)
+    ensure
+      BulkDataJob.after_perform_x(params)
+    end
+  end
      
 end #TestHelpers

data/tasks/jasmine.rake

@@ -0,0 +1,7 @@
+require 'jasmine-headless-webkit'
+
+Jasmine::Headless::Task.new('jasmine:headless') do |t|
+  t.colors = true
+  t.keep_on_error = true
+  t.jasmine_config = 'spec/javascripts/support/jasmine.yml'
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhoconnect
 version: !ruby/object:Gem::Version 
-  hash: 62196449
+  hash: 62196455
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - beta
-  - 1
-  version: 3.2.0.beta1
+  - 2
+  version: 3.2.0.beta2
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-24 00:00:00 Z
+date: 2012-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -193,6 +193,22 @@ dependencies:
   prerelease: false
   name: thor
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  requirement: *id012
+  prerelease: false
+  name: thin
+  type: :runtime
 description: RhoConnect App Integration Server and related command-line utilities
 email: dev@rhomobile.com
 executables: 
@@ -413,6 +429,7 @@ files:
 - installer/windows/configUi.ini
 - installer/windows/ServiceLib.nsh
 - installer/utils/constants.rb
+- installer/utils/package_upload/s3_single_file.rb
 - installer/utils/package_upload/repos.rake
 - installer/utils/package_upload/s3_upload.rb
 - installer/utils/download_from_s3.rb
@@ -433,7 +450,6 @@ files:
 - lib/rhoconnect/lock_ops.rb
 - lib/rhoconnect/body_content_type_parser.rb
 - lib/rhoconnect/console/server.rb
-- lib/rhoconnect/console/rhoconnect_api.rb
 - lib/rhoconnect/utilities.rb
 - lib/rhoconnect/web-console/server.rb
 - lib/rhoconnect/web-console/views/edit_user.js
@@ -550,6 +566,7 @@ files:
 - lib/rhoconnect/console.rb
 - lib/rhoconnect/read_state.rb
 - lib/rhoconnect.rb
+- tasks/jasmine.rake
 - tasks/redis.rake
 - spec/support/shared_examples.rb
 - spec/source_adapter_spec.rb
@@ -570,7 +587,6 @@ files:
 - spec/api/client/list_client_docs_spec.rb
 - spec/api/client/create_client_spec.rb
 - spec/api/client/list_clients_spec.rb
-- spec/api/application/rhoconnect_api_spec.rb
 - spec/api/user/delete_user_spec.rb
 - spec/api/user/create_user_spec.rb
 - spec/api/user/list_users_spec.rb
@@ -621,6 +637,7 @@ files:
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_runner.rb
 - spec/javascripts/edit_user_view_spec.js
+- spec/javascripts/session_spec.js
 - spec/javascripts/server_doc_view_spec.js
 - spec/javascripts/users_view_spec.js
 - spec/javascripts/PlayerSpec.js
@@ -723,7 +740,6 @@ test_files:
 - spec/api/client/list_client_docs_spec.rb
 - spec/api/client/create_client_spec.rb
 - spec/api/client/list_clients_spec.rb
-- spec/api/application/rhoconnect_api_spec.rb
 - spec/api/user/delete_user_spec.rb
 - spec/api/user/create_user_spec.rb
 - spec/api/user/list_users_spec.rb
@@ -774,6 +790,7 @@ test_files:
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_runner.rb
 - spec/javascripts/edit_user_view_spec.js
+- spec/javascripts/session_spec.js
 - spec/javascripts/server_doc_view_spec.js
 - spec/javascripts/users_view_spec.js
 - spec/javascripts/PlayerSpec.js

data/lib/rhoconnect/console/rhoconnect_api.rb

@@ -1,245 +0,0 @@
-require 'rest_client'
-path = File.join(File.dirname(__FILE__),'..','..')
-$:.unshift path
-require 'rhoconnect'
-include Rhoconnect
-
-module RhoconnectApi
-  class << self
-
-    def get_token(server,login,password)
-      if directcall?(server)
-        Server.get_api_token(nil,User.authenticate(login,password))
-      else  
-        do_login(server,login,password)
-      end
-    end
-    
-    def list_users(server,token)
-      if directcall?(server) and verify_token(token)
-        JSON.parse(Server.list_users(nil,api_user(token)))
-      else  
-        JSON.parse(RestClient.post("#{server}/api/user/list_users",
-            {:api_token => token}.to_json, :content_type => :json).body)
-      end
-    end
-    
-    def save_adapter(server,token,adapter_url)
-      if directcall?(server) and verify_token(token)
-        Server.save_adapter({:attributes => {'adapter_url' => adapter_url}},nil)
-      else  
-        RestClient.post("#{server}/api/source/save_adapter",
-          {:api_token => token,:adapter_url => adapter_url}.to_json, 
-            :content_type => :json)
-      end
-    end
-    
-    def create_user(server,token,login,password)
-      if directcall?(server) and verify_token(token)
-        Server.create_user({:attributes => {'login' => login, 'password' => password}},nil)
-      else
-        RestClient.post("#{server}/api/user/create_user",
-          {:api_token => token,:attributes => {:login => login, :password => password}}.to_json, 
-            :content_type => :json)
-      end  
-    end  
-
-    def update_user(server,token,attributes)
-      if directcall?(server) and verify_token(token)
-        Server.update_user({:attributes => attributes},api_user(token))
-      else  
-        RestClient.post("#{server}/api/user/update_user",
-          {:api_token => token,:attributes => attributes}.to_json, 
-            :content_type => :json)
-      end  
-    end
-    
-    def delete_user(server,token,user_id)
-      if directcall?(server) and verify_token(token)
-        Server.delete_user({:user_id => user_id},nil)
-      else
-        RestClient.post("#{server}/api/user/delete_user",
-          {:api_token => token, :user_id => user_id}.to_json, 
-           :content_type => :json)
-      end    
-    end
-  
-    def list_clients(server,token,user_id)
-      if directcall?(server) and verify_token(token)
-        JSON.parse(Server.list_clients({:user_id => user_id},nil))
-      else
-        JSON.parse(RestClient.post("#{server}/api/client/list_clients", 
-          {:api_token => token, :user_id => user_id}.to_json, :content_type => :json).body)
-      end
-    end
-    
-    def create_client(server,token,user_id)
-      if directcall?(server) and verify_token(token)
-        Server.create_client({:user_id => user_id},nil)
-      else  
-        RestClient.post("#{server}/api/client/create_client",
-          {:api_token => token, :user_id => user_id}.to_json, 
-           :content_type => :json).body
-      end
-    end  
-    
-    def delete_client(server,token,user_id,client_id)
-      if directcall?(server) and verify_token(token)
-        Server.delete_client({:user_id => user_id,:client_id => client_id},nil)
-      else
-        RestClient.post("#{server}/api/client/delete_client",
-          {:api_token => token, :user_id => user_id, 
-           :client_id => client_id}.to_json, :content_type => :json)    
-      end     
-    end
-
-    def get_client_params(server,token,client_id)
-      if directcall?(server) and verify_token(token)
-        JSON.parse(Server.get_client_params({:client_id => client_id},nil))
-      else
-        JSON.parse(RestClient.post("#{server}/api/client/get_client_params", 
-          {:api_token => token, :client_id => client_id}.to_json, :content_type => :json).body)
-      end
-    end
-    
-    def get_adapter(server,token)
-      if directcall?(server) and verify_token(token)
-        JSON.parse(Server.get_adapter({},nil))
-      else
-        JSON.parse(RestClient.post("#{server}/api/source/get_adapter", 
-          {:api_token => token}.to_json, :content_type => :json).body)
-      end
-    end
-    
-    def list_sources(server,token,partition='all')
-      if directcall?(server) and verify_token(token)
-        JSON.parse(Server.list_sources({:partition_type => partition.to_s},nil))
-      else
-        JSON.parse(RestClient.post("#{server}/api/source/list_sources", 
-          {:api_token => token, :partition_type => partition}.to_json, :content_type => :json).body)
-      end
-    end
-
-    def get_source_params(server,token,source_id)
-      if directcall?(server) and verify_token(token)
-        JSON.parse(Server.get_source_params({:source_id => source_id},nil))
-      else  
-        JSON.parse(RestClient.post("#{server}/api/source/get_source_params", 
-          {:api_token => token, :source_id => source_id}.to_json, :content_type => :json).body)
-      end
-    end
-    
-    def list_source_docs(server,token,source_id,user_id='*')
-      if directcall?(server) and verify_token(token)
-        JSON.parse(Server.list_source_docs({:source_id => source_id, :user_id => user_id},nil))
-      else  
-        JSON.parse(RestClient.post("#{server}/api/source/list_source_docs", 
-          {:api_token => token, :source_id => source_id, :user_id => user_id}.to_json, :content_type => :json).body)
-      end
-    end  
-      
-    def list_client_docs(server,token,source_id,client_id)
-      if directcall?(server) and verify_token(token)
-        JSON.parse(Server.list_client_docs({:source_id => source_id, :client_id => client_id},nil))
-      else  
-        JSON.parse(RestClient.post("#{server}/api/client/list_client_docs", 
-          {:api_token => token, :source_id => source_id, :client_id => client_id}.to_json, :content_type => :json).body)
-      end    
-    end  
-    
-    #TODO: figure out data_type programmatically     
-    def get_db_doc(server,token,doc,data_type='')
-      res = ""
-      if directcall?(server) and verify_token(token)
-        res = Server.get_db_doc({:doc => doc, :data_type => data_type},nil)
-      else
-        res = RestClient.post("#{server}/api/source/get_db_doc", 
-          {:api_token => token, :doc => doc, :data_type => data_type}.to_json, :content_type => :json).body
-      end 
-      data_type=='' ? JSON.parse(res) : res
-    end
-
-    #TODO: figure out data_type programmatically     
-    def set_db_doc(server,token,doc,data={},data_type='')
-      if directcall?(server) and verify_token(token)
-        Server.set_db_doc({:doc => doc, :data => data, :data_type => data_type},nil)
-      else  
-        RestClient.post("#{server}/api/source/set_db_doc", 
-         {:api_token => token, :doc => doc, :data => data, :data_type => data_type}.to_json, :content_type => :json)
-      end   
-    end
-          
-    def reset(server,token)
-      if directcall?(server) and verify_token(token)
-        Server.reset({:api_token => token},api_user(token))
-      else  
-        RestClient.post("#{server}/api/admin/reset",
-          {:api_token => token}.to_json, :content_type => :json)
-      end
-    end
-    
-    def ping(server,token,user_id,params)
-      ping_params = {'api_token' => token, 'user_id' => user_id}
-      [:message,:badge,:sound,:vibrate,:sources,:async].each do |part|
-        part = part.to_s
-        ping_params.merge!(part => params[part]) if params[part]
-      end
-      if directcall?(server) and verify_token(token)
-        Server.ping(ping_params,nil)
-      else  
-        RestClient.post("#{server}/api/client/ping",ping_params.to_json, :content_type => :json)
-      end  
-    end
-
-    def get_license_info(server,token)
-      if directcall?(server) and verify_token(token)
-        JSON.parse(Server.get_license_info(nil,nil))
-      else  
-        JSON.parse(RestClient.post("#{server}/api/admin/get_license_info",
-          {:api_token => token}.to_json, :content_type => :json).body)
-      end
-    end
-    
-    def stats(server,token,params)
-      if directcall?(server) and verify_token(token)
-        Server.stats(params,api_user(token))
-      else  
-        RestClient.post("#{server}/api/admin/stats",
-          {:api_token => token}.merge!(params).to_json, :content_type => :json).body
-      end
-    end
-    
-    private
-    
-    def do_login(server,login,password)
-      RestClient.post("#{server}/api/admin/login",
-        {:login => login, :password => password}.to_json,
-         :content_type => :json).body
-    end
-    
-    def directcall?(server)
-      server.nil? or server.length == 0
-    end
-    
-    def api_user(token)
-      ApiToken.load(token).user
-    end
-    
-    def verify_token(token)
-      raise ApiException.new(422, "Invalid/missing API user") unless api_user(token); true
-    end
-  end
-  
-  class Server
-    def self.api(method_name,namespace = nil, verb = :post, &block)
-      self.class.send(:define_method, method_name, &block) unless namespace == :application
-    end  
-    
-    def self.app_api(method_name, namespace = nil, verb = :post, &block)
-      # this is not used in RhoconnectAPI::Server
-    end
-  end
-end
-
-include RhoconnectApi
-Dir[File.join(File.dirname(__FILE__),'..','api','**','*.rb')].each { |api| load api }