rabl 0.6.2 → 0.6.3

data/fixtures/rails3_2/test/functional/users_controller_test.rb

@@ -0,0 +1,87 @@
+# Lives in <rabl>/test/integration/users_controller_test.rb
+# Symlinked to fixture applications
+
+begin # Sinatra
+  require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
+rescue LoadError # Rails
+  require File.expand_path(File.dirname(__FILE__) + '/../test_helper.rb')
+end
+
+context "UsersController" do
+  helper(:json_output) { JSON.parse(last_response.body) }
+
+  setup do
+    create_users!
+  end
+
+  context "for index action" do
+    # Tests `collection @users` extending from 'show' template
+
+    setup do
+      get "/users"
+    end
+
+    # Attributes (regular)
+    asserts("contains user usernames") do
+      json_output.map { |u| u["user"]["username"] }
+    end.equals { @users.map(&:username) }
+    asserts("contains email") do
+      json_output.map { |u| u["user"]["email"] }
+    end.equals { @users.map(&:email) }
+    asserts("contains location") do
+      json_output.map { |u| u["user"]["location"] }
+    end.equals { @users.map(&:location) }
+
+    # Attributes (custom name)
+    asserts("contains registered_at") do
+      json_output.map { |u| u["user"]["registered_at"] }
+    end.equals { @users.map(&:created_at).map(&:iso8601) }
+
+    # Node (renders based on attribute)
+    asserts("contains role") do
+      json_output.map { |u| u["user"]["role"] }
+    end.equals ['normal', 'normal', 'admin']
+
+    # Child (custom collection name)
+    asserts("contains formatted phone numbers") do
+      json_output.map { |u| u["user"]["pnumbers"].map { |n| n["pnumber"]["formatted"] } }
+    end.equals { @users.map { |u| u.phone_numbers.map(&:formatted) } }
+
+    # Node (renders collection partial)
+    asserts("contains formatted node numbers") do
+      json_output.map { |u| u["user"]["node_numbers"].map { |n| n["formatted"] } }
+    end.equals { @users.map { |u| u.phone_numbers.map(&:formatted) } }
+  end # index
+
+  context "for show action" do
+    # Tests `object :user => :person` custom parent node name
+    setup do
+      get "/users/#{@user1.id}"
+    end
+
+    # Attributes (regular)
+    asserts("contains username") { json_output["person"]["username"] }.equals { @user1.username }
+    asserts("contains email") { json_output["person"]["email"] }.equals { @user1.email }
+    asserts("contains location") { json_output["person"]["location"] }.equals { @user1.location }
+    # Attributes (custom name)
+    asserts("contains registered_at") { json_output["person"]["registered_at"] }.equals { @user1.created_at.iso8601 }
+    # Node (renders based on attribute)
+    asserts("contains role node") { json_output["person"]["role"] }.equals "normal"
+
+    # Child (custom collection name)
+    asserts("contains first phone number") {
+      json_output["person"]["pnumbers"][0]["pnumber"]["formatted"]
+    }.equals { @user1.phone_numbers[0].formatted }
+    asserts("contains second phone number") {
+      json_output["person"]["pnumbers"][1]["pnumber"]["formatted"]
+    }.equals { @user1.phone_numbers[1].formatted }
+
+    # Node (renders collection partial)
+    asserts("contains first node number") {
+      json_output["person"]["node_numbers"][0]["formatted"]
+    }.equals { @user1.phone_numbers[0].formatted }
+    asserts("contains second node number") {
+      json_output["person"]["node_numbers"][1]["formatted"]
+    }.equals { @user1.phone_numbers[1].formatted }
+  end # show
+end

data/fixtures/rails3_2/test/performance/browsing_test.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+require 'rails/performance_test_help'
+
+class BrowsingTest < ActionDispatch::PerformanceTest
+  # Refer to the documentation for all available options
+  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
+  #                          :output => 'tmp/performance', :formats => [:flat] }
+
+  def test_homepage
+    get '/'
+  end
+end

data/fixtures/rails3_2/test/test_helper.rb

@@ -0,0 +1,26 @@
+# Load Silence Functionality
+require File.expand_path(File.dirname(__FILE__) + "/../../../test/silence.rb")
+
+# Load Environment
+silence_warnings do
+  ENV["RAILS_ENV"] = "test"
+  require File.expand_path('../../config/environment', __FILE__)
+  require 'rails/test_help'
+end
+
+# Load Riot Test Environment
+require File.expand_path(File.dirname(__FILE__) + "/../../../test/integration/test_init.rb")
+
+# Run Migrations
+silence_stream(STDOUT) do
+  dbconf = YAML::load(File.open('config/database.yml'))[Rails.env]
+  ActiveRecord::Base.establish_connection(dbconf)
+  ActiveRecord::Base.logger = Logger.new(File.open('log/database.log', 'a'))
+  silence_stream(STDOUT) { ActiveRecord::Migrator.up('db/migrate') }
+end
+
+class Riot::Situation
+  def app
+    Rails.application
+  end
+end

data/fixtures/rails3_2/test/unit/helpers/posts_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class PostsHelperTest < ActionView::TestCase
+end

data/fixtures/rails3_2/test/unit/helpers/users_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class UsersHelperTest < ActionView::TestCase
+end

data/fixtures/rails3_2/test/unit/phone_number_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class PhoneNumberTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

data/fixtures/rails3_2/test/unit/post_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class PostTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

data/fixtures/rails3_2/test/unit/user_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class UserTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

data/lib/rabl/builder.rb

@@ -124,6 +124,12 @@ module Rabl
 
     private
 
+    # Returns a guess at the format in this scope
+    # request_format => "xml"
+    def request_format
+      @options[:format] if @options[:format] != "hash"
+    end
+
     # Caches the results of the block based on object cache_key
     # cache_results { compile_hash(options) }
     def cache_results(&block)

data/lib/rabl/partials.rb

@@ -32,27 +32,31 @@ module Rabl
     def fetch_source(file, options={})
       Rabl.source_cache(file, options[:view_path]) do
         if defined? Padrino
-          root_path = Padrino.root
+          view_path = Array(options[:view_path] || context_scope.settings.views)
           # use Padrino's own template resolution mechanism
-          file_path, _ = @_scope.instance_eval { resolve_template(file) }
+          file_path, _ = context_scope.instance_eval { resolve_template(file) }
           # Padrino chops the extension, stitch it back on
-          file_path = File.join(@_scope.settings.views, (file_path.to_s + ".rabl"))
-        elsif defined? Rails
-          if defined?(@_scope) && @_scope.respond_to?(:find_template)
-            # use Rails's own template resolution mechanism (partials and no partial)
-            lookup_proc = lambda { |partial| @_scope.find_template(file, [], partial) }
+          file_path = File.join(view_path.first.to_s, (file_path.to_s + ".rabl"))
+        elsif defined?(Rails) && context_scope
+          # use Rails template resolution mechanism if possible (find_template)
+          source_format = request_format if defined?(request_format)
+          view_path = Array(options[:view_path] || context_scope.view_paths.to_a)
+          if source_format && context_scope.respond_to?(:lookup_context) # Rails 3
+            lookup_proc = lambda { |partial| context_scope.lookup_context.find_template(file, [], partial) }
             template = lookup_proc.call(false) rescue lookup_proc.call(true)
-            file_path = File.join(Rails.root.to_s, template.inspect) if template
+            file_path = template.identifier if template
+          elsif source_format && context_scope.respond_to?(:view_paths) # Rails 2
+            template = context_scope.view_paths.find_template(file, source_format, false)
+            file_path = template.filename if template
           else # fallback to manual
