rhoconnect 3.4.5 → 4.0.0.beta.10

data/lib/rhoconnect/{model.rb → store_orm.rb}

@@ -1,26 +1,25 @@
 module Rhoconnect
-  # Taken from http://github.com/voloko/redis-model
+  # Taken from http://github.com/voloko/store-model
   #
-  # Simple models for redis-rb.
-  
-  class Model
+  # Simple ORM for store-rb.
+  class StoreOrm
     attr_accessor :id
   
     def initialize(id=nil)
       self.id = id
     end
   
-    def redis #:nodoc:
-      self.class.redis
+    def store #:nodoc:
+      self.class.store
     end
   
     # Issues delete commands for all defined fields
     def delete(name = nil)
       if name
-        redis.del field_key(name.to_s)
+        store.delete_value(field_key(name.to_s))
       else
         self.class.fields.each do |field|
-          redis.del field_key(field[:name])
+          store.delete_value(field_key(field[:name]))
         end
       end
     end
@@ -33,22 +32,22 @@ module Rhoconnect
     # specified amount.
     def increment!(name,amount=1)
       raise ArgumentError, "Only integer fields can be incremented." unless self.class.fields.include?({:name => name.to_s, :type => :integer})
-      redis.incrby(field_key(name), amount)
+      store.update_count(field_key(name), amount)
     end
   
     # Decrement the specified integer field by 1 or the
     # specified amount.
     def decrement!(name,amount=1)
       raise ArgumentError, "Only integer fields can be decremented." unless self.class.fields.include?({:name => name.to_s, :type => :integer})
-      redis.decrby(field_key(name), amount)
+      store.update_count(field_key(name), -amount)
     end
     
     def next_id #:nodoc:
-      redis.incr "sequence:#{self.prefix}:id"
+      store.incr "sequence:#{self.prefix}:id"
     end
   
     def self.is_exist?(id)
-      !redis.get(self._field_key(self._prefix,id,'rho__id')).nil?
+      !store.get_value(self._field_key(self._prefix,id,'rho__id')).nil?
     end
   
     def to_array
@@ -59,16 +58,6 @@ module Rhoconnect
       res
     end
 
-    # TODO: not used anymore
-    # def update(attribs)
-    #   self.class.fields.each do |field|
-    #     if field[:name] != 'name' and field[:name] != 'rho__id'
-    #       redis.del field_key(field[:name]) 
-    #     end  
-    #   end    
-    #   self.class.populate_attributes(self,attribs)
-    # end
-      
   protected
     def prefix #:nodoc:
       @prefix ||= self.class.prefix || self.class.class_prefix(self.class)
@@ -132,8 +121,8 @@ module Rhoconnect
       # Creates new model instance with given id
       alias_method :with_key, :new
       alias_method :with_next_key, :create
-  
-      # Defines marshaled rw accessor for redis string value
+
+      # Defines marshaled rw accessor for store string value
       def field(name, type = :string)
         if @fields.nil?
           @fields = []
@@ -146,30 +135,30 @@ module Rhoconnect
       
         fields << {:name => name.to_s, :type => type}
         if type == :string
-          class_eval "def #{name}; @#{name} ||= redis[field_key('#{name}')]; end"
-          class_eval "def #{name}=(value); @#{name} = redis[field_key('#{name}')] = value; end"
+          class_eval "def #{name}; @#{name} ||= store.get_value(field_key('#{name}')); end"
+          class_eval "def #{name}=(value); @#{name} = value.to_s; store.put_value(field_key('#{name}'), value.to_s); end"
         else
-          class_eval "def #{name}; @#{name} ||= Marshal::#{class_name}.load(redis[field_key('#{name}')]); end"
-          class_eval "def #{name}=(value); @#{name} = value; redis[field_key('#{name}')] = Marshal::#{class_name}.dump(value); end"
+          class_eval "def #{name}; @#{name} ||= Marshal::#{class_name}.load(store.get_value(field_key('#{name}'))); end"
+          class_eval "def #{name}=(value); @#{name} = value; store.put_value(field_key('#{name}'), Marshal::#{class_name}.dump(value)); end"
         end
       end
       alias_method :value, :field
         
-      # Defines accessor for redis list
+      # Defines accessor for store list
       def list(name, type = :string)
         class_name = marshal_class_name(name, type)
       
         fields << {:name => name.to_s, :type => :list}
-        class_eval "def #{name}; @#{name} ||= ListProxy.new(self.redis, field_key('#{name}'), Marshal::#{class_name}); end"
+        class_eval "def #{name}; @#{name} ||= ListProxy.new(self.store, field_key('#{name}'), Marshal::#{class_name}); end"
         eval_writer(name)
       end
   
-      # Defines accessor for redis set
+      # Defines accessor for store set
       def set(name, type = :string)
         class_name = marshal_class_name(name, type)
       
         fields << {:name => name.to_s, :type => :set}
-        class_eval "def #{name}; @#{name} ||= SetProxy.new(self.redis, field_key('#{name}'), Marshal::#{class_name}); end"
+        class_eval "def #{name}; @#{name} ||= SetProxy.new(self.store, field_key('#{name}'), Marshal::#{class_name}); end"
         eval_writer(name)
       end
     
@@ -178,8 +167,8 @@ module Rhoconnect
       end
   
       # Redefine this to change connection options
-      def redis
-        @@redis ||= Store.db
+      def store
+        @@store ||= Store.get_store(0)
       end
     
       def fields #:nodoc:
@@ -197,6 +186,19 @@ module Rhoconnect
   field << v
   end
   end
+  END
+      end
+      
+     def instance_eval_writer(name) #:nodoc:
+        instance_eval <<-END
+  def #{name}=(value)
+  field = self.#{name};
+  if value.respond_to?(:each)
+  value.each {|v| field << v}
+  else
+  field << v
+  end
+  end
   END
       end
   
@@ -269,146 +271,82 @@ module Rhoconnect
       end
     end
   
-  
-  
+    # PROXY implementations
     class FieldProxy #:nodoc
-      def initialize(redis, name, marshal)
-        @redis = redis
+      def initialize(store_inst, name, marshal)
+        # TODO: this low-level access should be removed in 4.0
+        @store_db = store_inst.send(:db)
         @name = name
         @marshal = marshal
       end
- 
-      # def method_missing(method, *argv)
-      #   translated_method = translate_method_name(method)
-      #   raise NoMethodError.new("Method '#{method}' is not defined") unless translated_method
-      #   @redis.send translated_method, @name, *argv
-      # end
-      #  
-      # protected
-      #   def translate_method_name(m)
-      #     m
-      #   end
     end
  
- 
- 
     class ListProxy < FieldProxy #:nodoc:
       def <<(v)
-        @redis.rpush @name, @marshal.dump(v)
+        @store_db.rpush @name, @marshal.dump(v)
       end
       alias_method :push_tail, :<<
     
       def push_head(v)
-        @redis.lpush @name, @marshal.dump(v)
+        @store_db.lpush @name, @marshal.dump(v)
       end
     
       def pop_tail
-        @marshal.load(@redis.rpop(@name))
+        @marshal.load(@store_db.rpop(@name))
       end
     
       def pop_head
-        @marshal.load(@redis.lpop(@name))
+        @marshal.load(@store_db.lpop(@name))
       end
     
       def [](from, to = nil)
         if to.nil?
-          @marshal.load(@redis.lindex(@name, from))
+          @marshal.load(@store_db.lindex(@name, from))
         else
-          @redis.lrange(@name, from, to).map! { |v| @marshal.load(v) }
+          @store_db.lrange(@name, from, to).map! { |v| @marshal.load(v) }
         end
       end
       alias_method :range, :[]
     
       def []=(index, v)
-        @redis.lset(@name, index, @marshal.dump(v))
+        @store_db.lset(@name, index, @marshal.dump(v))
       end
       alias_method :set, :[]=
     
       def include?(v)
-        @redis.exists(@name, @marshal.dump(v))
+        @store_db.exists(@name, @marshal.dump(v))
       end
     
       def remove(count, v)
-        @redis.lrem(@name, count, @marshal.dump(v))
+        @store_db.lrem(@name, count, @marshal.dump(v))
       end
