radiant-templates-extension 1.0.0 → 1.0.1

data/vendor/plugins/make_resourceful/spec/{rspec_on_rails → rspec-rails}/LICENSE

@@ -1,18 +1,20 @@
-All the code in this directory comes from the rspec_on_rails plugin.
+All the code in this directory comes from the rspec-rails plugin.
 We've pilfered it as needed to make the make_resourceful specs easier to write.
 It was made available by its authors under the following license terms:
 
+(The MIT License)
+
 ====================================================================
-== RSpec
-Copyright (c) 2005-2007 The RSpec Development Team
+==== RSpec, RSpec-Rails
+Copyright (c) 2005-2008 The RSpec Development Team
 ====================================================================
-== ARTS
+==== ARTS
 Copyright (c) 2006 Kevin Clark, Jake Howerton
 ====================================================================
-== ZenTest
+==== ZenTest
 Copyright (c) 2001-2006 Ryan Davis, Eric Hodel, Zen Spider Software
 ====================================================================
-== AssertSelect
+==== AssertSelect
 Copyright (c) 2006 Assaf Arkin
 ====================================================================
 

data/vendor/plugins/make_resourceful/spec/rspec-rails/redirect_to.rb

@@ -0,0 +1,113 @@
+module Spec
+  module Rails
+    module Matchers
+
+      class RedirectTo  #:nodoc:
+
+        def initialize(request, expected)
+          @expected = expected
+          @request = request
+        end
+
+        def matches?(response)
+          @redirected = response.redirect?
+          @actual = response.redirect_url
+          return false unless @redirected
+          if @expected.instance_of? Hash
+            return false unless @actual =~ %r{^\w+://#{@request.host}}
+            return false unless actual_redirect_to_valid_route
+            return actual_hash == expected_hash
+          else
+            return @actual == expected_url
+          end
+        end
+
+        def actual_hash
+          hash_from_url @actual
+        end
+
+        def expected_hash
+          hash_from_url expected_url
+        end
+
+        def actual_redirect_to_valid_route
+          actual_hash
+        end
+
+        def hash_from_url(url)
+          query_hash(url).merge(path_hash(url)).with_indifferent_access
+        end
+
+        def path_hash(url)
+          path = url.sub(%r{^\w+://#{@request.host}(?::\d+)?}, "").split("?", 2)[0]
+          ActionController::Routing::Routes.recognize_path path
+        end
+
+        def query_hash(url)
+          query = url.split("?", 2)[1] || ""
+          QueryParameterParser.parse_query_parameters(query, @request)
+        end
+
+       def expected_url
+          case @expected
+            when Hash
+              return ActionController::UrlRewriter.new(@request, {}).rewrite(@expected)
+            when :back
+              return @request.env['HTTP_REFERER']
+            when %r{^\w+://.*}
+              return @expected
+            else
+              return "http://#{@request.host}" + (@expected.split('')[0] == '/' ? '' : '/') + @expected
+          end
+        end
+
+        def failure_message
+          if @redirected
+            return %Q{expected redirect to #{@expected.inspect}, got redirect to #{@actual.inspect}}
+          else
+            return %Q{expected redirect to #{@expected.inspect}, got no redirect}
+          end
+        end
+
+        def negative_failure_message
+            return %Q{expected not to be redirected to #{@expected.inspect}, but was} if @redirected
+        end
+
+        def description
+          "redirect to #{@actual.inspect}"
+        end
+
+        class QueryParameterParser
+          def self.parse_query_parameters(query, request)
+            if defined?(CGIMethods)
+              CGIMethods.parse_query_parameters(query)
+            else
+              request.class.parse_query_parameters(query)
+            end
+          end
+        end
+      end
+
+      # :call-seq:
+      #   response.should redirect_to(url)
+      #   response.should redirect_to(:action => action_name)
+      #   response.should redirect_to(:controller => controller_name, :action => action_name)
+      #   response.should_not redirect_to(url)
+      #   response.should_not redirect_to(:action => action_name)
+      #   response.should_not redirect_to(:controller => controller_name, :action => action_name)
+      #
+      # Passes if the response is a redirect to the url, action or controller/action.
+      # Useful in controller specs (integration or isolation mode).
+      #
+      # == Examples
+      #
+      #   response.should redirect_to("path/to/action")
+      #   response.should redirect_to("http://test.host/path/to/action")
+      #   response.should redirect_to(:action => 'list')
+      def redirect_to(opts)
+        RedirectTo.new(request, opts)
+      end
+    end
+
+  end
+end

data/vendor/plugins/make_resourceful/spec/rspec-rails/render_template.rb

@@ -0,0 +1,90 @@
+module Spec
+  module Rails
+    module Matchers
+    
+      class RenderTemplate #:nodoc:
+    
+        def initialize(expected, controller)
+          @controller = controller
+          @expected = expected
+        end
+      
+        def matches?(response)
+          
+          if response.respond_to?(:rendered_file)
+            @actual = response.rendered_file
+          else
+            @actual = response.rendered_template.to_s
+          end
+          return false if @actual.blank?
+          given_controller_path, given_file = path_and_file(@actual)
+          expected_controller_path, expected_file = path_and_file(@expected)
+          given_controller_path == expected_controller_path && given_file.match(expected_file)
+        end
+        
+        def failure_message
+          "expected #{@expected.inspect}, got #{@actual.inspect}"
+        end
+        
+        def negative_failure_message
+          "expected not to render #{@expected.inspect}, but did"
+        end
+        
+        def description
+          "render template #{@expected.inspect}"
+        end
+      
+        private
+          def path_and_file(path)
+            parts = path.split('/')
+            file = parts.pop
+            controller = parts.empty? ? current_controller_path : parts.join('/')
+            return controller, file
+          end
+        
+          def controller_path_from(path)
+            parts = path.split('/')
+            parts.pop
+            parts.join('/')
+          end
+
+          def current_controller_path
+            @controller.class.to_s.underscore.gsub(/_controller$/,'')
+          end
+        
+      end
+
+      # :call-seq:
+      #   response.should render_template(path)
+      #   response.should_not render_template(path)
+      #
+      # Passes if the specified template is rendered by the response.
+      # Useful in controller specs (integration or isolation mode).
+      #
+      # <code>path</code> can include the controller path or not. It
+      # can also include an optional extension (no extension assumes .rhtml).
+      #
+      # Note that partials must be spelled with the preceding underscore.
+      #
+      # == Examples
+      #
+      #   response.should render_template('list')
+      #   response.should render_template('same_controller/list')
+      #   response.should render_template('other_controller/list')
+      #
+      #   #rjs
+      #   response.should render_template('list.rjs')
+      #   response.should render_template('same_controller/list.rjs')
+      #   response.should render_template('other_controller/list.rjs')
+      #
+      #   #partials
+      #   response.should render_template('_a_partial')
+      #   response.should render_template('same_controller/_a_partial')
+      #   response.should render_template('other_controller/_a_partial')
+      def render_template(path)
+        RenderTemplate.new(path.to_s, @controller)
+      end
+
+    end
+  end
+end

data/vendor/plugins/make_resourceful/spec/spec_helper.rb

@@ -1,13 +1,20 @@
 $: << File.dirname(__FILE__) + '/../lib'
+
 require 'rubygems'
-%w[spec action_pack active_record resourceful/maker
+%w[spec rails/version action_pack active_record resourceful/maker
    action_controller action_controller/test_process action_controller/integration
-   spec/rspec_on_rails/redirect_to spec/rspec_on_rails/render_template].each &method(:require)
+   spec/rspec-rails/redirect_to spec/rspec-rails/render_template].each &method(:require)
 
 Spec::Runner.configure do |config|
   config.mock_with :mocha
 end
 
+module MetaClass
+  def metaclass
+    class << self; self; end
+  end
+end
+
 def should_be_called(&block)
   pstub = stub
   pstub.expects(:call).instance_eval(&(block || proc {}))
@@ -39,6 +46,7 @@ end
 def stub_const(name)
   unless Object.const_defined?(name)
     obj = Object.new
+    obj.extend MetaClass
     obj.metaclass.send(:define_method, :to_s) { name.to_s }
     obj.metaclass.send(:alias_method, :inspect, :to_s)
     Object.const_set(name, obj)
@@ -93,7 +101,7 @@ module ControllerMocks
     @builder = Resourceful::Builder.new(@kontroller)
     class << @builder
       alias_method :made_resourceful, :instance_eval
-    end    
+    end
   end
 
   def responses
@@ -143,11 +151,11 @@ module RailsMocks
   end
 
   def redirect_to(opts)
-    RedirectTo.new(request, opts)
+    Spec::Rails::Matchers::RedirectTo.new(request, opts)
   end
 
   def render_template(path)
-    RenderTemplate.new(path.to_s, @controller)
+    Spec::Rails::Matchers::RenderTemplate.new(path.to_s, @controller)
   end
 
   private
@@ -155,6 +163,7 @@ module RailsMocks
   def init_kontroller(options)
     @kontroller = Class.new ActionController::Base
     @kontroller.extend Resourceful::Maker
+    @kontroller.extend MetaClass
 
     @kontroller.metaclass.send(:define_method, :controller_name) { options[:name] }
     @kontroller.metaclass.send(:define_method, :controller_path) { options[:name] }
@@ -175,7 +184,7 @@ module RailsMocks
     route_block = options[:routes] || proc { |map| map.resources options[:name] }
     ActionController::Routing::Routes.draw(&route_block)
   end
-  
+
   def init_controller(options)
     @controller = kontroller.new
     @request = ActionController::TestRequest.new
@@ -208,26 +217,53 @@ module RailsMocks
   end
 
   module ControllerMethods
-    def render(options=nil, deprecated_status=nil, &block)
+    # From rspec-rails ControllerExampleGroup  
+    
+    def render(options=nil, deprecated_status_or_extra_options=nil, &block)
+      if ::Rails::VERSION::STRING >= '2.0.0' && deprecated_status_or_extra_options.nil?
+        deprecated_status_or_extra_options = {}
+      end
+      
       unless block_given?
-        @template.metaclass.class_eval do
-          define_method :file_exists? do true end
+        if @template.respond_to?(:finder)
+          (class << @template.finder; self; end).class_eval do
+            define_method :file_exists? do; true; end
+          end
+        else
+          (class << @template; self; end).class_eval do
+            define_method :file_exists? do; true; end
+          end
+        end
+        (class << @template; self; end).class_eval do
           define_method :render_file do |*args|
-            @first_render ||= args[0]
+            @first_render ||= args[0] unless args[0] =~ /^layouts/
+            @_first_render ||= args[0] unless args[0] =~ /^layouts/
+          end
+          
+          define_method :_pick_template do |*args|
+            @_first_render ||= args[0] unless args[0] =~ /^layouts/
+            PickedTemplate.new
           end
         end
       end
 
-      super(options, deprecated_status, &block)
+      super(options, deprecated_status_or_extra_options, &block)
+    end
+    
+    class PickedTemplate
+      def render_template(*ignore_args); end
+      def render_partial(*ignore_args);  end
     end
   end
+  
 end
 
 module Spec::Example::ExampleGroupMethods
   def should_render_html(action)
     it "should render HTML by default for #{action_string(action)}" do
       action_method(action)[action, action_params(action)]
-      response.should be_success
+      response.should_have "Missing template things"
+      #response.should be_success
       response.content_type.should == 'text/html'
     end
   end
@@ -235,7 +271,8 @@ module Spec::Example::ExampleGroupMethods
   def should_render_js(action)
     it "should render JS for #{action_string(action)}" do
       action_method(action)[action, action_params(action, :format => 'js')]
-      response.should be_success
+      #response.contents.should.include? "Missing template things"
+      #response.should be_success
       response.content_type.should == 'text/javascript'
     end
   end
@@ -262,18 +299,21 @@ module Spec::Example::ExampleGroupMethods
 end
 
 module Spec::Example
-  class IntegrationExampleGroup < Test::Unit::TestCase
-    include ExampleMethods
-    class << self
-      include ExampleGroupMethods
+  class IntegrationExampleGroup < Spec::Example::ExampleGroup
+    include ActionController::TestProcess
+    include ActionController::Assertions
+    include RailsMocks
+    
+    # Need this helper, because we made current_objects private
+    def current_objects
+      controller.instance_eval("current_objects")
     end
 
-    def initialize(defined_description, &implementation)
-      super()
-      @_defined_description = defined_description
-      @_implementation = implementation
+    # Need this helper, because we made current_object private
+    def current_object
+      controller.instance_eval("current_object")
     end
-
+    
     ExampleGroupFactory.register(:integration, self)
   end
 end

data/vendor/plugins/make_resourceful/spec/urls_spec.rb

@@ -120,6 +120,7 @@ describe Resourceful::Default::URLs, " for a controller with a parent object" do
     @controller.stubs(:parent_object).returns(@person)
     @controller.stubs(:parent_name).returns('person')
     @controller.stubs(:parent?).returns(true)
+    @controller.stubs(:parent_class_name).returns('Person')
     @controller.stubs(:namespaces).returns([])
   end
 
@@ -247,6 +248,7 @@ describe Resourceful::Default::URLs, " for a controller with a parent object and
     @controller.stubs(:parent_object).returns(@person)
     @controller.stubs(:parent_name).returns('person')
     @controller.stubs(:parent?).returns(true)
+    @controller.stubs(:parent_class_name).returns('Person')
     @controller.stubs(:namespaces).returns([:admin, :main])
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-templates-extension
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Andrew vonderLuft
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -07:00
+date: 2011-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 23
         segments: 
-        - 0
-        - 9
         - 1
-        version: 0.9.1
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 description: Imposes structure on pages via content templates.
@@ -58,6 +58,7 @@ files:
 - app/views/admin/pages/_edit_template.html.haml
 - app/views/admin/pages/_edit_template_part.html.haml
 - app/views/admin/pages/_switch_templates.html.haml
+- app/views/admin/pages/_template_chooser.html.haml
 - app/views/admin/pages/_template_column.html.haml
 - app/views/admin/pages/_template_column_header.html.haml
 - app/views/admin/part_types/_form.html.haml
@@ -95,6 +96,7 @@ files:
 - lib/templates/helper.rb
 - lib/templates/page_extensions.rb
 - lib/templates/tags.rb
+- pkg/radiant-templates-extension-1.0.0.gem
 - public/images/admin/menu_arrow.png
 - public/images/admin/move_higher.png
 - public/images/admin/move_lower.png
@@ -102,6 +104,7 @@ files:
 - public/images/admin/move_to_top.png
 - public/images/admin/part_type.png
 - public/images/admin/template.png
+- radiant-templates-extension.gemspec
 - spec/controllers/admin_page_controller_extensions_spec.rb
 - spec/controllers/part_types_controller_spec.rb
 - spec/controllers/templates_controller_spec.rb
@@ -120,6 +123,7 @@ files:
 - vendor/plugins/acts_as_list/init.rb
 - vendor/plugins/acts_as_list/lib/active_record/acts/list.rb
 - vendor/plugins/acts_as_list/test/list_test.rb
+- vendor/plugins/make_resourceful/.gitignore
 - vendor/plugins/make_resourceful/DEFAULTS
 - vendor/plugins/make_resourceful/LICENSE
 - vendor/plugins/make_resourceful/README
@@ -159,9 +163,9 @@ files:
 - vendor/plugins/make_resourceful/spec/maker_spec.rb
 - vendor/plugins/make_resourceful/spec/response_spec.rb
 - vendor/plugins/make_resourceful/spec/responses_spec.rb
-- vendor/plugins/make_resourceful/spec/rspec_on_rails/LICENSE
-- vendor/plugins/make_resourceful/spec/rspec_on_rails/redirect_to.rb
-- vendor/plugins/make_resourceful/spec/rspec_on_rails/render_template.rb
+- vendor/plugins/make_resourceful/spec/rspec-rails/LICENSE
+- vendor/plugins/make_resourceful/spec/rspec-rails/redirect_to.rb
+- vendor/plugins/make_resourceful/spec/rspec-rails/render_template.rb
 - vendor/plugins/make_resourceful/spec/serialize_spec.rb
 - vendor/plugins/make_resourceful/spec/spec_helper.rb
 - vendor/plugins/make_resourceful/spec/urls_spec.rb