hari 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bec03d308713945bce8a8b110c663beb57450f7
-  data.tar.gz: 4679c39080577b390539c16921264c6d69ce0b50
+  metadata.gz: ca49682c61cc3b4b1a347e83c9d45e9a06747cb9
+  data.tar.gz: 3c89e8825f0286262ac6a7a4a3f0acbaa0a46191
 SHA512:
-  metadata.gz: 8d1b9c6f45f02be08c99b3f01286031d7c94a64a91d9f14c904acfd9934e0c3c9fa986cdf05a77b8af93d4e37ba25d2d8837d59fc1082cf112c315229a306ab3
-  data.tar.gz: 984b40a10bc769cb874b6879bfd10de44b970225480ed2d73285d6536ef5aed4f148d114721e160c7a79fc6ecd73646fc7e9f42edfe72c47a740579d35c9f139
+  metadata.gz: d5c0e5c57e863e065d0fe700d30a143cbab436f44b822ac8cfc26fcc3da0e3547517db2a565d6a402fa737d025851e18e9663f311d5c4d643cced4796d86a71f
+  data.tar.gz: 4d354e66a0ef1b90abf287d2a59bbc836fe25368a5ab590ca2f56b0a14f84d69b6f63fe76a5c01da51e6e0a232179078553404f7c385f9926c1a141828ab09e0

data/hari.gemspec

@@ -8,9 +8,17 @@ require 'hari/version'
 Gem::Specification.new do |s|
   s.name          = 'hari'
   s.version       = Hari::VERSION
-  s.summary       = 'Hari is a graph library on top of Redis + Lua scripts'
+  s.summary       = 'A tool to abstract complex relationships between ' +
+                    'Ruby objects onto Redis data structures.'
+
   s.description   = <<-MD
-    Hari is a graph library on top of Redis database + Lua scripts
+    Hari is a tool to abstract complex relationships between
+    Ruby objects onto Redis data structures.
+
+    It allows for expressive querying of those relationships
+    as well, in an easy way. It is mostly geared towards
+    typical social networking concepts like news feeds,
+    activity logs, friends of friends, mutual friends, and so on.
   MD
 
   s.author        = 'Victor Rodrigues'

data/lib/hari.rb

@@ -1,5 +1,6 @@
 require 'redis'
 require 'redis/namespace'
+require 'redis/connection/hiredis'
 require 'active_model'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/module/delegation'
@@ -8,6 +9,7 @@ require 'active_support/core_ext/string/inflections'
 require 'yajl'
 require 'erb'
 require 'ostruct'
+require 'digest/md5'
 
 require 'hari/version'
 require 'hari/configuration'
@@ -16,10 +18,12 @@ require 'hari/errors'
 module Hari
   extend self
 
-  autoload :Entity,   'hari/entity'
-  autoload :Keys,     'hari/keys'
-  autoload :Node,     'hari/node'
-  autoload :Relation, 'hari/relation'
+  autoload :Entity,        'hari/entity'
+  autoload :Keys,          'hari/keys'
+  autoload :Node,          'hari/node'
+  autoload :Object,        'hari/object'
+  autoload :Relation,      'hari/relation'
+  autoload :Serialization, 'hari/serialization'
 
   extend Configuration
   extend Hari::Node::Queries

data/lib/hari/configuration/redis.rb

@@ -16,9 +16,13 @@ module Hari
       private
 
       def redis_namespace(server)
-        return server if server.kind_of?(::Redis::Namespace)
+        prefix = 'hari'
 
-        ::Redis::Namespace.new :hari, redis_server(server)
+        if server.kind_of?(::Redis::Namespace)
+          prefix = "#{server.namespace}:#{prefix}"
+        end
+
+        ::Redis::Namespace.new prefix, redis_server(server)
       end
 
       def redis_server(server)

data/lib/hari/entity.rb

@@ -1,18 +1,12 @@
-require 'hari/entity/property'
-require 'hari/entity/repository'
-require 'hari/entity/serialization'
-
 module Hari
   class Entity
     extend  ActiveModel::Naming
     extend  ActiveModel::Callbacks
-    include ActiveModel::Validations
 
     autoload :Property,      'hari/entity/property'
-    autoload :Repository,    'hari/entity/property'
-    autoload :Serialization, 'hari/entity/property'
+    autoload :Repository,    'hari/entity/repository'
+    autoload :Serialization, 'hari/entity/serialization'
 
-    extend  Property::Builder
     include Repository
     include Serialization
 
@@ -23,27 +17,23 @@ module Hari
     property :updated_at, type: Time
 
     def initialize(attrs = {})
+      update_attributes attrs, save: false
+    end
+
+    def update_attributes(attrs = {}, options = {})
       return if attrs.blank?
 
       attrs = attrs.with_indifferent_access
 
       self.class.properties.each do |prop|
-        send("#{prop.name}=", attrs[prop.name]) if attrs[prop.name]
+        write_attribute prop.name, attrs[prop.name] if attrs.key?(prop.name)
       end
-    end
 
-    def attributes
-      self.class.properties.inject({}) do |buffer, prop|
-        buffer.merge prop.name => send(prop.name)
-      end
+      save if options.fetch(:save, true)
     end
 
-    alias :attribute :send
-    alias :read_attribute :send
-    alias :has_attribute? :respond_to?
-
-    def write_attribute(name, value)
-      send "#{name}=", value
+    def update_attribute(attribute, value)
+      update_attributes attribute => value
     end
 
     def ==(other)

data/lib/hari/entity/property.rb

@@ -3,14 +3,29 @@ module Hari
     class Property
       autoload :Builder, 'hari/entity/property/builder'
 
-      attr_accessor :name, :serializer, :options
+      attr_accessor :entity, :name, :serializer, :options
 
-      def initialize(name, options = {})
-        @name, @options = name.to_s, options
+      def initialize(entity, name, options = {})
+        @entity, @name, @options = entity, name.to_s, options
         @serializer = options.delete(:type) || Serialization::String
       end
 
-      def serialize(value)
+      def default
+        case options[:default]
+        when Proc
+          options[:default].call
+        else
+          options[:default]
+        end
+      end
+
+      def serialize(entity)
+        value = entity.attribute(name)
+
+        if value.nil?
+          value = entity.write_attribute(name, default)
+        end
+
         serializer.serialize value, name: name
       end
 

data/lib/hari/entity/property/builder.rb

@@ -4,10 +4,24 @@ module Hari
       module Builder
 
         def property(name, options = {})
-          attr_accessor name
+          attr_reader name
+          define_attribute_method name
+
           validates_presence_of name if options[:required]
 
-          self.properties << Property.new(name, options)
+          define_method "#{name}=" do |value|
+            unless send(name) == value
+              send "#{name}_will_change!"
+            end
+
+            instance_variable_set "@#{name}", value
+          end
+
+          if options[:type] == Serialization::Boolean
+            define_method("#{name}?") { send name }
+          end
+
+          properties << Property.new(self, name, options)
         end
 
         def properties(*args)
@@ -22,7 +36,8 @@ module Hari
                 a.ancestors.include? Hari::Entity
               end
 
-              entities_ancestors[1].properties.dup # the closest
+              entity = entities_ancestors[1]
+              entity ? entity.properties.dup : []
             end
           end
         end

data/lib/hari/entity/repository.rb

@@ -4,7 +4,9 @@ module Hari
       extend ActiveSupport::Concern
 
       def create_or_update
-        run_callbacks(:save) { new? ? create : update }
+        run_callbacks(:save) { new? ? create : update }.tap do
+          @changed_attributes.clear
+        end
       end
 
       alias :save :create_or_update
@@ -14,7 +16,7 @@ module Hari
           fail Hari::ValidationsFailed, self unless valid?
 
           @id ||= generate_id
-          self.created_at = Time.now
+          @created_at ||= Time.now
           self.updated_at = Time.now
           persist
         end
@@ -34,7 +36,9 @@ module Hari
       end
 
       def persist
-        Hari.redis.set id, to_json
+        source = to_json
+        @previously_changed = changes
+        Hari.redis.set id, source
       end
 
       def delete
@@ -57,6 +61,8 @@ module Hari
         def find(*args)
           options = args.extract_options!
           args.flatten!
+          return if args.empty?
+
           args = args.map { |a| a.to_s.gsub(/^hari\:/, '') }
           args.one? ? find_one(args[0], options) : find_many(args, options)
         end
@@ -66,6 +72,8 @@ module Hari
         end
 
         def find_many(ids, options = {})
+          return [] if ids.empty?
+
           Hari.redis.mget(ids).map &method(:from_json)
         end
 

data/lib/hari/entity/serialization.rb

@@ -3,28 +3,61 @@ module Hari
     module Serialization
       extend ActiveSupport::Concern
 
+      included do
+        include ActiveModel::Validations
+        include ActiveModel::Dirty
+        extend  Property::Builder
+      end
+
+      autoload :Array,    'hari/entity/serialization/array'
       autoload :Boolean,  'hari/entity/serialization/boolean'
       autoload :Date,     'hari/entity/serialization/date'
       autoload :DateTime, 'hari/entity/serialization/datetime'
       autoload :Float,    'hari/entity/serialization/float'
+      autoload :Hash,     'hari/entity/serialization/hash'
       autoload :Integer,  'hari/entity/serialization/integer'
       autoload :String,   'hari/entity/serialization/string'
       autoload :Time,     'hari/entity/serialization/time'
 
