json_defaults 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f796ce48261e6fa69e220517bb01d94141948ca
-  data.tar.gz: 44fcabe3fc5f8469d33720e31deb47534d8805f6
+  metadata.gz: 7fcdd7c7bb6915818e07ece1680190306da69a82
+  data.tar.gz: a57c67ba21367d881ecdc094f95d6f332c41b4de
 SHA512:
-  metadata.gz: 683f2ccc8470fb3540f3f4bc55d7d3463ec93fbf1ad3a1e913d116216d8bef8a1852d707af17e4b23d2718f50c48ca4b3f6137e9f67bcd997029db15b209f59f
-  data.tar.gz: f17b049fbe9816e1cac54ae4f363857dbb281613f3625d87abc85d5aff3110942973ec3b0bc2a65897f15077daba4934c3ca75ca2c3d493a124f91aa29424297
+  metadata.gz: a917c008923168a7a7079c41a769c0ec220d173f313c085f394ce9555040e63e0e0a0bdfe57a62f314c5df8891ad596261a290f2c7a49f54af48fa6158b33e97
+  data.tar.gz: ca9d60434d82740d7bffba778bde66e48b011da755d0a2229b801f1043070bc3be62c0477f7ba30d908146bbcf47f7338d3d419a202b2d46cca946c12af6c855

data/README.md

@@ -1,8 +1,6 @@
 # JsonDefaults
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/json_defaults`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Very simple library for defining default options for your object.
 
 ## Installation
 
@@ -22,15 +20,98 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Working with Model
+------------------------
+
+- Create jsonb field for you model:
+
+```ruby
+rails g migration add_json_field_to_users json_field:jsonb
+rake db:migrate
+```
+
+- Add this to your model:
+
+```ruby
+class User < ActiveRecord::Base
+  extend JsonDefaults
+  
+  json_defaults(
+    field: "json_field", 
+    options: {
+      field1: "It's",
+      field2: "awesome"
+    }
+  )
+end
+```
+And next just use defined fields with default options
+
+```ruby
+user = User.new
+user.json_field # => {"field1"=>"It's", "field2"=>"awesome"}
+user.field1 # => It's
+user.field2 # => awesome
+```
+You can update this field directly
+
+```ruby
+user = User.new
+user.field1 # => It's
+user.field1 = "cool" 
+user.field1 # => cool
+```
 
-## Development
+- You can also define type for each field:
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+```ruby
+class User < ActiveRecord::Base
+  extend JsonDefaults
+  
+  json_defaults(
+    field: "json_field", 
+    options: {
+      field1: "It's",
+      field2: "awesome",
+      field3: {
+        value: false,
+        boolean: true
+      },
+      field4: {
+        value: 666,
+        integer: true
+      }
+    }
+  )
+end
+```
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+```ruby
+user = User.new
+user.field4 # => 666
+user.field4 = "123" 
+user.field4 # => 123
+```
+
+### Options for defining field
 
-## Contributing
+```ruby
+  json_defaults(
+    field: "json_field", 
+    active_record: true,
+    options: {
+      key: "value",
+      key: {
+        value: 666,
+        integer: true
+      }
+    }
+  )
+```
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/json_defaults.
+| Option | type | Description |
+| :--- | :--- | :--- |
+| `field` |String| This parameter specifies which field in the model the json_defaults plugin will be applied to. |
+| `options` |Hash| Default hash for selected field with ```key``` and ```value``` |
+| `key` || Key's name in default hash. Can be ```string``` or ```symbol```|
 

data/json_defaults.gemspec

@@ -30,6 +30,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "activerecord", "~> 4.2"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "pg", "~> 0.18.4"
   spec.add_development_dependency "rspec"
 end

data/lib/json_defaults/version.rb

@@ -1,3 +1,3 @@
 module JsonDefaults
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/json_defaults.rb

@@ -1,12 +1,13 @@
 require "json_defaults/version"
-require "json_defaults/active_record_module"
 
 module JsonDefaults
 
   def json_defaults(field: nil, options: {}, active_record: false)
     options = options.stringify_keys
     define_json_methods(field, options)
-    set_default_options(field, options) if active_record
+    if defined?(ActiveRecord::Base) && self.ancestors.include?(ActiveRecord::Base)
+      set_default_options(field, options) 
+    end
   end
   
   private 
@@ -26,12 +27,20 @@ module JsonDefaults
           if 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
     end
 
+    def get_defult_data get_defult_data
+      if defaults.is_a?(Hash) && defaults.has_key?(:value)
+        return defaults[:value]
+      else
+        return defaults
+      end
+    end
+
     def define_setter base_field, field, defaults
       define_method "#{field}=" do |val|
         object_value = send base_field
@@ -55,4 +64,30 @@ module JsonDefaults
         })
       end
     end
+
+    def set_default_options field, options
+
+      after_initialize do |model|
+        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})
+        else
+
+          options.each do |key, value|
+            have_key = model.send(field).key?(key.to_s)
+
+            default_value = value.is_a?(Hash) && value.has_key?(:value) ? value[:value] : value
+            default_value = default_value.stringify_keys if default_value && default_value.is_a?(Hash)
+
+            model_value = model.send(field).try(:[], key.to_s).try(:stringify_keys)
+
+            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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_defaults
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - DenDos
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +95,6 @@ files:
 - bin/setup
 - json_defaults.gemspec
 - lib/json_defaults.rb
-- lib/json_defaults/active_record_module.rb
 - lib/json_defaults/version.rb
 homepage: ''
 licenses: []

data/lib/json_defaults/active_record_module.rb

@@ -1,29 +0,0 @@
-module JsonDefaults
-    private
-      def set_default_options field, options
-        after_initialize do |model|
-          if model.class.columns_hash[field].type == :json || model.class.columns_hash[field].type == :jsonb
-            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})
-            else
-              options.each do |key, value|
-                have_key = model.send(field).key?(key.to_s)
-                if !have_key 
-                  default_value = value.is_a?(Hash) && value.has_key?(:value) ? value[:value] : value
-                  model.send(field)[key] = default_value
-                else
-                  model_value = model.send(field)[key.to_s]
-                  if model_value.is_a?(Hash) && !((value.keys - model_value.symbolize_keys.keys).count == 0)
-                    model.send(field)[key.to_s] = {
-                      **value.symbolize_keys,
-                      **model_value.symbolize_keys
-                    }
-                  end
-                end
-              end   
-            end
-            model.save if !model.changes.blank?
-          end
-        end
-      end
-end