post_json 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52a70dfcec7f3478c9b2fab7e465c5b33c97229b
-  data.tar.gz: 7d302f9d087bc00360e203320e0afd5b64e3eb1d
+  metadata.gz: 9d00197439ef2828a5a9f92f800c029d8a396134
+  data.tar.gz: 59223ff032a986b240b83d0557f53c36aabcf708
 SHA512:
-  metadata.gz: b17682fa4780f53680fc7c7c55bb423974208d79356ba6ec70a9ab2ebc16ce9c83a7cc60b6101b71b507797434d84ef33cf9c818b40bbeed268c4b7045d69782
-  data.tar.gz: 99bbe826b5aab7659aaa74fa2e8413023b398940b4bf50aa98ed540989d339a2488c9e7300fb0af0c35cebcbcb4c37dc7d54d7180f41c5f4509e486ce476d4b2
+  metadata.gz: fa5492848c38164755418dc96b8c3e13ff97032e8d9d7f0b4f377b2ca72b86a7c381db5a47004cde68abb12c1b4aa8d1f63df90de287549d6bd7fa085c9a2610
+  data.tar.gz: 5d55d2a5331b57b5d12abe3b4cac590765f50ee116bc55db28b313c64f4b1cad11b3e2c49598cea7dca1b8b20182df5997c6f07886ca9991792a543f7b4a907e

data/README.md

@@ -141,7 +141,7 @@ puts me.attributes
 
 PostJson will serialize Time and DateTime to format `strftime('%Y-%m-%dT%H:%M:%S.%LZ')` when persisting documents.
 
-PostJson will also parse an attribute's value to a `Time` object, if the value is a string and matches the format.
+PostJson will also parse an attribute's value to a `DateTime` object, if the value is a string and matches the format.
 
 ### Supported methods
 

data/lib/post_json/base.rb

@@ -43,7 +43,7 @@ module PostJson
     def cache_key
       @dashed_name ||= self.class.name.underscore.dasherize
       __local__unique_version = __doc__version || Digest::MD5.hexdigest(attributes.inspect)
-      "#{@dashed_name}-#{id}-version-#{__local__unique_version}"
+      "#{@dashed_name}-#{self[self.class.primary_key]}-version-#{__local__unique_version}"
     end
 
     def attributes
@@ -58,6 +58,10 @@ module PostJson
       attributes.deep_dup
     end
 
+    def inspect
+      "#<#{self.class.name} #{attributes.map{ |k, v| "#{k}: #{v.inspect}" }.join(", ")}>"
+    end
+
     def write_attribute(attribute_name, value)
       attribute_name = attribute_name.to_s
       if attribute_name == '__doc__body'
@@ -110,7 +114,7 @@ module PostJson
     def __doc__body_convert_attribute_type(attribute_name, value)
       case value
       when /^[0-9]{4}-[0-1][0-9]-[0-3][0-9]T[0-2][0-9]:[0-5][0-9]:[0-5][0-9]\.[0-9]{3}Z$/
-        Time.zone.parse(value)
+        DateTime.parse(value)
       when Hash
         value.inject(HashWithIndifferentAccess.new) do |result, (key, value)|
           result[key] = __doc__body_convert_attribute_type("#{attribute_name}.#{key}", value)
@@ -314,9 +318,9 @@ module PostJson
     end
 
     def create_record
-      self.id = self.__doc__body['id'].to_s.strip.downcase
-      if self.id.blank?
-        self.id = self.__doc__body['id'] = SecureRandom.uuid
+      write_attribute(self.class.primary_key, self.__doc__body[self.class.primary_key].to_s.strip.downcase)
+      if read_attribute(self.class.primary_key).blank?
+        write_attribute(self.class.primary_key, (self.__doc__body[self.class.primary_key] = SecureRandom.uuid))
       end
 
       self.__doc__model_settings_id = self.class.persisted_settings.id

data/lib/post_json/version.rb

@@ -1,3 +1,3 @@
 module PostJson
-  VERSION = "1.0.12"
+  VERSION = "1.0.13"
 end

data/spec/models/base_spec.rb

@@ -438,7 +438,7 @@ describe "Base model" do
     let(:time) { Time.now }
     let(:time_in_zone) { time.in_time_zone }
     let(:date_time) { time.to_datetime }
-    let(:time_result) { Time.parse(time_in_zone.strftime('%Y-%m-%dT%H:%M:%S.%LZ')) }
+    let(:time_result) { DateTime.parse(time_in_zone.strftime('%Y-%m-%dT%H:%M:%S.%LZ')) }
     let(:time_hash) { { 'time' => time, 'time_in_zone' => time_in_zone, 'date_time' => date_time } }
     let(:time_array) { [time, time_in_zone, date_time] }
     let(:record) { PostJson::Collection["dates"].new(time: time, time_in_zone: time_in_zone, date_time: date_time, time_hash: time_hash, time_array: time_array) }
@@ -474,8 +474,11 @@ describe "Base model" do
         end
 
         its(:time) { should == time_result }
+        its(:time) { should be_a(DateTime) }
         its(:time_in_zone) { should == time_result }
+        its(:time_in_zone) { should be_a(DateTime) }
         its(:date_time) { should == time_result }
+        its(:date_time) { should be_a(DateTime) }
         its(:time_hash) { should == { 'time' => time_result, 'time_in_zone' => time_result, 'date_time' => time_result } }
         its(:time_array) { should == [time_result]*3 }
       end

data/spec/models/derived_base_spec.rb

@@ -16,4 +16,9 @@ describe "Base model as superclass" do
     subject { ChildModel.create(name: name) }
     its(:name) { should == name.upcase }
   end
+
+  context "inspect" do
+    subject { ChildModel.create(number: 1234) }
+    its(:inspect) { should == "#<#{subject.class.name} #{subject.attributes.map{ |k, v| "#{k}: #{v.inspect}" }.join(", ")}>" }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: post_json
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Jacob Madsen and Martin Thoegersen