rabl 0.6.11 → 0.6.12

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 0.6.12
+
+  * Fix view_path options for renderer (Thanks @ivanvanderbyl and @route)
+  * Only escape if data exists
+  * Fix default object recognition for Rails 2.3.2
+  * Adds `root_object` method on engine (Thanks @OliverLetterer)
+
 ## 0.6.11
 
   * Changes send to __send__ (Thanks @alindeman)

data/lib/rabl/builder.rb

@@ -9,6 +9,7 @@ module Rabl
     def initialize(options={}, &block)
       @options    = options
       @_scope     = options[:scope]
+      @_view_path = options[:view_path]
     end
 
     # Given an object and options, returns the hash representation

data/lib/rabl/engine.rb

@@ -10,6 +10,7 @@ module Rabl
     def initialize(source, options={})
       @_source = source
       @_options = options
+      @_view_path = options[:view_path]
     end
 
     def source=(string)
@@ -109,6 +110,13 @@ module Rabl
       @_data = data unless @_locals[:object]
     end
 
+    # Returns the current object that is the topic of this template
+    # Can be the collection or the object depending on topic assigned
+    # root_object => @user
+    def root_object
+      @_data
+    end
+
     # Sets the object as a collection casted to a simple array
     # collection @users
     # collection @users => :people
@@ -186,8 +194,9 @@ module Rabl
     # default_object => @user
     def default_object
       if context_scope.respond_to?(:controller)
-        full_name = context_scope.controller.controller_name
-        instance_variable_get("@#{ full_name.split("::").last }")
+        controller_name = context_scope.controller.controller_name
+        stripped_name = controller_name.split(%r{::|\/}).last
+        instance_variable_get("@#{stripped_name}")
       end
     end
 

data/lib/rabl/helpers.rb

@@ -97,7 +97,7 @@ module Rabl
 
     # Escape output if configured and supported
     def escape_output(data)
-      defined?(ERB::Util.h) && Rabl.configuration.escape_all_output ? ERB::Util.h(data) : data
+      (data && defined?(ERB::Util.h) && Rabl.configuration.escape_all_output) ? ERB::Util.h(data) : data
     end
 
   end

data/lib/rabl/partials.rb

@@ -8,7 +8,7 @@ module Rabl
     # options can have :view_path, :child_root, :root
     def partial(file, options={}, &block)
       raise ArgumentError, "Must provide an :object option to render a partial" unless options.has_key?(:object)
-      object, view_path = options.delete(:object), options.delete(:view_path)
+      object, view_path = options.delete(:object), options[:view_path] || @_view_path
       source, location = self.fetch_source(file, :view_path => view_path)
       engine_options = options.merge(:source => source, :source_location => location)
       self.object_to_hash(object, engine_options, &block)
@@ -23,7 +23,7 @@ module Rabl
     def object_to_hash(object, options={}, &block)
       return object unless is_object?(object) || is_collection?(object)
       return [] if is_collection?(object) && object.blank? # empty collection
-      engine_options = options.reverse_merge(:format => "hash", :root => (options[:root] || false))
+      engine_options = options.reverse_merge(:format => "hash", :view_path => @_view_path, :root => (options[:root] || false))
       Rabl::Engine.new(options[:source], engine_options).render(@_scope, :object => object, &block)
     end
 

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.6.11"
+  VERSION = "0.6.12"
 end

data/test/builder_test.rb

@@ -8,11 +8,12 @@ context "Rabl::Builder" do
   setup do
     @users = [User.new, User.new]
     @user = User.new
-    builder({})
+    builder({:view_path => '/path/to/views'})
   end
 
   context "#initialize" do
     asserts_topic.assigns :options
+    asserts_topic.assigns :_view_path
   end
 
   context "#build" do

data/test/engine_test.rb

@@ -14,6 +14,7 @@ context "Rabl::Engine" do
 
     asserts_topic.assigns :_source
     asserts_topic.assigns :_options
+    asserts_topic.assigns :_view_path
   end
 
   context "#cache" do
@@ -293,6 +294,16 @@ context "Rabl::Engine" do
     end
 
     context "#object" do
+      asserts "that it sets default object" do
+        template = rabl %{
+          attribute :name
+        }
+        scope = Object.new
+        stub(scope).controller { stub(Object).controller_name { "a/b/c::d/user" } }
+        scope.instance_variable_set :@user, User.new
+        template.render(scope).split
+      end.equals "{\"name\":\"rabl\"}".split
+
       asserts "that it sets data source" do
         template = rabl %q{
           object @user
@@ -371,6 +382,17 @@ context "Rabl::Engine" do
         template.render(scope)
       end.equals "{\"city\":\"irvine\"}"
 
+      asserts "that it exposes root_object" do
+        template = rabl %q{
+          object @user
+
+          attribute :name, :as => root_object.city
+        }
+        scope = Object.new
+        scope.instance_variable_set :@user, User.new(:name => 'irvine')
+        template.render(scope)
+      end.equals "{\"irvine\":\"irvine\"}"
+
       asserts "that it can add attribute under a different key name through hash" do
         template = rabl %{
           object @user

data/test/renderer_test.rb

@@ -158,6 +158,35 @@ context "Rabl::Renderer" do
       scope.instance_variable_set :@users, nil
       Rabl.render([], 'test', :view_path => tmp_path, :root => false, :scope => scope)
     end.equals "[]"
+
+    asserts 'handles view path for when it specified and config is empty' do
+      Rabl.configuration.view_paths = []
+
+      File.open(tmp_path + "profile.json.rabl", "w") do |f|
+        f.puts %q{
+          attributes :gender
+        }
+      end
+
+      File.open(tmp_path + "user.json.rabl", "w") do |f|
+        f.puts %(
+          object @user
+          attribute :name
+          glue(:profile) do
+            extends 'profile'
+          end
+          child(:profile) do
+            extends 'profile'
+          end
+        )
+      end
+
+      user = User.new(:name => 'irvine')
+      stub(user).profile { stub!.gender { "male" } }
+
+      renderer = Rabl::Renderer.new('user', user, :view_path => tmp_path)
+      renderer.render.split("").sort
+    end.equals "{\"user\":{\"name\":\"irvine\",\"object\":{\"gender\":\"male\"},\"gender\":\"male\"}}".split("").sort
   end
 
   context '.json' do

metadata

@@ -1,137 +1,183 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rabl
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.12
   prerelease: 
-  version: 0.6.11
 platform: ruby
-authors: 
+authors:
 - Nathan Esquenazi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.14
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.14
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: riot
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: riot
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.12.3
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 0.12.3
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.0.2
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: tilt
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: msgpack
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.4.5
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: bson
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+- !ruby/object:Gem::Dependency
+  name: bson
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: plist
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: General ruby templating with json, bson, xml and msgpack support
-email: 
+email:
 - nesquena@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -372,32 +418,29 @@ files:
 - test/teststrap.rb
 homepage: https://github.com/nesquena/rabl
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rabl
-rubygems_version: 1.8.19
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: General ruby templating with json, bson, xml and msgpack support
-test_files: 
+test_files:
 - test/bson_engine_test.rb
 - test/builder_test.rb
 - test/configuration_test.rb