jsonity 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0b3d54f6eddfdffc490d03bd3ca9e425fb3070d
-  data.tar.gz: 8a27c77c19e6aca44dacd7d566f48069c3289e14
+  metadata.gz: e143b7fe62f2f26f3cb2a822b3187dcf4fbb02e2
+  data.tar.gz: 104e8408636364ced72db027c4d612890934019c
 SHA512:
-  metadata.gz: f2c478c82bd37af05ef29e02cdc622d8ac6d04482d8c0a538617d60bfa55ef98e487496243cf9c8041d81661e403187411ffef8daf6610923fae510211c54a9f
-  data.tar.gz: 953b99cc7190836866bd5350c03894d3cb57e4a65dcaea29c1d18449e4c31ff866ad370ce3c0e79aeef2c6fb8bc3bbe5915f1d408fdcecf5ea4385b6522e6a90
+  metadata.gz: 64a51ab45373c8d4fa38593dfbc7dba6a8d1900d4b1544bada32dfc7d55df3a1cbb2d95e83fe17b00eaace5e99a7aac6a48f67e4964115ec4acaf9efdad107df
+  data.tar.gz: e5a980b2de32ca4fe8f66a92f4fa849c6002f6470490f00d2a4670bfc9f91e33b0f55a0d4bb3623137b0d2cdf950c187b222ea003369e98160ff6202fad4b60f

data/README.md

@@ -435,19 +435,35 @@ Notice that two objects `meta!` got merged.
 ```
 
 
-### Using data object
+### Conditional
 
-You can get the data object as a second block parameter.
+You can use `if:` and `unless:` options.
 
 ```ruby
 Jsonity.build { |t|
-  t[].people!(@people) { |person, person_obj|
-    unless person_obj.private_member?
-      person.name
-      person.age
-    end
+  t[].people!(@people) { |person|
+    # if:
+    person.cv!(if: &:looking_for_job?) { |cv|
+      cv.title
+      cv.download_link
+    }
+
+    # unless:
+    person.name unless: &:anonymous?
+  }
+}
+```
 
-    person.cv if person_obj.looking_for_job?
+
+### Getting data object
+
+You can get the data object by calling `get`.
+
+```ruby
+Jsonity.build { |t|
+  t[].people!(@people) { |person|
+    # debugging object
+    p person.get
   }
 }
 ```

data/lib/jsonity/builder.rb

@@ -4,11 +4,11 @@ module Jsonity
     ###
     # Build Jsonity
     #
-    # @params {any} object - [optional]
-    # @params {Hash | nil} content - [optional]
+    # @params {Object} object - [optional]
+    # @params {Hash<Object, Object> | nil} content - [optional]
     # @block
     #
-    # @return {Hash} - json object
+    # @return {Hash<String, Object>} - json object
     ###
     def self.build(object = nil, content = nil, &block)
       content = {} unless content.is_a?(::Hash)
@@ -29,8 +29,8 @@ module Jsonity
     ###
     # Initializer
     #
-    # @params {any} object
-    # @params {Hash | nil} content
+    # @params {Object} object
+    # @params {Hash<Object, Object> | nil} content
     ###
     def initialize(object, content)
       @object, @content = object, content
@@ -39,11 +39,22 @@ module Jsonity
 
     ###
     # Set `obj` for the object
+    #
+    # @return {Object}
     ###
     def <=(obj)
       @object = obj
     end
 
+    ###
+    # Get the object
+    #
+    # @return {Object}
+    ###
+    def get
+      @object
+    end
+
     ###
     # Create array context
     #
@@ -57,21 +68,21 @@ module Jsonity
     ###
     # Mixin / Scoping
     #
-    # @params {any} obj - [optional]
+    # @params {Object} obj - [optional]
     # @block
     ###
     def call(obj = nil, &block)
       if obj
         Builder.build obj, @content, &block
       else
-        block_call block, self, @object
+        block_call block, self
       end
     end
 
     ###
     # Getter for `@content`
     #
-    # @return {Hash | nil}
+    # @return {Hash<Object, Object> | nil}
     ###
     def _content
       evaluate_array_blocks!
@@ -83,6 +94,10 @@ module Jsonity
 
     ###
     # Handle ghost methods
+    #
+    # @params {Symbol} name
+    # @params {Array<Object>} args
+    # @block block - [optional]
     ###
     def method_missing(name, *args, &block)
       name = name.to_s
@@ -116,10 +131,12 @@ module Jsonity
     # Create attribute node
     #
     # @params {String} name
-    # @params {Hash} options
-    # @block - [optional]
+    # @params {Hash<Symbol, Object>} options
+    # @block block - [optional]
     ###
     def attribute(name, options, &block)
+      return unless on_condition options
+
       obj = get_object_for name, options
 
       value = block ? block_call(block, options[:_object] || @object) : obj
@@ -130,10 +147,12 @@ module Jsonity
     # Create hash node
     #
     # @params {String} name
-    # @params {Hash} options
-    # @block - [optional]
+    # @params {Hash<Symbol, Object>} options
+    # @block block - [optional]
     ###
     def hash(name, options, &block)
+      return unless on_condition options
+
       obj = get_object_for name, options
 
       if options[:_nullable] && !obj
@@ -149,10 +168,12 @@ module Jsonity
     # Create array node
     #
     # @params {String} name
-    # @params {Hash} options
-    # @block
+    # @params {Hash<Symbol, Object>} options
+    # @block block - [optional]
     ###
     def array(name, options, &block)
+      return unless on_condition options
+
       block ||= ->(t) {}
 
       if (deferred = @deferred_array_blocks[name])
@@ -200,9 +221,9 @@ module Jsonity
     # Get object
     #
     # @params {String} name
-    # @params {Hash} options
+    # @params {Hash<Symbol, Object>} options
     #
-    # @return {any}
+    # @return {Object}
     ###
     def get_object_for(name, options)
       if options[:_object]
@@ -218,9 +239,9 @@ module Jsonity
     # Arity safe proc call
     #
     # @params {Proc} block
-    # @params {[any]} *args
+    # @params {Array<Object>} *args
     #
-    # @return {any}
+    # @return {Object}
     ###
     def block_call(block, *args)
       ::Kernel.raise RequiredBlockError.new('No block') unless block
@@ -228,5 +249,27 @@ module Jsonity
       block.call *args.first(block.arity.abs)
     end
 
+    ###
+    # On condition
+    #
+    # @params {Hash<Symbol, Object>} options
+    # @params {Object} obj
+    ###
+    def on_condition(options, obj = @object)
+      o_if, o_unless = options[:if], options[:unless]
+
+      flag = true
+
+      unless o_if.nil?
+        flag &&= o_if.is_a?(::Proc) ? block_call(o_if, obj) : o_if
+      end
+
+      unless o_unless.nil?
+        flag &&= !(o_unless.is_a?(::Proc) ? block_call(o_unless, obj) : o_unless)
+      end
+
+      flag
+    end
+
   end
 end

data/lib/jsonity/version.rb

@@ -1,3 +1,9 @@
 module Jsonity
-  VERSION = '1.0.8'
+
+  MAJOR    = 1
+  MINOR    = 1
+  REVISION = 0
+
+  VERSION = [MAJOR, MINOR, REVISION].compact.join '.'
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonity
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - Yuki Iwanaga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler