norton 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dc27425e5727f91cb894d4b3604b5eaa35b9031
-  data.tar.gz: f504cab091855d1ebdef3d5462563c36bfe38c54
+  metadata.gz: 45ea8d2f8971be12351a0cd129ed8a851f2a7823
+  data.tar.gz: bd77674e841f9dd8c8e2603a46b75a4cf03ed281
 SHA512:
-  metadata.gz: c417f7fb3f1f0329ab01bd9e794abe5be6924ef09987de3ee7e8b3496e7937fd215f234d2d0bcee27bb562eaebb1549cb904145f39ff881fdccad1edcdbe266b
-  data.tar.gz: 4797d39f200cde4d2bf5947fdc96b5cc6ed7723acc0ea10a817668a7912738b0dc852df5091c3898c54d9a636d2d891533943bff1adc92201944feb3eb090da4
+  metadata.gz: 1c4ca36139885b6ea121edc8c3b9ceb81ace3f9abe2c85e01f17c208f280748ef91cfc27b7f7d473e1fd4ca03cd79566193cf99e5e0b20de2273494212dce75f
+  data.tar.gz: 8e9c450ff7fc10a7d9c8007645ab60640f0be59549c2d952bd286e9babdfe023d3ad076fcf3ac46c27e9e993f6ab061b6cecdd02d693792dd0d9277aeb483fc0

data/CHANGLOG.md

@@ -1,5 +1,9 @@
 ### 0.1.1
 