-    
-      # def length
-      #   @redis.llen(@name)
-      # end
-      #     
-      # def trim(from, to)
-      #   @redis.ltrim(@name, from, to)
-      # end
-      #     
-      # def to_s
-      #   range(0, 100).join(', ')
-      # end
-      #  
-    # protected
-    #   def translate_method_name(m)
-    #     COMMANDS[m]
-    #   end
     end
  
- 
- 
     class SetProxy < FieldProxy #:nodoc:
-      # COMMANDS = {
-      #   :intersect_store => "sinterstore",
-      #   :union_store => "sunionstore",
-      #   :diff_store => "sdiffstore",
-      #   :move => "smove",
-      # }
-    
       def <<(v)
-        @redis.sadd @name, @marshal.dump(v)
+        @store_db.sadd @name, @marshal.dump(v)
       end
       alias_method :add, :<<
     
       def delete(v)
-        @redis.srem @name, @marshal.dump(v)
+        @store_db.srem @name, @marshal.dump(v)
       end
       alias_method :remove, :delete
     
       def include?(v)
-        @redis.sismember @name, @marshal.dump(v)
+        @store_db.sismember @name, @marshal.dump(v)
       end
       alias_method :has_key?, :include?
       alias_method :member?, :include?
     
       def members
-        members = @redis.smembers(@name)
+        members = @store_db.smembers(@name)
         if members
           members.map { |v| @marshal.load(v) }
         else 
           []
         end
       end
-    
-      def intersect(*keys)
-        @redis.sinter(@name, *keys).map { |v| @marshal.load(v) }
-      end
-    
-      def union(*keys)
-        @redis.sunion(@name, *keys).map { |v| @marshal.load(v) }
-      end
-    
-      def diff(*keys)
-        @redis.sdiff(@name, *keys).map { |v| @marshal.load(v) }
-      end
-    
-        # def length
-        #   @redis.llen(@name)
-        # end
-        #     
-        # def to_s
-        #   members.join(', ')
-        # end
-        #  
-    # protected
-    #   def translate_method_name(m)
-    #     COMMANDS[m]
-    #   end
     end
   end
 end

data/lib/rhoconnect/tasks.rb

@@ -141,6 +141,7 @@ namespace :rhoconnect do
     desc "Run source adapter specs"
     task :spec do
       files = File.join('spec','**','*_spec.rb')
+      puts "files loaded are ****** #{files}"
       RSpec::Core::RakeTask.new('rhoconnect:spec') do |t|
         t.pattern = FileList[files]
         t.rspec_opts = %w(-fn -b --color)
@@ -158,7 +159,7 @@ namespace :rhoconnect do
       system("#{cmd} config.ru -P #{rhoconnect_pid}")
     elsif jruby?
       puts 'Starting rhoconnect in jruby environment...'
-      system("#{cmd}")
+      system("#{cmd} -r config.ru")
     else
       puts 'Detach with Ctrl+\  Re-attach with rake rhoconnect:attach'
       sleep 2
@@ -177,7 +178,7 @@ namespace :rhoconnect do
         system("#{cmd} config.ru -P #{rhoconnect_pid}")
       elsif jruby?
         puts 'Starting rhoconnect in jruby environment...'
-        system("#{cmd}")
+        system("#{cmd} -r config.ru")
       else
         system("bundle exec #{cmd} config.ru -P #{rhoconnect_pid}")
       end
@@ -199,7 +200,7 @@ namespace :rhoconnect do
         system("#{cmd} config.ru -P #{rhoconnect_pid}")
       elsif jruby?
         puts 'Starting rhoconnect in jruby environment...'
-        system("#{cmd}")
+        system("#{cmd} -r config.ru")
       else
         system("bundle exec #{cmd} config.ru -P #{rhoconnect_pid}")
       end
@@ -228,7 +229,20 @@ namespace :rhoconnect do
     if windows?
   	  File.delete "#{rhoconnect_pid}" if system("FOR /F %A in (#{rhoconnect_pid}) do taskkill /F /PID %A")
     else
-      system "cat #{rhoconnect_pid} | xargs kill -3"
+      if File.exist?("#{rhoconnect_pid}")
+        pid = `cat #{rhoconnect_pid}` 
+        puts "Sending a QUIT signal to process #{pid}"
+        system "kill -3 #{pid}"
+        count = 0
+        loop do
+          sleep 1
+          count += 1
+          exit if !File.exist?("#{rhoconnect_pid}")
+          break if count >= 5       
+        end
+        puts "Process #{pid} is still running. Sending a KILL signal to it ..."
+        system "kill -9 #{pid}"  
+      end
     end
   end
   

data/lib/rhoconnect/test_methods.rb

@@ -1,6 +1,8 @@
 module Rhoconnect
-  class SourceAdapter
-    attr_accessor :result
+  module Model
+    class Base
+      attr_accessor :result
+    end
   end
   
   module TestMethods
@@ -10,7 +12,7 @@ module Rhoconnect
       app_id = 'application'
       s_fields = {
         :user_id => user_id,
-        :app_id => app_id
+        :app_id => app_id,
       }
       c_fields = {
         :device_type => 'Apple',
@@ -22,7 +24,14 @@ module Rhoconnect
       @u = User.create(:login => user_id)
       @s = Source.load(adapter.to_s,s_fields)
       @c = Client.create(c_fields,{:source_name => adapter.to_s})
-      @ss = SourceSync.new(@s)
+
+      @model = Rhoconnect::Model::Base.create(@s)
+      handler_sync = lambda { @model.query(params[:query])}
+      @query_engine = Rhoconnect::Handler::Query::Engine.new(@model, handler_sync, {})
+      handler_cud = lambda { @model.send params[:operation].to_sym, params["#{params[:operation]}_object".to_sym] }
+      @cud_engine = Rhoconnect::Handler::Changes::Engine.new(['create', 'update', 'delete'], @model, handler_cud, {})
+      handler_search = lambda { @model.search(params[:search]) }
+      @search_engine = Rhoconnect::Handler::Search::Engine.new(@model, @c, handler_search, {})
     end
     
     # Executes the adapter's query method and returns 
@@ -41,7 +50,7 @@ module Rhoconnect
     #   "2"=>{"name"=>"Best", "industry"=>"Software"}
     # }
     def test_query
-      res = @ss.process_query
+      res = @query_engine.do_sync
       return @s.is_pass_through? ? res : md
     end
     
@@ -60,7 +69,8 @@ module Rhoconnect
     def test_search(search_params)
       pass_through = @s.pass_through
       @s.pass_through = 'true'
-      res = @ss.search(@c.id, search_params)
+      @search_engine.params[:search] = search_params
+      res = @search_engine.do_search
       @s.pass_through = pass_through
       res
     end
@@ -93,7 +103,7 @@ module Rhoconnect
     #   {'index' => view}.to_json
     # }
     def test_metadata
-     @ss.process_query
+     @query_engine.do_sync
      return @s.get_value(:metadata)
     end
     
@@ -119,7 +129,7 @@ module Rhoconnect
     # }.to_json
     # test_schema would return the above
     def test_schema
-      @ss.process_query
+      @query_engine.do_sync
       return @s.get_value(:schema)
     end
     
@@ -150,10 +160,11 @@ module Rhoconnect
     # document (:md) should also contain the new record.
     def test_create(record)
       if @s.is_pass_through?
-        @ss.pass_through_cud({'create'=> {'temp-id' => record}},nil)
+        @cud_engine.params = {'create'=> {'temp-id' => record}}
+        @cud_engine.do_pass_through_cud
       else
-        @s.put_zdata(:create,@c.id,{'temp-id' => record},true)
-        @ss.process_cud
+        @s.push_queue(:create,@c.id,{'temp-id' => record},true)
+        @cud_engine.do_cud
         links = @c.get_data(:create_links)['temp-id']
         links ? links['l'] : nil
       end
@@ -179,10 +190,11 @@ module Rhoconnect
     # as shown above
     def test_update(record)
       if @s.is_pass_through?
-        @ss.pass_through_cud({'update'=> record },nil)
+        @cud_engine.params = {'update'=> record }
+        @cud_engine.do_pass_through_cud
       else
-        @s.put_zdata(:update,@c.id,record,true)
-        @ss.process_cud
+        @s.push_queue(:update,@c.id,record,true)
+        @cud_engine.do_cud
       end
     end
     
@@ -212,10 +224,11 @@ module Rhoconnect
     # verified as shown above.
     def test_delete(record)
       if @s.is_pass_through?
-        @ss.pass_through_cud({'delete'=> record },nil)
+        @cud_engine.params = {'delete'=> record }
+        @cud_engine.do_pass_through_cud
       else
-        @s.put_zdata(:delete,@c.id,record,true)
-        @ss.process_cud
+        @s.push_queue(:delete,@c.id,record,true)
+        @cud_engine.do_cud
       end
     end
     

data/lib/rhoconnect/user.rb

@@ -3,7 +3,7 @@ require 'digest/sha1'
 module Rhoconnect
   # Inspired by sinatra-authentication
   # Password uses simple sha1 digest for hashing
-  class User < Model
+  class User < StoreOrm
     field :login,:string
     field :email,:string
     field :salt,:string
@@ -11,13 +11,14 @@ module Rhoconnect
     set   :clients, :string
     field :admin, :int
     field :token_id, :string
-        
+    #set_all :users, :string
+
     class << self
       def create(fields={})
         raise ArgumentError.new("Empty login") if (fields[:login].nil? or fields[:login].empty?)
         raise ArgumentError.new("Reserved user id #{fields[:login]}") if fields[:login] && fields[:login] == '__shared__'
         fields[:id] = fields[:login]
-        user = super(fields)      
+        user = super(fields)
         if Rhoconnect.stats
           Rhoconnect::Stats::Record.set('users') { Store.incr('user:count') }
         else
@@ -25,14 +26,19 @@ module Rhoconnect
         end
         user
       end
-    
+
       def authenticate(login,password)
         return unless is_exist?(login)
         current_user = load(login)
         return if current_user.nil?
         return current_user if User.encrypt(password, current_user.salt) == current_user.hashed_password
       end
-      
+
+      # Rails like methods
+      def all
+        App.load(APP_NAME).users.members
+      end
+
       def ping(params)
         if params['async']
           PingJob.enqueue(params)
@@ -41,17 +47,17 @@ module Rhoconnect
         end
       end
     end
-    
+
     def new_password=(pass)
       self.password=(pass)
     end
-    
+
     def password=(pass)
       @password = pass
       self.salt = User.random_string(10) if !self.salt
       self.hashed_password = User.encrypt(@password, self.salt)
     end
-    
+
     def delete
       clients.members.each do |client_id|
         Client.load(client_id,{:source_name => '*'}).delete
@@ -64,31 +70,43 @@ module Rhoconnect
       end
       super
     end
-    
+
     def create_token
       if self.token_id && ApiToken.is_exist?(self.token_id)
-        self.token.delete 
+        self.token.delete
       end
-      self.token_id = ApiToken.create(:user_id => self.login).id
+      fields = {:user_id => self.login}
+      if self.login == 'rhoadmin'
+        fields[:value] = Rhoconnect.api_token
+      end
+      self.token_id = ApiToken.create(fields).id
     end
-    
+
     def token
       ApiToken.load(self.token_id)
     end
-    
+
     def token=(value)
       if self.token_id && ApiToken.is_exist?(self.token_id)
-        self.token.delete 
+        self.token.delete
       end
       self.token_id = ApiToken.create(:user_id => self.login, :value => value).id
     end
-    
+
     def update(fields)
       fields.each do |key,value|
         self.send("#{key.to_sym}=", value) unless key == 'login'
-      end  
+      end
+    end
+
+    def to_hash
+       res = {}
+       self.class.fields.each do |field|
+         res[field[:name].to_sym] = send(field[:name].to_sym) if field[:name] == 'login'
+       end
+       res
     end
-      
+
     protected
     def self.encrypt(pass, salt)
       Digest::SHA1.hexdigest(pass+salt)

data/lib/rhoconnect/utilities.rb

@@ -115,6 +115,6 @@ EOF
 #    end
 
   def trinidad?
-    'bundle exec jruby -S trinidad -p 9292 -r config.ru'
+    'bundle exec jruby -S trinidad'
   end
 end #Utilities

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.4.5'
-end
+  VERSION = '4.0.0.beta.10'
+end