json_defaults 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a2838d635fd659872ea17ce7b9a98a8f9b357f389e1b243f81872bbacca820a
-  data.tar.gz: e365be73d60e7491e02f4087ea770f5bd49c8f83ef23b68754707e73ad591c90
+  metadata.gz: edb266e8c31d0afd0a9dba8e3b32d6ba33f33ed9a5d788ec5b11b47db79fee12
+  data.tar.gz: 2e1ced8a6eeae357b2fd0cee2e71caff307efde41cb0ebf6aef6e97f5f1813ea
 SHA512:
-  metadata.gz: 261b08abe50895e600607d9f7a23ad3d259db765b58c08959fdee5fc0517ce36cc17442c16e0c83e51c0d6fad8a857177e0e1d87f9cdb47435b87bf2ba5c93fd
-  data.tar.gz: 7f088e2bb6c93ef5e165d14638a0c3bec33d1127855318d1a12cd40a9b7f4d0d45a1e131944e2b486e90f842d9fa028624ac409e1ee6221e8d4bc5185d8cf43f
+  metadata.gz: 3942a81529c1c21d86b8c55bcd05beb3300d35c0df0918f17bcd0059504b550483f51a92914798c6a4d12c15fd88d2635f41ff909d06d558670eaf8c24430652
+  data.tar.gz: d36ac9e6ae31a25824c4b02b53eeccf65b7181c1a786bc932a2e7270470b616a79cb8414e5ed6da9957ad9e21424ce83406f5d6d109b1c980d3e3842db6eda6d

data/lib/json_defaults.rb

@@ -1,81 +1,78 @@
-require "json_defaults/version"
+require 'json_defaults/version'
 
 module JsonDefaults
-
   def json_defaults(field: nil, options: {}, active_record: false)
     options = options.stringify_keys
     define_json_methods(field, options)
-    if defined?(ActiveRecord::Base) && self.ancestors.include?(ActiveRecord::Base)
-      set_default_options(field, options) 
-    end
+    set_default_options(field, options) if defined?(ActiveRecord::Base) && ancestors.include?(ActiveRecord::Base)
   end
-  
-  private 
-    def define_json_methods(base_field, options)
-      options.each do |field, defaults|
-        define_getter(base_field, field, defaults)
-        define_setter(base_field, field, defaults)
-      end
-    end
 
-    def define_getter base_field, field, defaults
-      return if self.attribute_names.include?(field)
-      
-      define_method field do
-        val = send base_field
-        if val && val.is_a?(Hash) && val.has_key?(field)
-          val[field]
-        else
-          if defaults.is_a?(Hash) && defaults.has_key?(:value)
-            return defaults[:value]
-          else
-            return defaults.is_a?(Hash) ? defaults.stringify_keys : defaults
-          end
-        end
-      end
+  private
+
+  def define_json_methods(base_field, options)
+    options.each do |field, defaults|
+      define_getter(base_field, field, defaults)
+      define_setter(base_field, field, defaults)
     end
+  end
 
-    def get_defult_data get_defult_data
-      if defaults.is_a?(Hash) && defaults.has_key?(:value)
+  def define_getter(base_field, field, defaults)
+    return if attribute_names.include?(field)
+
+    define_method field do
+      val = send base_field
+      if val && val.is_a?(Hash) && val.has_key?(field)
+        val[field]
+      elsif defaults.is_a?(Hash) && defaults.has_key?(:value)
         return defaults[:value]
       else
-        return defaults
+        return defaults.is_a?(Hash) ? defaults.stringify_keys : defaults
       end
     end
+  end
+
+  def get_defult_data(_get_defult_data)
+    if defaults.is_a?(Hash) && defaults.has_key?(:value)
+      defaults[:value]
+    else
+      defaults
+    end
+  end
 
-    def define_setter base_field, field, defaults
-      return if self.attribute_names.include?(field)
+  def define_setter(base_field, field, defaults)
+    return if attribute_names.include?(field)
 
-      define_method "#{field}=" do |val|
-        object_value = send base_field
-        unless val && val.is_a?(Hash)
-          object_value = {}
-        end
-        
-        if defaults.is_a?(Hash) && defaults.has_key?(:integer) && defaults[:integer]
-          val = val.to_i
-        end
+    define_method "#{field}=" do |val|
+      object_value = send base_field
+      object_value = {} unless val && val.is_a?(Hash)
 
-        if defaults.is_a?(Hash) && defaults.has_key?(:boolean) && defaults[:boolean]
-          val = val.is_a?(TrueClass) || val.respond_to?(:to_i) && val.to_i == 1
-        end
+      val = val.to_i if defaults.is_a?(Hash) && defaults.has_key?(:integer) && defaults[:integer]
 
-        object_value[field] = val
-        
-        send("#{base_field}=", {
-          **send("#{base_field}").symbolize_keys,
-          **object_value.symbolize_keys
-        })
+      if defaults.is_a?(Hash) && defaults.has_key?(:boolean) && defaults[:boolean]
+        val = val.is_a?(TrueClass) || val.respond_to?(:to_i) && val.to_i == 1
       end
-    end
 
-    def set_default_options field, options
+      object_value[field] = val
 
-      after_initialize do |model|
+      send("#{base_field}=", {
+        **send(base_field.to_s).symbolize_keys,
+        **object_value.symbolize_keys
+           })
+    end
+  end
+
+  def set_default_options(field, options)
+    after_initialize do |model|
+      if model.respond_to?(field)
         if model.send(field).blank?
-          model.send("#{field}=", options.each {|key, value| options[key] = value.is_a?(Hash) && value.has_key?(:value) ? value[:value] : value})
+          model.send("#{field}=", options.each do |key, value|
+            options[key] = if value.is_a?(Hash) && value.has_key?(:value)
+                             value[:value]
+                           else
+                             value
+                           end
+          end)
         else
-
           options.each do |key, value|
             have_key = model.send(field).key?(key.to_s)
 
@@ -84,14 +81,14 @@ module JsonDefaults
 
             model_value = model.send(field).try(:[], key.to_s).try(:stringify_keys)
 
-            if !have_key 
+            if !have_key
               model.send(field)[key] = default_value
             elsif have_key && model_value.is_a?(Hash)
               model.send(field)[key] = default_value.merge(model_value)
             end
-
-          end   
+          end
         end
       end
     end
+  end
 end

data/lib/json_defaults/version.rb

@@ -1,3 +1,3 @@
 module JsonDefaults
-  VERSION = '0.1.8'.freeze
+  VERSION = '0.1.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_defaults
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - DenDos
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -93,6 +93,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- json_defaults-0.1.8.gem
 - json_defaults.gemspec
 - lib/json_defaults.rb
 - lib/json_defaults/version.rb