grape-rabl 0.0.2 → 0.0.3

data/README.md

@@ -41,12 +41,12 @@ end
 To *get post put delete options* add **:rabl** options with template name.
 
 ```ruby
-get "/path", :rabl => "template_name.rabl" do
+get "/path", :rabl => "template_name" do
   # stuff
   @var = "hello"
 end
 
-post "/path", :rabl => "template_name_diff.rabl" do
+post "/path", :rabl => "template_name_diff" do
   # stuff
   @user = User.find_user("email@example.com")
 end
@@ -54,6 +54,15 @@ end
 
 **You can use instance variables in templates!**
 
+## Template name
+
+You can use "**view.rabl**" or just "**view**"
+
+```ruby
+get "/home", :rabl => "view"
+get "/home", :rabl => "view.rabl"
+```
+
 ### Example
 
 ```ruby
@@ -66,7 +75,7 @@ end
 
 class UserAPI < Grape::API
   # use rabl with 'hello.rabl' template
-  get '/user', :rabl => 'hello.rabl' do
+  get '/user', :rabl => 'hello' do
     @user = User.first
   end
 
@@ -84,6 +93,7 @@ object @user => :user
 attributes :name
 ```
 
+
 Enjoy :)
 
 ## Contributing

data/lib/grape-rabl/formatter.rb

@@ -11,12 +11,22 @@ module Grape
         current_endpoint = env['api.endpoint']
 
         rabl(current_endpoint) do |template|
-          engine = ::Tilt.new(File.join(env['api.tilt.root'], template))
+          engine = ::Tilt.new(view_path(template))
           rendered = engine.render(current_endpoint, {})
           Rack::Response.new(rendered, status, headers).to_a
         end
       end
 
+      private
+
+      def view_path(template)
+        if template.split(".")[-1] == "rabl"
+          File.join(env['api.tilt.root'], template)
+        else
+          File.join(env['api.tilt.root'], (template + ".rabl"))
+        end
+      end
+
       def rabl(endpoint)
         if template = rablable?(endpoint)
           yield template

data/lib/grape-rabl/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Rabl
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/grape_rabl_spec.rb

@@ -26,14 +26,16 @@ describe Grape::Rabl do
       lambda{ get "/home" }.should_not raise_error("Use Rack::Config to set 'api.tilt.root' in config.ru")
     end
 
-    it "should render rabl template" do
-      subject.get("/home", :rabl => "user.rabl") do
-        @user = OpenStruct.new(:name => "LTe", :email => "email@example.com")
-        @project = OpenStruct.new(:name => "First")
-      end
+    ["user", "user.rabl"].each do |rabl_option|
+      it "should render rabl template (#{rabl_option})" do
+        subject.get("/home", :rabl => rabl_option) do
+          @user = OpenStruct.new(:name => "LTe", :email => "email@example.com")
+          @project = OpenStruct.new(:name => "First")
+        end
 
-      get "/home"
-      last_response.body.should == '{"user":{"name":"LTe","email":"email@example.com","project":{"name":"First"}}}'
+        get "/home"
+        last_response.body.should == '{"user":{"name":"LTe","email":"email@example.com","project":{"name":"First"}}}'
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-rabl
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000 Z
+date: 2012-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rabl
-  requirement: &15019600 !ruby/object:Gem::Requirement
+  requirement: &4299880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15019600
+  version_requirements: *4299880
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &15016400 !ruby/object:Gem::Requirement
+  requirement: &4298300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15016400
+  version_requirements: *4298300
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &15027960 !ruby/object:Gem::Requirement
+  requirement: &4294300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15027960
+  version_requirements: *4294300
 description: Use rabl in grape
 email:
 - piotr.nielacny@gmail.com