easyredis 0.0.2 → 0.0.3

data/README.md

@@ -43,7 +43,7 @@ We can now make post objects:
 Posts are automatically given ids that we can then use to retrive them:
 
     id = p.id
-    p = Post[id]  # or Post.find(id)
+    p = Post.find(id)
     p.title  # => "My First Post"
 
 We also get a created_at field for free that we can sort by.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('easyredis','0.0.2') do |p|
+Echoe.new('easyredis','0.0.3') do |p|
   p.description = "simple framework designed to make using redis as a database simpler"
   p.url = "https://github.com/alecbenzer/easyredis"
   p.author = "Alec Benzer"
@@ -15,17 +15,17 @@ end
 require 'benchmark'
 require './tests/test'
 
-$names = ["Bill","Bob","John","Jack","Alec","Mark","Nick","Evan","Eamon","Joe","Vikram"]
-
 def rand_name
-  $names[rand*$names.size]
+  length = 2
+  chars = []
+  length.times { chars << (rand(26) + 65).chr }
+  chars.join
 end
 
+
 namespace :bm do
   task :clear do
-    count = Man.count
-
-    puts "destroying #{$count} previous entries"
+    puts "destroying #{Man.count} previous entries"
     Benchmark.bm do |bm|
       bm.report { Man.destroy_all }
     end
@@ -34,43 +34,54 @@ namespace :bm do
   task :add do
     count = ENV["count"] ? ENV["count"].to_i : 25000
     puts "adding #{count} new entries"
-    Benchmark.bm do |bm|
-      bm.report { count.times { m = Man.new ; m.name = rand_name } }
+    time = Benchmark::Tms.new
+    count.times do
+      name = rand_name
+      age = rand(100)
+      time += Benchmark.measure { m = Man.new ; m.name = name ; m.age = age }
     end
+    puts time.format
   end
 
   task :populate => [:clear, :add]
 
-  task :sort do
-    puts "sorting #{Man.count} entries by name"
-    Benchmark.bm do |bm|
-      #bm.report("ruby:") { Man.all.sort_by { |m| m.name } }
-      #bm.report("redis:") { Man.sort_by(:name) }
-      bm.report { Man.sort_by(:name) }
-    end
-  end
-
   task :search do
     puts "searching #{Man.count} entries by a particular name"
+    name = Man.rand.name
     Benchmark.bm do |bm|
-      name = rand_name
-      #bm.report("ruby:") { Man.all.select {|m| m.name == name} }
-      #bm.report("redis:") { Man.search_by(:name,name) }
       bm.report { Man.search_by(:name,name) }
     end
   end
 
+  task :singlesearch do
+    puts "seaching #{Man.count} entries by a particular age"
+    puts "NOTE: this metric is only relevant if Model#search is not detecting single-field searches and using Model#search_by"
+    age = rand(100)
+    t1 = Benchmark.measure { Man.search(:age => age) }
+    t2 = Benchmark.measure { Man.search_by(:age,age) }
+    puts "Model#search:"
+    puts t1.format
+    puts "Model#search_by:"
+    puts t2.format
+    puts "search is #{((t1.real/t2.real) - 1)*100}% slower"
+  end
+
+  task :multisearch do
+    man = Man.rand
+    name = man.name
+    age = man.age
+    count = 0
+    time = Benchmark.measure { count = Man.search(:name => name, :age => age).size }
+    puts "retrived #{count} out of #{Man.count} entries in:"
+    puts time.format
+  end
+
   task :find do
-    puts "finding one of #{Man.count} entry by name"
+    puts "finding one of #{Man.count} entries by name"
+    name = Man.rand.name
     Benchmark.bm do |bm|
-      name = rand_name
-      #bm.report("redis:") { Man.find_by(:name,name) }
       bm.report { Man.find_by(:name,name) }
     end
   end
 
 end
-
-task :doc do
-  puts `rdoc lib/ --title "EasyRedis"`
-end

data/easyredis.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easyredis}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alec Benzer"]
-  s.date = %q{2011-02-05}
+  s.date = %q{2011-02-06}
   s.description = %q{simple framework designed to make using redis as a database simpler}
   s.email = %q{alecbezer @nospam@ gmail.com}
   s.extra_rdoc_files = ["README.md", "lib/easyredis.rb"]

data/lib/easyredis.rb

@@ -45,6 +45,8 @@ module EasyRedis
   end
 
   # connect to a redis server
+  #
+  # takes the same options that Redis#new does from the redis gem
   def self.connect(options = {})
     @redis = Redis.new(options)
   end
