jsonite 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 001f4ee4203a2a9ad449b3ce2be7bef23ba649dc
-  data.tar.gz: cf3d345ce6b1e7194edf8a009512b5a5873f3972
+  metadata.gz: 5612be53563ec019fa0b12169f778105d529896c
+  data.tar.gz: f19a895e932ae5b559f5de7699c39df930189713
 SHA512:
-  metadata.gz: c819dffe0197681f90b17d6e86b5e219861538830c966d2b6f23e3497018c70e09d3070147a618684bb661ed8a42ee95d3c41f01d7e5a9c7bb8854ece3176746
-  data.tar.gz: 73ce6f0f49069b446b458347a3803d162b4bdd21d6ffd8ce74323d8e5e8a1f52b27a1a6d8b3c2a2e6d97c8496932d762dba5993bc332acf1fa1fc6b47e358b79
+  metadata.gz: 3273041c6a95535e89442a3d99ddf8bf6e2fe8dc3ce94d1a8e2c109a50f4b915a98ffc0ecefcfd42e3f026d7524993f9b3e9c1421b76bf0c8dc4c55e0af9c462
+  data.tar.gz: 461ea18c18c82ee91734e644cebfea19a733b2951a072ce39b4ca0244f7a1a3c2a9d1eca3657e7afb45a289ff1e7aa9c0accf6ddffe47ae0463b5065a0841db5

data/lib/jsonite.rb

@@ -1,6 +1,7 @@
 require 'active_support/core_ext/object/blank'
 require 'active_support/json/encoding'
 require 'jsonite/helper'
+require 'jsonite/lets_proxy'
 
 # = Jsonite
 #
@@ -23,29 +24,25 @@ class Jsonite
     #   # => [{"email"=>"stephen@example.com"}, ...]
     #
     # Configuration options:
+    # * <tt>:root</tt> - A root key to wrap the resource with.
     # * <tt>:with</tt> - A specified presenter (defaults to `self`).
     #
-    # All other options are passed along to <tt>#as_json</tt>.
+    # All other options are passed along to <tt>#present</tt>.
     def present resource, options = {}
       presenter = options.delete(:with) { self }
 
-      case resource
-      when Jsonite
-        resource.as_json options
-      else
-        resource = if resource.respond_to?(:to_ary)
-          resource.to_ary.map do |r|
-            present presenter.new(r), options.merge(root: nil)
-          end
-        elsif resource.respond_to?(:as_json)
-          present presenter.new(resource), options.merge(root: nil)
-        else
-          resource
+      presented = if resource.is_a? Jsonite
+        resource.present options
+      elsif resource.respond_to?(:to_ary)
+        resource.to_ary.map do |member|
+          presenter.new(member).present options.merge root: nil
         end
-
-        root = options.fetch :root, Helper.resource_name(resource)
-        root ? { root => resource } : resource
+      else
+        presenter.new(resource).present options.merge root: nil
       end
+
+      root = options.fetch(:root) { Helper.resource_name(resource) }
+      root ? { root => presented } : presented
     end
 
     # Defines a property to be exposed during presentation.
@@ -61,14 +58,9 @@ class Jsonite
     # * <tt>:with</tt> - A specified presenter. Ignored when a handler is
     #   present. Useful when you want to embed a resource as a property (rather
     #   than in the <tt>_embedded</tt> node).
+    # * <tt>:ignore_nil</tt> - Ignore `nil`.
     def property name, options = {}, &handler
-      handler ||= if options[:with]
-        proc { Jsonite.present send(name), with: options[:with] }
-      else
-        proc { send name }
-      end
-
-      properties[name] = handler
+      properties[name.to_s] = { handler: handler }.merge options
     end
 
     def properties *properties
@@ -102,7 +94,7 @@ class Jsonite
     #
     #   class UserPresenter < Jsonite
     #     link :todos, title: 'To-dos', templated: true do |context|
-    #       "#{context.user_todos_url self}{?done}
+    #       "#{context.user_todos_url self}{?done}"
     #     end
     #   end
     #   # {
@@ -115,7 +107,7 @@ class Jsonite
     #   #   }
     #   # }
     def link rel = :self, options = {}, &handler
-      links[rel] = options.merge handler: Proc.new # enforce handler presence
+      links[rel.to_s] = { handler: Proc.new }.merge options # require handler
     end
 
     def links
@@ -143,27 +135,40 @@ class Jsonite
     # Configuration options:
     # * <tt>:with</tt> - A specified presenter. Required if a handler isn't
     #   present.
+    # * <tt>:ignore_nil</tt> - Ignore `nil`.
     def embed rel, options = {}, &handler
-      if handler.nil?
-        presenter = options.fetch :with
-        handler = proc do |context|
-          Jsonite.present send(rel), with: presenter, context: context
-        end
-      end
-
-      embedded[rel] = handler
+      options.fetch :with unless handler
+      embedded[rel.to_s] = { handler: handler }.merge options
     end
 
     def embedded
       @embedded ||= {}
     end
 
+    # Defines a memoized "virtual" method on the resource.
+    #
+    #   class UserPresenter < Jsonite
+    #     let(:full_name) { "#{first_name} #{last_name}" }
+    #     property :full_name
+    #   end
+    #   # {
+    #   #   "full_name": "Stephen Celis"
+    #   # }
+    def let name, &handler
+      lets[name.to_s] = handler
+    end
+
+    def lets
+      @lets ||= {}
+    end
+
     private
 
     def inherited presenter
       presenter.properties.update properties
       presenter.links.update links
       presenter.embedded.update embedded
+      presenter.lets.update lets
     end
 
   end
@@ -177,49 +182,72 @@ class Jsonite
     @resource, @defaults = resource, defaults
   end
 
-  # Returns a JSON representation (Hash) of the resource.
+  # Returns a raw representation (Hash) of the resource.
   #
   # Options:
   # * <tt>:context</tt> - A context to pass a presenter instance while
   #   rendering properties, links, and embedded resources.
-  def as_json options = {}
-    return resource.as_json options if instance_of? Jsonite
+  def present options = {}
     options = defaults.merge options
+
     context = options.delete :context
-    hash = properties context
-    hash.update _links: links(context) if self.class.links.present?
-    hash.update _embedded: embedded(context) if self.class.embedded.present?
-    hash.as_json options
+    proxied = LetsProxy.new resource, context, self.class.lets
+
+    presented = properties proxied, context
+    _links = links proxied, context
+    presented['_links'] = _links if _links.present?
+    _embedded = embedded proxied, context
+    presented['_embedded'] = _embedded if _embedded.present?
+
+    root = options.fetch(:root) { Helper.resource_name(resource) }
+    root ? { root => presented } : presented
+  end
+
+  # Returns a JSON-ready representation (Hash) of the resource.
+  #
+  # Options:
+  # * <tt>:root</tt>
+  def as_json options = {}
+    present(options).as_json options
   end
 
   private
 
-  def properties context = nil
-    context ||= resource
-    self.class.properties.each_with_object({}) do |(name, handler), props|
-      catch :ignore do
-        props[name] = resource.instance_exec context, &handler
-      end
+  def properties rsrc, context = nil
+    self.class.properties.each_with_object({}) do |(name, options), props|
+      catch(:ignore) { props[name] = fetch name, rsrc, context, options }
     end
   end
 
-  def links context = nil
-    context ||= resource
+  def links rsrc, context = nil
     self.class.links.each_with_object({}) do |(rel, link), links|
       catch :ignore do
-        href = resource.instance_exec context, &link[:handler]
-        links[rel] = { href: href }.merge link.except :handler
+        href = fetch rel, rsrc, context, link
+        links[rel] = { 'href' => href }.merge link.except :handler
       end
     end
   end
 
-  def embedded context = nil
-    context ||= resource
-    self.class.embedded.each_with_object({}) do |(name, handler), embedded|
-      catch :ignore do
-        embedded[name] = resource.instance_exec context, &handler
-      end
+  def embedded rsrc, context = nil
+    self.class.embedded.each_with_object({}) do |(name, options), embeds|
+      catch(:ignore) { embeds[name] = fetch name, rsrc, context, options }
+    end
+  end
+
+  def fetch name, rsrc, context, options
+    value = if options[:handler]
+      rsrc.instance_exec context, &options[:handler]
+    else
+      rsrc.__send__ name
     end
+
+    throw :ignore if options[:ignore_nil] && value.nil?
+
+    if options[:with] && !value.nil?
+      return options[:with].present value, context: context, root: nil
+    end
+
+    value
   end
 
 end

data/lib/jsonite/helper.rb

@@ -6,7 +6,7 @@ class Jsonite
     module_function
 
     def resource_name resource
-      if resource.respond_to? :model_name
+      if resource.respond_to?(:model_name) && resource.respond_to?(:to_ary)
         resource.model_name.collection
       elsif resource.class.respond_to? :model_name
         resource.class.model_name.singular

data/lib/jsonite/lets_proxy.rb

@@ -0,0 +1,23 @@
+class Jsonite
+  class LetsProxy < BasicObject
+
+    undef_method :==, :!, :!=
+
+    def initialize object, context, lets = {}
+      @__object__, @__context__, @__lets__ = object, context, lets
+
+      @__memoized__ = ::Hash.new do |memoized, name|
+        memoized[name] = instance_exec @__context__, &@__lets__.fetch(name)
+      end
+    end
+
+    def method_missing name, *args, &block
+      if @__lets__.key?(name.to_s)
+        @__memoized__[name.to_s]
+      else
+        @__object__.__send__ name, *args, &block
+      end
+    end
+
+  end
+end

data/lib/jsonite/version.rb

@@ -1,5 +1,5 @@
 class Jsonite
 
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonite
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Stephen Celis
@@ -9,20 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
@@ -61,9 +75,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/jsonite.rb
 - lib/jsonite/helper.rb
+- lib/jsonite/lets_proxy.rb
 - lib/jsonite/version.rb
-- lib/jsonite.rb
 homepage: https://github.com/barrelage/jsonite
 licenses:
 - MIT
@@ -74,18 +89,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A tiny, HAL-compliant JSON presenter
 test_files: []
+has_rdoc: false