hari 0.0.1 → 0.0.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDFjMThhM2VkNGMwNTRlYTMzNDM2Y2UyN2E5MDZhOTYxZDViZWI3MQ==
+  data.tar.gz: !binary |-
+    NTM0ZDBmNmJkYjMwOGZiNGRiZWE0MDg3NjYzZjIzZjBlNWY3YWI2Nw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MTA3OTM4MTkxN2E3MWM0YjRkNjBkYjNhNzc1OWIxMjZhMzU2NTJlYmZlNjRl
+    NmZmOTZkZjY3Yzk4ZTY3Zjk3NzRiMjJkMjdlMTNjNDgyZGFiZGQ1ZGY2YmQw
+    ZmZiN2JkZmEzYzkwZDI3Y2M4YzQ1NDlmZTExOTM0ODY0N2NlMDQ=
+  data.tar.gz: !binary |-
+    ZDBlNjJiYTg3NWRiMzU5YTkzNDRiNzRlOGE3MDFhYzI3ZDI0YWI4M2UzZDkx
+    NjljYTE1ODUwZjlkODIxZjc5Y2E4N2Q1ZjU0OGYxMTM4MDgxYzRlMTZiZDEw
+    ZWY2ZDIyNmIwYjU5NjRjMDI5ZjQyYWM5MTZhZDQ2YmJiZWQxNDg=

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+  - 1.9.3-p429
+  - 2.0.0-p195
+before_install:
+  - "gem install bundler --no-rdoc --no-ri 1>/dev/null"
+after_failure: sudo cat /var/log/redis/redis.log
+script:
+  - "rspec spec"
+notifications:
+  email: false
+  campfire:
+    secure: "COyR7y6VhbUK1MZwy75GksEJcsIASweKbKwwADIL45rI1df7H6op8ee+8G6o\nqBx5a9g7JGkWxAIHb2ML+lCDGe4zniruZdpljI+l+6XSKlkhGip3+4uszYEC\nkSyc3PyYQj7liREnMzwQ8VyH6y60hyfcfF5VtNEF13IWYoYa7WY="
+services:
+  - redis-server

data/LICENSE

@@ -1,22 +1,18 @@
-Copyright (c) 2013 Victor Rodrigues
+Copyright (c) 2013, Clubjudge
+All rights reserved.
 
-MIT License
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+ - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the docume
+   ntation and/or other materials provided with the distribution.
+ - Neither the name of the Clubjudge nor the names of its contributors may be used to endorse or promote products derived from this
+   software without specific prior written permission.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUD
+ING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN N
+O EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR C
+ONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR P
+ROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ LITY OF SUCH DAMAGE.

data/README.md