@@ -93,21 +95,28 @@ module EasyRedis
         offset = index
         self[offset...(offset+limit)]
       elsif index.is_a? Range
-        a = index.begin
-        b = index.end
-        b -= 1 if index.exclude_end?
-        ids = []
-        if @order == :asc
-          ids = EasyRedis.redis.zrange(@klass.sort_prefix(@field),a,b)
-        elsif @order == :desc
-          ids = EasyRedis.redis.zrevrange(@klass.sort_prefix(@field),a,b)
-        end
-        ids.map{|i|@klass.new(i)}
+        access(index)
       elsif index.is_a? Integer
         self[index..index].first
       end
     end
 
+    # helper method for []
+    #
+    # takes a range and returns corresponding elements
+    def access(range)
+      a = range.begin
+      b = range.end
+      b -= 1 if index.exclude_end?
+      ids = []
+      if @order == :asc
+        ids = EasyRedis.redis.zrange(@klass.sort_prefix(@field),a,b)
+      elsif @order == :desc
+        ids = EasyRedis.redis.zrevrange(@klass.sort_prefix(@field),a,b)
+      end
+      ids.map{|i|@klass.new(i)}
+    end
+
     # iterate through all members of this sort
     def each
       self[0..-1].each { |o| yield o }
@@ -130,6 +139,14 @@ module EasyRedis
       end
     end
 
+    def last(n = nil)
+      if n
+        self[-n..-1]
+      else
+        self[-1]
+      end
+    end
+
     def inspect
       "#<EasyRedis::Sort model=#{@klass.name}, field=#{@field.to_s}, order=#{@order.to_s}>"
     end
@@ -143,6 +160,8 @@ module EasyRedis
 
     # add a field to the model
     def self.field(name)
+      @@fields ||= []
+      @@fields << name.to_sym
       name = name.to_s
       getter = name
       setter = name + "="
@@ -185,6 +204,18 @@ module EasyRedis
       self.sort_by :created_at, options
     end
 
+    def self.first(n = nil)
+      self.all.first(n)
+    end
+
+    def self.last(n = nil)
+      self.all.last(n)
+    end
+
+    def self.rand
+      self[Kernel.rand(self.count)]
+    end
+
     # find an instance of this model based on its id
     def self.find(id)
       if EasyRedis.redis.zscore(prefix.pluralize,id)
@@ -194,9 +225,8 @@ module EasyRedis
       end
     end
 
-    # alias for Model#find
-    def self.[](id)
-      find(id)
+    def self.[](index,amt=nil)
+      self.all[index,amt]
     end
 
     # get all entries where field matches val
@@ -207,12 +237,23 @@ module EasyRedis
       ids = EasyRedis.redis.zrangebyscore(sort_prefix(field),scr,scr,proc_options(options))
       ids.map{|i| new(i) }
     end
-    
+
     # get the first entry where field matches val
     def self.find_by(field,val)
       search_by(field,val,:limit => 1).first
     end
 
+    def self.search(params)
+      return search_by(*params.first) if params.size == 1  # comment out for benchmarking purposes
+      result_set = nil
+      params.each do |field,value|
+        scr = EasyRedis.score(value)
+        ids = EasyRedis.redis.zrangebyscore(sort_prefix(field),scr,scr)
+        result_set = result_set ? (result_set & Set.new(ids)) : Set.new(ids)
+      end
+      result_set.map{|i|new(i)}
+    end
+
     # get all entries, sorted by the given field
     def self.sort_by(field,options = {:order => :asc})
       EasyRedis::Sort.new(field,options[:order],self)
@@ -284,7 +325,7 @@ module EasyRedis
     def [](field)
       EasyRedis.redis.hget(key_name,field)
     end
-    
+
     # directly change a field of this entry's redis hash
     #
     # note that you cannot access created_at or id with these methods
@@ -311,6 +352,13 @@ module EasyRedis
       "#<#{self.class.name}:#{@id}>"
     end
 
+    # clears all fields, causing future gets to reretrive them from redis
+    def clear
+      @@fields.each do |field|
+        self.instance_variable_set("@"+field.to_s,nil)
+      end
+    end
+
 
     private 
 

data/tests/test.rb

@@ -2,9 +2,10 @@ require './lib/easyredis'
 
 class Man < EasyRedis::Model
   field :name
-  field :friend
+  field :age
 
   sort_on :name
+  sort_on :age
 end
 
 EasyRedis.connect

metadata

@@ -2,7 +2,7 @@
 name: easyredis
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Alec Benzer
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 -05:00
+date: 2011-02-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency