tokamak 1.2.0 → 1.2.1

data/lib/tokamak.rb

@@ -7,7 +7,10 @@ require "bundler/setup"
 # Lib
 module Tokamak
   def self.builder_lookup(media_type)
-    Tokamak::Builder::Base.global_media_types[media_type[/^([^\s\;]+)/, 1]]
+    builder = Tokamak::Builder::Base.global_media_types[media_type[/^([^\s\;]+)/, 1]]
+    builder.nil? ?
+      (raise Tokamak::BuilderError.new("Could not find a builder for the media type: #{media_type}")) : 
+      builder
   end
 end
 

data/lib/tokamak/hook/rails.rb

@@ -17,6 +17,19 @@ module Tokamak
         end
       end
 
+      module Rails3Adapter
+        def _pick_partial_template(path) #:nodoc:
+          return path unless path.is_a?(String)
+          prefix = controller_path unless path.include?(?/)
+          find_template(path, prefix, true).instance_eval do
+            unless respond_to?(:path)
+              def path; virtual_path end
+            end
+            self
+          end
+        end
+      end
+
       module Helpers
         # Load a partial template to execute in describe
         #
@@ -41,7 +54,12 @@ module Tokamak
         # end
         #
         def partial(partial_path, caller_binding = nil)
-          template = _pick_partial_template(partial_path)
+          begin
+            template = _pick_partial_template(partial_path)
+          rescue NoMethodError
+            self.extend(Rails3Adapter)
+            template = _pick_partial_template(partial_path)
+          end
 
           # Create a context to assing variables
           if caller_binding.kind_of?(Hash)

data/lib/tokamak/version.rb

@@ -2,7 +2,7 @@ module Tokamak
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
 

data/test/rails3_skel/Rakefile

@@ -0,0 +1,7 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+require 'rake'
+
+Rails3Skel::Application.load_tasks

data/test/rails3_skel/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/test/rails3_skel/app/controllers/test_controller.rb

@@ -0,0 +1,18 @@
+class TestController < ApplicationController
+  def show
+    @some_articles = [
+      {:id => 1, :title => "a great article", :updated => Time.now},
+      {:id => 2, :title => "another great article", :updated => Time.now}
+    ]
+    response.content_type = request.negotiated_type
+  end
+
+  def feed
+    @some_articles = [
+      {:id => 1, :title => "a great article", :updated => Time.now},
+      {:id => 2, :title => "another great article", :updated => Time.now}
+    ]
+    response.content_type = request.negotiated_type
+  end
+
+end

data/test/rails3_skel/app/views/test/_feed_member.tokamak

@@ -0,0 +1,9 @@
+member.values do |values|
+    values.id      "uri:#{article[:id]}"
+    values.title   article[:title]
+    values.updated article[:updated]
+end
+
+member.link("image", "http://example.com/image/1")
+member.link("image", "http://example.com/image/2", :type => "application/json")
+

data/test/rails3_skel/app/views/test/feed.tokamak

@@ -0,0 +1,24 @@
+collection(@some_articles) do |collection|
+    collection.values do |values|
+        values.id      "http://example.com/json"
+        values.title   "Feed"
+        values.updated Time.now
+
+        values.author {
+            values.name  "John Doe"
+            values.email "joedoe@example.com"
+        }
+
+        values.author {
+            values.name  "Foo Bar"
+            values.email "foobar@example.com"
+        }
+    end
+
+    collection.link("next"    , "http://a.link.com/next")
+    collection.link("previous", "http://a.link.com/previous")
+
+    collection.members(:root => "articles") do |member, article|
+        partial("feed_member", :locals => {:member => member, :article => article})
+    end
+end

data/test/rails3_skel/app/views/test/show.tokamak

@@ -0,0 +1,31 @@
+collection(@some_articles) do |collection|
+    collection.values do |values|
+        values.id      "http://example.com/json"
+        values.title   "Feed"
+        values.updated Time.now
+
+        values.author {
+            values.name  "John Doe"
+            values.email "joedoe@example.com"
+        }
+
+        values.author {
+            values.name  "Foo Bar"
+            values.email "foobar@example.com"
+        }
+    end
+
+    collection.link("next"    , "http://a.link.com/next")
+    collection.link("previous", "http://a.link.com/previous")
+
+    collection.members(:root => "articles") do |member, article|
+        member.values do |values|
+            values.id      "uri:#{article[:id]}"
+            values.title   article[:title]
+            values.updated article[:updated]
+        end
+
+        member.link("image", "http://example.com/image/1")
+        member.link("image", "http://example.com/image/2", :type => "application/json")
+    end
+end

