ohm 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a988b7d453e4d23906662c7fd1d8d993634892
-  data.tar.gz: 4673e7432655aeb8b9061d184ff912cb35ac42d3
+  metadata.gz: 6d404b17a73aaa3f8e44ef1973cc2c2281bfdeb7
+  data.tar.gz: 5e59ffee49a2bee96c3417cc0763f31552bf06ff
 SHA512:
-  metadata.gz: b315cdda1f6011e68b2c1f194f229fc1b757d1cf8b40548df5852f8f5c96b8fe0a7dfb20c43ff8614f9bdd0905b367bab098e6ba209c389ce925859696b09dec
-  data.tar.gz: a64327f9085061116c85d50d63d3719d47b3521833bc72374fa3094444ca6b7d9f4ee1a747497b27b09d4c1bf02b9b6ac54075c0f5b230f3d6c6e4ae0a3cf233
+  metadata.gz: 849b95d5ebfc61b136be8351b6c0887e6c2961c78bb086204c39a1110524efd02fe94d48c5ed05c123c326567aa70ffbb2292e70a10d9f875307dd33e82f72e9
+  data.tar.gz: db2213eff5791aa09f02e2d79c9059d9ed4d3619f6206257bf3a69c227a2481361f179fd620ec6b07d4c21f7cb89965d6e52e7b90ab08494ef8ed067e637aa31

data/.gems

@@ -1,4 +1,4 @@
-cutest -v 1.2.0
+cutest -v 1.2.1
 msgpack -v 0.5.8
 nido -v 0.0.1
-redic -v 1.0.1
+redic -v 1.1.0

data/README.md

@@ -25,6 +25,7 @@ These are libraries in other languages that were inspired by Ohm.
 * [Lohm](https://github.com/slact/lua-ohm) for Lua, created by slact
 * [Nohm](https://github.com/maritz/nohm) for Node.js, created by maritz
 * [Redisco](https://github.com/iamteem/redisco) for Python, created by iamteem
+* [redis3m](https://github.com/luca3m/redis3m) for C++, created by luca3m
 
 Articles and Presentations
 --------------------------

data/examples/philosophy.rb

@@ -8,7 +8,7 @@
 #
 # Beyond that, Ohm doesn't try to hide Redis, but rather exposes it in
 # a simple way, through key hierarchies provided by the library
-# [Nest](http://github.com/soveran/nest).
+# [Nido](http://github.com/soveran/nido).
 
 # Let's require `Ohm`. We also require `Ohm::Contrib` so we can make
 # use of its module `Ohm::Callbacks`.
@@ -25,34 +25,27 @@ class Post < Ohm::Model
   attribute :title
   index :title
 
-  list :comments, Comment
+  list :comments, :Comment
 
-  # This is one example of using the underlying library `Nest` directly.
-  # As you can see, we can easily drop down to using raw *Redis* commands,
-  # in this case we use
-  # [ZREVRANGE](http://code.google.com/p/redis/wiki/ZrangeCommand).
-  #
-  # *Note:* Since `Ohm::Model` defines a `to_proc`, we can use the `&` syntax
-  # together with `map` to make our code a little more terse.
+  # This is one example of using Redic simple API and
+  # the underlying library `Nido`.
   def self.latest
-    key[:latest].zrevrange(0, -1).map(&Post)
+    fetch(redis.call("ZRANGE", key[:latest], 0, -1))
   end
 
+  protected
+
   # Here we just quickly push this instance of `Post` to our `latest`
   # *SORTED SET*. We use the current time as the score.
-protected
   def after_save
-    self.class.key[:latest].zadd(Time.now.to_i, id)
+    redis.call("ZADD", model.key[:latest], Time.now.to_i, id)
   end
 
   # Since we add every `Post` to our *SORTED SET*, we have to make sure that
   # we removed it from our `latest` *SORTED SET* as soon as we delete a
   # `Post`.
-  #
-  # In this case we use the raw *Redis* command
-  # [ZREM](http://code.google.com/p/redis/wiki/ZremCommand).
   def after_delete
-    self.class.key[:latest].zrem(id)
+    redis.call("ZREM", model.key[:latest], id)
   end
 end
 
@@ -68,32 +61,35 @@ require "cutest"
 
 # To make it simple, we also ensure that every test run has a clean
 # *Redis* instance.
-prepare { Ohm.flush }
+prepare do
+  Ohm.flush
+end
 
-# Now let's create Post. `Cutest` by default yields the return value of the
+# Now let's create a post. `Cutest` by default yields the return value of the
 # block to each and every one of the test blocks.
-setup { Post.create }
+setup do
+  Post.create
+end
 
 # We then verify the behavior for our `Post:latest` ZSET. Our created
 # post should automatically be part of `Post:latest`.
-test "created post is inserted into latest" do |p|
-  assert [p.id] == Post.key[:latest].zrange(0, -1)
+test "created post is inserted into latest" do |post|
+  assert [post.id] == Post.latest.map(&:id)
 end
 
 # And it should automatically be removed from it as soon as we delete our
 # `Post`.
-test "deleting the created post removes it from latest" do |p|
-  p.delete
+test "deleting the created post removes it from latest" do |post|
+  post.delete
 
-  assert Post.key[:latest].zrange(0, -1).empty?
+  assert Post.latest.empty?
 end
 
 # You might be curious what happens when we do `Post.all`. The test here
 # demonstrates more or less what's happening when you do that.
-test "querying Post:all using raw Redis commands" do |p|
-  assert [p.id] == Post.key[:all].smembers
-
-  assert [p] == Post.key[:all].smembers.map(&Post)
+test "querying Post:all using raw Redis commands" do |post|
+  assert [post.id] == Post.all.ids
+  assert [post] == Post.all.to_a
 end
 
 #### Understanding `post.comments`.
@@ -102,48 +98,40 @@ end
 # `post.comments` object.
 
 # Getting the current size of our comments is just a wrapper for
-# [LLEN](http://code.google.com/p/redis/wiki/LlenCommand).
-test "checking the number of comments for a given post" do |p|
-  assert 0 == p.comments.key.llen
-  assert 0 == p.comments.size
+# [LLEN](http://redis.io/commands/LLEN).
+test "checking the number of comments for a given post" do |post|
+  assert_equal 0, post.comments.size
+  assert_equal 0, Post.redis.call("LLEN", post.comments.key)
 end
 
 # Also, pushing a comment to our `post.comments` object is equivalent
-# to doing an [RPUSH](http://code.google.com/p/redis/wiki/RpushCommand)
-# of its `id`.
-test "pushing a Comment manually and checking for its presence" do |p|
+# to doing an [RPUSH](http://redis.io/commands/RPUSH) of its `id`.
+test "pushing a comment manually and checking for its presence" do |post|
   comment = Comment.create
 
-  p.comments.key.rpush(comment.id)
-  assert [comment.id] == p.comments.key.lrange(0, -1)
+  Post.redis.call("RPUSH", post.comments.key, comment.id)
+  assert_equal comment, post.comments.last
+
+  post.comments.push(comment)
+  assert_equal comment, post.comments.last
 end
 
-# Now for some interesting judo
+# Now for some interesting judo.
 test "now what if we want to find all Ohm or Redis posts" do
-  ohm = Post.create(:title => "Ohm")
-  redis = Post.create(:title => "Redis")
-
-  # Let's first choose an arbitrary key name to hold our `Set`.
-  ohm_redis = Post.key.volatile["ohm-redis"]
-
-  # A *volatile* key just simply means it will be prefixed with a `~`.
-  assert "~:Post:ohm-redis" == ohm_redis
+  ohm = Post.create(title: "Ohm")
+  redis = Post.create(title: "Redis")
 
   # Finding all *Ohm* or *Redis* posts now will just be a call to
-  # [SUNIONSTORE](http://code.google.com/p/redis/wiki/SunionstoreCommand)
-  # on our *volatile* `ohm-redis` key.
-  ohm_redis.sunionstore(
-    Post.index_key_for(:title, "Ohm"),
-    Post.index_key_for(:title, "Redis")
-  )
+  # [SUNIONSTORE](http://redis.io/commands/UNIONSTORE).
+  result = Post.find(title: "Ohm").union(title: "Redis")
 
   # And voila, they have been found!
-  assert [ohm.id, redis.id] == ohm_redis.smembers.sort
+  assert_equal [ohm, redis], result.to_a
 end
 
 #### The command reference is your friend
 
 # If you invest a little time reading through all the different
-# [Redis commands](http://code.google.com/p/redis/wiki/CommandReference),
-# I'm pretty sure you will enjoy your experience hacking with Ohm, Nest and
-# Redis a lot more.
+# [Redis commands](http://redis.io/commands).
+# I'm pretty sure you will enjoy your experience hacking with Ohm, Nido,
+# Redic and Redis a lot more.

data/lib/ohm.rb

@@ -611,7 +611,7 @@ module Ohm
   end
 
   # Anytime you filter a set with more than one requirement, you
-  # internally use a `MultiSet`. `MutiSet` is a bit slower than just
+  # internally use a `MultiSet`. `MultiSet` is a bit slower than just
   # a `Set` because it has to `SINTERSTORE` all the keys prior to
   # retrieving the members, size, etc.
   #
@@ -775,7 +775,7 @@ module Ohm
     end
 
     def self.mutex
-      @mutex ||= Mutex.new
+      @@mutex ||= Mutex.new
     end
 
     def self.synchronize(&block)
@@ -1074,23 +1074,36 @@ module Ohm
     # persisted attributes. All attributes are stored on the Redis
     # hash.
     #
-    # Example:
     #   class User < Ohm::Model
     #     attribute :name
     #   end
     #
-    #   # It's the same as:
+    #   user = User.new(name: "John")
+    #   user.name
+    #   # => "John"
     #
-    #   class User < Ohm::Model
-    #     def name
-    #       @attributes[:name]
-    #     end
+    #   user.name = "Jane"
+    #   user.name
+    #   # => "Jane"
     #
-    #     def name=(name)
-    #       @attributes[:name] = name
-    #     end
+    # A +lambda+ can be passed as a second parameter to add
+    # typecasting support to the attribute.
+    #
+    #   class User < Ohm::Model
+    #     attribute :age, ->(x) { x.to_i }
     #   end
     #
+    #   user = User.new(age: 100)
+    #
+    #   user.age
+    #   # => 100
+    #
+    #   user.age.kind_of?(Integer)
+    #   # => true
+    #
+    # Check http://rubydoc.info/github/cyx/ohm-contrib#Ohm__DataTypes
+    # to see more examples about the typecasting feature.
+    #
     def self.attribute(name, cast = nil)
       attributes << name unless attributes.include?(name)
 

data/ohm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ohm"
-  s.version = "2.0.0"
+  s.version = "2.0.1"
   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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Michel Martens
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic
@@ -106,7 +106,6 @@ files:
 - test/connection.rb
 - test/core.rb
 - test/counters.rb
-- test/db/.gitignore
 - test/enumerable.rb
 - test/filtering.rb
 - test/hash_key.rb
@@ -116,7 +115,6 @@ files:
 - test/list.rb
 - test/model.rb
 - test/set.rb
-- test/test.conf
 - test/thread_safety.rb
 - test/to_hash.rb
 - test/uniques.rb

data/test/test.conf

@@ -1,8 +0,0 @@
-dir ./test/db
-pidfile ./redis.pid
-port 6379
-timeout 300
-loglevel debug
-logfile stdout
-databases 16
-daemonize yes