renderit 0.1.0 → 0.2.0

data/README.rdoc

@@ -20,6 +20,10 @@ will be used.
 
 In order to use those tempates, default view or layout have to be present. You will not be able to render 'application_new' layout in case you have no 'application' layout.
 
-Have fun :)
+== Rails compatibility
+
+In order to use this gem with rails 2.3.*, you just have to put 'config.gem "renderit"' string in config/environment.rb file.
+
+In order to user this gem with rails 3, you have to require 'renderit' gem in Gemfile and create some file (I prefer renderit.rb) in config/initializers folder where 'RenderIt.load_config' line should be present.
 
 Copyright (c) 2010 Andrey Romanov. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/renderit.rb

@@ -1,36 +1,3 @@
-class ActionController::Base
-  private
-
-  # default_render method for ActionController::Base is redefined
-  # in order to render views for specific browsers (depending on user_agent)
-  def default_render
-    @renderit_template ||= RenderIt.get_template_name(request)
-    template_path = default_template_name + '_' + @renderit_template
-    if view_paths.find_template(template_path, default_template_format)
-      render template_path
-    end
-  rescue ActionView::MissingTemplate => e
-    render default_template_name
-  end
-
-  # default_layout method for ActionController::Base is redefined
-  # in order to render layouts for specific browsers (depending on user_agent)
-  def default_layout
-    @renderit_template = RenderIt.get_template_name(request)
-    layout = self.class.read_inheritable_attribute(:layout)
-    return layout unless self.class.read_inheritable_attribute(:auto_layout)
-    begin
-      rendered_layout = find_layout(layout+ '_' + @renderit_template, default_template_format)
-    rescue ActionView::MissingTemplate
-    end
-    return rendered_layout if rendered_layout
-    find_layout(layout, default_template_format)
-  rescue ActionView::MissingTemplate
-    nil
-  end
-
-end
-
 class RenderIt
   # Default regular expressions to define browser and its version
   DEFAULT_BROWSERS_CONFIG = {
@@ -123,4 +90,99 @@ class RenderIt
 
 end
 
-RenderIt.load_config
+
+RAILS_THREE_REGEXP = /^3/
+
+if RAILS_THREE_REGEXP =~ Rails.version # If rails version is 3
+
+  module AbstractController
+    module Rendering
+
+      def _normalize_options(options)
+        if options[:partial] == true
+          options[:partial] = action_name
+        end
+        if (options.keys & [:partial, :file, :template]).empty?
+          options[:prefix] ||= _prefix
+        end
+
+        options[:template] ||= (options[:action] || action_name).to_s
+        if (@renderit_template ||= RenderIt.get_template_name(request))
+          begin
+            template_name = options[:template]+'_'+@renderit_template
+            if lookup_context.find_template(template_name, options[:prefix])
+              options[:template] = template_name
+            end
+          rescue ActionView::MissingTemplate => e          
+          end
+        end
+        options
+      end
+
+    end
+
+  end
+
+  module AbstractController
+    module Layouts
+
+      def _normalize_options(options)
+        super
+        if _include_layout?(options)
+          layout = options.key?(:layout) ? options.delete(:layout) : :default
+          value = _layout_for_option(layout)
+          if (value && (@renderit_template ||= RenderIt.get_template_name(request)) )
+            begin
+              template_name = value+'_'+@renderit_template
+              if lookup_context.find_template(template_name, 'layouts')
+                value = template_name
+              end
+            rescue ActionView::MissingTemplate => e
+            end
+          end
+          options[:layout] = (value =~ /\blayouts/ ? value : "layouts/#{value}") if value
+        end
+      end
+
+    end
+  end
+
+
+else # If rails version is 2.3.*
+
+  class ActionController::Base
+    private
+
+    # default_render method for ActionController::Base is redefined
+    # in order to render views for specific browsers (depending on user_agent)
+    def default_render
+      @renderit_template ||= RenderIt.get_template_name(request)
+      template_path = default_template_name + '_' + @renderit_template
+      if view_paths.find_template(template_path, default_template_format)
+        render template_path
+      end
+    rescue ActionView::MissingTemplate => e
+      render default_template_name
+    end
+
+    # default_layout method for ActionController::Base is redefined
+    # in order to render layouts for specific browsers (depending on user_agent)
+    def default_layout
+      @renderit_template = RenderIt.get_template_name(request)
+      layout = self.class.read_inheritable_attribute(:layout)
+      return layout unless self.class.read_inheritable_attribute(:auto_layout)
+      begin
+        rendered_layout = find_layout(layout+ '_' + @renderit_template, default_template_format)
+      rescue ActionView::MissingTemplate
+      end
+      return rendered_layout if rendered_layout
+      find_layout(layout, default_template_format)
+    rescue ActionView::MissingTemplate
+      nil
+    end
+
+  end
+
+  RenderIt.load_config
+
+end

data/renderit.gemspec

@@ -0,0 +1,54 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{renderit}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Andrey Romanov"]
+  s.date = %q{2010-08-09}
+  s.description = %q{Renders different templates depending on browser user_agent.}
+  s.email = %q{judo.ras@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lib/renderit.rb",
+     "renderit.gemspec",
+     "test/helper.rb",
+     "test/test_renderit.rb"
+  ]
+  s.homepage = %q{http://github.com/romanoff/renderit}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Renders different templates depending on browser user_agent.}
+  s.test_files = [
+    "test/helper.rb",
+     "test/test_renderit.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    else
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: renderit
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Andrey Romanov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 +03:00
+date: 2010-08-09 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,7 @@ files:
 - Rakefile
 - VERSION
 - lib/renderit.rb
+- renderit.gemspec
 - test/helper.rb
 - test/test_renderit.rb
 has_rdoc: true