ruson 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39dd7c6ce4a45497f8925a29bd35bc4cead7c1a7de5b540f82ac3792be969305
-  data.tar.gz: ddd14dd0b2f08c7f2fc2a6502908234411ae6a28e0eb6d222f5736d9668411bb
+  metadata.gz: df8812fa2f70ad440c16a4647961a68955b3909d481db38bd6271534afce154c
+  data.tar.gz: d8877e9e6f435d319a736e0157845dae2264ba6468a2ed918b158601de2a8881
 SHA512:
-  metadata.gz: b908373f13bca616112e8bc1ef73d237cd1a44aa06102e9c4b7309befb2358530ea6622688a088f1293b63eb387798561bc9363453d7962b01b4df67169b3644
-  data.tar.gz: cb648ad162cbfbc5a25d3814ec686d116ddcfed0e75c59e7137cf5492b13bbfae8e940842c25c8bf075b9674d038a7cbfeab058bd350efc05ef755aa5a53d0f4
+  metadata.gz: 5883b0fc7b4e95a713a906f83c1d3f07a2761cd1cf4a246f2ae6ee2591322fd24791c8ce99f37dc6e62338c4da55494d160428206838de34154e5402efcad409
+  data.tar.gz: 20fb24a41b36de01dcb8bfcb32a864ed88808f49229617a610ceb5ced0ee8a0ca3bf4204c5100120349fee63f76a79948cd09f7d4b16afcb02e34dc8a0afd44e

data/README.md

@@ -65,6 +65,26 @@ post = Post.new(json)
 post.url #=> 'http://sample.com'
 ```
 
+### nilable
+
+post.json
+```json
+{
+  "title": "Ruson",
+  "post_url": "http://sample.com"
+}
+```
+
+```ruby
+class Post < Ruson::Base
+  field :title, nilable: false
+  field :url, name: 'post_url'
+end
+
+json = File.read('post.json')
+post = Post.new(json) #=> Ruson::NotNilException
+```
+
 ### nested class
 
 #### class

data/lib/ruson/base.rb

@@ -9,6 +9,9 @@ require 'ruson/class/float'
 require 'ruson/converter'
 require 'ruson/json'
 require 'ruson/value'
+require 'ruson/nilable'
+
+require 'ruson/error'
 
 module Ruson
   class Base
@@ -53,6 +56,7 @@ module Ruson
     include Ruson::Converter
     include Ruson::Json
     include Ruson::Value
+    include Ruson::Nilable
 
     def initialize(json, root_key: nil)
       params = get_hash_from_json(json)
@@ -73,7 +77,11 @@ module Ruson
 
     def init_attributes(accessors, params)
       accessors.each do |key, options|
-        val = get_val(params, options[:name] || key, options)
+        key_name = options[:name] || key
+        value = params[key_name]
+
+        check_nilable(value, options)
+        val = get_val(value, options)
         set_attribute(key, val)
       end
     end

data/lib/ruson/error.rb

@@ -0,0 +1,4 @@
+module Ruson
+  class NotNilException < StandardError
+  end
+end

data/lib/ruson/nilable.rb

@@ -0,0 +1,16 @@
+module Ruson
+  module Nilable
+    def check_nilable(value, options)
+      return if nilable?(options)
+      raise Ruson::NotNilException if value.nil?
+    end
+
+    private
+
+    def nilable?(options)
+      nilable = options[:nilable]
+      return true if nilable.nil?
+      nilable
+    end
+  end
+end

data/lib/ruson/value.rb

@@ -1,12 +1,12 @@
 module Ruson
   module Value
-    def get_val(params, key_name, options)
+    def get_val(value, options)
       if !options[:class].nil?
-        class_param(params[key_name], options[:class])
+        class_param(value, options[:class])
       elsif !options[:each_class].nil?
-        each_class_param(params[key_name], options[:each_class])
+        each_class_param(value, options[:each_class])
       else
-        params[key_name]
+        value
       end
     end
 

data/lib/ruson/version.rb

@@ -1,3 +1,3 @@
 module Ruson
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruson
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - klriutsa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,9 @@ files:
 - lib/ruson/class/float.rb
 - lib/ruson/class/integer.rb
 - lib/ruson/converter.rb
+- lib/ruson/error.rb
 - lib/ruson/json.rb
+- lib/ruson/nilable.rb
 - lib/ruson/value.rb
 - lib/ruson/version.rb
 - ruson.gemspec