ohm 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60d1fadf47380356ffbc44627e28f9b15ff8528a
-  data.tar.gz: f911d9c462235f7c56f5216b10f1b2d48f3ab287
+  metadata.gz: 44f992bf97d394e618f9e3608a13999e6a37ffbf
+  data.tar.gz: 9e97ba2177d8067c64ab4e2b0b7a0a710703bb18
 SHA512:
-  metadata.gz: 67eea41a25fd17691a9cc79700abf248438a7bccefc7624053212d6439d6252bfc2850e0a7905fe8a2ad46eadac6d9d11d150978cec4f937a2bbba89ea05e90b
-  data.tar.gz: 1e17aace64652f6c96cd79fa6ff071a67fbed614951af15e8487d8fee78b21ec69f10313b7e8b1004292d1f97a22c3d8be74d5f892172742fe634fea84989ef2
+  metadata.gz: a0d5bc81d2fa070ee3b9306844bc61a1d089cf67e464fd8c3939274db918d986f3e6d97c8166ae3f1caf2c0d679c7c1802c55499d65dc0ca35a619ee9446b342
+  data.tar.gz: 50008d8d644b1825507db45e921e78aaa0cd19b48fc587eca43605495155d91e816e49abc75a02f6bc4aef1e5351c81940384da4eb97c8e3e8eb6934ba75ce65

data/.gems

@@ -1,4 +1,4 @@
-nido -v 0.0.1
 cutest -v 1.2.0
-msgpack -v 0.5.4
-redic -v 0.0.5
+msgpack -v 0.5.8
+nido -v 0.0.1
+redic -v 1.0.1

data/CHANGELOG.md

@@ -0,0 +1,293 @@
+- Lists now respond to range.
+
+  Example:
+
+      class Comment < Ohm::Model
+      end
+
+      class Post < Ohm::Model
+        list :comments, :Comment
+      end
+
+      c1 = Comment.create
+      c2 = Comment.create
+      c3 = Comment.create
+
+      post = Post.create
+      post.comments.push(c1)
+      post.comments.push(c2)
+      post.comments.push(c3)
+
+      post.comments.range(0, 1) == [c1, c2]
+      # => true
+
+- When a record is created, `#id` returns a string instead of a integer.
+  This ensures ID is string everywhere:
+
+  Example:
+
+      ## Before
+
+      Meetup.create(name: "Ruby").id
+      # => 1
+
+      Meetup.find(name: "Ruby").id
+      # => "1"
+
+      ## Now
+
+      Meetup.create.id
+      # => "1"
+
+      Meetup.find(name: "Ruby").id
+      # => "1"
+
+- If an attribute is set to an empty string, Ohm won't delete the attribute.
+
+  Example:
+
+      # Before
+      event = Meetup.create(location: "")
+      Meetup[event.id].location
+      # => nil
+
+      # Now
+      event = Meetup.create(location: "")
+      Meetup[event.id].location
+      # => ""
+
+- Include `Ohm::List#ids` in the public API. It returns an array with all
+  the ID's of the list.
+
+  Example:
+
+      class Comment < Ohm::Model
+      end
+
+      class Post < Ohm::Model
+        list :comments, :Comment
+      end
+
+      post = Post.create
+      post.comments.push(Comment.create)
+      post.comments.push(Comment.create)
+      post.comments.push(Comment.create)
+
+      post.comments.ids
+      # => ["1", "2", "3"]
+
+- Include `Ohm::BasicSet#exists?` in the public API. This makes possible
+  to check if an id is included in a set. Check `Ohm::BasicSet#exists?`
+  documentation for more details.
+
+  Example:
+
+      class Post < Ohm::Model
+      end
+
+      class User < Ohm::Model
+        set :posts, :Post
+      end
+
+      user = User.create
+      user.posts.add(post = Post.create)
+
+      user.posts.exists?(post.id)       # => true
+      user.posts.exists?("nonexistent") # => false
+
+
+- Change `Ohm::MultiSet#except` to union keys instead of intersect them
+  when passing an array.
+
+  Example:
+
+      class User < Ohm::Model
+        attribute :name
+      end
+
+      john = User.create(name: "John")
+      jane = User.create(name: "Jane")
+
+      res = User.all.except(name: [john.name, jane.name])
+
+      # before
+      res.size # => 2
+
+      # now
+      res.size # => 0
+
+
+- Move ID generation to Lua. With this change, it's no longer possible
+  to generate custom ids. All ids are autoincremented.
+
+
+- Add `Ohm::Model.track` method to allow track of custom keys. This key
+  is removed when the model is deleted.
+
+  Example:
+
+      class Foo < Ohm::Model
+        track :notes
+      end
+
+      foo = Foo.create
+
+      Foo.redis.call("SET", foo.key[:notes], "something")
+      Foo.redis.call("KEYS", "*").include?("Foo:1:notes")
+      # => true
+
+      foo.delete
+      Foo.redis.call("KEYS", "*").include?("Foo:1:notes")
+      # => false
+
+
+- `Ohm::Model#reference` accepts strings as model references.
+
+  Example:
+
+      class Bar < Ohm::Model
+        reference :foo, "SomeNamespace::Foo"
+      end
+
+      Bar.create().foo.class # => SomeNamespace::Foo
+
+
+- `Ohm::Model#save` sanitizes attributes before sending to Lua.
+  This complies with the original spec in Ohm v1 where a `to_s`
+  is done on each value.
+
+  Example:
+
+      class Post < Ohm::Model
+        attribute :published
+      end
+
+      post = Post.create(published: true)
+      post = Post[post.id]
+
+      # before
+      post.published # => "1"
+
+      # now
+      post.published # => "true"
+
+
+- `Ohm::Model#save` don't save values for attributes set to false.
+
+  Example:
+
+      class Post < Ohm::Model
+        attribute :published
+      end
+
+      post = Post.create(published: false)
+      post = Post[post.id]
+
+      # before
+      post.published # => "0"
+
+      # now
+      post.published # => nil
+
+
+- `nest` dependency has been removed. Now, Ohm uses [nido][nido]
+  to generate the keys that hold the data.
+
+
+- `scrivener` dependency has been removed. Ohm no longer supports model
+  validations and favors filter validation on the boundary layer. Check
+  [scrivener][scrivener] project for more information.
+
+
+- `redis` dependency has been removed. Ohm 2 uses [redic][redic],
+  a lightweight Redis client. Redic uses the `hiredis` gem for the
+  connection and for parsing the replies. Now, it defaults to a
+  Redic connection to "redis://127.0.0.1:6379". To change it, you
+  will need to provide an instance of `Redic` through the `Ohm.redis=`
+  helper.
+
+  Example:
+
+      Ohm.redis = Redic.new("redis://:<passwd>@<host>:<port>/<db>")
+
+  Check Redic README for more details.
+
+
+- `Ohm::Model#transaction` and `Ohm::Transaction` have been removed.
+
+
+- Move `save` and `delete` operations to Lua scripts.
+
+
+- Support for Ruby 1.8 and 1.9 has been removed.
+
+[nido]: https://github.com/soveran/nido
+[scrivener]: https://github.com/soveran/scrivener
+[redic]: https://github.com/amakawa/redic
+
+1.3.2
+-----
+
+- Fetching a batch of objects is now done in batches of 1000 objects at
+  a time. If you are iterating over large collections, this change should
+  provide a significant performance boost both in used memory and total
+  execution time.
+- MutableSet#<< is now an alias for #add.
+
+1.3.1
+-----
+
+- Improve memory consumption when indexing persisted attributes.
+
+  No migration is needed and old indices will be cleaned up as you save
+  instances.
+
+1.3.0
+-----
+
+- Add Model.attributes.
+
+1.2.0
+-----
+
+- Enumerable fix.
+- Merge Ohm::PipelinedFetch into Ohm::Collection.
+- Fix Set, MultiSet, and List enumerable behavior.
+- Change dependencies to use latest cutest.
+
+1.1.0
+-----
+
+- Compatible with redis-rb 3.
+
+1.0.0
+-----
+
+- Fetching a batch of objects is now done through one pipeline, effectively
+  reducing the IO to just 2 operations (one for SMEMBERS / LRANGE, one for
+  the actual HGET of all the individual HASHes.)
+- write_remote / read_remote have been replaced with set / get respectively.
+- Ohm::Model.unique has been added.
+- Ohm::Model::Set has been renamed to Ohm::Set
+- Ohm::Model::List has been renamed to Ohm::List
+- Ohm::Model::Collection is gone.
+- Ohm::Validations is gone. Ohm now uses Scrivener::Validations.
+- Ohm::Key is gone. Ohm now uses Nest directly.
+- No more concept of volatile keys.
+- Ohm::Model::Wrapper is gone.
+- Use Symbols for constants instead of relying on Ohm::Model.const_missing.
+- #sort / #sort_by now uses `limit` as it's used in redis-rb, e.g. you
+  have to pass in an array like so: sort(limit: [0, 1]).
+- Set / List have been trimmed to contain only the minimum number
+  of necessary methods.
+- You can no longer mutate a collection / set as before, e.g. doing
+  User.find(...).add(User[1]) will throw an error.
+- The #union operation has been added. You can now chain it with your filters.
+- Temporary keys when doing finds are now automatically cleaned up.
+- Counters are now stored in their own key instead, i.e. in
+  User:<id>:counters.
+- JSON support has to be explicitly required by doing `require
+  "ohm/json"`.
+- All save / delete / update operations are now done using
+  transactions (see http://redis.io/topics/transactions).
+- All indices are now stored without converting the values to base64.

data/README.md

@@ -48,7 +48,7 @@ with the sources if you want to change some settings.
 
 If you don't have Ohm, try this:
 
-    $ [sudo] gem install ohm
+    $ [sudo] gem install ohm -v 2.0.0.rc1
 
 Or you can grab the code from [http://github.com/soveran/ohm][ohm].
 

data/benchmarks/common.rb

@@ -1,7 +1,7 @@
 require "bench"
 require_relative "../lib/ohm"
 
-Ohm.connect(:port => 6379, :db => 15)
+Ohm.redis = Redic.new("redis://127.0.0.1:6379/15")
 Ohm.flush
 
 class Event < Ohm::Model

data/examples/json-hash.rb

@@ -5,91 +5,64 @@
 # If you've ever needed to build an AJAX route handler, you may have noticed
 # the prevalence of the design pattern where you return a JSON response.
 #
-#     post "/comments.json" do
-#       comment = Comment.create(params[:comment])
-#       comment.to_json
+#     on get, "comments" do
+#       res.write Comment.all.to_json
 #     end
 #
 # `Ohm` helps you here by providing sensible defaults. It's not very popular,
 # but `Ohm` actually has a `to_hash` method.
 
-# Let's start by requiring `ohm` and `json`. In ruby 1.9, `json` is
-# actually part of the standard library, so you don't have to install a gem
-# for it. For ruby 1.8.x, a simple `[sudo] gem install json` will do it.
+# Let's start by requiring `ohm` and `ohm/json`.
 require "ohm"
-require "json"
+require "ohm/json"
 
-# Here we define our `Post` model with just a single `attribute` called
-# `title`.
-#
-# We also define a validation, asserting the presence of the `title`.
+# Here we define our `Post` model with just a single `attribute` called `title`.
 class Post < Ohm::Model
   attribute :title
-
-  def validate
-    assert_present :title
-  end
 end
 
-# Now let's load the test framework `cutest` to verify our code. We
-# also call `Ohm.flush` for each test run.
+# Now let's load the test framework `cutest` to test our code.
 require "cutest"
 
+# We also call `Ohm.flush` for each test run.
 prepare { Ohm.flush }
 
 # When we successfully create a `Post`, we can see that it returns
 # only the *id* and its value in the hash.
 test "hash representation when created" do
-  post = Post.create(:title => "my post")
+  post = Post.create(title: "my post")
 
-  assert({ :id => "1" } == post.to_hash)
+  assert_equal Hash[id: post.id], post.to_hash
 end
 
 # The JSON representation is actually just `post.to_hash.to_json`, so the
 # same result, only in JSON, is returned.
 test "json representation when created" do
-  post = Post.create(:title => "my post")
-
-  assert("{\"id\":\"1\"}" == post.to_json)
-end
+  post = Post.create(title: "my post")
 
-# Let's try and do the opposite now -- that is, purposely try and create
-# an invalid `Post`. We can see that it returns the `errors` of the
-# `Post`, because we added an `assert_present :title` in our code above.
-test "hash representation when validation failed" do
-  post = Post.create
-
-  assert({ :errors => [[:title, :not_present]]} == post.to_hash)
-end
-
-# As is the case for a valid record, the JSON representation is
-# still equivalent to `post.to_hash.to_json`.
-test "json representation when validation failed" do
-  post = Post.create
-
-  assert("{\"errors\":[[\"title\",\"not_present\"]]}" == post.to_json)
+  assert_equal "{\"id\":\"#{post.id}\"}", post.to_json
 end
 
 #### Whitelisted approach
 
-# Unlike in other frameworks which dumps out all attributes by default,
+# Unlike other frameworks which dumps out all attributes by default,
 # `Ohm` favors a whitelisted approach where you have to explicitly
 # declare which attributes you want.
 #
-# By default, only `:id` and `:errors` will be available, depending if
-# it was successfully saved or if there were validation errors.
+# By default, only `:id` will be available if the model is persisted.
 
 # Let's re-open our Post class, and add a `to_hash` method.
 class Post
   def to_hash
-    super.merge(:title => title)
+    super.merge(title: title)
   end
 end
 
 # Now, let's test that the title is in fact part of `to_hash`.
 test "customized to_hash" do
-  post = Post.create(:title => "Override FTW?")
-  assert({ :id => "1", :title => "Override FTW?" } == post.to_hash)
+  post = Post.create(title: "Override FTW?")
+
+  assert_equal Hash[id: post.id, title: post.title], post.to_hash
 end
 
 #### Conclusion

data/lib/ohm.rb

@@ -4,7 +4,7 @@ require "msgpack"
 require "nido"
 require "redic"
 require "securerandom"
-require "ohm/command"
+require_relative "ohm/command"
 
 module Ohm
   LUA_CACHE   = Hash.new { |h, k| h[k] = Hash.new }
@@ -134,11 +134,15 @@ module Ohm
 
     # Wraps the whole pipelining functionality.
     def fetch(ids)
-      ids.each do |id|
-        redis.queue("HGETALL", namespace[id])
-      end
+      data = nil
+
+      model.synchronize do
+        ids.each do |id|
+          redis.queue("HGETALL", namespace[id])
+        end
 
-      data = redis.commit
+        data = redis.commit
+      end
 
       return [] if data.nil?
 
@@ -178,6 +182,34 @@ module Ohm
       model[redis.call("LINDEX", key, -1)]
     end
 
+    # Returns an array of elements from the list using LRANGE.
+    # #range receives 2 integers, start and stop
+    #
+    # Example:
+    #
+    #   class Comment < Ohm::Model
+    #   end
+    #
+    #   class Post < Ohm::Model
+    #     list :comments, :Comment
+    #   end
+    #
+    #   c1 = Comment.create
+    #   c2 = Comment.create
+    #   c3 = Comment.create
+    #
+    #   post = Post.create
+    #
+    #   post.comments.push(c1)
+    #   post.comments.push(c2)
+    #   post.comments.push(c3)
+    #
+    #   [c1, c2] == post.comments.range(0, 1)
+    #   # => true
+    def range(start, stop)
+      fetch(redis.call("LRANGE", key, start, stop))
+    end
+
     # Checks if the model is part of this List.
     #
     # An important thing to note is that this method loads all of the
@@ -186,7 +218,7 @@ module Ohm
     #
     # You may want to avoid doing this if your list has say, 10K entries.
     def include?(model)
-      ids.include?(model.id.to_s)
+      ids.include?(model.id)
     end
 
     # Replace all the existing elements of a list with a different
@@ -206,13 +238,15 @@ module Ohm
     #   # => false
     #
     def replace(models)
-      ids = models.map { |model| model.id }
-
-      redis.queue("MULTI")
-      redis.queue("DEL", key)
-      ids.each { |id| redis.queue("RPUSH", key, id) }
-      redis.queue("EXEC")
-      redis.commit
+      ids = models.map(&:id)
+
+      model.synchronize do
+        redis.queue("MULTI")
+        redis.queue("DEL", key)
+        ids.each { |id| redis.queue("RPUSH", key, id) }
+        redis.queue("EXEC")
+        redis.commit
+      end
     end
 
     # Pushes the model to the _end_ of the list using RPUSH.
@@ -236,7 +270,7 @@ module Ohm
     #   end
     #
     #   class Post < Ohm::Model
-    #     list :comments, Comment
+    #     list :comments, :Comment
     #   end
     #
     #   p = Post.create
@@ -256,11 +290,32 @@ module Ohm
       redis.call("LREM", key, 0, model.id)
     end
 
-  private
+    # Returns an array with all the ID's of the list.
+    #
+    #   class Comment < Ohm::Model
+    #   end
+    #
+    #   class Post < Ohm::Model
+    #     list :comments, :Comment
+    #   end
+    #
+    #   post = Post.create
+    #   post.comments.push(Comment.create)
+    #   post.comments.push(Comment.create)
+    #   post.comments.push(Comment.create)
+    #
+    #   post.comments.map(&:id)
+    #   # => ["1", "2", "3"]
+    #
+    #   post.comments.ids
+    #   # => ["1", "2", "3"]
+    #
     def ids
       redis.call("LRANGE", key, 0, -1)
     end
 
+  private
+
     def redis
       model.redis
     end
@@ -270,9 +325,8 @@ module Ohm
   class BasicSet
     include Collection
 
-    # Allows you to sort by any field in your model.
-    #
-    # Example:
+    # Allows you to sort by any attribute in the hash, this doesn't include
+    # the +id+. If you want to sort by ID, use #sort.
     #
     #   class User < Ohm::Model
     #     attribute :name
@@ -365,7 +419,27 @@ module Ohm
       end
     end
 
-    # Grab all the elements of this set using SMEMBERS.
+    # Returns an array with all the ID's of the set.
+    #
+    #   class Post < Ohm::Model
+    #   end
+    #
+    #   class User < Ohm::Model
+    #     attribute :name
+    #     index :name
+    #
+    #     set :posts, :Post
+    #   end
+    #
+    #   User.create(name: "John")
+    #   User.create(name: "Jane")
+    #
+    #   User.all.ids
+    #   # => ["1", "2"]
+    #
+    #   User.find(name: "John").union(name: "Jane").ids
+    #   # => ["1", "2"]
+    #
     def ids
       execute { |key| redis.call("SMEMBERS", key) }
     end
@@ -524,13 +598,15 @@ module Ohm
     #   # => false
     #
     def replace(models)
-      ids = models.map { |model| model.id }
-
-      redis.queue("MULTI")
-      redis.queue("DEL", key)
-      ids.each { |id| redis.queue("SADD", key, id) }
-      redis.queue("EXEC")
-      redis.commit
+      ids = models.map(&:id)
+
+      model.synchronize do
+        redis.queue("MULTI")
+        redis.queue("DEL", key)
+        ids.each { |id| redis.queue("SADD", key, id) }
+        redis.queue("EXEC")
+        redis.commit
+      end
     end
   end
 
@@ -695,7 +771,15 @@ module Ohm
     end
 
     def self.redis
-      @redis ||= Redic.new(Ohm.redis.url)
+      defined?(@redis) ? @redis : Ohm.redis
+    end
+
+    def self.mutex
+      @mutex ||= Mutex.new
+    end
+
+    def self.synchronize(&block)
+      mutex.synchronize(&block)
     end
 
     # Returns the namespace for all the keys generated using this model.
@@ -703,6 +787,7 @@ module Ohm
     # Example:
     #
     #   class User < Ohm::Model
+    #   end
     #
     #   User.key == "User"
     #   User.key.kind_of?(String)

data/lib/ohm/lua/save.lua

@@ -122,4 +122,4 @@ index(model, indices)
 remove_uniques(model, uniques)
 unique(model, uniques)
 
-return model.id
+return tostring(model.id)

data/ohm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ohm"
-  s.version = "2.0.0.rc1"
+  s.version = "2.0.0.rc2"
   s.summary = %{Object-hash mapping library for Redis.}
   s.description = %Q{Ohm is a library that allows to store an object in Redis, a persistent key-value database. It has very good performance.}
   s.authors = ["Michel Martens", "Damian Janowski", "Cyril David"]

data/test/association.rb

@@ -1,4 +1,4 @@
-require File.expand_path("./helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class User < Ohm::Model
   collection :posts, :Post

data/test/connection.rb

@@ -1,9 +1,10 @@
-# encoding: UTF-8
+require_relative 'helper'
 
-require File.expand_path("./helper", File.dirname(__FILE__))
+test "model inherits Ohm.redis connection by default" do
+  class C < Ohm::Model
+  end
 
-unless defined?(Redic::CannotConnectError)
-  Redic::CannotConnectError = Errno::ECONNREFUSED
+  assert_equal C.redis.url, Ohm.redis.url
 end
 
 test "model can define its own connection" do
@@ -13,10 +14,3 @@ test "model can define its own connection" do
 
   assert B.redis.url != Ohm.redis.url
 end
-
-test "model inherits Ohm.redis connection by default" do
-  class C < Ohm::Model
-  end
-
-  assert_equal C.redis.url, Ohm.redis.url
-end

data/test/core.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("./helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class Event < Ohm::Model
   attribute :name
@@ -8,19 +6,19 @@ class Event < Ohm::Model
 end
 
 test "assign attributes from the hash" do
-  event = Event.new(:name => "Ruby Tuesday")
+  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")
+  event1 = Event.create(name: "Ruby Tuesday")
+  event2 = Event.create(name: "Ruby Meetup")
 
-  assert_equal "1", event1.id.to_s
-  assert_equal "2", event2.id.to_s
+  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
+ event = Event.create(name: "32° Kisei-sen")
+ assert_equal "32° Kisei-sen", Event[event.id].name
 end

data/test/counters.rb

@@ -1,4 +1,4 @@
-require File.expand_path("./helper", File.dirname(__FILE__))
+require_relative "helper"
 
 $VERBOSE = false
 

data/test/enumerable.rb

@@ -1,4 +1,4 @@
-require File.expand_path("./helper", File.dirname(__FILE__))
+require_relative "helper"
 
 scope do
   class Contact < Ohm::Model
@@ -32,7 +32,7 @@ scope do
 
   test "select" do |john, jane|
     assert_equal 2, Contact.all.count
-    assert_equal [john], Contact.all.select { |c| c.id.to_s == john.id.to_s }
+    assert_equal [john], Contact.all.select { |c| c.id == john.id }
   end
 end
 

data/test/filtering.rb

@@ -1,4 +1,4 @@
-require File.expand_path("./helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class User < Ohm::Model
   attribute :fname
@@ -165,7 +165,7 @@ scope do
 
     assert_equal 1, res.size
     assert res.map(&:mood).include?("sad")
-    assert res.map(&:book_id).include?(book2.id.to_s)
+    assert res.map(&:book_id).include?(book2.id)
   end
 
   test "@myobie usecase" do |book1, book2|

data/test/hash_key.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("./helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class Tag < Ohm::Model
   attribute :name

data/test/helper.rb

@@ -1,7 +1,3 @@
-# encoding: UTF-8
-
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
-
 begin
   require "ruby-debug"
 rescue LoadError
@@ -18,7 +14,7 @@ end unless defined?(silence_warnings)
 
 $VERBOSE = true
 
-require "ohm"
+require_relative "../lib/ohm"
 
 Ohm.redis = Redic.new("redis://127.0.0.1:6379")
 

data/test/indices.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("./helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class User < Ohm::Model
   attribute :email

data/test/json.rb

@@ -1,6 +1,5 @@
 require_relative 'helper'
-
-require "ohm/json"
+require_relative "../lib/ohm/json"
 
 class Venue < Ohm::Model
   attribute :name

data/test/list.rb

@@ -1,4 +1,4 @@
-require File.expand_path("./helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class Post < Ohm::Model
   list :comments, :Comment
@@ -67,3 +67,17 @@ test "deleting main model cleans up the collection" do |p, _, _, _|
 
   assert_equal 0, Ohm.redis.call("EXISTS", p.key[:comments])
 end
+
+test "#ids returns an array with the ids" do |post, *comments|
+  assert_equal comments.map(&:id), post.comments.ids
+end
+
+test "range" do |p, c1, c2, c3|
+  assert_equal 3, p.comments.range(0, 100).size
+  assert_equal [c1, c2, c3], p.comments.range(0, 2)
+  assert_equal [c1, c2], p.comments.range(0, 1)
+  assert_equal [c2, c3], p.comments.range(1, 2)
+  assert_equal [c1, c2, c3], p.comments.range(0, -1)
+  assert_equal [c1, c2], p.comments.range(0, -2)
+  assert_equal [c2, c3], p.comments.range(1, -1)
+end

data/test/model.rb

@@ -1,7 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("./helper", File.dirname(__FILE__))
-
+require_relative "helper"
 require "ostruct"
 
 class Post < Ohm::Model
@@ -113,11 +110,11 @@ test "assign attributes from the hash" do
 end
 
 test "assign an ID and save the object" do
-  event1 = Event.create(:name => "Ruby Tuesday")
-  event2 = Event.create(:name => "Ruby Meetup")
+  event1 = Event.create(name: "Ruby Tuesday")
+  event2 = Event.create(name: "Ruby Meetup")
 
-  assert 1 == event1.id
-  assert 2 == event2.id
+  assert_equal "1", event1.id
+  assert_equal "2", event2.id
 end
 
 test "updates attributes" do
@@ -138,14 +135,6 @@ test "delete the attribute if set to nil" do
   assert_equal nil, Meetup[event.id].location
 end
 
-# FIXME: Failing test, as Meetup[event.id].location is returning "".
-# test "delete the attribute if set to an empty string" do
-#   event = Meetup.create(:name => "Ruby Tuesday", :location => "Los Angeles")
-#   assert "Los Angeles" == Meetup[event.id].location
-#   assert event.update(:location => "")
-#   assert_equal nil, Meetup[event.id].location
-# end
-
 test "not raise if an attribute is redefined" do
   class RedefinedModel < Ohm::Model
     attribute :name
@@ -267,8 +256,8 @@ test "assign a new id to the event" do
   assert !event1.new?
   assert !event2.new?
 
-  assert 1 == event1.id
-  assert 2 == event2.id
+  assert_equal "1", event1.id
+  assert_equal "2", event2.id
 end
 
 # Saving a model
@@ -703,6 +692,8 @@ end
 # Models connected to different databases
 class ::Car < Ohm::Model
   attribute :name
+
+  self.redis = Redic.new
 end
 
 class ::Make < Ohm::Model
@@ -711,7 +702,6 @@ end
 
 setup do
   Car.redis.call("SELECT", 15)
-  Car.redis.call("FLUSHDB")
 end
 
 test "save to the selected database" do

data/test/set.rb

@@ -4,6 +4,10 @@ class Post < Ohm::Model
 end
 
 class User < Ohm::Model
+  attribute :name
+
+  index :name
+
   set :posts, :Post
 end
 
@@ -18,3 +22,16 @@ test '#exists? returns true if the given id is included in the set' do
 
   assert user.posts.exists?(post.id)
 end
+
+test "#ids returns an array with the ids" do
+  user_ids = [
+    User.create(name: "John").id,
+    User.create(name: "Jane").id
+  ]
+
+  assert_equal user_ids, User.all.ids
+
+  result = User.find(name: "John").union(name: "Jane")
+
+  assert_equal user_ids, result.ids
+end

data/test/thread_safety.rb

@@ -0,0 +1,67 @@
+require_relative "helper"
+
+class Post < Ohm::Model; end
+class Role < Ohm::Model; end
+
+class User < Ohm::Model
+  list :posts, :Post
+  set  :roles, :Role
+end
+
+setup do
+  User.create
+end
+
+test "list#replace" do |user|
+  Post.mutex.lock
+
+  thread = Thread.new { user.posts.replace([Post.create]) }
+
+  sleep 0.1
+
+  assert_equal true, thread.alive?
+
+  Post.mutex.unlock
+
+  sleep 0.1
+
+  assert_equal false, thread.alive?
+
+  thread.join
+end
+
+test "set#replace" do |user|
+  Role.mutex.lock
+
+  thread = Thread.new { user.roles.replace([Role.create]) }
+
+  sleep 0.1
+
+  assert_equal true, thread.alive?
+
+  Role.mutex.unlock
+
+  sleep 0.1
+
+  assert_equal false, thread.alive?
+
+  thread.join
+end
+
+test "collection#fetch" do
+  User.mutex.lock
+
+  thread = Thread.new { User.all.to_a }
+
+  sleep 0.1
+
+  assert_equal true, thread.alive?
+
+  User.mutex.unlock
+
+  sleep 0.1
+
+  assert_equal false, thread.alive?
+
+  thread.join
+end

data/test/uniques.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("./helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class User < Ohm::Model
   attribute :email

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Michel Martens
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic
@@ -80,7 +80,7 @@ extra_rdoc_files: []
 files:
 - .gems
 - .gitignore
-- CHANGELOG
+- CHANGELOG.md
 - LICENSE
 - README.md
 - Rakefile
@@ -113,12 +113,12 @@ files:
 - test/hash_key.rb
 - test/helper.rb
 - test/indices.rb
-- test/issue-52.rb
 - test/json.rb
 - test/list.rb
 - test/model.rb
 - test/set.rb
 - test/test.conf
+- test/thread_safety.rb
 - test/to_hash.rb
 - test/uniques.rb
 homepage: http://soveran.github.io/ohm/

data/CHANGELOG

@@ -1,112 +0,0 @@
-(unreleased)
-
-- Include Ohm::BasicSet#exists? in the public API. This makes possible
-	to check if an id is included in a set. Check Ohm::BasicSet#exists?
-	documentation for more details.
-
-- Change Ohm::MultiSet#except to union keys instead of intersect them
-  when passing an array.
-
-      class User < Ohm::Model
-        attribute :name
-      end
-
-      john = User.create(:name => "John")
-      jane = User.create(:name => "Jane")
-
-      res = User.all.except(:name => [john.name, jane.name])
-
-      # before
-      res.size # => 2
-
-      # now
-      res.size # => 0
-
-- Move ID generation to Lua. With this change, it's no longer possible
-	to generate custom ids. All ids are autoincremented.
-
-- Ohm::Model#reference accepts strings as model references. For example:
-
-      class Bar < Ohm::Model
-        reference :foo, "SomeNamespace::Foo"
-      end
-
-- Nest dependency has been removed. Now, Ohm uses Nido
-	(https://github.com/soveran/nido) to generate the keys that hold
-	the data.
-
-- Scrivener dependency has been removed.
-
-- Ohm no longer supports model validations and favors filter validation
-	on the boundary layer. Check Scrivener project
-	(https://github.com/soveran/scrivener) for more information.
-
-- Redis dependency has been removed. Now, Ohm uses Redic
-	(https://github.com/amakawa/redic), a lightweight Redis client.
-	Redic uses the hiredis gem for the connection and for parsing
-	the replies. Check Redic's README for more details.
-
-- Ohm::Model#transaction has been removed.
-
-- Ohm::Transaction has been removed.
-
-1.3.2
-
-- Fetching a batch of objects is now done in batches of 1000 objects at
-  a time. If you are iterating over large collections, this change should
-  provide a significant performance boost both in used memory and total
-  execution time.
-- MutableSet#<< is now an alias for #add.
-
-1.3.1
-
-- Improve memory consumption when indexing persisted attributes.
-
-  No migration is needed and old indices will be cleaned up as you save
-  instances.
-
-1.3.0
-
-- Add Model.attributes.
-
-1.2.0
-
-- Enumerable fix.
-- Merge Ohm::PipelinedFetch into Ohm::Collection.
-- Fix Set, MultiSet, and List enumerable behavior.
-- Change dependencies to use latest cutest.
-
-1.1.0
-
-- Compatible with redis-rb 3.
-
-1.0.0
-
-- Fetching a batch of objects is now done through one pipeline, effectively
-  reducing the IO to just 2 operations (one for SMEMBERS / LRANGE, one for
-  the actual HGET of all the individual HASHes.)
-- write_remote / read_remote have been replaced with set / get respectively.
-- Ohm::Model.unique has been added.
-- Ohm::Model::Set has been renamed to Ohm::Set
-- Ohm::Model::List has been renamed to Ohm::List
-- Ohm::Model::Collection is gone.
-- Ohm::Validations is gone. Ohm now uses Scrivener::Validations.
-- Ohm::Key is gone. Ohm now uses Nest directly.
-- No more concept of volatile keys.
-- Ohm::Model::Wrapper is gone.
-- Use Symbols for constants instead of relying on Ohm::Model.const_missing.
-- #sort / #sort_by now uses `limit` as it's used in redis-rb, e.g. you
-  have to pass in an array like so: sort(limit: [0, 1]).
-- Set / List have been trimmed to contain only the minimum number
-  of necessary methods.
-- You can no longer mutate a collection / set as before, e.g. doing
-  User.find(...).add(User[1]) will throw an error.
-- The #union operation has been added. You can now chain it with your filters.
-- Temporary keys when doing finds are now automatically cleaned up.
-- Counters are now stored in their own key instead, i.e. in
-  User:<id>:counters.
-- JSON support has to be explicitly required by doing `require
-  "ohm/json"`.
-- All save / delete / update operations are now done using
-  transactions (see http://redis.io/topics/transactions).
-- All indices are now stored without converting the values to base64.

data/test/issue-52.rb

@@ -1,34 +0,0 @@
-require_relative "helper"
-
-class Model < Ohm::Model
-  attribute :hash
-  index :hash
-
-  attribute :data
-end
-
-test do
-  50.times do |i|
-    Ohm.flush
-
-    Model.create(:hash => "123")
-
-    assert_equal 1, Ohm.redis.call("SCARD", "Model:all")
-
-    Thread.new do
-      a = Model.find(:hash => "123").first
-      a.update(:data => "2")
-    end
-
-    sleep 0.01
-
-    b = Model.find(:hash => "123").first
-
-    if Ohm.redis.call("SCARD", "Model:indices:hash:123") != 1
-      flunk("Failed at iteration %d" % i)
-    end
-
-    assert ! b.nil?
-  end
-end
-