+- Fix `allow_nil` option for `timestamp` type. [#issue18](https://github.com/jianshucom/norton/issues/18)
+
+### 0.1.1
+
 - Fix `attribute` **get** method, using instance variable directly.
 
 ### 0.1.0

data/lib/norton/counter.rb

@@ -15,7 +15,7 @@ module Norton
       #
       # @return [type] [description]
       def counter(name, options={}, &blk)
-        register_norton_value(name, :counter)
+        register_norton_value(name, :counter, options)
 
         # Redis: GET
         define_method(name) do

data/lib/norton/helper.rb

@@ -15,12 +15,12 @@ module Norton
       #
       # @return [void]
       #
-      def register_norton_value(name, norton_type)
+      def register_norton_value(name, norton_type, options = {})
         if !Norton::SUPPORTED_TYPES.include?(norton_type.to_sym)
           raise Norton::InvalidType.new("Norton Type: #{norton_type} invalid!")
         end
 
-        @norton_values[name.to_sym] = norton_type.to_sym
+        @norton_values[name.to_sym] = options.symbolize_keys.merge(:type => norton_type.to_sym)
       end
 
       #
@@ -42,7 +42,7 @@ module Norton
       # @return [Symbol]
       #
       def norton_value_type(name)
-        norton_values[name.to_sym]
+        norton_values.dig(name.to_sym, :type)
       end
     end
 
@@ -109,14 +109,20 @@ module Norton
     def assign_values(new_values)
       new_values.each do |field, val|
         type = self.class.norton_value_type(field)
-        next unless %i[counter timestamp].include?(type)
 
-        value = cast_value(type, val || try("#{field}_default_value"))
-        instance_variable_set("@#{field}", value)
-
-        if type == :timestamp && val.nil? && !try("#{field}_default_value").nil?
-          Norton.redis.with do |conn|
-            conn.set(norton_value_key(field), value)
+        case type
+        when :counter
+          value = cast_value(type, val || try("#{field}_default_value"))
+          instance_variable_set("@#{field}", value)
+        when :timestamp
+          if !val.nil?
+            instance_variable_set("@#{field}", cast_value(type, val))
+          elsif self.class.norton_values[field][:allow_nil]
+            instance_variable_set("@#{field}", nil)
+          else
+            value = cast_value(type, try("#{field}_default_value"))
+            instance_variable_set("@#{field}", value)
+            Norton.redis.with { |conn| conn.set(norton_value_key(field), value) }
           end
         end
       end

data/lib/norton/timestamp.rb

@@ -14,19 +14,23 @@ module Norton
       #
       # @return [type] [description]
       def timestamp(name, options={})
-        register_norton_value(name, :timestamp)
+        register_norton_value(name, :timestamp, options)
 
         # Redis: GET
         define_method(name) do
-          instance_variable_get("@#{name}") || begin
-            value = Norton.redis.with do |conn|
-              raw_value = conn.get(norton_value_key(name))
-              break raw_value if raw_value.present?
+          return instance_variable_get("@#{name}") if instance_variable_defined?("@#{name}")
 
-              send("#{name}_default_value").tap do |default_value|
-                conn.set(norton_value_key(name), default_value)
-              end
+          value = Norton.redis.with do |conn|
+            raw_value = conn.get(norton_value_key(name))
+            break raw_value if raw_value.present?
+
+            send("#{name}_default_value").tap do |default_value|
+              conn.set(norton_value_key(name), default_value)
             end
+          end
+          if value.nil? && options[:allow_nil]
+            instance_variable_set("@#{name}", nil)
+          else
             instance_variable_set("@#{name}", value.to_i)
           end
         end

data/lib/norton/version.rb

@@ -1,3 +1,3 @@
 module Norton
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/norton/helper_spec.rb

@@ -35,7 +35,13 @@ describe Norton::Helper do
 
     it "adds the fields with valid type to `@norton_values`" do
       Dummy.register_norton_value("foo", "counter")
-      expect(Dummy.norton_values[:foo]).to eq(:counter)
+      expect(Dummy.norton_values[:foo][:type]).to eq(:counter)
+    end
+
+    it "adds the fields with options" do
+      Dummy.register_norton_value("foo", "counter", :allow_nil => true)
+      expect(Dummy.norton_values[:foo][:type]).to eq(:counter)
+      expect(Dummy.norton_values[:foo][:allow_nil]).to eq(true)
     end
   end
 
@@ -158,6 +164,7 @@ describe Norton::Helper do
 
           dummy.norton_mget(:time2)
 
+          expect(dummy.time2).to be_nil
           expect(
             Norton.redis.with { |conn| conn.exists(dummy.norton_value_key(:time2)) }
           ).to eq(false)

data/spec/norton/timestamp_spec.rb

@@ -20,6 +20,11 @@ describe Norton::Timestamp do
     expect(dummy.respond_to?(:born_at_default_value)).to be(true)
     expect(dummy.respond_to?(:touch_born_at)).to be(true)
     expect(dummy.respond_to?(:remove_born_at)).to be(true)
+
+    expect(Dummy.norton_values[:thirteen_ts][:type]).to eq(:timestamp)
+    expect(Dummy.norton_values[:thirteen_ts][:digits]).to eq(13)
+    expect(Dummy.norton_values[:first_kissed_at][:allow_nil]).to eq(true)
+    expect(Dummy.norton_values[:first_kissed_at][:allow_nil]).to eq(true)
   end
 
   describe "#born_at" do
@@ -41,6 +46,10 @@ describe Norton::Timestamp do
       end
       expect(value.to_i).to eq(456)
     end
+
+    it "returns nil if no value in norton and the timestamp allows nil" do
+      expect(dummy.first_kissed_at).to be_nil
+    end
   end
 
   describe "#born_at_default_value" do

data/spec/norton_spec.rb

@@ -16,6 +16,7 @@ describe Norton do
 
       counter   :counter1
       timestamp :time1
+      timestamp :time2, :allow_nil => true
       hash_map  :map1
 
       def id
@@ -94,6 +95,7 @@ describe Norton do
 
           dummy.norton_mget(:time2)
 
+          expect(dummy.time2).to be_nil
           expect(
             Norton.redis.with { |conn| conn.exists(dummy.norton_value_key(:time2)) }
           ).to eq(false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: norton
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Larry Zhao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis