rabl 0.2.5 → 0.2.6

data/lib/rabl/engine.rb

@@ -15,7 +15,7 @@ module Rabl
       @_locals, @_scope = locals, scope
       self.copy_instance_variables_from(@_scope, [:@assigns, :@helpers])
       @_options[:scope] = @_scope
-      @_options[:format] ||= default_format
+      @_options[:format] ||= self.request_format
       @_data = locals[:object] || self.default_object
       instance_eval(@_source) if @_source.present?
       instance_eval(&block) if block_given?
@@ -130,13 +130,13 @@ module Rabl
     end
 
     # Returns a guess at the format in this scope
-    # default_format => "xml"
-    def default_format
+    # request_format => "xml"
+    def request_format
       format = self.request_params.has_key?(:format) ? @_scope.params[:format] : nil
       if request = @_scope.respond_to?(:request) && @_scope.request
         format ||= request.format.to_sym.to_s if request.respond_to?(:format)
       end
-      format || "json"
+      format && self.respond_to?("to_#{format}") ? format : "json"
     end
 
     # Returns the request parameters if available in the scope

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -2,7 +2,7 @@
 name: rabl
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 Z
+date: 2011-05-19 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: riot
@@ -89,6 +90,7 @@ files:
 - test/models/user.rb
 - test/template_test.rb
 - test/teststrap.rb
+has_rdoc: true
 homepage: https://github.com/nesquena/rabl
 licenses: []
 
@@ -112,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rabl
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: General ruby templating for json or xml