-      def to_json
-        hash = self.class.properties.inject({}) do |buffer, prop|
-          buffer.merge prop.name => prop.serialize(send(prop.name))
+      def initialize(attrs = {})
+        return if attrs.blank?
+
+        attrs = attrs.with_indifferent_access
+
+        self.class.properties.each do |prop|
+          write_attribute(prop.name, attrs[prop.name]) if attrs.key?(prop.name)
         end
+      end
 
-        Yajl::Encoder.encode hash
+      def attributes
+        self.class.properties.inject({}) do |buffer, prop|
+          buffer.merge prop.name => send(prop.name)
+        end
       end
 
-      module ClassMethods
+      alias :attribute :send
+      alias :read_attribute :send
+      alias :has_attribute? :respond_to?
+      alias :read_attribute_for_serialization :send
 
-        def from_json(source)
-          return if source.blank?
+      def write_attribute(name, value)
+        send "#{name}=", value
+      end
 
-          attrs = Yajl::Parser.parse(source).inject({}) do |buffer, (key, value)|
+      def to_hash
+        self.class.properties.inject({}) do |buffer, prop|
+          buffer.merge prop.name => prop.serialize(self)
+        end
+      end
+
+      def to_json
+        Yajl::Encoder.encode to_hash
+      end
+
+      module ClassMethods
+
+        def from_hash(source)
+          hash = source.inject({}) do |buffer, (key, value)|
             if prop = properties.find { |p| p.name == key }
               buffer[key] = prop.desserialize(value)
             end
@@ -32,7 +65,18 @@ module Hari
             buffer
           end
 
-          new attrs
+          new(hash).tap { |e| e.changed_attributes.clear }
+        end
+
+        def from_json(source)
+          return if source.blank?
+
+          case source
+          when ::String
+            from_hash Yajl::Parser.parse(source)
+          when ::Hash
+            from_hash source
+          end
         end
 
       end

data/lib/hari/entity/serialization/array.rb

@@ -0,0 +1,21 @@
+module Hari
+  class Entity
+    module Serialization
+      module Array
+
+        def self.serialize(value, options = {})
+          Array value
+        end
+
+        def self.desserialize(value, options = {})
+          Array value
+        end
+
+        def self.method_missing(method, *args, &block)
+          ::Array.send method, *args, &block
+        end
+
+      end
+    end
+  end
+end

data/lib/hari/entity/serialization/hash.rb

@@ -0,0 +1,31 @@
+module Hari
+  class Entity
+    module Serialization
+      module Hash
+
+        def self.serialize(value, options = {})
+          if value.blank?
+            {}
+          elsif value.respond_to?(:to_hash)
+            value.to_hash
+          elsif value.respond_to?(:to_h)
+            value.to_h
+          elsif value.respond_to?(:marshal_dump)
+            value.marshal_dump
+          else
+            fail 'value not accepted as a Hash'
+          end
+        end
+
+        def self.desserialize(value, options = {})
+          value
+        end
+
+        def self.method_missing(method, *args, &block)
+          ::Hash.send method, *args, &block
+        end
+
+      end
+    end
+  end
+end

data/lib/hari/keys.rb

@@ -1,9 +1,14 @@
 module Hari
   module Keys
+
+    TYPES = %w(string list hash set sorted_set)
+
     autoload :Key,       'hari/keys/key'
+    autoload :Hash,      'hari/keys/hash'
     autoload :List,      'hari/keys/list'
     autoload :Set,       'hari/keys/set'
     autoload :SortedSet, 'hari/keys/sorted_set'
     autoload :String,    'hari/keys/string'
+
   end
 end

data/lib/hari/keys/hash.rb

@@ -0,0 +1,67 @@
+module Hari
+  module Keys
+    class Hash < Key
+
+      def hash(name = nil)
+        return super() unless name
+
+        @name = name
+        self
+      end
+
+      def hash!(name)
+        @name = name
+        to_h
+      end
+
+      def to_h
+        Hari.redis.hgetall key
+      end
+
+      def delete(field)
+        Hari.redis.hdel key, field
+      end
+
+      def key?(field)
+        Hari.redis.hexists key, field
+      end
+
+      alias :has_key? :key?
+      alias :member?  :key?
+
+      def keys
+        Hari.redis.hkeys key
+      end
+
+      def values
+        Hari.redis.hvals key
+      end
+
+      def values_at(*keys)
+        Hari.redis.hmget key, keys
+      end
+
+      def [](field)
+        Hari.redis.hget key, field
+      end
+
+      def set(field, value)
+        Hari.redis.hset key, field, value
+      end
+
+      alias :[]= :set
+
+      def merge!(args = {})
+        Hari.redis.hmset key, args.to_a.flatten
+      end
+
+      def count
+        Hari.redis.hlen key
+      end
+
+      alias :size   :count
+      alias :length :count
+
+    end
+  end
+end