@@ -0,0 +1,22 @@
+[![Build Status](https://travis-ci.org/Clubjudge/hari.png?branch=master)](https://travis-ci.org/Clubjudge/hari)
+
+## hari
+
+Hari is a library to persist and get nodes and its relations in Redis, using different data structures depending on your need.
+
+    Hari(user: 23).out(:follow).out(:activity).limit(25)
+
+The query above will return the top `25` activities from all nodes user `23` follows.
+
+### Relations
+
+Creating a relation can be as simple as:
+
+    Hari.relation! :follow, user, event
+
+    # where user / event are:
+
+    - objects with #id method (node representation will be class#id, like user#23)
+    - strings with node_type#node_id
+    - hash like { node_type => node_id }
+    - a Hari::Node instance

data/hari.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.author        = 'Victor Rodrigues'
   s.email         = 'victorc.rodrigues@gmail.com'
-  s.homepage      = 'http://github.com/rodrigues/hari'
+  s.homepage      = 'http://github.com/Clubjudge/hari'
 
   s.license       = 'MIT'
 
@@ -35,4 +35,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec',   '~> 2.13'
   s.add_development_dependency 'rake',    '~> 10.0'
   s.add_development_dependency 'pry'
+  s.add_development_dependency 'delorean'
 end

data/lib/hari.rb

@@ -4,17 +4,72 @@ require 'active_model'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/string/inflections'
 require 'yajl'
+require 'erb'
+require 'ostruct'
 
 require 'hari/version'
 require 'hari/configuration'
 require 'hari/errors'
 require 'hari/entity'
 require 'hari/node'
-require 'hari/relationship'
+require 'hari/relation'
 
 module Hari
   extend self
   extend Configuration
+  extend Hari::Node::Queries
 
+  def node(arg)
+    type, id = node_type(arg), node_id(arg)
+    node = Node.new(model_id: id)
+    node.instance_variable_set '@node_type', type.to_s
+    node
+  end
+
+  def node_key(model)
+    if type = node_type(model)
+      "#{type}##{node_id(model)}"
+    else
+      node_id model
+    end
+  end
+
+  def node_id(model)
+    case model
+    when ::String, ::Symbol
+      model.to_s.split('#').last
+    when ::Hash
+      model.first[1]
+    when Hari::Node
+      model.model_id
+    else
+      model.id
+    end
+  end
+
+  def node_type(model)
+    case model
+    when ::String, ::Symbol
+      model.to_s.split('#').first
+    when ::Hash
+      model.first[0]
+    when Hari::Node
+      model.node_type
+    when Hari::Entity
+      nil
+    else
+      model.class.to_s.underscore.split('/').last
+    end
+  end
+
+  def relation!(type, from, target)
+    Relation.create type, from, target
+  end
+
+end
+
+def Hari(arg)
+  Hari.node arg
 end

data/lib/hari/entity.rb

@@ -33,26 +33,23 @@ module Hari
       end
     end
 
-    alias attribute send
-    alias read_attribute send
+    alias :attribute :send
+    alias :read_attribute :send
+    alias :has_attribute? :respond_to?
 
     def write_attribute(name, value)
       send "#{name}=", value
     end
 
-    def has_attribute?(name)
-      respond_to? name
-    end
-
     def ==(other)
-      other.is_a?(Hari::Entity) && self.id == other.id
+      other.is_a?(Hari::Entity) && id == other.id
     end
 
     def new?
-      self.id.nil?
+      id.nil?
     end
 
-    alias new_record? new?
+    alias :new_record? :new?
 
     def persisted?
       not new?
@@ -63,14 +60,14 @@ module Hari
     end
 
     def generate_id
-      'ent' + ::Time.now.strftime('%Y%m%d%H%M%S') + SecureRandom.hex(3)
+      '_e' + ::Time.now.strftime('%Y%m%d%H%M%S') + SecureRandom.hex(3)
     end
 
     def to_s
       attrs = attributes
       attrs.delete 'id'
 
-      "<#{self.class} id=#{id} attributes=#{attrs}>"
+      "<#{self.class} id='#{id}' attributes=#{attrs}>"
     end
 
   end

data/lib/hari/entity/property.rb

@@ -12,11 +12,11 @@ module Hari
       end
 
       def serialize(value)
-        serializer.serialize(value, name: name)
+        serializer.serialize value, name: name
       end
 
       def desserialize(value)
-        serializer.desserialize(value, name: name)
+        serializer.desserialize value, name: name
       end
 
     end

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

@@ -15,7 +15,15 @@ module Hari
           args.each { |name| property name, options }
 
           @properties ||= begin
-            self == Hari::Entity ? [] : Hari::Entity.properties.dup
+            if self == Hari::Entity
+              []
+            else
+              entities_ancestors = ancestors.select do |a|
+                a.ancestors.include? Hari::Entity
+              end
+
+              entities_ancestors[1].properties.dup # the closest
+            end
           end
         end
 

data/lib/hari/entity/repository.rb

@@ -7,7 +7,7 @@ module Hari
         run_callbacks(:save) { new? ? create : update }
       end
 
-      alias save create_or_update
+      alias :save :create_or_update
 
       def create
         run_callbacks :create do
@@ -46,7 +46,7 @@ module Hari
         self
       end
 
-      alias destroy delete
+      alias :destroy :delete
 
       module ClassMethods
 
@@ -57,6 +57,7 @@ module Hari
         def find(*args)
           options = args.extract_options!
           args.flatten!
+          args = args.map { |a| a.to_s.gsub(/^hari\:/, '') }
           args.one? ? find_one(args[0], options) : find_many(args, options)
         end
 

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

@@ -8,6 +8,8 @@ module Hari
         end
 
         def self.desserialize(value, options = {})
+          return unless value
+
           Float value
         rescue
           raise SerializationError, "#{options[:name]}:#{value} is not a float"

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

@@ -8,16 +8,9 @@ module Hari
         end
 
         def self.desserialize(value, options = {})
-          case value
-          when ::String
-            if value =~ /^\d+$/
-              value.to_i
-            else
-              raise
-            end
-          else
-            Integer(value)
-          end
+          return unless value
+
+          Integer value
         rescue
           raise SerializationError, "#{options[:name]}:#{value} is not an integer"
         end

data/lib/hari/node.rb

@@ -1,15 +1,32 @@
+require 'hari/node/repository'
 require 'hari/node/queries'
+require 'hari/node/serialization'
 
 module Hari
   class Node < Entity
     include Hari::Node::Queries
+    include Hari::Node::Repository
+    extend  Hari::Node::Serialization
 
-    property :model_id, required: true
+    property :model_id
+
+    def initialize(attrs = {})
+      attrs = { model_id: attrs } if attrs.kind_of?(::Fixnum)
+      super
+    end
 
     def generate_id
-      return model_id if model_id.include?('#')
+      return super unless model_id
+
+      model_id.to_s.include?('#') ? model_id.to_s : "#{node_type}##{model_id}"
+    end
+
+    def node_type
+      @node_type || self.class.node_type
+    end
 
-      self.class.to_s.underscore + "#" + model_id.to_s
+    def self.node_type
+      self.to_s.underscore
     end
 
   end

data/lib/hari/node/queries.rb

@@ -1,7 +1,40 @@
+require 'hari/node/queries/list'
+require 'hari/node/queries/set'
+require 'hari/node/queries/sorted_set'
+require 'hari/node/queries/relation'
+
 module Hari
   class Node < Entity
     module Queries
 
+      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
+
+      private
+
+      def set_query
+        Queries::Set.new query_node
+      end
+
+      def sorted_set_query
+        Queries::SortedSet.new query_node
+      end
+
+      def list_query
+        Queries::List.new query_node
+      end
+
+      def relation_query
+        Queries::Relation::Start.new query_node
+      end
+
+      def query_node
+        self.kind_of?(Hari::Node) ? self : nil
+      end
+
     end
   end
 end

data/lib/hari/node/queries/list.rb

@@ -0,0 +1,147 @@
+module Hari
+  class Node < Entity
+    module Queries
+      class List
+
+        attr_reader :node, :name
+
+        def initialize(node = nil)
+          @node = node
+        end
+
+        def key
+          @key ||= begin
+            prefix = node ? "#{Hari.node_key(node)}:" : ''
+            prefix + name.to_s
+          end
+        end
+
+        def list(name)
+          @name = name
+          self
+        end
+
+        def list!(name)
+          @name = name
+          range
+        end
+
+        def [](*args)
+          arg = args.first
+
+          if args.size == 2
+            range *args
+          elsif arg.kind_of? Integer
+            at arg
+          elsif arg.kind_of? Range
+            range arg.first, arg.last
+          end
+        end
+
+        def first
+          self[0]
+        end
+
+        def last
+          self[-1]
+        end
+
+        def []=(index, member)
+          Hari.redis.lset key, index, member
+        end
+
+        def range(start = 0, stop = -1)
+          Hari.redis.lrange key, start, stop
+        end
+
+        alias :members :range
+        alias :to_a    :range
+
+        def from(index)
+          range index
+        end
+
+        def to(index)
+          range 0, index
+        end
+
+        def at(index)
+          Hari.redis.lindex key, index
+        end
+
+        alias :index :at
+
+        def trim(start, stop)
+          Hari.redis.ltrim key, start, stop
+        end
+
+        def count
+          Hari.redis.llen key
+        end
+
+        alias :size :count
+        alias :length :count
+
+        def empty?
+          count == 0
+        end
+
+        def one?
+          count == 1
+        end
+
+        def many?
+          count > 1
+        end
+
+        def include?(member)
+          range.include? member
+        end
+
+        alias :member? :include?
+
+        def push(*members)
+          Hari.redis.rpush key, members
+        end
+
+        alias :rpush :push
+        alias :add   :push
+
+        def lpush(*members)
+          Hari.redis.lpush key, members
+        end
+
+        def <<(member)
+          push member
+        end
+
+        def insert_before(pivot, member)
+          Hari.redis.linsert key, :before, pivot, member
+        end
+
+        def insert_after(pivot, member)
+          Hari.redis.linsert key, :after, pivot, member
+        end
+
+        alias :insert :insert_after
+
+        def delete(member, count = 0)
+          Hari.redis.lrem key, count, member
+        end
+
+        def pop
+          Hari.redis.rpop key
+        end
+
+        alias :rpop :pop
+
+        def shift
+          Hari.redis.lpop key
+        end
+
+        alias :lpop :shift
+
+      end
+    end
+  end
+end