jsonity 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42316fb2fab2080e7f8c124563f1971d6da6e2dc
-  data.tar.gz: 236ba99b0a71315e733f4ec072a9935d71e72a20
+  metadata.gz: 8b9dbe8b1de7d83969314a84ad14212824935da4
+  data.tar.gz: 1ad4683c458a684dbb631ca8870ce40ea019500c
 SHA512:
-  metadata.gz: 7a20a170051ad9b85ee8e7718b2eb29b8fc73b4ada974ae09c36321b8c97662e33baacc6fc6d541c7b862ac8d61d33467d1cc724f6dba4c696181b20bf30e252
-  data.tar.gz: 2a5f7fcd98774c4d19914f07f4048e61c7809259456382e52d00deac7baac9561ea0e5a5e5bc32337675f35fd856a1f397315ddd07aa69a948173719a8aa8f46
+  metadata.gz: aebb379ed36c70e1e37c50e4ae27ef4cc2235ae9b0c5fd48994857407ec385fa0b7fb86f9477562cf14906ec7072696d3d1907180600866a09084f50e16a6c20
+  data.tar.gz: 0a7d2d44a3cc95b2fbcdd424080c6b7addd7f8a0b34d41451441f2c31fd1adea71e08b206755d85ad7e66589f546110a3e37d30e888cf543e73aeea30fb6e71b

data/README.md

@@ -296,6 +296,10 @@ If you set `attr_json` in any class, **the specified attributes will automatical
 ```ruby
 class Sample < Struct.new(:id, :foo, :bar)
   attr_json :id, :foo
+
+  attr_json { |sample|
+    sample.hello_from 'attr_json!'
+  }
 end
 
 @sample = Sample.new 123, 'foo!', 'bar!!'
@@ -311,7 +315,8 @@ Jsonity.build { |t|
 {
   "sample": {
     "id": 123,
-    "foo": "foo!"
+    "foo": "foo!",
+    "hello_from": "attr_json!"
   }
 }
 =end
@@ -322,7 +327,7 @@ Still you can create any kinds of nodes with a block:
 ```ruby
 Jsonity.build { |t|
   t.sample!(@sample) { |sample|
-    sample.bar { |bar| "this is #{bar}" }
+    sample.bar { |s| "this is #{s.bar}" }
   }
 }
 =begin
@@ -330,6 +335,7 @@ Jsonity.build { |t|
   "sample": {
     "id": 123,
     "foo": "foo!",
+    "hello_from": "attr_json!",
     "bar": "this is bar!!"
   }
 }

data/lib/jsonity/attribute.rb

@@ -8,10 +8,15 @@ module Jsonity
       # Automatically export attributes to json
       #
       # @params {[String | Symbol]} *attrs
+      # @block - [optional]
       ###
-      def attr_json(*attrs)
-        @json_attributes ||= Set.new
-        @json_attributes |= attrs.map(&:to_s)
+      def attr_json(*attrs, &block)
+        @json_attributes ||= []
+        @json_attributes += attrs.map(&:to_s)
+        @json_attributes.uniq!
+
+        @json_attribute_blocks ||= []
+        @json_attribute_blocks << block if block
       end
 
       ###
@@ -20,14 +25,24 @@ module Jsonity
       # @return {[String]}
       ###
       def json_attributes
-        @json_attributes.to_a
+        @json_attributes || []
+      end
+
+      ###
+      # Get json attributes
+      #
+      # @return {[String]}
+      ###
+      def json_attribute_blocks
+        @json_attribute_blocks || []
       end
+
     end
 
     module InstanceMethods
 
       ###
-      # Get json attributes
+      # Get json attributes (delegates to self class)
       #
       # @return {[String]}
       ###
@@ -35,6 +50,15 @@ module Jsonity
         self.class.json_attributes
       end
 
+      ###
+      # Get json attributes (delegates to self class)
+      #
+      # @return {[String]}
+      ###
+      def json_attribute_blocks
+        self.class.json_attribute_blocks
+      end
+
     end
   end
 end

data/lib/jsonity/builder.rb

@@ -15,11 +15,15 @@ module Jsonity
       builder = new object, content
 
       if object.respond_to? :json_attributes
-        object.json_attributes.each { |a| builder.__send__ :attribute, a, nil }
+        object.json_attributes.each { |a| builder.__send__(:attribute, a, {}) }
+      end
+
+      if object.respond_to? :json_attribute_blocks
+        object.json_attribute_blocks.each { |b| builder.(&b) }
       end
 
       builder.(&block)
-      builder.__send__ :content
+      builder._content
     end
 
     ###
@@ -64,6 +68,16 @@ module Jsonity
       end
     end
 
+    ###
+    # Getter for `@content`
+    #
+    # @return {Hash | nil}
+    ###
+    def _content
+      evaluate_array_blocks!
+      @content
+    end
+
 
   private
 
@@ -75,7 +89,7 @@ module Jsonity
       is_object = name.match OBJECT_SUFFIX
       name, is_object = name[0..-2], is_object[0] if is_object
 
-      options = args.last.is_a?(::Hash) ? args.pop : {}
+      options = args.last.is_a?(::Hash) ? args.pop.dup : {}
       options[:_object] = args[0]
       options[:_nullable] = ('?' == is_object)
 
@@ -98,16 +112,6 @@ module Jsonity
       self
     end
 
-    ###
-    # Getter for `@content`
-    #
-    # @return {Hash | nil}
-    ###
-    def content
-      evaluate_array_blocks!
-      @content
-    end
-
     ###
     # Create attribute node
     #
@@ -118,7 +122,8 @@ module Jsonity
     def attribute(name, options, &block)
       obj = get_object_for name, options
 
-      @content[name] = block ? block_call(block, obj || @object) : obj
+      value = block ? block_call(block, options[:_object] || @object) : obj
+      @content[name] = Formatter.format value, name
     end
 
     ###
@@ -196,14 +201,14 @@ module Jsonity
     # Get object
     #
     # @params {String} name
-    # @params {Hash} options - [optional]
+    # @params {Hash} options
     #
     # @return {any}
     ###
-    def get_object_for(name, options = nil)
-      if options && options[:_object]
+    def get_object_for(name, options)
+      if options[:_object]
         options[:_object]
-      elsif options && options[:inherit]
+      elsif options[:inherit]
         @object
       elsif @object.respond_to? name
         @object.public_send name

data/lib/jsonity/formatter.rb

@@ -0,0 +1,11 @@
+module Jsonity
+  class Formatter
+    class << self
+
+      def format(obj, name)
+        obj
+      end
+
+    end
+  end
+end

data/lib/jsonity/version.rb

@@ -1,3 +1,3 @@
 module Jsonity
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/lib/jsonity.rb

@@ -1,5 +1,6 @@
 require 'forwardable'
 require 'jsonity/version'
+require 'jsonity/formatter'
 require 'jsonity/builder'
 require 'jsonity/core_ext'
 require 'jsonity/rails' if defined? Rails

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonity
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Yuki Iwanaga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,6 +55,7 @@ files:
 - lib/jsonity/attribute.rb
 - lib/jsonity/builder.rb
 - lib/jsonity/core_ext.rb
+- lib/jsonity/formatter.rb
 - lib/jsonity/rails.rb
 - lib/jsonity/version.rb
 homepage: https://github.com/creasty/jsonity