ohm 1.1.0 → 1.1.1

data/lib/ohm.rb

@@ -195,7 +195,7 @@ module Ohm
     # them.
     #
     def sort_by(att, options = {})
-      sort(options.merge(:by => namespace["*->%s" % att]))
+      sort(options.merge(:by => to_key(att)))
     end
 
     # Allows you to sort your models using their IDs. This is much
@@ -223,7 +223,7 @@ module Ohm
     #
     def sort(options = {})
       if options.has_key?(:get)
-        options[:get] = namespace["*->%s" % options[:get]]
+        options[:get] = to_key(options[:get])
         return execute { |key| db.sort(key, options) }
       end
 
@@ -296,6 +296,14 @@ module Ohm
     def exists?(id)
       execute { |key| db.sismember(key, id) }
     end
+
+    def to_key(att)
+      if model.counters.include?(att)
+        namespace["*:counters->%s" % att]
+      else
+        namespace["*->%s" % att]
+      end
+    end
   end
 
   class List < Struct.new(:key, :namespace, :model)
@@ -1020,6 +1028,8 @@ module Ohm
     # try to do it, you'll receive an Ohm::MissingID error.
     #
     def self.counter(name)
+      counters << name unless counters.include?(name)
+
       define_method(name) do
         return 0 if new?
 
@@ -1358,6 +1368,10 @@ module Ohm
       @uniques ||= []
     end
 
+    def self.counters 
+      @counters ||= []
+    end
+
     def self.collections
       @collections ||= []
     end

data/test/filtering.rb

@@ -52,7 +52,7 @@ test "#[]" do |john, jane|
 end
 
 test "#except" do |john, jane|
-  out = User.create(:status => "inactive", :lname => "Doe")
+  User.create(:status => "inactive", :lname => "Doe")
 
   res = User.find(:lname => "Doe").except(:status => "inactive")
 
@@ -80,8 +80,8 @@ test "indices bug related to a nil attribute" do |john, jane|
 end
 
 test "#union" do |john, jane|
+  User.create(:status => "super", :lname => "Doe")
   included = User.create(:status => "inactive", :lname => "Doe")
-  excluded = User.create(:status => "super", :lname => "Doe")
 
   res = User.find(:status => "active").union(:status => "inactive")
 
@@ -112,9 +112,9 @@ scope do
     book1 = Book.create
     book2 = Book.create
 
-    auth1 = Author.create(:book => book1, :mood => "happy")
-    auth2 = Author.create(:book => book1, :mood => "sad")
-    auth3 = Author.create(:book => book2, :mood => "sad")
+    Author.create(:book => book1, :mood => "happy")
+    Author.create(:book => book1, :mood => "sad")
+    Author.create(:book => book2, :mood => "sad")
 
     [book1, book2]
   end

data/test/helper.rb

@@ -15,7 +15,7 @@ def silence_warnings
   yield
 ensure
   $VERBOSE = original_verbose
-end
+end unless defined?(silence_warnings)
 
 $VERBOSE = true
 

data/test/model.rb

@@ -16,6 +16,7 @@ end
 
 class Person < Ohm::Model
   attribute :name
+  counter :logins
   index :initial
 
   def initial
@@ -70,7 +71,7 @@ test "empty model is ok" do
   class Foo < Ohm::Model
   end
 
-  foo = Foo.create
+  Foo.create
 end
 
 test "counters are cleaned up during deletion" do
@@ -551,25 +552,36 @@ end
 # Sorting lists and sets by model attributes
 setup do
   @event = Event.create(:name => "Ruby Tuesday")
-  @event.attendees.add(Person.create(:name => "D"))
-  @event.attendees.add(Person.create(:name => "C"))
-  @event.attendees.add(Person.create(:name => "B"))
-  @event.attendees.add(Person.create(:name => "A"))
+  {'D' => 4, 'C' => 2, 'B' => 5, 'A' => 3}.each_pair do |name, logins|
+    person = Person.create(:name => name)
+    person.incr :logins, logins
+    @event.attendees.add(person)
+  end
 end
 
 test "sort the model instances by the values provided" do
   people = @event.attendees.sort_by(:name, :order => "ALPHA")
-  assert %w[A B C D] == people.map { |person| person.name }
+  assert %w[A B C D] == people.map(&:name)
 end
 
 test "accept a number in the limit parameter" do
   people = @event.attendees.sort_by(:name, :limit => [0, 2], :order => "ALPHA")
-  assert %w[A B] == people.map { |person| person.name }
+  assert %w[A B] == people.map(&:name)
 end
 
 test "use the start parameter as an offset if the limit is provided" do
   people = @event.attendees.sort_by(:name, :limit => [1, 2], :order => "ALPHA")
-  assert %w[B C] == people.map { |person| person.name }
+  assert %w[B C] == people.map(&:name)
+end
+
+test "use counter attributes for sorting" do
+  people = @event.attendees.sort_by(:logins, :limit => [0, 3], :order => "ALPHA")
+  assert %w[C A D] == people.map(&:name)
+end
+
+test "use counter attributes for sorting with key option" do
+  people = @event.attendees.sort_by(:logins, :get => :logins, :limit => [0, 3], :order => "ALPHA")
+  assert %w[2 3 4] == people
 end
 
 # Collections initialized with a Model parameter

data/test/validations.rb

@@ -103,7 +103,7 @@ end
 # An existing model with a valid name
 scope do
   setup do
-    event = Event.create(:name => "original")
+    Event.create(:name => "original")
   end
 
   # That has the name changed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2152343760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152343760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nest
-  requirement: &2152342280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +39,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152342280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: scrivener
-  requirement: &2152341580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,18 +55,28 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152341580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2152340840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *2152340840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: Ohm is a library that allows to store an object in Redis, a persistent
   key-value database. It includes an extensible list of validations and has very good
   performance.
@@ -115,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ohm
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Object-hash mapping library for Redis.