data/test/rails3_skel/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Rails3Skel::Application

data/test/rails3_skel/config/application.rb

@@ -0,0 +1,54 @@
+require File.expand_path('../boot', __FILE__)
+
+# Pick the frameworks you want:
+# require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+# require "active_resource/railtie"
+require "rails/test_unit/railtie"
+
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+module Rails3Skel
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # JavaScript files you want as :defaults (application.js is always included).
+    config.action_view.javascript_expansions[:defaults] = %w()
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+
+    config.middleware.use(Rack::Conneg) do |conneg|
+      conneg.set :accept_all_extensions, false
+      conneg.set :fallback, :html
+      conneg.ignore('/public/')
+      conneg.provide([:json,:xml])
+    end
+  end
+end

data/test/rails3_skel/config/boot.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/test/rails3_skel/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Rails3Skel::Application.initialize!

data/test/rails3_skel/config/environments/development.rb

@@ -0,0 +1,26 @@
+Rails3Skel::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_view.debug_rjs             = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+end
+

data/test/rails3_skel/config/environments/production.rb

@@ -0,0 +1,49 @@
+Rails3Skel::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The production environment is meant for finished, "live" apps.
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Specifies the header that your server uses for sending files
+  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+
+  # For nginx:
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+
+  # If you have no front-end server that supports something like X-Sendfile,
+  # just comment this out and Rails will serve the files
+
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Disable Rails's static asset server
+  # In production, Apache or nginx will already do this
+  config.serve_static_assets = false
+
+  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
+end

data/test/rails3_skel/config/environments/test.rb

@@ -0,0 +1,35 @@
+Rails3Skel::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/test/rails3_skel/config/initializers/backtrace_silencers.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!

data/test/rails3_skel/config/initializers/inflections.rb

@@ -0,0 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end

data/test/rails3_skel/config/initializers/mime_types.rb

@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone

data/test/rails3_skel/config/initializers/secret_token.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+Rails3Skel::Application.config.secret_token = 'a99f8d7966ca819b542a7974ce8f4e81d2082462dde13da8e6aa6d124db718d97562df564c7de9096b6f5f75b5bfb9e126245ebd6ba97d6b6f92ea0e91a8d976'

data/test/rails3_skel/config/initializers/session_store.rb

@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+Rails3Skel::Application.config.session_store :cookie_store, :key => '_rails3_skel_session'
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rails generate session_migration")
+# Rails3Skel::Application.config.session_store :active_record_store

data/test/rails3_skel/config/locales/en.yml

@@ -0,0 +1,5 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  hello: "Hello world"

data/test/rails3_skel/config/routes.rb

@@ -0,0 +1,58 @@
+Rails3Skel::Application.routes.draw do
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
+
+  # Sample of regular route:
+  #   match 'products/:id' => 'catalog#view'
+  # Keep in mind you can assign values other than :controller and :action
+
+  # Sample of named route:
+  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+  # This route can be invoked with purchase_url(:id => product.id)
+
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Sample resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
+
+  # Sample resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Sample resource route with more complex sub-resources
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', :on => :collection
+  #     end
+  #   end
+
+  # Sample resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
+
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root :to => "welcome#index"
+
+  # See how all your routes lay out with "rake routes"
+
+  # This is a legacy wild controller route that's not recommended for RESTful applications.
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  match ':controller(/:action(/:id(.:format)))'
+end

data/test/rails3_skel/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/test/tokamak/hook/rails_test.rb

@@ -7,7 +7,8 @@ begin
   require 'ruby-debug'
 rescue Exception => e; end
 
-require File.expand_path(File.dirname(__FILE__) + '/../../rails2_skel/config/environment.rb')
+railsv = ENV["RAILS_MAJOR_VERSION"] || "2"
+require File.expand_path(File.dirname(__FILE__) + "/../../rails#{railsv}_skel/config/environment.rb")
 
 # put the require below to use tokamak in your rails project
 require "tokamak/hook/rails"
@@ -15,9 +16,10 @@ require "tokamak/hook/rails"
 class Tokamak::Hook::RailsTest < ActionController::IntegrationTest
 
   def test_view_generation_with_json
-    get '/test/show', {}, :accept => 'application/json'
+    self.accept = "application/json"
+    get '/test/show'
 
-    json = @controller.response.body
+    json = (@controller || self).response.body
     hash = JSON.parse(json).extend(Methodize)
 
     assert_equal "John Doe"               , hash.author.first.name
@@ -36,9 +38,10 @@ class Tokamak::Hook::RailsTest < ActionController::IntegrationTest
   end
 
   def test_view_generation_with_xml
-    get '/test/show', {}, :accept => 'application/xml'
+    self.accept = "application/xml"
+    get '/test/show'
 
-    xml = @controller.response.body
+    xml = (@controller || self).response.body
     xml = Nokogiri::XML::Document.parse(xml)
 
     assert_equal "John Doe"               , xml.css("root > author").first.css("name").first.text
@@ -56,9 +59,10 @@ class Tokamak::Hook::RailsTest < ActionController::IntegrationTest
   end
 
   def test_view_generation_with_partial
-    get '/test/feed', {}, :accept => 'application/xml'
+    self.accept = "application/xml"
+    get '/test/feed'
 
-    xml = @controller.response.body
+    xml = (@controller || self).response.body
     xml = Nokogiri::XML::Document.parse(xml)
 
     assert_equal "John Doe"               , xml.css("root > author").first.css("name").first.text

data/test/tokamak/hook/tilt_test.rb

@@ -10,6 +10,17 @@ rescue Exception => e; end
 require "tokamak/hook/tilt"
 
 class Tokamak::Hook::TiltTest < Test::Unit::TestCase
+  def setup
+    @template_file = File.expand_path(File.dirname(__FILE__) + '/../../rails2_skel/app/views/test/show.tokamak')
+  end
+  
+  def test_tokamak_builder_with_tilt_and_unsupported_media_type
+    e = assert_raise(Tokamak::BuilderError) do
+      template = Tokamak::Hook::Tilt::TokamakTemplate.new(@template_file, :media_type => 'unsupported/type')
+      template.render(self)
+    end
+    assert_equal "Could not find a builder for the media type: unsupported/type", e.message
+  end
 
   def test_tokamak_builder_integration_with_tilt
     @some_articles = [
@@ -17,7 +28,7 @@ class Tokamak::Hook::TiltTest < Test::Unit::TestCase
       {:id => 2, :title => "another great article", :updated => Time.now}
     ]
 
-    template = Tokamak::Hook::Tilt::TokamakTemplate.new(File.expand_path(File.dirname(__FILE__) + '/../../rails2_skel/app/views/test/show.tokamak'), :media_type => "application/json")
+    template = Tokamak::Hook::Tilt::TokamakTemplate.new(@template_file, :media_type => "application/json")
     json     = template.render(self, :@some_articles => @some_articles)
     hash     = JSON.parse(json).extend(Methodize)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tokamak
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Luis Cipriani
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 -03:00
+date: 2011-08-01 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -204,6 +204,27 @@ files:
 - test/rails2_skel/log/development.log
 - test/rails2_skel/Rakefile
 - test/rails2_skel/script/console
+- test/rails3_skel/app/controllers/application_controller.rb
+- test/rails3_skel/app/controllers/test_controller.rb
+- test/rails3_skel/app/views/test/_feed_member.tokamak
+- test/rails3_skel/app/views/test/feed.tokamak
+- test/rails3_skel/app/views/test/show.tokamak
+- test/rails3_skel/config/application.rb
+- test/rails3_skel/config/boot.rb
+- test/rails3_skel/config/environment.rb
+- test/rails3_skel/config/environments/development.rb
+- test/rails3_skel/config/environments/production.rb
+- test/rails3_skel/config/environments/test.rb
+- test/rails3_skel/config/initializers/backtrace_silencers.rb
+- test/rails3_skel/config/initializers/inflections.rb
+- test/rails3_skel/config/initializers/mime_types.rb
+- test/rails3_skel/config/initializers/secret_token.rb
+- test/rails3_skel/config/initializers/session_store.rb
+- test/rails3_skel/config/locales/en.yml
+- test/rails3_skel/config/routes.rb
+- test/rails3_skel/config.ru
+- test/rails3_skel/Rakefile
+- test/rails3_skel/script/rails
 - test/test_helper.rb
 - test/tokamak/builder/base_test.rb
 - test/tokamak/builder/json_test.rb