rhosync 2.0.0.beta9 → 2.0.0.beta10

data/lib/rhosync/console/rhosync_api.rb

@@ -4,10 +4,11 @@ module RhosyncApi
   class << self
 
     def get_token(server,login,password)
-      res = RestClient.post("#{server}/login",
-          {:login => login, :password => password}.to_json, :content_type => :json)
-      res.cookies['rhosync_session'] = CGI.escape(res.cookies['rhosync_session'])
-      RestClient.post("#{server}/api/get_api_token",'',{:cookies => res.cookies})
+      # res = RestClient.post("#{server}/login",
+      #           {:login => login, :password => password}.to_json, :content_type => :json)
+      # RestClient.post("#{server}/api/get_api_token",'',{:cookies => res.cookies})
+      cookie = login(server,login,password)
+      RestClient.post("#{server}/api/get_api_token",'',{:cookies => cookie})
     end
     
     def list_users(server,token)
@@ -100,5 +101,18 @@ module RhosyncApi
         {:api_token => token}.to_json, :content_type => :json).body)
     end
     
+    private
+    
+    # TODO: Kill this code when rest-client properly 
+    # escapes cookie strings on MAC/LINUX AND WINDOWS
+    def login(server,login,password)
+      uri = URI.parse(server)
+      http = Net::HTTP.new(uri.host,uri.port)
+      res,data = http.post( '/login', 
+        {:login => login, :password => password}.to_json, 
+        {'Content-Type' => 'application/json'} )
+      cookie = res.response['set-cookie'].split('; ')[0].split('=')
+      {cookie[0] => cookie[1]}
+    end
   end
 end

data/lib/rhosync/jobs/bulk_data_job.rb

@@ -59,9 +59,9 @@ module Rhosync
       
       db.transaction do |database|
         # Create a table with columns specified by 'property' array in settings
-        schema['property'].each do |column|
-          create_table << "#{column.keys[0]} varchar default NULL" 
-          columns << column.keys[0]
+        schema['property'].each do |key,value|
+          create_table << "#{key} varchar default NULL" 
+          columns << key
           qm << '?'
         end
         database.execute("CREATE TABLE #{source.name}(
@@ -80,13 +80,13 @@ module Rhosync
         end
         
         # Create indexes for specified columns in settings 'index'
-        schema['index'].each do |index|
-          database.execute("CREATE INDEX #{index.keys[0]} on #{source.name} (#{index.values[0]});")
+        schema['index'].each do |key,value|
+          database.execute("CREATE INDEX #{key} on #{source.name} (#{value});")
         end if schema['index']
         
         # Create unique indexes for specified columns in settings 'unique_index'
-        schema['unique_index'].each do |index|
-          database.execute("CREATE UNIQUE INDEX #{index.keys[0]} on #{source.name} (#{index.values[0]});")
+        schema['unique_index'].each do |key,value|
+          database.execute("CREATE UNIQUE INDEX #{key} on #{source.name} (#{value});")
         end if schema['unique_index']
       end
     

data/lib/rhosync/server.rb

@@ -58,7 +58,7 @@ module Rhosync
       end
 
       def login
-        if params[:login] == 'admin'
+        if params[:login] == 'rhoadmin'
           user = User.authenticate(params[:login], params[:password])
         elsif current_app and current_app.can_authenticate?
           user = current_app.authenticate(params[:login], params[:password], session)

data/lib/rhosync/source.rb

@@ -10,6 +10,7 @@ module Rhosync
     field :poll_interval,:integer
     field :partition_type,:string
     field :sync_type,:string
+    field :belongs_to,:string
     field :queue,:string
     field :query_queue,:string
     field :cud_queue,:string
@@ -28,6 +29,7 @@ module Rhosync
       fields[:partition_type] ||= :user
       fields[:poll_interval] ||= 300
       fields[:sync_type] ||= :incremental
+      fields[:belongs_to] = fields[:belongs_to].to_json if fields[:belongs_to]
       fields[:schema] = fields[:schema].to_json if fields[:schema]
     end
         
@@ -48,8 +50,9 @@ module Rhosync
       return '' unless self.schema
       schema = JSON.parse(self.schema)
       blob_attribs = []
-      schema['property'].each do |property|
-        blob_attribs << property.keys[0] if property.values[0] == 'blob'
+      schema['property'].each do |key,value|
+        values = value ? value.split(',') : []
+        blob_attribs << key if values.include?('blob')
       end
       blob_attribs.sort.join(',')
     end

data/lib/rhosync/tasks.rb

@@ -59,13 +59,13 @@ namespace :rhosync do
   
   task :config do
     $settings = load_settings(File.join('settings','settings.yml'))
-    env = (ENV['RHO_ENV'] || :development).to_sym  
-    uri = URI.parse($settings[env][:syncserver])
+    $env = (ENV['RHO_ENV'] || :development).to_sym  
+    uri = URI.parse($settings[$env][:syncserver])
     $url = "#{uri.scheme}://#{uri.host}"
     $url = "#{$url}:#{uri.port}" if uri.port && uri.port != 80
     $host = uri.host
     $port = uri.port
-    $appname = $settings[env][:syncserver].split('/').last
+    $appname = $settings[$env][:syncserver].split('/').last
     $token_file = File.join(ENV['HOME'],'.rhosync_token')
     $token = File.read($token_file) if File.exist?($token_file)
   end
@@ -187,6 +187,18 @@ namespace :rhosync do
   task :web => :config do
     windows? ? sh("start #{$url}") : sh("open #{$url}")
   end
+  
+  desc "Flush data store - WARNING: THIS REMOVES ALL DATA IN RHOSYNC"
+  task :flushdb => :config do
+    puts "*** WARNING: THIS WILL REMOVE ALL DATA FROM YOUR REDIS STORE ***"
+    confirm = ask "Are you sure (please answer yes/no)? "
+    if confirm == 'yes'
+      Redis.new.flushdb
+      puts "Database flushed..."
+    else
+      puts "Aborted..."
+    end
+  end
 end
 
 load File.join(File.dirname(__FILE__),'..','..','tasks','redis.rake')

data/lib/rhosync/version.rb

@@ -1,3 +1,3 @@
 module Rhosync
-  VERSION = '2.0.0.beta9'
+  VERSION = '2.0.0.beta10'
 end

data/lib/rhosync.rb

@@ -105,8 +105,8 @@ module Rhosync
   
   # Generate admin user on first load
   def create_admin_user
-    unless User.is_exist?('admin')
-      admin = User.create({:login => 'admin', :admin => 1})
+    unless User.is_exist?('rhoadmin')
+      admin = User.create({:login => 'rhoadmin', :admin => 1})
       admin.password = ''
       admin.create_token
     end

data/spec/api/api_helper.rb

@@ -22,7 +22,7 @@ describe "ApiHelper", :shared => true do
       :run => false,
       :secret => "secure!"
     )
