record_redis 0.11.0 → 0.12.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTcyZmY2ZDAwYWZmZTAyZDJiODFlNDJiYjhlZTAxZDY5ZDU0OWFkNg==
+    Y2QyMTdjMzNjMzcxMTQ2ZmNmYmQwM2NjN2JlZGVkNjMwMDczNDJiNQ==
   data.tar.gz: !binary |-
-    MTM2MDZlYzgyZTc1OGI3MTg5MTU1YzcwNTkxYmRhZmU1MzYwNzc0OQ==
+    MDBhMGE0Njc4YjFjODYyNGE1ZWYzOGNhYmFhMjk0MmQ2ODJjNGY1Mw==
 SHA512:
   metadata.gz: !binary |-
-    ZDEwY2FiNDU5MmViZTNkYTY3MzY1NDRjZDQ1MGI1NjA2ZmIwNzZmYjIyN2M2
-    NmU3MzU5NDg3MzIyZjlkYWJjZDU0OTcwZTdmNGJlOTE1M2ExNzM1OWY0NDMy
-    ZDhjMjg4NGE0ZTg4Mjg4OTViOWQwZGI4MzY3ZGM2MzBlNjFkODE=
+    NWY3MTQ4NTJiYzc5YmRiNTg1MjUzNmQwYWM2N2M1ODE3ZjVkYzQ0NDQ4ZmJm
+    ZWQ1OGEyNDNhMDQ4ZWM2ZDgwMzg2ODg1YmU0NGJkZWE5NGVkMDQwYzFhZmZi
+    MzljZjQ4NDNlYzU2MGNhYjI0MWE5YmYxOWUwOGE5N2I3NmRhY2M=
   data.tar.gz: !binary |-
-    NzIyYTZiMDE3ZDkxNDJjYjhhZWIwNGU1MTFiOWY1OWJhMzFhYzQ3Yjk2OGQy
-    YmQxYTNiNjVmNTZhODk5MWI3ZGFhYzg1NmQ2MGM0MTI4MGNjOWVjZDNlZWFk
-    ODhjZjA3ZGM1Yjc0Y2JjYWYwZmY0MzI2ZmFmZjBjOGVhZTdmNTM=
+    ZWNjM2ViMmRkYzNiZWVhZTQzZjUxNTQ0NzhhYmEzYzA1NDMxYWMwNDljZjIz
+    ODhlOGRhY2FjYTY3ZDAyM2EyNWQ1YjljZTA4NmExMDMwY2ZmODEwZjkwMjA0
+    Yjg4ODdmYjcyY2I1MDc1OGFkZGM3MGE0OGMyZjcxNDZkNjAxYzM=

data/lib/redis_record/base.rb

@@ -47,13 +47,13 @@ module RedisRecord
     def self.redis_sort(elements,order)
       attribute= order.split(" ").first
       direction= order.split(" ").last
-      
+      result = Array.new
       if direction=="dsc"
-        elements.sort {|a,b| b.send(attribute) <=> a.send(attribute)}
+        result= elements.sort {|a,b| b.send(attribute) <=> a.send(attribute)}
       else
-        elements.sort {|a,b| a.send(attribute) <=> b.send(attribute)}
+        result= elements.sort {|a,b| a.send(attribute) <=> b.send(attribute)}
       end
-      
+      result
       
     end
     def update(attributes)
@@ -126,12 +126,15 @@ module RedisRecord
     
     def self.make_all_selectors(name)
       class_eval <<-EOD
-        def self.find_all_by_#{name}(value)
+        def self.find_all_by_#{name}(value,*args)
           models= Array.new
           results= self.find_all
           results.each do |result|
             models << result if result.#{name}==value
           end
+          if args.size > 0
+            models = redis_sort(models,args.first[:sort]) if args.first[:sort]
+          end
           models
         end
       EOD

data/lib/redis_record/version.rb

@@ -1,3 +1,3 @@
 module RedisRecord
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/spec/fixtures/network.yml

@@ -5,4 +5,9 @@ one:
 two:
   Name: s_name
   Format: s_format
-  Key: s_key
+  Key: s_key
+
+three:
+  Name: x_name
+  Format: s_format
+  Key: x_key

data/spec/lib/redis_record/base_spec.rb

@@ -65,15 +65,28 @@ describe RedisRecord::Base do
       result= Network.find_by_Name("f_name")
       result.Name.should == name
     end
+    
   end
   
   describe '#find_all_by_' do
+    
+    before(:all) do
+      redis_fixture= RedisRecord::Fixture.new
+      redis_fixture.fixture "Network"
+    end
+    
     it 'must find all Entries for the given attribute' do
       Network.create({"Name" => "testNetwork", "Key" => "t1"})
       Network.create({"Name" => "testNetwork", "Key" => "tt1"})
       results= Network.find_all_by_Name("testNetwork")
       results.size.should == 2
     end
+    
+    it 'must return as first Entry with the given format and sort order a Network with name s_name' do
+      networks= Network.find_all_by_Format("s_format",:order => "Name asc")
+      networks.first.Name.should == "s_name"
+    end
+    
   end
   
   describe '#update' do
@@ -94,12 +107,14 @@ describe RedisRecord::Base do
   
   describe '#find_all with sort' do
     
-    redis_fixture= RedisRecord::Fixture.new
-    redis_fixture.fixture "Network"
+    before(:all) do
+      redis_fixture= RedisRecord::Fixture.new
+      redis_fixture.fixture "Network"
+    end
     
     it 'must find all Entries for the given attribute sort by a attribute' do
       networks = Network.find_all({:sort => "Name dsc"})
-      networks.first.Name.should == "s_name"
+      networks.first.Name.should == "x_name"
     end
   
   end

data/spec/lib/redis_record/fixture_spec.rb

@@ -21,7 +21,7 @@ describe RedisRecord::Fixture do
   it 'should update a redis hash key by a fixture' do
     redis_fixture= RedisRecord::Fixture.new
     redis_fixture.fixture "Network"
-    Network.find_all.size.should == 2
+    Network.find_all.size.should == 3
   end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: record_redis
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Marcel Schlimper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis