related 0.3.0 → 0.3.1

data/lib/related/node.rb

@@ -212,9 +212,9 @@ module Related
             end
           else
             if @limit
-              @result = Related.redis.zrange(key, page_start, page_end)
+              @result = Related.redis.zrevrange(key, page_start, page_end)
             else
-              @result = Related.redis.zrange(key, 0, -1)
+              @result = Related.redis.zrevrange(key, 0, -1)
             end
           end
         end

data/lib/related/relationship.rb

@@ -1,6 +1,8 @@
 module Related
   class Relationship < Entity
 
+    validates_presence_of :label, :start_node_id, :end_node_id
+
     def initialize(*attributes)
       if attributes.first.is_a?(String)
         @id = attributes.first
@@ -17,7 +19,7 @@ module Related
     end
 
     def rank
-      Related.redis.zrank("#{self.start_node_id}:rel:#{self.label}:out", self.id)
+      Related.redis.zrevrank("#{self.start_node_id}:rel:#{self.label}:out", self.id)
     end
 
     def self.create(label, node1, node2, attributes = {})

data/lib/related/version.rb

@@ -1,3 +1,3 @@
 module Related
-  Version = VERSION = '0.3.0'
+  Version = VERSION = '0.3.1'
 end

data/test/active_model_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('test/test_helper')
 class ActiveModelTest < ActiveModel::TestCase
   include ActiveModel::Lint::Tests
 
-  class Like < Related::Relationship
+  class Like < Related::Entity
     validates_numericality_of :how_much, :allow_nil => true
 
     before_save :before_save_callback

data/test/related_test.rb

@@ -141,19 +141,20 @@ class RelatedTest < Test::Unit::TestCase
     node3 = Related::Node.create
     node4 = Related::Node.create
     node5 = Related::Node.create
-    rel1 = Related::Relationship.create(:friends, node1, node2)
+    rel1 = Related::Relationship.create(:friends, node1, node2, :name => 'rel1')
     sleep(1)
-    rel2 = Related::Relationship.create(:friends, node1, node3)
+    rel2 = Related::Relationship.create(:friends, node1, node3, :name => 'rel2')
     sleep(1)
-    rel3 = Related::Relationship.create(:friends, node1, node4)
+    rel3 = Related::Relationship.create(:friends, node1, node4, :name => 'rel3')
     sleep(1)
-    rel4 = Related::Relationship.create(:friends, node1, node5)
+    rel4 = Related::Relationship.create(:friends, node1, node5, :name => 'rel4')
     sleep(1)
-    rel5 = Related::Relationship.create(:friends, node1, node5)
-    assert_equal [rel1,rel2,rel3], node1.outgoing(:friends).relationships.per_page(3).page(1).to_a
-    assert_equal [rel4,rel5], node1.outgoing(:friends).relationships.per_page(3).page(2).to_a
-    assert_equal [rel2,rel3,rel4], node1.outgoing(:friends).relationships.per_page(3).page(rel1).to_a
-    assert_equal [rel4,rel5], node1.outgoing(:friends).relationships.per_page(3).page(rel3).to_a
+    rel5 = Related::Relationship.create(:friends, node1, node5, :name => 'rel5')
+    assert_equal [rel5,rel4,rel3], node1.outgoing(:friends).relationships.per_page(3).page(1).to_a
+    assert_equal [rel2,rel1], node1.outgoing(:friends).relationships.per_page(3).page(2).to_a
+    assert_equal [rel5,rel4,rel3], node1.outgoing(:friends).relationships.per_page(3).page(nil).to_a
+    assert_equal [rel4,rel3,rel2], node1.outgoing(:friends).relationships.per_page(3).page(rel5).to_a
+    assert_equal [rel2,rel1], node1.outgoing(:friends).relationships.per_page(3).page(rel3).to_a
   end
 
   def test_can_count_the_number_of_related_nodes
@@ -272,4 +273,16 @@ class RelatedTest < Test::Unit::TestCase
     assert_match /^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ$/, node.updated_at
   end
 
+  def test_should_require_a_relationship_to_have_a_label_start_node_and_end_node
+    assert_raises Related::ValidationsFailed do
+      Related::Relationship.create(nil, 'x', 'y')
+    end
+    assert_raises Related::ValidationsFailed do
+      Related::Relationship.create(:friend, nil, 'y')
+    end
+    assert_raises Related::ValidationsFailed do
+      Related::Relationship.create(:friend, 'x', nil)
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: related
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Niklas Holmgren
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-07 00:00:00 +02:00
+date: 2011-10-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency