hari 0.0.4 → 0.0.5

data/lib/hari/keys/key.rb

@@ -2,10 +2,10 @@ module Hari
   module Keys
     class Key
 
-      attr_reader :node, :name
+      attr_reader :node, :name, :options
 
-      def initialize(node = nil)
-        @node = node
+      def initialize(node = nil, options = {})
+        @node, @options = node, options
       end
 
       def key
@@ -43,6 +43,27 @@ module Hari
         Hari.redis.ttl key
       end
 
+      def serialize(value)
+        type = options[:type]
+
+        if type.nil? || value.nil?
+          value
+        else
+          value.kind_of?(Enumerable) ? value.map(&:to_json) : value.to_json
+        end
+      end
+
+      def desserialize(value)
+        type = options[:type]
+
+        if type.nil? || value.nil?
+          value
+        else
+          value.kind_of?(Enumerable) ? value.map { |v| type.from_json(v) }
+                                     : type.from_json(value)
+        end
+      end
+
     end
   end
 end

data/lib/hari/keys/list.rb

@@ -33,11 +33,11 @@ module Hari
       end
 
       def []=(index, member)
-        Hari.redis.lset key, index, member
+        Hari.redis.lset key, index, serialize(member)
       end
 
       def range(start = 0, stop = -1)
-        Hari.redis.lrange key, start, stop
+        desserialize Hari.redis.lrange(key, start, stop)
       end
 
       alias :members :range
@@ -52,7 +52,7 @@ module Hari
       end
 
       def at(index)
-        Hari.redis.lindex key, index
+        desserialize Hari.redis.lindex(key, index)
       end
 
       alias :index :at
@@ -81,20 +81,22 @@ module Hari
       end
 
       def include?(member)
-        range.include? member
+        range.include? serialize(member)
       end
 
       alias :member? :include?
 
       def push(*members)
-        Hari.redis.rpush key, members
+        return if Array(members).empty?
+
+        Hari.redis.rpush key, serialize(members)
       end
 
       alias :rpush :push
       alias :add   :push
 
       def lpush(*members)
-        Hari.redis.lpush key, members
+        Hari.redis.lpush key, serialize(members)
       end
 
       def <<(member)
@@ -116,13 +118,13 @@ module Hari
       end
 
       def pop
-        Hari.redis.rpop key
+        desserialize Hari.redis.rpop(key)
       end
 
       alias :rpop :pop
 
       def shift
-        Hari.redis.lpop key
+        desserialize Hari.redis.lpop(key)
       end
 
       alias :lpop :shift

data/lib/hari/keys/set.rb

@@ -13,11 +13,11 @@ module Hari
       end
 
       def members
-        Hari.redis.smembers key
+        desserialize Hari.redis.smembers(key)
       end
 
       def rand(count = 1)
-        Hari.redis.srandmember key, count
+        desserialize Hari.redis.srandmember(key, count)
       end
 
       def count
@@ -40,13 +40,13 @@ module Hari
       end
 
       def include?(member)
-        Hari.redis.sismember key, member
+        Hari.redis.sismember key, serialize(member)
       end
 
       alias :member? :include?
 
       def add(*members)
-        Hari.redis.sadd key, members
+        Hari.redis.sadd key, serialize(members)
       end
 
       def <<(member)
@@ -54,15 +54,15 @@ module Hari
       end
 
       def delete(*members)
-        Hari.redis.srem key, members
+        Hari.redis.srem key, serialize(members)
       end
 
       def pop
-        Hari.redis.spop key
+        desserialize Hari.redis.spop(key)
       end
 
       def intersect(*set_queries)
-        Hari.redis.sinter key, set_query_keys(set_queries)
+        desserialize Hari.redis.sinter(key, set_query_keys(set_queries))
       end
 
       def &(other_set_query)
@@ -70,7 +70,7 @@ module Hari
       end
 
       def diff(*set_queries)
-        Hari.redis.sdiff key, set_query_keys(set_queries)
+        desserialize Hari.redis.sdiff(key, set_query_keys(set_queries))
       end
 
       def -(other_set_query)

data/lib/hari/keys/sorted_set.rb

@@ -15,7 +15,10 @@ module Hari
       def range(start = 0, stop = -1, options = {})
         return revrange(start, stop, options) if options[:desc]
 
-        Hari.redis.zrange key, start, stop, options.slice(:with_scores)
+        result = Hari.redis.zrange key, start, stop,
+          options.slice(:with_scores)
+
+        desserialize result
       end
 
       alias :members :range
