mack 0.8.0 → 0.8.0.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+=== 0.8.0.2
+* [#190] Fixed ViewTemplate methods can easily be overridden
+
 === 0.8.0
 * [#187] Fixed: When an exception is raised, the request doesn't get 'logged'
 * [#185] Fixed: .html is being appended to logged requests when there's a 404

data/lib/mack/controller/controller.rb

@@ -272,7 +272,7 @@ module Mack
     private
     def do_render
       render unless @view_template
-      @rendered_action = @view_template.compile_and_render
+      @rendered_action = @view_template._compile_and_render
     end
 
     def layout

data/lib/mack/rendering/type/action.rb

@@ -28,7 +28,7 @@ module Mack
         # Example:
         #   app/views/users/show.html.erb 
         def render
-          a_file = File.join(self.controller_view_path, "#{self.render_value}.#{self.options[:format]}")
+          a_file = File.join(self.controller_view_path, "#{self._render_value}.#{self._options[:format]}")
           render_file(a_file)
         end
         

data/lib/mack/rendering/type/file_base.rb

@@ -13,7 +13,7 @@ module Mack
           Mack::Rendering::Engine::Registry.engines[type].each do |e|
             @engine = find_engine(e).new(self.view_template)
             find_file(file + ".#{@engine.extension}") do |f|
-              return @engine.render(File.new(f), self.binder)
+              return @engine.render(File.new(f), self._binder)
             end
           end
           raise Mack::Errors::ResourceNotFound.new(file + ".*")

data/lib/mack/rendering/type/inline.rb

@@ -10,8 +10,8 @@ module Mack
       class Inline < Mack::Rendering::Type::Base
         
         def render
-          @engine = find_engine((self.options[:engine] || :erubis)).new(self.view_template)
-          return @engine.render(self.render_value, self.binder)
+          @engine = find_engine((self._options[:engine] || :erubis)).new(self.view_template)
+          return @engine.render(self._render_value, self._binder)
         end
         
         # Passes concatenation messages through to the Mack::Rendering::Engine object.

data/lib/mack/rendering/type/layout.rb

@@ -12,7 +12,7 @@ module Mack
         # Example:
         #   app/views/layouts/application.html.erb 
         def render
-          l_file = Mack::Paths.layouts("#{self.options[:layout]}.#{self.options[:format]}")
+          l_file = Mack::Paths.layouts("#{self._options[:layout]}.#{self._options[:format]}")
           begin
             render_file(l_file, :layout)
           rescue Mack::Errors::ResourceNotFound => e

data/lib/mack/rendering/type/partial.rb

@@ -15,7 +15,7 @@ module Mack
         # Example:
         #   app/views/users/_form.html.erb 
         def render
-          partial = self.render_value.to_s
+          partial = self._render_value.to_s
           parts = partial.split("/")
           if parts.size == 1
             # it's local to this controller
@@ -26,7 +26,7 @@ module Mack
             parts[parts.size - 1] = "_" << parts.last
             partial = Mack::Paths.views(parts)
           end
-          partial = "#{partial}.#{self.options[:format]}"
+          partial = "#{partial}.#{self._options[:format]}"
           render_file(partial, :partial)
         end
         

data/lib/mack/rendering/type/public.rb

@@ -9,9 +9,9 @@ module Mack
         # Attempts to find the file on disk and return it. If no file extension is provided then the 'format' 
         # of the request is appended to the file name.
         def render
-          p_file = self.render_value
+          p_file = self._render_value
           if File.extname(p_file).blank?
-            p_file = "#{p_file}.#{self.options[:format]}"
+            p_file = "#{p_file}.#{self._options[:format]}"
           end
           find_file(Mack::Paths.public(p_file)) do |f|
             return File.open(f).read

data/lib/mack/rendering/type/template.rb

@@ -13,7 +13,7 @@ module Mack
         # Example:
         #   <%= render(:template, "users/show") %> # => app/views/users/show.html.erb
         def render
-          t_file = Mack::Paths.views("#{self.render_value}.#{self.options[:format]}")
+          t_file = Mack::Paths.views("#{self._render_value}.#{self._options[:format]}")
           render_file(t_file, :template)
         end
         

data/lib/mack/rendering/type/text.rb

@@ -9,7 +9,7 @@ module Mack
       class Text < Mack::Rendering::Type::Base
         
         def render
-          self.render_value
+          self._render_value
         end
         
       end # Text

data/lib/mack/rendering/type/url.rb

@@ -32,8 +32,8 @@ module Mack
         
         # Retrieves the contents of the url using either GET or POST, passing along any specified parameters.
         def render
-          options = {:method => :get, :raise_exception => false}.merge(self.options)
-          url = self.render_value
+          options = {:method => :get, :raise_exception => false}.merge(self._options)
+          url = self._render_value
           remote = url.match(/^[a-zA-Z]+:\/\//)
           case options[:method]
           when :get
@@ -43,7 +43,7 @@ module Mack
               end
             else
               do_render_local_url(url, options) do |url, options|
-                Rack::MockRequest.new(self.app_for_rendering).get(url, options)
+                Rack::MockRequest.new(self._app_for_rendering).get(url, options)
               end
             end
           when :post
@@ -53,7 +53,7 @@ module Mack
               end
             else
               do_render_local_url(url, options) do |url, options|
-                Rack::MockRequest.new(self.app_for_rendering).post(url, options)
+                Rack::MockRequest.new(self._app_for_rendering).post(url, options)
               end
             end
           else

data/lib/mack/rendering/type/xml.rb

@@ -23,9 +23,9 @@ module Mack
         
         # See Mack::Rendering::Type::FileBase render_file for more information.
         def render
-          self.options[:format] = "xml"
-          self.controller.response["Content-Type"] = Mack::Utils::MimeTypes[self.options[:format]]
-          x_file = File.join(self.controller_view_path, "#{self.render_value}.#{self.options[:format]}")
+          self._options[:format] = "xml"
+          self.controller.response["Content-Type"] = Mack::Utils::MimeTypes[self._options[:format]]
+          x_file = File.join(self.controller_view_path, "#{self._render_value}.#{self._options[:format]}")
           render_file(x_file, :xml)
         end
         

data/lib/mack/rendering/view_template.rb

@@ -5,25 +5,25 @@ module Mack
     class ViewTemplate
       
       # Allows access to any options passed into the template.
-      attr_accessor :options
-      attr_accessor :render_type
-      attr_accessor :render_value
+      attr_accessor :_options
+      attr_accessor :_render_type
+      attr_accessor :_render_value
       
       def initialize(render_type, render_value, options = {})
-        self.render_type = render_type
-        self.render_value = render_value
-        self.options = options
+        self._render_type = render_type
+        self._render_value = render_value
+        self._options = options
         @_yield_to_cache = {}
         Thread.current[:view_template] = self
         # Define methods for :locals
-        (self.options[:locals] || {}).each do |k,v|
+        (self._options[:locals] || {}).each do |k,v|
           define_instance_method(k) {v}
         end
       end
       
       # Allows access to the current Mack::Controller object.
       def controller
-        self.options[:controller]
+        self._options[:controller]
       end
       
       # Returns the Mack::Request associated with the current Mack::Controller object.
@@ -57,8 +57,8 @@ module Mack
       #   <%= render(:partial, :latest_news) %>
       #   <%= render(:url, "http://www.mackframework.com") %>
       def render(render_type, render_value, options = {})
-        options = self.options.merge({:layout => false}).merge(options)
-        Mack::Rendering::ViewTemplate.new(render_type, render_value, options).compile_and_render
+        options = self._options.merge({:layout => false}).merge(options)
+        Mack::Rendering::ViewTemplate.new(render_type, render_value, options)._compile_and_render
       end
       
       # Returns a string stored using content_for.
@@ -93,18 +93,18 @@ module Mack
       # Transfers all the instance variables from the controller to the current instance of
       # the view template. This call is cached, so it only happens once, regardless of the number
       # of times it is called.
-      def compile
-        ivar_cache("compiled_template") do
-          self.options.symbolize_keys!
-          transfer_vars(self.controller)
+      def _compile
+        ivar_cache("_compiled_template") do
+          self._options.symbolize_keys!
+          _transfer_vars(self.controller)
         end
       end
       
-      # Fully compiles and renders the view and, if applicable, it's layout.
-      def compile_and_render
-        self.compile
-        content_for(:view, render_view)
-        render_layout
+      # Fully _compiles and renders the view and, if applicable, it's layout.
+      def _compile_and_render
+        self._compile
+        content_for(:view, _render_view)
+        _render_layout
       end
       
       # Passes concatenation messages through to the Mack::Rendering::Type object.
@@ -117,7 +117,7 @@ module Mack
       # Primarily used by Mack::Rendering::Type::Url when dealing with 'local' urls.
       # This returns an instance of the current application to run additional requests
       # through.
-      def app_for_rendering
+      def _app_for_rendering
         ivar_cache do
           Mack::Utils::Server.build_app
         end
@@ -125,25 +125,25 @@ module Mack
       
       # Returns the binding of the current view template to be used with
       # the engines to render.
-      def binder
+      def _binder
         binding
       end
       
       private
       
-      def render_layout
-        if @_render_type.allow_layout? && self.options[:layout]
+      def _render_layout
+        if @_render_type.allow_layout? && self._options[:layout]
           return Mack::Rendering::Type::Layout.new(self).render
         end
         return yield_to(:view)
       end
       
-      def render_view
-        @_render_type = find_render_type(self.render_type).new(self)
+      def _render_view
+        @_render_type = _find_render_type(self._render_type).new(self)
         @_render_type.render
       end
       
-      def find_file(*path)
+      def _find_file(*path)
         f = File.join(path)
         if File.exists?(f)
           yield f
@@ -151,13 +151,13 @@ module Mack
       end
   
       # Transfer instance variables from the controller to the view.
-      def transfer_vars(x)
+      def _transfer_vars(x)
         x.instance_variables.each do |v|
           self.instance_variable_set(v, x.instance_variable_get(v))
         end
       end
       
-      def find_render_type(e)
+      def _find_render_type(e)
         eval("Mack::Rendering::Type::#{e.to_s.camelcase}")
       end
       

data/lib/mack/version.rb

@@ -1,3 +1,3 @@
 module Mack
-  VERSION = '0.8.0' unless const_defined?("VERSION")
+  VERSION = '0.8.0.2' unless const_defined?("VERSION")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.0.2
 platform: ruby
 authors: 
 - markbates
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.0
+        version: 0.8.0.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: configatron