ohm 1.2.0 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fb164eaa5fbec17afbcceb9a4c7f8ded8ace93b5
+  data.tar.gz: 4ab08c00e7edf980f16e3d854012b3a5e9503b1a
+SHA512:
+  metadata.gz: 5f3c9c4a0457fd31a0b14eb783840c23e8996e69205fffaacea18ae22efb1c5aa643188d2ddcaf1c2fe584efe2fa5231b58d5997627e7f9f7249b6e52c5b446e
+  data.tar.gz: 6d0e08cd9092c0fce4c41a326163c1cf13a37f2a781020be389bd83d46fa650b8af05785873fb57343cdeb3b7721d341c4c063b1dca38163f835f7e7b8975ee7

data/README.md

@@ -633,7 +633,7 @@ Ohm is rather small and can be extended in many ways.
 A lot of amazing contributions are available at [Ohm Contrib][contrib]
 make sure to check them if you need to extend Ohm's functionality.
 
-[contrib]: http://cyx.github.com/ohm-contrib/doc/
+[contrib]: http://cyx.github.com/ohm-contrib/
 
 Upgrading
 =========

data/lib/ohm.rb

@@ -780,6 +780,8 @@ module Ohm
     #   # => true
     #
     def self.with(att, val)
+      raise IndexNotFound unless uniques.include?(att)
+
       id = db.hget(key[:uniques][att], val)
       id && self[id]
     end
@@ -1019,6 +1021,8 @@ module Ohm
     #   end
     #
     def self.attribute(name, cast = nil)
+      attributes << name unless attributes.include?(name)
+
       if cast
         define_method(name) do
           cast[@attributes[name]]
@@ -1396,7 +1400,7 @@ module Ohm
       @uniques ||= []
     end
 
-    def self.counters 
+    def self.counters
       @counters ||= []
     end
 
@@ -1404,6 +1408,10 @@ module Ohm
       @collections ||= []
     end
 
+    def self.attributes
+      @attributes ||= []
+    end
+
     def self.filters(dict)
       unless dict.kind_of?(Hash)
         raise ArgumentError,
@@ -1411,10 +1419,10 @@ module Ohm
           "If you want to find by ID, use #{self}[id] instead."
       end
 
-      dict.map { |k, v| toindices(k, v) }.flatten
+      dict.map { |k, v| to_indices(k, v) }.flatten
     end
 
-    def self.toindices(att, val)
+    def self.to_indices(att, val)
       raise IndexNotFound unless indices.include?(att)
 
       if val.kind_of?(Enumerable)
@@ -1498,28 +1506,23 @@ module Ohm
       end
     end
 
-    def _delete_uniques(_uniques)
-      _uniques.each do |unique, val|
+    def _delete_uniques(uniques)
+      uniques.each do |unique, val|
         db.hdel(unique, val)
         db.hdel(key[:_uniques], unique)
       end
     end
 
-    def _delete_indices(_indices)
-      _indices.each do |index|
+    def _delete_indices(indices)
+      indices.each do |index|
         db.srem(index, id)
         db.srem(key[:_indices], index)
       end
-      # model.indices.each do |att|
-      #   val = atts[att.to_s]
-
-      #   db.srem(model.key[:indices][att][val], id)
-      # end
     end
 
     def _save_indices(indices)
       indices.each do |att, val|
-        model.toindices(att, val).each do |index|
+        model.to_indices(att, val).each do |index|
           db.sadd(index, id)
           db.sadd(key[:_indices], index)
         end

data/test/hash_key.rb

@@ -27,3 +27,7 @@ test "on a reloaded model" do
   tag = Tag[tag.id]
   assert "Ruby" == hash[tag]
 end
+
+test "on attributes class method" do
+  assert [:name] == Tag.attributes
+end

data/test/indices.rb

@@ -36,6 +36,12 @@ test "be able to find by the given attribute" do
   assert @user1 == User.find(:email => "foo").first
 end
 
+test "raise if the index doesn't exist" do
+  assert_raise Ohm::IndexNotFound do
+    User.find(:address => "foo")
+  end
+end
+
 test "raise an error if the parameter supplied is not a hash" do
   begin
     User.find(1)

data/test/ranks.rb

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+
+__END__
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+class Comment < Ohm::Model
+  def self.ranks
+    @indices ||= []
+  end
+
+  def self.rank(attribute)
+    ranks << attribute unless ranks.include?(attribute)
+  end
+
+  def ranked?(attribute)
+  end
+end
+
+setup do
+  User.create(:email => "a@a.com")
+end

data/test/setup.rb

@@ -0,0 +1,48 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+class Event < Ohm::Model
+  attribute :name
+  attribute :location
+
+  def setup
+    txn = Transaction.new do |t|
+      related = nil
+
+      t.watch(key[:related]) unless new?
+
+      t.read do
+       related = db.smembers(key[:related])
+      end
+
+      t.write do
+        related.each do |k|
+          db.del(k)
+        end
+
+        db.del(key[:related])
+      end
+    end
+
+    __delete__.append(txn)
+  end
+end
+
+test "assign attributes from the hash" do
+  event = Event.new(:name => "Ruby Tuesday")
+  assert_equal event.name, "Ruby Tuesday"
+end
+
+test "assign an ID and save the object" do
+  event1 = Event.create(:name => "Ruby Tuesday")
+  event2 = Event.create(:name => "Ruby Meetup")
+
+  assert_equal "1", event1.id
+  assert_equal "2", event2.id
+end
+
+test "save the attributes in UTF8" do
+ event = Event.create(:name => "32° Kisei-sen")
+ assert "32° Kisei-sen" == Event[event.id].name
+end

data/test/uniques.rb

@@ -39,6 +39,14 @@ test "raises when it already exists during save" do
   end
 end
 
+test "raises if the index doesn't exist" do
+  User.create(:email => "b@b.com")
+
+  assert_raise Ohm::IndexNotFound do
+    User.with(:address, "b@b.com")
+  end
+end
+
 test "doesn't raise when saving again and again" do |u|
   ex = nil
 
@@ -85,3 +93,33 @@ test "unique virtual attribute" do
     User.create(:email => "baz@yahoo.com")
   end
 end
+
+test "assert_unique" do |u|
+  class User
+    def assert_unique(att)
+      result = self.class.with(att, send(att))
+      assert((result.nil? || result.eql?(self)), [att, :not_unique])
+    end
+
+    def validate
+      assert_unique :email
+    end
+  end
+
+  # There's one user with email "a@a.com".
+  user = User.new(:email => "a@a.com")
+
+  # A new user with a conflicting attribute.
+  assert_equal true,  user.new?
+  assert_equal false, user.valid?
+  assert_equal [:not_unique], user.errors[:email]
+
+  user.email = "b@b.com"
+  user.save
+  user.email = "a@a.com"
+
+  # An existing user with a conflicting attribute.
+  assert_equal false, user.new?
+  assert_equal false, user.valid?
+  assert_equal [:not_unique], user.errors[:email]
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - Michel Martens
@@ -11,28 +10,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -40,7 +36,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,7 +43,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: scrivener
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -56,7 +50,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -64,7 +57,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -72,7 +64,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -112,32 +103,33 @@ files:
 - test/list.rb
 - test/model.rb
 - test/pipeline-performance.rb
+- test/ranks.rb
+- test/setup.rb
 - test/transactions.rb
 - test/uniques.rb
 - test/validations.rb
 - test/test.conf
 homepage: http://soveran.github.com/ohm/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ohm
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Object-hash mapping library for Redis.
 test_files: []