octojson 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f942e2da4cb45bfacb5affe69154c4431b85a61d1d99c98740daf71af0a4442
-  data.tar.gz: 4b8c165ef9fb600bfb99a43f6dd5559fcebb31f40869371fdc99bd5127baf72e
+  metadata.gz: 8fa45a13217ecaafc46df907a7ddc6fa1ed44c63cc16ef0df594d5230a117567
+  data.tar.gz: 3e1f8bfd93d2a22428c4cb0212b4543748a2f6cfb5951a7d789dba42945fdb42
 SHA512:
-  metadata.gz: a26204c160edda006f5a3a49a8bc1b8fc5c83887119dafd063d30460ff1a5e00f2ae86d25d584fccd8a757cf4ab015e2f95f6e3f29e1372fda3b637012d9165e
-  data.tar.gz: cfaea459b9959e537f6ebc49b43d822bf3cbcd2ed6847cb3bf23512a74c41cb87727b1a257c44a781c9d3918884c02cf582078bf1831a557939aadf3496222b6
+  metadata.gz: 2c27638781bbae67bf1cd44a67ab551702298ba9d6000deb841c7d43cb03e3f136208d79d11ecdda40384030f37301ca0810398b5998b167eb5aced70bc96421
+  data.tar.gz: 5410264dca67feb65b372384dfd6131f12b33a8388bd1120def8532100fb6228e0862cadd979d38c32108a4cd1ce5c5ec115f60434765ecb34509190e99b1c15

data/lib/octojson.rb

@@ -5,49 +5,66 @@ module ActiveRecord
     extend ActiveSupport::Concern
 
     class_methods do
-      def octojson(json_attribute, schema, schema_key)      
+      def octojson(json_attribute, schema, schema_key = nil)      
         schema.each do |attribute,data|
           data.each do |key,value|
-            define_method("#{json_attribute}_#{attribute}_#{key}") do 
+            define_method(attribute_name(json_attribute, attribute, key)) do 
               self[json_attribute][key.to_s]
             end
 
             if value[:validates]
-              validates "#{json_attribute}_#{attribute}_#{key}", value[:validates].merge(if: -> { send(schema_key.to_s) == attribute.to_s })
+              validates attribute_name(json_attribute, attribute, key), value[:validates].merge(if: -> { apply_validatation?(schema_key, attribute) })
             end
           end
         end
 
         after_initialize do 
-          if new_record? && has_attribute?(json_attribute) && instance_eval(schema_key.to_s)
-            field_types = schema[instance_eval(schema_key.to_s).to_sym]
-            write_attributes(json_attribute, field_types) unless field_types.nil?
+          if new_record? && has_attribute?(json_attribute) && schema_key_value(schema, schema_key)
+            field_types = schema[schema_key_value(schema, schema_key).to_sym]
+            write_attributes(json_attribute, field_types) unless field_types.nil? 
           end
         end
 
         before_validation do
-          if has_attribute?(json_attribute) 
-            field_types = schema[instance_eval(schema_key.to_s).to_sym]
-            write_attributes(json_attribute, field_types) unless field_types.nil?
+          if has_attribute?(json_attribute) && schema_key_value(schema, schema_key)
+            field_types = schema[schema_key_value(schema, schema_key).to_sym]
+            write_attributes(json_attribute, field_types) unless field_types.nil? 
           end
         end
 
         define_method("#{json_attribute}_strong_params") do 
-          if has_attribute?(json_attribute)
-            field_types = schema[instance_eval(schema_key.to_s).to_sym]
+          if has_attribute?(json_attribute) && schema_key_value(schema, schema_key)
+            field_types = schema[schema_key_value(schema, schema_key).to_sym]
             
             return nil if field_types.nil?
             
             field_types.map do |k,v|
-              v[:type] == :json ? { k => v[:nested_attributes] } : k
+              nestable?(v) ? { k => v[:nested_attributes] } : k
             end
           end
         end
       end
+
+      private
+
+      def attribute_name(json_attribute, attribute, key)
+        return "#{json_attribute}_#{key}" if attribute == "_default"
+        "#{json_attribute}_#{attribute}_#{key}"
+      end
     end
 
     private
 
+    def apply_validatation?(schema_key, attribute)
+      return true if attribute.to_s == "_default"
+      send(schema_key.to_s) == attribute.to_s
+    end
+
+    def schema_key_value(schema, schema_key)
+      return "_default" if schema[:_default].present?
+      instance_eval(schema_key.to_s)
+    end
+
     def write_attributes(json_attribute, field_types)
       if self.send("#{json_attribute}_changed?") && !self.send("#{json_attribute}_change")[0].blank?
         self[json_attribute] = self.send("#{json_attribute}_change")[0].merge(self[json_attribute])
@@ -59,12 +76,24 @@ module ActiveRecord
         if self[json_attribute][key.to_s] == nil
           new_settings[key] = value[:default]
         else
+          if nestable?(value)
+            self[json_attribute][key.to_s].each do |o|
+              o.each do |k,v|
+                o.delete(k) if value[:nested_attributes].exclude?(k.to_sym)
+              end
+            end
+          end
+          
           new_settings[key] = self[json_attribute][key.to_s]        
         end
       end
 
       self[json_attribute] = new_settings
     end
+
+    def nestable?(value)
+      value[:type] == :array || value[:type] == :json
+    end
   end
 end
 

data/lib/octojson/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Octojson
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/test/db/migrate/20200407031737_build_test_db.rb

@@ -3,6 +3,7 @@ class BuildTestDb < ActiveRecord::Migration[6.0]
     create_table :posts do |t|
       t.string :post_type
       t.jsonb :settings
+      t.jsonb :options
     end
   end
 end

data/test/db/schema.rb

@@ -18,6 +18,7 @@ ActiveRecord::Schema.define(version: 2020_04_07_031737) do
   create_table "posts", force: :cascade do |t|
     t.string "post_type"
     t.jsonb "settings"
+    t.jsonb "options"
   end
 
 end

data/test/fixtures/models/post.rb

@@ -18,5 +18,14 @@ class Post < ActiveRecord::Base
     }
   }.freeze
 
+  OPTIONS_SCHEMA_AS_DEFAULT = { 
+    _default: {
+      title: { type: :string, default: 'default title' },
+      number_default: { type: :integer, default: 3, validates: { numericality: { only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 5 } } },
+      sub_options: { type: :array, default: [], nested_attributes: [:name, :type] }
+    }
+  }.freeze
+
   octojson :settings, SCHEMA, :post_type
+  octojson :options, OPTIONS_SCHEMA_AS_DEFAULT
 end

data/test/octojson_test.rb

@@ -81,7 +81,7 @@ class OctojsonTest < ActiveSupport::TestCase
         :text_one, 
         :boolean_one, 
         :number_one, 
-        { :json_one=> [:nested_one, :nested_two, :nested_three] }
+        { :json_one => [:nested_one, :nested_two, :nested_three] }
       ]
   end
 
@@ -94,4 +94,43 @@ class OctojsonTest < ActiveSupport::TestCase
     post = Post.new(post_type: 'type_one', settings: { number_one: 99 })
     assert_equal post.valid?, false
   end
+
+  test 'apply defaults when default case on initialize' do
+    post = Post.new()
+    assert_equal post.options['title'], 'default title'
+    assert_equal post.options['number_default'], 3
+    assert_equal post.options['sub_options'], []
+  end
+
+  test 'invalid when default case' do
+    post = Post.new(options: { number_default: 99 })
+    assert_equal post.valid?, false
+  end
+
+  test 'default case with array of objects' do
+    post = Post.new(options: { sub_options: [{
+        id: "test",
+        name: "name 1",
+        type: "type 1"
+      },
+      {
+        id: "test 2",
+        other: false,
+        name: "name 2",
+        type: "type 2"
+      }] 
+    })
+    assert_equal post.options['sub_options'], [{"name"=>"name 1", "type"=>"type 1"}, {"name"=>"name 2", "type"=>"type 2"}]
+  end
+
+  test '#{json_attribute}_strong_params for default' do
+    post = Post.new
+    post.save
+
+    assert_equal post.options_strong_params, [
+      :title,
+      :number_default,
+      { :sub_options => [:name, :type] }
+    ]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octojson
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Chris Bacon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-18 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord