ohm 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65d8dd7c7555b0a26c8f4eb8845c08354b174acc
-  data.tar.gz: b12b6410534f2031ae211eff20604e9ac6da4473
+  metadata.gz: c14f3b614b87065690df7178044108141a7d056e
+  data.tar.gz: dc6fcb2dfb315d0802828269c5b412ce623060b2
 SHA512:
-  metadata.gz: 322e82928c55dc4fbaa9a370220c8e7c0bc382ef4a709fd96456add67a4b26f56617f7f54af4c5a3c14af59fc27fe50fa0ad6339db9246be7c1bee87fa743ddd
-  data.tar.gz: dbf21bd5c4984b2d6cbbb8c379aa88696c0a2a154d1fcf5cccfad35ca2e24856d223bb6e3b4642c556b163e82ae344e1cf9d45e2fcfe5b625aca6ef8b5c36d3f
+  metadata.gz: dd5d4210c0bdba7c564eda8af923d48034452f7fe0ff3b04ff828cc06cb13f5ce3f541161b67fec2404a908facd9495843c8532f929cfb4d1a911f15ac2580fa
+  data.tar.gz: 777c1de3589c60f6d32ce53ab464fc0a952df4f35593119bc01a1d5add324acfde7913348c3a540ab8cb2e4991641dd74b269f30c80f1ed1f888be5a6abeeb82

data/.gems

@@ -1,4 +1,4 @@
 nest -v 3.0.0
 redic -v 1.5.0
-stal -v 0.1.0
 cutest -v 1.2.3
+stal -v 0.3.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.1.1
+
+- Serialize keys as strings when using JSON.
+
+- Reset attributes when calling `load!`.
+
 ## 3.1.0
 
 - Use Nest instead of Nido

data/lib/ohm.rb

@@ -1108,9 +1108,7 @@ module Ohm
     #   u = User.new(:name => "John")
     #
     def initialize(atts = {})
-      @attributes = {}
-      @_memo = {}
-      update_attributes(atts)
+      reload_attributes(atts)
     end
 
     # Access the ID used to store this model. The ID is used together
@@ -1143,10 +1141,17 @@ module Ohm
     # Preload all the attributes of this model from Redis. Used
     # internally by `Model::[]`.
     def load!
-      update_attributes(Utils.dict(key.call("HGETALL"))) unless new?
+      reload_attributes(Utils.dict(key.call("HGETALL"))) unless new?
       return self
     end
 
+    # Reset the attributes table and load the passed values.
+    def reload_attributes(atts = {})
+      @attributes = {}
+      @_memo = {}
+      update_attributes(atts)
+    end
+
     # Read an attribute remotely from Redis. Useful if you want to get
     # the most recent value of the attribute and not rely on locally
     # cached value.
@@ -1375,7 +1380,7 @@ module Ohm
       script(LUA_DELETE, 0,
         { "name" => model.name,
           "id" => id,
-          "key" => key
+          "key" => key.to_s
         }.to_json,
         uniques.to_json,
         model.tracked.to_json

data/ohm.gemspec

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

data/test/model.rb

@@ -123,6 +123,26 @@ test "updates attributes" do
   assert "Ruby Meetup" == event.name
 end
 
+test "reload attributes" do
+  event1 = Meetup.create(:name => "Foo", :location => "Bar")
+  event2 = Meetup[event1.id]
+
+  assert_equal "Foo", event1.name
+  assert_equal "Bar", event1.location
+
+  assert_equal "Foo", event2.name
+  assert_equal "Bar", event2.location
+
+  event1.update(:name => nil)
+  event2.load!
+
+  assert_equal nil, event1.name
+  assert_equal "Bar", event1.location
+
+  assert_equal nil, event2.name
+  assert_equal "Bar", event2.location
+end
+
 test "save the attributes in UTF8" do
  event = Meetup.create(:name => "32° Kisei-sen")
  assert "32° Kisei-sen" == Meetup[event.id].name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Michel Martens
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-03 00:00:00.000000000 Z
+date: 2016-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic