rhoconnect 3.2.1 → 3.3.1.beta2

data/CHANGELOG.md

@@ -1,8 +1,27 @@
-## 3.2.1 (2012-06-21)
-* #30760809 - moved appserver url to redis
-
-## 3.2.0 (2012-05-30)
-* #27555029 - support REDISTOGO_URL in addition to REDIS env vars as redis connection strings for Heroku
+## 3.3.1.beta2 (2012-07-09
+* #29806209 - Store re-design - implement persistent hashing
+* #32389009 - Store re-design - optimize sync by computing diffs only for the requested number of objects (as specified by page_size)
+* #26876157 - push: auth route added `/ans/login`
+* #26892609 - push: queue support
+* #31863031 - push: handle token post `device_push_type` attribute
+* #32483159 - update web console to use RC v1 routes
+
+## 3.3.1.beta1 (2012-06-29)
+* #29796429 - use list to preserve bulk data sources order
+* #29743645 - do not execute ping when platform is not configured
+* #27198669 - REST API routes
+* #27422451 - Create middleware to extract API token, current user, etc.
+* #27198831 - Move API_TOKEN from params into the header
+* #27198869 - Move CLIENT_ID from params into the header
+* #30760809 - Bug move appserver to redis from memory and config settings
+* #30732533 - dtach-install command fails
+* Added `version` command to print current version
+* #31161737 - PingJob handles missing user ids or users with no clients
+* #31245585 - blob_attribs in bulk database missing overwrite flag
+
+## 3.2.1 (2012-06-22)
+* #30760809 - Bug move appserver to redis from memory and config settings
+* #27555029 - support REDISTOGO_URL in addition to REDIS env vars as redis connection strings
 
 ## 3.2.0.final (2012-05-15)
 * Release candidate

data/Gemfile

@@ -37,7 +37,7 @@ group :development do
 end
 
 group :test do
-  gem 'rspec', '~> 2.9.0'
+  gem 'rspec', '~> 2.10.0'
   gem "rcov", '~> 1.0.0', :require => false, :platforms => :ruby_18
   gem 'simplecov', :require => false, :platforms => [:ruby_19,:jruby]
   gem 'rack-test', '>= 0.5.3', :require => 'rack/test'
@@ -46,5 +46,5 @@ group :test do
 end
 
 group :build do
-  gem 'fpm', '>= 0.4.6'
+  gem 'fpm', '>= 0.4.9'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.2.1)
+    rhoconnect (3.3.1.beta2)
       bundler (~> 1.0)
       json (~> 1.6.0)
       rake (~> 0.9.2)
@@ -11,7 +11,7 @@ PATH
       rubyzip (~> 0.9.4)
       sinatra (~> 1.3)
       templater (~> 1.0.0)
-      thor (~> 0.14.6)
+      thor (~> 0.15.0)
       uuidtools (>= 2.1.1)
 
 GEM
@@ -31,7 +31,7 @@ GEM
     builder (3.0.0)
     cabin (0.4.4)
       json
-    childprocess (0.3.2)
+    childprocess (0.3.3)
       ffi (~> 1.0.6)
     clamp (0.3.1)
     coffee-script (2.2.0)
@@ -41,16 +41,16 @@ GEM
     crack (0.3.1)
     daemons (1.1.8)
     diff-lcs (1.1.3)
-    eventmachine (1.0.0.rc.1)
-    excon (0.13.4)
+    eventmachine (1.0.0.rc.4)
+    excon (0.14.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
     extlib (0.9.15)
     ffaker (1.14.0)
     ffi (1.0.11)
-    fog (1.3.1)
+    fog (1.4.0)
       builder
-      excon (~> 0.13.0)
+      excon (~> 0.14.0)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0)
@@ -87,7 +87,7 @@ GEM
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.5.2)
-    nokogiri (1.5.4)
+    nokogiri (1.5.5)
     rack (1.4.1)
     rack-fiber_pool (0.9.2)
     rack-protection (1.2.0)
@@ -107,14 +107,14 @@ GEM
       vegas (~> 0.1.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.0)
+    rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
+    rspec-mocks (2.10.1)
     ruby-hmac (0.4.0)
     rubyzip (0.9.9)
     selenium-webdriver (2.24.0)
@@ -130,7 +130,7 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.4.3)
+    sprockets (2.4.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -140,11 +140,11 @@ GEM
       diff-lcs (>= 1.1.2)
       extlib (>= 0.9.5)
       highline (>= 1.4.0)
-    thin (1.3.1)
+    thin (1.4.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.14.6)
+    thor (0.15.4)
     tilt (1.3.3)
     uuidtools (2.1.2)
     vegas (0.1.11)
@@ -166,7 +166,7 @@ DEPENDENCIES
   eventmachine (~> 1.0.0.beta)
   ffaker (~> 1.14.0)
   fog (>= 1.1.0)
-  fpm (>= 0.4.6)
+  fpm (>= 0.4.9)
   jasmine
   jasmine-headless-webkit
   jdbc-sqlite3 (>= 3.7.2)
@@ -175,7 +175,7 @@ DEPENDENCIES
   rack-test (>= 0.5.3)
   rcov (~> 1.0.0)
   rhoconnect!
-  rspec (~> 2.9.0)
+  rspec (~> 2.10.0)
   simplecov
   sqlite3 (>= 1.3.3)
   thin

data/bench/benchapp/Gemfile

@@ -1,35 +1,32 @@
 source 'http://rubygems.org'
 
-gem 'rhoconnect', '~> 3.1.0'
+gem 'rhoconnect', :path => '../../'
 
 # Helps with some of the limitations of green threads, not needed in ruby 1.9.x
 gem 'SystemTimer', '~> 1.2.3', :platforms => :ruby_18
+gem 'win32-process', :platforms => [:mswin, :mingw]
+
+# use thin and eventmachine everywhere except JRuby
+platforms :ruby, :ruby_19, :mingw, :mingw_19 do
+  gem "eventmachine", "~> 1.0.0.beta"
+  # using thin by default
+  gem 'thin'
+end
+
+# for async framework
+# for Async, Eventful execution
+platforms :ruby_19, :mingw_19 do
+  gem 'rack-fiber_pool'
+  gem 'async-rack'
+end
 
 platforms :jruby do
   gem 'jdbc-sqlite3', ">= 3.7.2"
   gem 'dbi', ">= 0.4.5"
   gem 'dbd-jdbc', ">= 0.1.4"
   gem 'jruby-openssl', ">= 0.7.4"
+  gem 'trinidad'
   gem 'warbler'
 end
 
 gem 'sqlite3', ">= 1.3.3", :platforms => [:ruby, :mswin, :mingw]
-
-# For jruby trinidad JRuby web server is used
-gem 'trinidad',  :platforms => :jruby
-
-group :development do
-  # By default to run application thin web server is used
-  gem 'thin', :platforms => [:ruby, :mswin, :mingw]
-end
-
-group :test do
-  gem 'rack-test', '>= 0.5.3', :require => "rack/test"
-  gem 'rspec', '~> 2.6.0'
-end
-
-# for Async, Eventful execution
-platforms :ruby_19 do
-  gem 'rack-fiber_pool'
-  gem 'async-rack'
-end

data/bench/benchapp/config.ru

@@ -6,10 +6,10 @@ Bundler.require
 # Try to load vendor-ed rhoconnect, otherwise load the gem
 begin
   require 'vendor/rhoconnect/lib/rhoconnect/server'
-  require 'vendor/rhoconnect/lib/rhoconnect/console/server'
+  require 'vendor/rhoconnect/lib/rhoconnect/web-console/server'
 rescue LoadError
   require 'rhoconnect/server'
-  require 'rhoconnect/console/server'
+  require 'rhoconnect/web-console/server'
 end
 
 # By default, turn on the resque web console

data/bench/benchapp/settings/settings.yml

@@ -7,16 +7,16 @@
     :poll_interval: 300
 
 :test:
-  :syncserver: http://localhost:9292/api/application/
+  :syncserver: http://localhost:9292/application/
   :licensefile: settings/license.key
   :redis: localhost:6379
   :log_disabled: true
 :development:
-  :syncserver: http://localhost:9292/api/application/
+  :syncserver: http://localhost:9292/application/
   :licensefile: settings/license.key
   :redis: localhost:6379
   :log_disabled: true
 :production: 
-  :syncserver: http://localhost:9292/api/application/
+  :syncserver: http://localhost:9292/application/
   :licensefile: settings/license.key
   :redis: localhost:6379

data/bench/blobapp/Gemfile

@@ -4,26 +4,29 @@ gem 'rhoconnect', :path => '../../'
 
 # Helps with some of the limitations of green threads, not needed in ruby 1.9.x
 gem 'SystemTimer', '~> 1.2.3', :platforms => :ruby_18
+gem 'win32-process', :platforms => [:mswin, :mingw]
+
+# use thin and eventmachine everywhere except JRuby
+platforms :ruby, :ruby_19, :mingw, :mingw_19 do
+  gem "eventmachine", "~> 1.0.0.beta"
+  # using thin by default
+  gem 'thin'
+end
+
+# for async framework
+# for Async, Eventful execution
+platforms :ruby_19, :mingw_19 do
+  gem 'rack-fiber_pool'
+  gem 'async-rack'
+end
 
 platforms :jruby do
   gem 'jdbc-sqlite3', ">= 3.7.2"
   gem 'dbi', ">= 0.4.5"
   gem 'dbd-jdbc', ">= 0.1.4"
   gem 'jruby-openssl', ">= 0.7.4"
+  gem 'trinidad'
   gem 'warbler'
 end
 
 gem 'sqlite3', ">= 1.3.3", :platforms => [:ruby, :mswin, :mingw]
-
-# For jruby trinidad JRuby web server is used
-gem 'trinidad',  :platforms => :jruby
-
-group :development do
-  # By default to run application thin web server is used
-  gem 'thin', :platforms => [:ruby, :mswin, :mingw]
-end
-
-group :test do
-  gem 'rack-test', '>= 0.5.3', :require => "rack/test"
-  gem 'rspec', '~> 2.6.0'
-end

data/bench/blobapp/config.ru

@@ -6,10 +6,10 @@ Bundler.require
 # Try to load vendor-ed rhoconnect, otherwise load the gem
 begin
   require 'vendor/rhoconnect/lib/rhoconnect/server'
-  require 'vendor/rhoconnect/lib/rhoconnect/console/server'
+  require 'vendor/rhoconnect/lib/rhoconnect/web-console/server'
 rescue LoadError
   require 'rhoconnect/server'
-  require 'rhoconnect/console/server'
+  require 'rhoconnect/web-console/server'
 end
 
 # By default, turn on the resque web console

data/bench/blobapp/settings/settings.yml

@@ -1,16 +1,18 @@
+#Sources
 :sources: 
   BlobAdapter: 
     :poll_interval: 300
  
 :test: 
   :redis: localhost:6379
-  :syncserver: http://localhost:9292/api/application/
+  :syncserver: http://localhost:9292/application/
   :licensefile: settings/license.key
 :development: 
   :redis: localhost:6379
-  :syncserver: http://localhost:9292/api/application/
+  :syncserver: http://localhost:9292/application/
   :licensefile: settings/license.key
+  :log_disabled: true
 :production: 
   :redis: localhost:6379
-  :syncserver: http://localhost:9292/api/application/
+  :syncserver: http://localhost:9292/application/
   :licensefile: settings/license.key

data/bench/lib/bench.rb

@@ -56,71 +56,74 @@ module Bench
     
     def get_server_license_info
       token = get_token
-      params = {:api_token => token}
-      @body = RestClient.post("#{@host}/api/admin/get_license_info",
-        params.to_json, :content_type => :json)
+      @body = RestClient.get(
+        "#{@host}/rc/#{Rhoconnect::API_VERSION}/system/license",
+        {'X-RhoConnect-API-TOKEN' => token, :content_type => :json})
       JSON.parse(@body.to_s)
     end
     
     def get_server_state(doc)
       token = get_token
-      params = {:api_token => token, :doc => doc}
-      @body = RestClient.post("#{@host}/api/source/get_db_doc",
-        params.to_json, :content_type => :json)
+      @body = RestClient.get(
+        "#{@host}/rc/#{Rhoconnect::API_VERSION}/store/#{doc}",
+        {'X-RhoConnect-API-TOKEN' => token})
       JSON.parse(@body.to_s)
     end
     
     def get_server_value(doc)
       token = get_token
-      params = {:api_token => token, :doc => doc, :data_type => 'string'}
-      @body = RestClient.post("#{@host}/api/source/get_db_doc",
-        params.to_json, :content_type => :json)
+      @body = RestClient.get(
+        "#{@host}/rc/#{Rhoconnect::API_VERSION}/store/#{doc}",
+        {'X-RhoConnect-API-TOKEN' => token, :content_type => :json})
     end
     
     def reset_app
-      RestClient.post("#{@host}/api/admin/reset",{:api_token => get_token}.to_json, :content_type => :json)
+      RestClient.post(
+        "#{@host}/rc/#{Rhoconnect::API_VERSION}/system/reset",
+        {},
+        {:content_type => :json, 'X-RhoConnect-API-TOKEN' => get_token})
     end
     
     def create_user(user_name, password)
       token = get_token
-      RestClient.post("#{@host}/api/user/create_user",
-        {:api_token => token, :app_name => @app_name,
-          :attributes => {:login => user_name, :password => password}}.to_json,
-          :content_type => :json)
+      RestClient.post(
+        "#{@host}/rc/#{Rhoconnect::API_VERSION}/users",
+        {:app_name => @app_name, :attributes => {:login => user_name, :password => password}}.to_json,
+        {:content_type => :json, 'X-RhoConnect-API-TOKEN' => token})
     end
     
     def set_server_state(doc,data,append=false)
       token = get_token
-      params = {:api_token => token, :doc => doc, :data => data, :append => append}
-      if data.is_a? String
-        params[:data_type] = 'string'
-      end
-      RestClient.post("#{@host}/api/source/set_db_doc",
-        params.to_json, :content_type => :json)
+      params = {:data => data, :append => append}
+      params[:data_type] = 'string' if data.is_a? String
+      RestClient.post(
+        "#{@host}/rc/#{Rhoconnect::API_VERSION}/store/#{doc}",
+        params.to_json,
+        {'X-RhoConnect-API-TOKEN' => token, :content_type => :json})
     end
     
     def reset_refresh_time(source_name,poll_interval=nil)
       token = get_token
-      RestClient.post("#{@host}/api/source/set_refresh_time",
-        {:api_token => token, :source_name => source_name,
-          :user_name => @user_name, 
-          :poll_interval => poll_interval}.to_json, 
-          :content_type => :json)
+      RestClient.put(
+        "#{@host}/rc/#{Rhoconnect::API_VERSION}/readstate/users/#{@user_name}/sources/#{source_name}",
+        {:poll_interval => poll_interval}.to_json,
+        {'X-RhoConnect-API-TOKEN' => token, :content_type => :json})
     end
     
     def set_simulate_time(source_name,simulate_time=0)
       token = get_token
-      RestClient.post("#{@host}/api/source/update_source_params",
-        {:api_token => token, :source_name => source_name,
-          :user_name => @user_name, 
-          :data => {:simulate_time => simulate_time}}.to_json, 
-          :content_type => :json)
+      RestClient.put(
+        "#{@host}/rc/#{Rhoconnect::API_VERSION}/sources/#{source_name}",
+        {:data => {:simulate_time => simulate_time}}.to_json,
+        {'X-RhoConnect-API-TOKEN' => token, :content_type => :json})
     end
     
     def get_token
       unless @token
-        @token = RestClient.post("#{@host}/api/admin/login", 
-          {:login => @admin_login, :password => @admin_password}.to_json, :content_type => :json)
+        @token = RestClient.post(
+          "#{@host}/rc/#{Rhoconnect::API_VERSION}/system/login",
+          {:login => @admin_login, :password => @admin_password}.to_json,
+          :content_type => :json)
       end
       @token
     end

data/bench/lib/bench/session.rb

@@ -11,7 +11,7 @@ module Bench
     end
       
     def post(marker,url,headers={})
-      @body = yield
+      @body = yield if block_given?
       _request(marker,:_post,url,headers)
     end
     
@@ -22,6 +22,10 @@ module Bench
       _request(marker,:_get,url_params,headers)          
     end
     
+    def delete(marker,url,headers={})
+      _request(marker,:_delete,url,headers)          
+    end
+    
     protected
     def _request(marker,verb,url,headers)
       result = Result.new(marker,verb,url,@thread_id,@iteration)
@@ -58,6 +62,10 @@ module Bench
       RestClient.post(url, @body, headers)
     end
     
+    def _delete(url,headers)
+      RestClient.delete(url, headers)
+    end
+    
     def _url_params(params)
       elements = []
       params.each do |key,value|