dolly 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bd1cf887f25cacb3b25be56354cf74c1771cd021514cb8bf733e31aa7198feb
-  data.tar.gz: cd464f54583a1f417fb58e27f504ccce8ddd33f39f1f48eea0f3b66487313445
+  metadata.gz: b4a7f73673dc9600d2451b6ae0dd1ed5ca8c792f671f1a115405b751610b9077
+  data.tar.gz: 7765f1a58d5515aebce77a79fdde6e0aad8e8928867e39c45a26ac5321ef7cb9
 SHA512:
-  metadata.gz: 5c2bddaf348f5028c10ea464ea3265a9653d741508a103d3bd4d3e83757261ead6de60d630db9a8fa512ba22e13cd36043debc8e8d7be457aa63079018a3d580
-  data.tar.gz: f1c2ede8149132f5d6941fbbe0b4eb1ada18ed060eb76ccd8b4eeffec556590b2b8c8044331d6726de10a0758120a6595b07f6da5afdd86da95be655344ceb8b
+  metadata.gz: 9430a6c2bc2b951442751b3192778a7d73985d6cb3fa0864f5a9529695d20fec13cd4b451d8232f06dfc0a27cc6897acae734eb979c52b63a60d81aa7c5061c6
+  data.tar.gz: a46dd510d441efffe1b7998e64b5806fba6fee10470dc3c38d78a4be49bd18d48b50ad9d84b630ef0c04895934214821162a46e3bc3888a71c02171623bffdb6

data/lib/dolly/connection.rb

@@ -6,10 +6,12 @@ require 'dolly/request_header'
 require 'dolly/exceptions'
 require 'dolly/configuration'
 require 'refinements/string_refinements'
+require 'dolly/framework_helper'
 
 module Dolly
   class Connection
     include Dolly::Configuration
+    include Dolly::FrameworkHelper
     attr_reader :db, :app_env
 
     DEFAULT_HEADER = { 'Content-Type' => 'application/json', 'Accept' => 'application/json' }
@@ -92,7 +94,12 @@ module Dolly
       raise Dolly::ResourceNotFound if res.status.to_i == 404
       raise Dolly::ServerError.new(res.status.to_i) if (400..600).include? res.status.to_i
       return res.header_str if method == :head
-      Oj.load(res.body_str, symbol_keys: true)
+
+      data = Oj.load(res.body_str, symbol_keys: true)
+      return data unless rails?
+      data.with_indifferent_access
+    rescue Oj::ParseError
+      res.body_str
     end
 
     def values_to_json hash

data/lib/dolly/document.rb

@@ -15,6 +15,7 @@ require 'dolly/timestamp'
 require 'dolly/query_arguments'
 require 'dolly/document_creation'
 require 'dolly/class_methods_delegation'
+require 'dolly/framework_helper'
 require 'refinements/string_refinements'
 
 module Dolly
@@ -35,6 +36,7 @@ module Dolly
     include Attachment
     include QueryArguments
     include ClassMethodsDelegation
+    include FrameworkHelper
 
     attr_writer :doc
 
@@ -46,7 +48,7 @@ module Dolly
     protected
 
     def doc
-      @doc ||= {}
+      @doc ||= doc_for_framework
     end
 
     def init_ancestor_properties
@@ -59,5 +61,10 @@ module Dolly
         end
       end
     end
+
+    def doc_for_framework
+      return {} unless rails?
+      {}.with_indifferent_access
+    end
   end
 end

data/lib/dolly/document_creation.rb

@@ -1,16 +1,23 @@
 require 'dolly/properties'
+require 'dolly/framework_helper'
 
 module Dolly
   module DocumentCreation
     include Properties
+    include FrameworkHelper
 
     def from_doc(doc)
       attributes = property_clean_doc(doc)
-      new(attributes).tap { |model| model.doc = doc }
+
+      new(attributes).tap do |model|
+        model.send(:doc).merge!(doc)
+      end
     end
 
     def from_json(json)
-      from_doc(Oj.load(json, symbol_keys: true))
+      raw_data = Oj.load(json, symbol_keys: true)
+      data = rails? ? data.with_indifferent_access : raw_data
+      from_doc(data)
     end
 
     def create(attributes)

data/lib/dolly/framework_helper.rb

@@ -0,0 +1,7 @@
+module Dolly
+  module FrameworkHelper
+    def rails?
+      defined?(ActiveSupport::HashWithIndifferentAccess)
+    end
+  end
+end

data/lib/dolly/properties.rb

@@ -30,7 +30,7 @@ module Dolly
     end
 
     def property_clean_doc(doc)
-      doc.reject { |key, _value| !property_keys.include?(key) }
+      doc.reject { |key, _value| property_keys.exclude?(key.to_sym) }
     end
   end
 end

data/lib/dolly/property.rb

@@ -16,10 +16,15 @@ module Dolly
     def cast_value(value)
       return set_default if value.nil?
       return value unless class_name
-      return self_klass.new(value) unless respond_to?(klass_sym)
+      return custom_class(value) unless respond_to?(klass_sym)
       send(klass_sym, value)
     end
 
+    def custom_class(value)
+      value = value.is_a?(Hash) ? value.symbolize_keys : value
+      self_klass.new(value)
+    end
+
     def boolean?
       [TrueClass, FalseClass].include?(class_name)
     end
@@ -32,6 +37,14 @@ module Dolly
       value.to_h
     end
 
+    def hash_with_indifferent_access_value(value)
+      if defined?(Rails)
+        value.to_h.with_indifferent_access
+      else
+        value.to_h
+      end
+    end
+
     def integer_value(value)
       value.to_i
     end
@@ -70,7 +83,13 @@ module Dolly
     end
 
     def klass_sym
-      :"#{self_klass.name.underscore}_value"
+      klass_name = self_klass.
+                   name.
+                   split('::').
+                   last.
+                   underscore
+
+      :"#{klass_name}_value"
     end
 
     def self_klass

data/lib/dolly/property_manager.rb

@@ -5,7 +5,7 @@ module Dolly
       assign_rev_properties(attributes)
 
       lambda do |property|
-        name = property.key.to_sym
+        name = property.key
         next unless doc[name].nil?
         write_attribute(name, attributes[name])
       end
@@ -19,9 +19,9 @@ module Dolly
     end
 
     def write_attribute(key, value)
-      value = set_property_value(key, value)
-      instance_variable_set(:"@#{key}", value)
-      update_doc(key, value)
+      casted_value = set_property_value(key, value)
+      instance_variable_set(:"@#{key}", casted_value)
+      update_doc(key, casted_value)
     end
 
     def valid_property?(name)

data/lib/dolly/version.rb

@@ -1,3 +1,3 @@
 module Dolly
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dolly
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - javierg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -129,6 +129,7 @@ files:
 - lib/dolly/document_state.rb
 - lib/dolly/document_type.rb
 - lib/dolly/exceptions.rb
+- lib/dolly/framework_helper.rb
 - lib/dolly/identity_properties.rb
 - lib/dolly/mango.rb
 - lib/dolly/mango_index.rb