-    @api_token = User.load('admin').token_id
+    @api_token = User.load('rhoadmin').token_id
   end
 
   def app

data/spec/api/create_user_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__),'api_helper')
 describe "RhosyncApiCreateUser" do
   it_should_behave_like "ApiHelper"
   
-  it "should create user as admin" do
+  it "should create user" do
     params = {:api_token => @api_token,
       :attributes => {:login => 'testuser1', :password => 'testpass1'}}
     post "/api/create_user", params

data/spec/api/get_api_token_spec.rb

@@ -4,12 +4,12 @@ describe "RhosyncApiGetApiToken" do
   it_should_behave_like "ApiHelper"
   
   it "should get token string" do
-    post "/login", :login => 'admin',:password => ''
+    post "/login", :login => 'rhoadmin',:password => ''
     post "/api/get_api_token"
     last_response.body.should == @api_token
   end
   
-  it "should fail to get token if user is not admin" do
+  it "should fail to get token if user is not rhoadmin" do
     post "/login", :login => @u_fields[:login],:password => 'testpass'
     post "/api/get_api_token"
     last_response.status.should == 422    

data/spec/api/get_source_params_spec.rb

@@ -17,6 +17,7 @@ describe "RhosyncApiGetSourceParams" do
       {"name"=>"poll_interval", "value"=>300, "type"=>"integer"}, 
       {"name"=>"partition_type", "value"=>"user", "type"=>"string"}, 
       {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"}, 
+      {"name"=>"belongs_to", "type"=>"string", "value"=>nil},
       {"name"=>"queue", "value"=>nil, "type"=>"string"}, 
       {"name"=>"query_queue", "value"=>nil, "type"=>"string"}, 
       {"name"=>"cud_queue", "value"=>nil, "type"=>"string"},

data/spec/api/reset_spec.rb

@@ -3,20 +3,20 @@ require File.join(File.dirname(__FILE__),'api_helper')
 describe "RhosyncApiReset" do
   it_should_behave_like "ApiHelper"
   
-  it "should reset and re-create admin user with bootstrap" do
+  it "should reset and re-create rhoadmin user with bootstrap" do
     Store.put_data('somedoc',{'foo'=>'bar'})
     post "/api/reset", :api_token => @api_token
     App.is_exist?(@test_app_name).should == true
     Store.get_data('somedoc').should == {}
-    User.authenticate('admin','').should_not be_nil
+    User.authenticate('rhoadmin','').should_not be_nil
   end
   
-  it "should reset and re-create admin user with initializer" do
+  it "should reset and re-create rhoadmin user with initializer" do
     Store.put_data('somedoc',{'foo'=>'bar'})
     post "/api/reset", :api_token => @api_token
     App.is_exist?(@test_app_name).should == true
     Store.get_data('somedoc').should == {}
-    User.authenticate('admin','').should_not be_nil
+    User.authenticate('rhoadmin','').should_not be_nil
     load File.join(Rhosync.base_directory,@test_app_name+'.rb')
   end
 end

data/spec/api/update_user_spec.rb

@@ -7,8 +7,8 @@ describe "RhosyncApiUpdateUser" do
     post "/api/update_user", :api_token => @api_token, 
       :attributes => {:new_password => '123'}
     last_response.should be_ok
-    user = User.authenticate('admin','123')
-    user.login.should == 'admin'
+    user = User.authenticate('rhoadmin','123')
+    user.login.should == 'rhoadmin'
     user.admin.should == 1
   end
   
@@ -23,8 +23,8 @@ describe "RhosyncApiUpdateUser" do
     post "/api/update_user", :api_token => @api_token, 
       :attributes => {:new_password => '123', :login => 'admin1'}
     last_response.should be_ok
-    user = User.authenticate('admin','123')
-    user.login.should == 'admin'
+    user = User.authenticate('rhoadmin','123')
+    user.login.should == 'rhoadmin'
     user.admin.should == 1
     User.is_exist?('admin1').should == false
   end

data/spec/apps/rhotestapp/settings/settings.yml

@@ -3,20 +3,24 @@
     poll_interval: 300
   SimpleAdapter:
     poll_interval: 600
-    partition_type: app
+    partition_type: 'app'
   FixedSchemaAdapter:
     poll_interval: 300
+    sync_type: 'incremental'
+    belongs_to: 
+      brand: 'Customer'
     schema:
       version: '1.0'
       property:
-        - name: string
-        - brand: string
-        - price: string
-        - image_url: blob
+        name: 'string'
+        brand: 'string'
+        price: 'string'
+        image_url_cropped: 'blob,overwrite'
+        image_url: 'blob'
       index: 
-        - by_name_brand: 'name,brand'
+        by_name_brand: 'name,brand'
       unique_index: 
-        - by_price: 'price'
+        by_price: 'price'
     
 :development:
   :licensefile: settings/license.key

data/spec/server/server_spec.rb

@@ -43,8 +43,8 @@ describe "Server" do
     last_response.should be_ok
   end
   
-  it "should login as admin user" do
-    post "/login", "login" => 'admin', "password" => ''
+  it "should login as rhoadmin user" do
+    post "/login", "login" => 'rhoadmin', "password" => ''
     last_response.should be_ok
   end
   
@@ -117,17 +117,23 @@ describe "Server" do
     before(:each) do
       do_post "/application/clientlogin", "login" => @u.login, "password" => 'testpass'
       @source_config = {
-        "sources"=> { 
-          "FixedSchemaAdapter"=>
-            {"schema"=>{"property"=>[{"name"=>"string"}, 
-              {"brand"=>"string"}, {"price"=>"string"}, 
-              {"image_url"=>"blob"}], "version"=>"1.0", 
-              "unique_index"=>[{"by_price"=>"price"}], 
-              "index"=>[{"by_name_brand"=>"name,brand"}]}, 
-              "poll_interval"=>300},
-           "SampleAdapter"=>{"poll_interval"=>300}, 
-           "SimpleAdapter"=>{"partition_type"=>"app", 
-             "poll_interval"=>600}}
+        "sources"=>
+        {"FixedSchemaAdapter"=>
+          {"schema"=>
+            {"property"=>
+              {"image_url_cropped"=>"blob,overwrite",
+               "price"=>"string",
+               "brand"=>"string",
+               "name"=>"string",
+               "image_url"=>"blob"},
+             "unique_index"=>{"by_price"=>"price"},
+             "version"=>"1.0",
+             "index"=>{"by_name_brand"=>"name,brand"}},
+           "poll_interval"=>300,
+           "sync_type"=>"incremental",
+           "belongs_to"=>{"brand"=>"Customer"}},
+         "SampleAdapter"=>{"poll_interval"=>300},
+         "SimpleAdapter"=>{"partition_type"=>"app", "poll_interval"=>600}}
       }
     end
     

data/spec/spec_helper.rb

@@ -129,8 +129,8 @@ module TestHelpers
     if s.schema
       schema = JSON.parse(s.schema)
       columns = ['object']
-      schema['property'].each do |column|
-        columns << column.keys[0]
+      schema['property'].each do |key,value|
+        columns << key
       end
       db.execute("select #{columns.join(',')} from #{s.name}") do |row|
         obj = data[row[0]]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: -1848230043
+  hash: -1967355490
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - beta9
-  version: 2.0.0.beta9
+  - beta10
+  version: 2.0.0.beta10
 platform: ruby
 authors: 
 - Rhomobile
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-28 00:00:00 -07:00
+date: 2010-06-02 00:00:00 -07:00
 default_executable: rhosync
 dependencies: 
 - !ruby/object:Gem::Dependency