ohm 0.1.0.rc2 → 0.1.0.rc4

data/README.markdown

@@ -228,7 +228,7 @@ An index is a set that's handled automatically by Ohm. For any index declared,
 Ohm maintains different sets of objects IDs for quick lookups.
 
 In the `Event` example, the index on the name attribute will
-allow for searches like `Event.find(name: "some value")`.
+allow for searches like `Event.find(:name => "some value")`.
 
 Note that the `assert_unique` validation and the methods `find` and `except` need a
 corresponding index in order to work.
@@ -238,18 +238,18 @@ corresponding index in order to work.
 You can find a collection of records with the `find` method:
 
     # This returns a collection of users with the username "Albert"
-    User.find(username: "Albert")
+    User.find(:username => "Albert")
 
 ### Filtering results
 
     # Find all users from Argentina
-    User.find(country: "Argentina")
+    User.find(:country => "Argentina")
 
     # Find all activated users from Argentina
-    User.find(country: "Argentina", status: "activated")
+    User.find(:country => "Argentina", :status => "activated")
 
     # Find all users from Argentina, except those with a suspended account.
-    User.find(country: "Argentina").except(status: "suspended")
+    User.find(:country => "Argentina").except(:status => "suspended")
 
 Note that calling these methods results in new sets being created
 on the fly. This is important so that you can perform further operations
@@ -365,6 +365,13 @@ values. The result of the block is used as the error message:
     error_messages
     # => ["The email foo@example.com is already registered."]
 
+Ohm Extensions
+==============
+
+Ohm is rather small and can be extended in many ways.
+
+A lot of amazing contributions are available at [Ohm Contrib](http://labs.sinefunc.com/ohm-contrib/doc/), make sure to check them if you need to extend Ohm's functionality.
+
 Versions
 ========
 

data/Rakefile

@@ -24,6 +24,14 @@ task :stop do
   end
 end
 
-Rake::TestTask.new(:test) do |t|
-  t.pattern = 'test/**/*_test.rb'
+task :test do
+  Dir["test/**/*_test.rb"].each do |file|
+    fork do
+      load file
+    end
+
+    Process.wait
+
+    exit $?.exitstatus unless $?.success?
+  end
 end

data/lib/ohm.rb

@@ -518,7 +518,7 @@ module Ohm
     end
 
     def self.all
-      @all ||= Ohm::Model::Index.new(key(:all), Wrapper.wrap(self))
+      Ohm::Model::Index.new(key(:all), Wrapper.wrap(self))
     end
 
     def self.attributes
@@ -623,6 +623,48 @@ module Ohm
       incr(att, -count)
     end
 
+    # Export the id and errors of the object. The `to_hash` takes the opposite
+    # approach of providing all the attributes and instead favors a
+    # white listed approach.
+    #
+    # @example
+    #
+    #   person = Person.create(:name => "John Doe")
+    #   person.to_hash == { :id => '1' }
+    #   # => true
+    #
+    #   # if the person asserts presence of name, the errors will be included
+    #   person = Person.create(:name => "John Doe")
+    #   person.name = nil
+    #   person.valid?
+    #   # => false
+    #
+    #   person.to_hash == { :id => '1', :errors => [[:name, :not_present]] }
+    #   # => true
+    #
+    #   # for cases where you want to provide white listed attributes just do:
+    #
+    #   class Person < Ohm::Model
+    #     def to_hash
+    #       super.merge(:name => name)
+    #     end
+    #   end
+    #
+    #   # now we have the name when doing a to_hash
+    #   person = Person.create(:name => "John Doe")
+    #   person.to_hash == { :id => '1', :name => "John Doe" }
+    #   # => true
+    def to_hash
+      attrs = {}
+      attrs[:id] = id unless new?
+      attrs[:errors] = errors unless errors.empty?
+      attrs
+    end
+
+    def to_json(*args)
+      to_hash.to_json(*args)
+    end
+
     def attributes
       self.class.attributes
     end
@@ -644,6 +686,11 @@ module Ohm
     rescue MissingID
       false
     end
+    alias :eql? :==
+
+    def hash
+      new? ? super : key.hash
+    end
 
     # Lock the object before executing the block, and release it once the block is done.
     def mutex
@@ -694,21 +741,41 @@ module Ohm
     end
 
     def write
-      unless attributes.empty?
-        attributes.each do |att|
+      unless (attributes + counters).empty?
+        atts = (attributes + counters).inject([]) { |ret, att|
           value = send(att).to_s
 
-          if value.empty?
-            db.hdel(key, att)
-          else
-            db.hset(key, att, value)
-          end
+          ret.push(att, value)  if not value.empty?
+          ret
+        }
+
+        db.multi do
+          db.del(key)
+          db.hmset(key, *atts.flatten)  if atts.any?
         end
       end
     end
 
+    def write_remote(att, value)
+      write_local(att, value)
+
+      if value.to_s.empty?
+        db.hdel(key, att)
+      else
+        db.hset(key, att, value)
+      end
+    end
+
     def self.const_missing(name)
-      Wrapper.new(name) { const_get(name) }
+      wrapper = Wrapper.new(name) { const_get(name) }
+
+      # Allow others to hook to const_missing.
+      begin
+        super(name)
+      rescue NameError
+      end
+
+      wrapper
     end
 
   private

data/lib/ohm/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Ohm
-  VERSION = "0.1.0.rc2"
+  VERSION = "0.1.0.rc4"
 end

data/test/1.8.6_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 class TestString < Test::Unit::TestCase
   context "String#lines" do

data/test/connection_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 class ConnectionTest < Test::Unit::TestCase
   setup do

data/test/errors_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 class ErrorsTest < Test::Unit::TestCase
   class User < Ohm::Model

data/test/hash_key_test.rb

@@ -0,0 +1,36 @@
+# encoding: UTF-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+
+class Tag < Ohm::Model
+  attribute :name
+end
+
+class HashKeyTest < Test::Unit::TestCase
+  setup do
+    Ohm.flush
+  end
+
+  test "using a new record as a hash key" do
+    tag = Tag.new
+    hash = { tag => "Ruby" }
+
+    assert_equal "Ruby", hash[tag]
+    assert_nil hash[Tag.new]
+  end
+
+  test "on a persisted model" do
+    tag = Tag.create(:name => "Ruby")
+
+    assert_equal "Ruby", { tag => "Ruby" }[tag]
+  end
+
+  test "on a reloaded model" do
+    tag = Tag.create(:name => "Ruby")
+    hash = { tag => "Ruby" }
+
+    tag = Tag[tag.id]
+    assert_equal "Ruby", hash[tag]
+  end
+end
+

data/test/indices_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 class IndicesTest < Test::Unit::TestCase
   setup do
@@ -43,7 +43,7 @@ class IndicesTest < Test::Unit::TestCase
     end
 
     should "raise an error if the parameter supplied is not a hash" do
-      assert_raises ArgumentError.new("You need to supply a hash with filters. If you want to find by ID, use IndicesTest::User[id] instead.") do
+      assert_raises ArgumentError, "You need to supply a hash with filters. If you want to find by ID, use IndicesTest::User[id] instead." do
         User.find(1)
       end
     end

data/test/model_module_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require File.join(File.dirname(__FILE__), "test_helper")
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 require "ostruct"
 
 module Model

data/test/model_test.rb

@@ -1,7 +1,8 @@
 # encoding: UTF-8
 
-require File.join(File.dirname(__FILE__), "test_helper")
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 require "ostruct"
+require "json"
 
 class Post < Ohm::Model
   attribute :body
@@ -256,6 +257,16 @@ class ModelTest < Test::Unit::TestCase
 
       assert_equal "foo", event.slug
     end
+
+    should "save counters" do
+      event = Event.create(:name => "Foo")
+
+      event.incr(:votes)
+      event.save
+
+      assert_equal 1, Event[event.id].votes
+    end
+
   end
 
   context "Delete" do
@@ -942,6 +953,18 @@ class ModelTest < Test::Unit::TestCase
       assert_equal car, Car[1]
       assert_nil Make[1]
     end
+
+    should "allow changing the database" do
+      Car.create(:name => "Twingo")
+
+      assert_equal ["1"], Car.all.raw
+
+      Car.connect :db => 15
+      assert_equal [], Car.all.raw
+
+      Car.connect :db => 14
+      assert_equal ["1"], Car.all.raw
+    end
   end
 
   context "Persistence" do
@@ -959,4 +982,103 @@ class ModelTest < Test::Unit::TestCase
       assert_equal 1, Event[1].votes
     end
   end
+
+  context "Exporting" do
+    class Venue < Ohm::Model
+      attribute :name
+
+      def validate
+        assert_present :name
+      end
+    end
+
+    context "a new model without errors" do
+      should "export an empty hash via to_hash" do
+        person = Venue.new
+        assert_equal({}, person.to_hash)
+      end
+    end
+
+    context "a new model with some errors" do
+      should "export a hash with the errors" do
+        person = Venue.new
+        person.valid?
+
+        assert_equal({ :errors => [[:name, :not_present]] }, person.to_hash)
+      end
+    end
+
+    context "an existing model" do
+      should "export a hash with the its id" do
+        person = Venue.create(:name => "John Doe")
+        assert_equal({ :id => '1' }, person.to_hash)
+      end
+    end
+
+    context "an existing model with validation errors" do
+      should "export a hash with its id and the errors" do
+        person = Venue.create(:name => "John Doe")
+        person.name = nil
+        person.valid?
+
+        expected_hash = { :id => '1', :errors => [[:name, :not_present]] }
+
+        assert_equal expected_hash, person.to_hash
+      end
+    end
+
+    class Programmer < Ohm::Model
+      attribute :language
+
+      def validate
+        assert_present :language
+      end
+
+      def to_hash
+        super.merge(:language => language)
+      end
+    end
+
+    context "a subclassed to_hash" do
+      should "return the merged attributes" do
+        programmer = Programmer.create(:language => "Ruby")
+        expected_hash = { :id => '1', :language => 'Ruby' }
+
+        assert_equal expected_hash, programmer.to_hash
+      end
+    end
+
+    context "the JSON representation of an object" do
+      should "just be the to_hash of a model" do
+        json = JSON.parse(Programmer.create(:language => "Ruby").to_json)
+
+        assert_equal ["id", "language"], json.keys.sort
+        assert_equal "1", json["id"]
+        assert_equal "Ruby", json["language"]
+      end
+    end
+  end
+
+  describe "a Model with individual attribute writing needs" do
+    class Order < Ohm::Model
+      attribute :state
+
+      def authorize!
+        write_remote :state, 'authorized'
+      end
+    end
+
+    test "writes locally" do
+      order = Order.create(:state => "pending")
+      order.authorize!
+      assert_equal 'authorized', order.state
+    end
+
+    test "writes remotely" do
+      order = Order.create(:state => "pending")
+      order.authorize!
+      order = Order[order.id]
+      assert_equal 'authorized', order.state
+    end
+  end
 end

data/test/mutex_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 class TestMutex < Test::Unit::TestCase
   class Person < Ohm::Model

data/test/upgrade_script_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require File.join(File.dirname(__FILE__), "test_helper")
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 require "ohm/utils/upgrade"
 

data/test/validations_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 class ValidationsTest < Test::Unit::TestCase
   class Event < Ohm::Model

data/test/wrapper_test.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+
+$missing_constants = []
+
+class Object
+  def self.const_missing(name)
+    $missing_constants << name
+    super(name)
+  end
+end
+
+class Foo < Ohm::Model
+  set :bars, Bar
+end
+
+class Tests < Test::Unit::TestCase
+  test "calls other const_missing hooks" do
+    assert_equal [:Bar], $missing_constants
+  end
+end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 1
   - 0
-  - rc2
-  version: 0.1.0.rc2
+  - rc4
+  version: 0.1.0.rc4
 platform: ruby
 authors: 
 - Michel Martens
@@ -16,13 +16,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-12 00:00:00 -03:00
+date: 2010-07-02 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -38,6 +39,7 @@ dependencies:
   name: contest
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -51,6 +53,7 @@ dependencies:
   name: batch
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -86,6 +89,7 @@ files:
 - test/all_tests.rb
 - test/connection_test.rb
 - test/errors_test.rb
+- test/hash_key_test.rb
 - test/indices_test.rb
 - test/model_module_test.rb
 - test/model_test.rb
@@ -93,6 +97,7 @@ files:
 - test/test_helper.rb
 - test/upgrade_script_test.rb
 - test/validations_test.rb
+- test/wrapper_test.rb
 - test/test.conf
 has_rdoc: true
 homepage: http://github.com/soveran/ohm
@@ -104,6 +109,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -111,6 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
@@ -122,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ohm
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Object-hash mapping library for Redis.