@@ -25,7 +28,10 @@ module Hari
       end
 
       def revrange(start = 0, stop = -1, options = {})
-        Hari.redis.zrevrange key, start, stop, options.slice(:with_scores)
+        result = Hari.redis.zrevrange key, start, stop,
+          options.slice(:with_scores)
+
+        desserialize result
       end
 
       alias :reverse_range :revrange
@@ -38,11 +44,17 @@ module Hari
       def range_by_score(min, max, options = {})
         return revrange_by_score(min, max, options) if options[:desc]
 
-        Hari.redis.zrangebyscore key, min, max, options.slice(:with_scores, :limit)
+        result = Hari.redis.zrangebyscore key, min, max,
+          options.slice(:with_scores, :limit)
+
+        desserialize result
       end
 
       def revrange_by_score(min, max, options = {})
-        Hari.redis.zrevrangebyscore key, max, min, options.slice(:with_scores, :limit)
+        result = Hari.redis.zrevrangebyscore key, max, min,
+          options.slice(:with_scores, :limit)
+
+        desserialize result
       end
 
       def rank(member, options = {})
@@ -55,7 +67,7 @@ module Hari
       alias :position :rank
 
       def revrank(member)
-        Hari.redis.zrevrank key, member
+        Hari.redis.zrevrank key, serialize(member)
       end
 
       alias :reverse_ranking  :revrank
@@ -87,11 +99,11 @@ module Hari
       alias :member? :include?
 
       def score(member)
-        Hari.redis.zscore key, member
+        Hari.redis.zscore key, serialize(member)
       end
 
       def add(*score_members)
-        Hari.redis.zadd key, score_members.to_a.flatten
+        Hari.redis.zadd key, serialize(score_members.to_a.flatten)
       end
 
       def <<(*score_members)
@@ -99,7 +111,7 @@ module Hari
       end
 
       def delete(*members)
-        Hari.redis.zrem key, members
+        Hari.redis.zrem key, serialize(members)
       end
 
       def trim_by_rank(start, stop)

data/lib/hari/node.rb

@@ -1,6 +1,7 @@
 require 'hari/node/repository'
 require 'hari/node/queries'
 require 'hari/node/serialization'
+require 'hari/node/index'
 
 module Hari
   class Node < Entity
@@ -15,10 +16,22 @@ module Hari
       super
     end
 
+    after_update  { reindex }
+    after_create  { reindex force_index: true }
+    after_destroy { remove_from_indexes }
+
     def generate_id
-      return super unless model_id
+      unless model_id.present?
+        begin
+          self.model_id = SecureRandom.hex(8)
+        end until !Hari.redis.exists(node_key)
+      end
+
+      node_key
+    end
 
-      model_id.to_s.include?('#') ? model_id.to_s : "#{node_type}##{model_id}"
+    def node_key
+      "#{node_type}##{model_id}"
     end
 
     def node_type
@@ -29,5 +42,9 @@ module Hari
       self.to_s.underscore
     end
 
+    def self.indexed_properties
+      properties.select { |p| p.options[:index] }
+    end
+
   end
 end

data/lib/hari/node/index.rb

@@ -0,0 +1,152 @@
+module Hari
+  class Node
+    class Index
+
+      attr_accessor :property, :value, :indexes, :options
+
+      attr_writer :start, :stop
+
+      def initialize(property, value)
+        @property, @value  = property, value
+        @indexes, @options = [], {}
+      end
+
+      def add(node)
+        Hari.redis.zadd key, Time.now.to_f, node.model_id
+      end
+
+      def delete(node)
+        Hari.redis.zrem key, node.model_id
+      end
+
+      def append(index)
+        self.indexes << index
+
+        self
+      end
+
+      def start
+        @start ||= 0
+      end
+
+      def stop
+        @stop ||= -1
+      end
+
+      def limit(page = nil, per_page = nil)
+        if page.present? && per_page.present?
+          self.start = page * per_page
+          self.stop  = start + per_page - 1
+        end
+
+        self
+      end
+
+      def from(score, direction = nil)
+        direction ||= :up
+        options[:from] = { score: score.to_f, direction: direction.to_s }
+
+        self
+      end
+
+      def count
+        return count_intersect unless indexes.empty?
+
+        from = options[:from]
+        limit = stop == -1 ? stop : stop - start + 1
+
+        if from.present? && from[:direction] == 'up'
+          Hari.redis.zrevrangebyscore(key, '+inf', from[:score]).size
+        elsif from.present? && from[:direction] == 'down'
+          Hari.redis.zrevrangebyscore(key, from[:score], '-inf').size
+        else
+          Hari.redis.zcard key
+        end
+      end
+
+      def count_intersect
+        intersect
+
+        from = options[:from]
+        limit = stop == -1 ? stop : stop - start + 1
+
+        count = if from.present? && from[:direction] == 'up'
+          Hari.redis.zrevrangebyscore(intersect_key, '+inf', from[:score]).size
+        elsif from.present? && from[:direction] == 'down'
+          Hari.redis.zrevrangebyscore(intersect_key, from[:score], '-inf').size
+        else
+          Hari.redis.zcard intersect_key
+        end
+
+        Hari.redis.del intersect_key
+
+        count
+      end
+
+      def list
+        return list_intersect unless indexes.empty?
+
+        from = options[:from]
+        limit = stop == -1 ? stop : stop - start + 1
+
+        ids = if from.present? && from[:direction] == 'up'
+          Hari.redis.zrevrangebyscore key, '+inf', from[:score], limit: [start, limit]
+        elsif from.present? && from[:direction] == 'down'
+          Hari.redis.zrevrangebyscore key, from[:score], '-inf', limit: [start, limit]
+        else
+          Hari.redis.zrevrange key, start, stop
+        end
+
+        property.entity.find_many ids
+      end
+
+      def list_intersect
+        intersect
+
+        from = options[:from]
+        limit = stop == -1 ? stop : stop - start + 1
+
+        ids = if from.present? && from[:direction] == 'up'
+          Hari.redis.zrevrangebyscore intersect_key, '+inf', from[:score], limit: [start, limit]
+        elsif from.present? && from[:direction] == 'down'
+          Hari.redis.zrevrangebyscore intersect_key, from[:score], '-inf', limit: [start, limit]
+        else
+          Hari.redis.zrevrange intersect_key, start, stop
+        end
+
+        Hari.redis.del intersect_key
+
+        property.entity.find_many ids
+      end
+
+      alias :to_a   :list
+      alias :result :list
+
+      def key
+        "#{property.entity.node_type}|#{property.name}:#{digest(value)}"
+      end
+
+      private
+
+      def digest(value)
+        case value = value.to_s.strip
+        when ''
+          '_NULL_'
+        when /^[[:alnum:]]+$/
+          value
+        else
+          Digest::MD5.hexdigest value
+        end
+      end
+
+      def intersect
+        Hari.redis.zinterstore intersect_key, [key] + indexes.map(&:key), aggregate: 'max'
+      end
+
+      def intersect_key
+        "inter:#{key}:#{indexes.map(&:key).join(':')}"
+      end
+
+    end
+  end
+end

data/lib/hari/node/queries.rb

@@ -1,34 +1,49 @@
+require 'hari/node/queries/relation'
+require 'hari/node/queries/type'
+
 module Hari
   class Node < Entity
     module Queries
-      autoload :Relation, 'hari/node/queries/relation'
-      autoload :Type,     'hari/node/queries/type'
+      extend ActiveSupport::Concern
 
       delegate :in, :out, to: :relation_query
 
-      delegate :set,        :set!,        to: :set_query
-      delegate :sorted_set, :sorted_set!, to: :sorted_set_query
-      delegate :list,       :list!,       to: :list_query
-      delegate :string,     :string!,     to: :string_query
+      Keys::TYPES.each do |key|
+        query_builder = Keys.const_get(key.camelize)
 
-      private
+        define_method key do |name = nil, options = {}|
+          return super() unless name
 
-      def set_query
-        Keys::Set.new query_node
-      end
+          query = query_builder.new(query_node, options)
+          query.send key, name
+        end
 
-      def sorted_set_query
-        Keys::SortedSet.new query_node
+        define_method "#{key}!" do |name, options = {}|
+          query = query_builder.new(query_node, options)
+          query.send "#{key}!", name
+        end
       end
 
-      def list_query
-        Keys::List.new query_node
-      end
+      included do
+        Keys::TYPES.each do |key|
+          define_singleton_method key do |name = nil, options = {}|
+            return super() unless name
 
-      def string_query
-        Keys::String.new query_node
+            define_method(name) { send key, name, options }
+            define_method("#{name}!") { send "#{key}!", name, options }
+
+            define_method "#{name}=" do |value|
+              data = send(name)
+              data.delete!
+
+              data.add *value
+            end
+          end
+        end
       end
 
+      private
+
       def relation_query
         Queries::Relation::Start.new query_node
       end