record_redis 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c11177d1227be344bd47d3b984b7e57a901e0928
-  data.tar.gz: 87396ea689c2256d50f5efc6544b1263781dbc9e
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTcyZmY2ZDAwYWZmZTAyZDJiODFlNDJiYjhlZTAxZDY5ZDU0OWFkNg==
+  data.tar.gz: !binary |-
+    MTM2MDZlYzgyZTc1OGI3MTg5MTU1YzcwNTkxYmRhZmU1MzYwNzc0OQ==
 SHA512:
-  metadata.gz: 8ebbddfc671b7f0b020ef7443c321e9a8704a040d1752c0da222720f75bd096a7e7c9e21bfe6af52aa668335596f9fa31e868b9d08fca75106d9fee220e883f9
-  data.tar.gz: 16a8e37abdbe8ccb7f53a47b1b19a458107b41aac6c2487e754455f1eb8a1e94514e667e7d66cfb9c61974e593afc8401b4f0cbd062077c2bb572a6384a33ccb
+  metadata.gz: !binary |-
+    ZDEwY2FiNDU5MmViZTNkYTY3MzY1NDRjZDQ1MGI1NjA2ZmIwNzZmYjIyN2M2
+    NmU3MzU5NDg3MzIyZjlkYWJjZDU0OTcwZTdmNGJlOTE1M2ExNzM1OWY0NDMy
+    ZDhjMjg4NGE0ZTg4Mjg4OTViOWQwZGI4MzY3ZGM2MzBlNjFkODE=
+  data.tar.gz: !binary |-
+    NzIyYTZiMDE3ZDkxNDJjYjhhZWIwNGU1MTFiOWY1OWJhMzFhYzQ3Yjk2OGQy
+    YmQxYTNiNjVmNTZhODk5MWI3ZGFhYzg1NmQ2MGM0MTI4MGNjOWVjZDNlZWFk
+    ODhjZjA3ZGM1Yjc0Y2JjYWYwZmY0MzI2ZmFmZjBjOGVhZTdmNTM=

data/lib/redis_record/base.rb

@@ -21,7 +21,7 @@ module RedisRecord
       model
     end
     
-    def self.find_all
+    def self.find_all(*args)
       models = Array.new
       name=  self.name
       RedisRecord::Connection.connect unless RedisRecord::Connection.isConnected?
@@ -38,9 +38,24 @@ module RedisRecord
       else
         return nil
       end
+      if args.size > 0
+        models = redis_sort(models,args.first[:sort]) if args.first[:sort]
+      end
       models
     end
     
+    def self.redis_sort(elements,order)
+      attribute= order.split(" ").first
+      direction= order.split(" ").last
+      
+      if direction=="dsc"
+        elements.sort {|a,b| b.send(attribute) <=> a.send(attribute)}
+      else
+        elements.sort {|a,b| a.send(attribute) <=> b.send(attribute)}
+      end
+      
+      
+    end
     def update(attributes)
       @hash_of_properties.merge!(attributes)
       name=  self.class

data/lib/redis_record/relation.rb

@@ -25,7 +25,7 @@ module RedisRecord
     def self.make_has_many_relation(name)
       class_eval <<-EOD
         def #{name}
-          #{name}.find_all_by_#{self.name}Key(self.Key)
+          #{name}.find_all_by_#{self.name}Key(self.Key.to_s)
         end
       EOD
     end
@@ -40,7 +40,7 @@ module RedisRecord
     def self.make_has_one_relation(name)
       class_eval <<-EOD
         def #{name}
-          #{name}.find_by_#{self.name}Key(self.Key)
+          #{name}.find_by_#{self.name}Key(self.Key.to_s)
         end
       EOD
     end

data/lib/redis_record/version.rb

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

data/spec/lib/redis_record/base_spec.rb

@@ -2,11 +2,12 @@ require 'spec_helper'
 
 describe RedisRecord::Base do
   
+  
   describe '#properties' do
     it 'should have a method #name and #format' do
       network= Network.new
-      network.methods.to_s.include?("Name=").should be_true
-      network.methods.to_s.include?("Format=").should be_true
+      network.methods.to_s.include?("Name=").should == true
+      network.methods.to_s.include?("Format=").should == true
     end
     
     it 'must change the value of the name property' do
@@ -20,13 +21,13 @@ describe RedisRecord::Base do
   describe '#create' do
     it 'should should be true to create a entity' do
       network= Network.create({"Name" => "paul"})