-            root_path = Rails.root
-            view_path = options[:view_path] || File.join(root_path, "app/views/")
-            file_path = Dir[File.join(view_path, file + ".{*.,}rabl")].first
+            file_path = Dir[File.join("{#{view_path.join(",")}}", file + ".{*.,}rabl")].first
           end
         elsif defined? Sinatra
-          view_path = options[:view_path] || @_scope.settings.views
-          file_path = Dir[File.join(view_path, file + ".{*.,}rabl")].first
+          view_path = Array(options[:view_path] || context_scope.settings.views)
+          file_path = Dir[File.join("{#{view_path.join(",")}}", file + ".{*.,}rabl")].first
         end
 
+        raise "Cannot find rabl template '#{file}' within registered views!" unless File.exist?(file_path.to_s)
         [File.read(file_path.to_s), file_path.to_s] if file_path
       end
     end

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/test/partials_test.rb

@@ -7,12 +7,11 @@ class TestPartial
 end
 
 context "Rabl::Partials" do
-  context "fetch_source" do
+  context "fetch_source with json" do
     helper(:tmp_path) { @tmp_path ||= Pathname.new(Dir.mktmpdir) }
 
     setup do
-      ::Rails = stub(Class.new)
-      ::Rails.root.returns(tmp_path)
+      ::Sinatra = stub(Class.new)
       File.open(tmp_path + "test.json.rabl", "w") do |f|
         f.puts "content"
       end
@@ -26,15 +25,14 @@ context "Rabl::Partials" do
 
     asserts(:first).equals {["content\n", (tmp_path + "test.json.rabl").to_s ]}
     asserts(:last).equals {["content_v1\n", (tmp_path + "test_v1.json.rabl").to_s ]}
-    teardown { Object.send(:remove_const, :Rails) }
+    teardown { Object.send(:remove_const, :Sinatra) }
   end
 
-  context "fetch_source" do
+  context "fetch_source with rabl" do
     helper(:tmp_path) { @tmp_path ||= Pathname.new(Dir.mktmpdir) }
 
     setup do
-      ::Rails = stub(Class.new)
-      ::Rails.root.returns(tmp_path)
+      ::Sinatra = stub(Class.new)
       File.open(tmp_path + "test.rabl", "w") do |f|
         f.puts "content"
       end
@@ -43,15 +41,14 @@ context "Rabl::Partials" do
     asserts('detects file.rabl') { topic }.equals do
       ["content\n", (tmp_path + 'test.rabl').to_s]
     end
-    teardown { Object.send(:remove_const, :Rails) }
+    teardown { Object.send(:remove_const, :Sinatra) }
   end
 
-  context "fetch_source" do
+  context "fetch_source with view_path" do
     helper(:tmp_path) { @tmp_path ||= Pathname.new(Dir.mktmpdir) }
 
     setup do
-      ::Rails = stub(Class.new)
-      ::Rails.root.returns(tmp_path)
+      ::Sinatra = stub(Class.new)
       File.open(tmp_path + "test.rabl", "w") do |f|
         f.puts "content"
       end
@@ -63,6 +60,6 @@ context "Rabl::Partials" do
     asserts('detects file.json.rabl first') { topic }.equals do
       ["content2\n", (tmp_path + 'test.json.rabl').to_s]
     end
-    teardown { Object.send(:remove_const, :Rails) }
+    teardown { Object.send(:remove_const, :Sinatra) }
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: rabl
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-21 00:00:00 Z
+date: 2012-03-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
@@ -255,6 +255,72 @@ files:
 - fixtures/rails3/test/functional/posts_controller_test.rb
 - fixtures/rails3/test/functional/users_controller_test.rb
 - fixtures/rails3/test/test_helper.rb
+- fixtures/rails3_2/.gitignore
+- fixtures/rails3_2/Gemfile
+- fixtures/rails3_2/README.rdoc
+- fixtures/rails3_2/Rakefile
+- fixtures/rails3_2/app/assets/images/rails.png
+- fixtures/rails3_2/app/assets/javascripts/application.js
+- fixtures/rails3_2/app/assets/javascripts/posts.js.coffee
+- fixtures/rails3_2/app/assets/javascripts/users.js.coffee
+- fixtures/rails3_2/app/assets/stylesheets/application.css
+- fixtures/rails3_2/app/assets/stylesheets/posts.css.scss
+- fixtures/rails3_2/app/assets/stylesheets/users.css.scss
+- fixtures/rails3_2/app/controllers/application_controller.rb
+- fixtures/rails3_2/app/controllers/posts_controller.rb
+- fixtures/rails3_2/app/controllers/users_controller.rb
+- fixtures/rails3_2/app/helpers/application_helper.rb
+- fixtures/rails3_2/app/helpers/posts_helper.rb
+- fixtures/rails3_2/app/helpers/users_helper.rb
+- fixtures/rails3_2/app/mailers/.gitkeep
+- fixtures/rails3_2/config.ru
+- fixtures/rails3_2/config/application.rb
+- fixtures/rails3_2/config/boot.rb
+- fixtures/rails3_2/config/database.yml
+- fixtures/rails3_2/config/environment.rb
+- fixtures/rails3_2/config/environments/development.rb
+- fixtures/rails3_2/config/environments/production.rb
+- fixtures/rails3_2/config/environments/test.rb
+- fixtures/rails3_2/config/initializers/backtrace_silencers.rb
+- fixtures/rails3_2/config/initializers/inflections.rb
+- fixtures/rails3_2/config/initializers/mime_types.rb
+- fixtures/rails3_2/config/initializers/secret_token.rb
+- fixtures/rails3_2/config/initializers/session_store.rb
+- fixtures/rails3_2/config/initializers/wrap_parameters.rb
+- fixtures/rails3_2/config/locales/en.yml
+- fixtures/rails3_2/config/routes.rb
+- fixtures/rails3_2/db/schema.rb
+- fixtures/rails3_2/db/seeds.rb
+- fixtures/rails3_2/doc/README_FOR_APP
+- fixtures/rails3_2/lib/assets/.gitkeep
+- fixtures/rails3_2/lib/tasks/.gitkeep
+- fixtures/rails3_2/log/.gitkeep
+- fixtures/rails3_2/public/404.html
+- fixtures/rails3_2/public/422.html
+- fixtures/rails3_2/public/500.html
+- fixtures/rails3_2/public/favicon.ico
+- fixtures/rails3_2/public/index.html
+- fixtures/rails3_2/public/robots.txt
+- fixtures/rails3_2/script/rails
+- fixtures/rails3_2/test/fixtures/.gitkeep
+- fixtures/rails3_2/test/fixtures/phone_numbers.yml
+- fixtures/rails3_2/test/fixtures/posts.yml
+- fixtures/rails3_2/test/fixtures/users.yml
+- fixtures/rails3_2/test/functional/.gitkeep
+- fixtures/rails3_2/test/functional/posts_controller_test.rb
+- fixtures/rails3_2/test/functional/users_controller_test.rb
+- fixtures/rails3_2/test/integration/.gitkeep
+- fixtures/rails3_2/test/performance/browsing_test.rb
+- fixtures/rails3_2/test/test_helper.rb
+- fixtures/rails3_2/test/unit/.gitkeep
+- fixtures/rails3_2/test/unit/helpers/posts_helper_test.rb
+- fixtures/rails3_2/test/unit/helpers/users_helper_test.rb
+- fixtures/rails3_2/test/unit/phone_number_test.rb
+- fixtures/rails3_2/test/unit/post_test.rb
+- fixtures/rails3_2/test/unit/user_test.rb
+- fixtures/rails3_2/vendor/assets/javascripts/.gitkeep
+- fixtures/rails3_2/vendor/assets/stylesheets/.gitkeep
+- fixtures/rails3_2/vendor/plugins/.gitkeep
 - fixtures/sinatra_test/Gemfile
 - fixtures/sinatra_test/Rakefile
 - fixtures/sinatra_test/app.rb