-      network.should be_true
+      network.should == true
       
     end
     
     it 'should be true to create a entity with empty key' do
       network= Network.create({"Name" => "paul", "Key" => ""})
-      network.should be_true
+      network.should == true
     end
   end
   
@@ -53,9 +54,15 @@ describe RedisRecord::Base do
   end
   
   describe '#find_by_' do
+    
+    before(:all) do
+      redis_fixture= RedisRecord::Fixture.new
+      redis_fixture.fixture "Network"
+    end
+    
     it 'must find a Entry with the given name' do
-      name= "testNetwork"
-      result= Network.find_by_Name("testNetwork")
+      name= "f_name"
+      result= Network.find_by_Name("f_name")
       result.Name.should == name
     end
   end
@@ -81,7 +88,19 @@ describe RedisRecord::Base do
     it 'should remove a existing entity' do
       Network.create({"Name" => "paul", "Key" => "1234567890_for_delete"})
       network= Network.find("1234567890_for_delete")
-      network.delete.should be_true
+      network.delete.should == 1
+    end
+  end
+  
+  describe '#find_all with sort' do
+    
+    redis_fixture= RedisRecord::Fixture.new
+    redis_fixture.fixture "Network"
+    
+    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"
     end
+  
   end
 end

data/spec/lib/redis_record/config_spec.rb

@@ -4,7 +4,7 @@ describe RedisRecord::Connection do
   before (:all) do
     @host = "127.0.0.1"
     @port = "6379"
-    @db = 0  
+    @db = 2  
   end  
   
   it 'must set a host for a connection' do
@@ -23,20 +23,20 @@ describe RedisRecord::Connection do
   describe '#connect' do
     it 'has to connect to a given redis db' do
       redis = RedisRecord::Connection.connect
-      RedisRecord::Connection.isConnected?.should be_true
+      RedisRecord::Connection.isConnected?.should == true
     end
     
     it 'has to reconnect to a given redis db' do
       redis = RedisRecord::Connection.connect
       redis.client.disconnect
       redis = RedisRecord::Connection.connect
-      RedisRecord::Connection.isConnected?.should be_true
+      RedisRecord::Connection.isConnected?.should == true
     end
     
     it 'should be false to check a failed redis connection' do
       redis = RedisRecord::Connection.connect
       redis.client.disconnect
-      RedisRecord::Connection.isConnected?.should be_false
+      RedisRecord::Connection.isConnected?.should  == false
     end
   end
   

data/spec/lib/redis_record/fixture_spec.rb

@@ -6,10 +6,6 @@ describe RedisRecord::Fixture do
     #code
   end
   
-  before(:all) do
-    RedisRecord::Fixture::Fixture_Path= "./spec/fixtures/"
-  end
-  
   it 'should load a fixtures yaml' do
     fixture= RedisRecord::Fixture.new
     erg = fixture.load(RedisRecord::Fixture::Fixture_Path+"network")

data/spec/lib/redis_record/relation_spec.rb

@@ -13,12 +13,14 @@ end
 describe RedisRecord::Base do
   
   it 'Site must have a Network' do
-    network= Network.create({:Name => "paul", :Key => "1234567890"})
-    site= Site.create({:Name => "paul", :Key => "1234567890", :NetworkKey=>"1234567890"})
+    network= Network.create({"Name" => "paul", "Key" => "1234567890"})
+    site= Site.create({"Name" => "paul", "Key" => "1234567890", "NetworkKey"=>"1234567890"})
     site= Site.find("1234567890")
     site.Network.Name.should=="paul"
   end
   it 'Network must have a Site' do
+    network= Network.create({"Name" => "paul", "Key" => "1234567890"})
+    Site.create({"Name" => "paul", "Key" => "1234567890", "NetworkKey"=>"1234567890"})
     network= Network.find("1234567890")
     network.Site.first.Name.should=="paul"
   end

data/spec/spec_helper.rb

@@ -30,7 +30,7 @@ end
 RedisRecord::Connection::Host= @host
 @port = "6379"
 RedisRecord::Connection::Port= @port
-@db = 0
+@db = 2
 RedisRecord::Connection::Db= @db
 RedisRecord::Connection.connect
-  
+RedisRecord::Fixture::Fixture_Path= "./spec/fixtures/"  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: record_redis
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Marcel Schlimper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -28,42 +28,42 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: a redis orm mapper for rails
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
+- .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -103,12 +103,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []