typo 5.1.3 → 5.1.98

data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/spec_helper.rb

@@ -7,12 +7,18 @@ require File.expand_path("#{dir}/../spec_resources/controllers/render_spec_contr
 require File.expand_path("#{dir}/../spec_resources/controllers/rjs_spec_controller")
 require File.expand_path("#{dir}/../spec_resources/controllers/redirect_spec_controller")
 require File.expand_path("#{dir}/../spec_resources/controllers/action_view_base_spec_controller")
+require File.expand_path("#{dir}/../spec_resources/helpers/addition_helper")
 require File.expand_path("#{dir}/../spec_resources/helpers/explicit_helper")
 require File.expand_path("#{dir}/../spec_resources/helpers/more_explicit_helper")
 require File.expand_path("#{dir}/../spec_resources/helpers/view_spec_helper")
 require File.expand_path("#{dir}/../spec_resources/helpers/plugin_application_helper")
 
-ActionController::Routing.controller_paths << "#{dir}/../spec_resources/controllers"
+extra_controller_paths = File.expand_path("#{dir}/../spec_resources/controllers")
+
+unless ActionController::Routing.controller_paths.include?(extra_controller_paths)
+  ActionController::Routing.instance_eval {@possible_controllers = nil}
+  ActionController::Routing.controller_paths << extra_controller_paths
+end
 
 module Spec
   module Rails
@@ -38,6 +44,12 @@ class Proc
   end
 end
 
+Spec::Runner.configure do |config|
+  config.before(:each, :type => :controller) do
+  end
+end
+
+
 ActionController::Routing::Routes.draw do |map|
   map.resources :rspec_on_rails_specs
   map.connect 'custom_route', :controller => 'custom_route_spec', :action => 'custom_route'

data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/controllers/controller_spec_controller.rb

@@ -1,4 +1,12 @@
 class ControllerSpecController < ActionController::Base
+  before_filter :raise_error, :only => :action_with_skipped_before_filter
+  
+  def raise_error
+    raise "from a before filter"
+  end
+  
+  skip_before_filter :raise_error
+  
   if ['edge','2.0.0'].include?(ENV['RSPEC_RAILS_VERSION'])
     set_view_path [File.join(File.dirname(__FILE__), "..", "views")]
   else
@@ -10,11 +18,33 @@ class ControllerSpecController < ActionController::Base
   end
   
   def action_with_template
-    session[:session_key] = "session value"
-    flash[:flash_key] = "flash value"
     render :template => "controller_spec/action_with_template"
   end
   
+  def action_which_sets_flash
+    flash[:flash_key] = "flash value"
+    render :text => ""
+  end
+  
+  def action_which_gets_session
+    raise "expected #{params[:session_key].inspect}\ngot #{session[:session_key].inspect}" unless (session[:session_key] == params[:expected])
+    render :text => ""
+  end
+  
+  def action_which_sets_session
+    session[:session_key] = "session value"
+  end
+      
+  def action_which_gets_cookie
+    raise "expected #{params[:expected].inspect}, got #{cookies[:cookie_key].inspect}" unless (cookies[:cookie_key] == params[:expected])
+    render :text => ""
+  end
+      
+  def action_which_sets_cookie
+    cookies['cookie_key'] = params[:value]
+    render :text => ""
+  end
+      
   def action_with_partial
     render :partial => "controller_spec/partial"
   end
@@ -32,7 +62,6 @@ class ControllerSpecController < ActionController::Base
   end
 
   def action_setting_the_assigns_hash
-    assigns['direct_assigns_key'] = :direct_assigns_key_value
     @indirect_assigns_key = :indirect_assigns_key_value
   end
   
@@ -52,5 +81,19 @@ class ControllerSpecController < ActionController::Base
                             :partial => 'non_existent_partial'
     end
   end
+  
+  def action_with_skipped_before_filter
+    render :text => ""
+  end
+  
+  def action_that_assigns_false_to_a_variable
+    @a_variable = false
+    render :text => ""
+  end
 end
 
+class ControllerInheritingFromApplicationControllerController < ApplicationController
+  def action_with_inherited_before_filter
+    render :text => ""
+  end
+end

data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/controllers/render_spec_controller.rb

@@ -23,4 +23,8 @@ class RenderSpecController < ApplicationController
   def action_that_renders_nothing
     render :nothing => true
   end
+  
+  def action_with_alternate_layout
+    render :layout => 'simple'
+  end
 end

data/vendor/plugins/rspec-rails/spec_resources/helpers/addition_helper.rb

@@ -0,0 +1,5 @@
+module AdditionHelper
+  def plus(addend)
+    @addend + addend
+  end
+end

data/vendor/plugins/rspec-rails/spec_resources/helpers/explicit_helper.rb

@@ -0,0 +1,38 @@
+module ExplicitHelper
+  def method_in_explicit_helper
+    "<div>This is text from a method in the ExplicitHelper</div>"
+  end
+  
+  # this is an example of a method spec'able with eval_erb in helper specs
+  def prepend(arg, &block)
+    begin # rails edge after 2.1.0 eliminated need for block.binding
+      concat(arg) + block.call
+    rescue
+      concat(arg, block.binding) + block.call
+    end
+  end
+  
+  def named_url
+    rspec_on_rails_specs_url
+  end
+  
+  def named_path
+    rspec_on_rails_specs_path
+  end
+  
+  def params_foo
+    params[:foo]
+  end
+  
+  def session_foo
+    session[:foo]
+  end
+  
+  def request_thing
+    request.thing
+  end
+  
+  def flash_thing
+    flash[:thing]
+  end
+end

data/vendor/plugins/rspec-rails/spec_resources/views/objects/_object.html.erb

@@ -0,0 +1 @@
+<%= object.name %>

data/vendor/plugins/rspec-rails/spec_resources/views/view_spec/accessor.rhtml

@@ -0,0 +1,5 @@
+<div id="session"><%= session[:key] %></div>
+<div id="params"><%= params[:key] %></div>
+<div id="flash"><%= flash[:key] %></div>
+<div id="controller"><%= params[:controller] %></div>
+<div id="action"><%= params[:action] %></div>

data/vendor/plugins/rspec-rails/spec_resources/views/view_spec/block_helper.rhtml

@@ -0,0 +1,3 @@
+<% if_allowed do %>
+	<div>block helper was rendered</div>
+<% end %>

data/vendor/plugins/rspec-rails/spec_resources/views/view_spec/should_not_receive.rhtml

@@ -0,0 +1,3 @@
+<% if @obj.render_partial? %>
+  <%= render :partial => 'some_partial' %>
+<% end %>

data/vendor/plugins/rspec-rails/stories/configuration/stories.rb

@@ -0,0 +1,5 @@
+require File.join(File.dirname(__FILE__), *%w[.. helper])
+
+with_steps_for :running_rspec do
+  run File.join(File.dirname(__FILE__), *%w[.. .. .. rspec stories configuration before_blocks.story]), :type => RailsStory
+end

data/vendor/plugins/{rspec_on_rails → rspec-rails}/stories/helper.rb

@@ -1,5 +1,6 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift File.expand_path("#{dir}/../lib")
 require File.expand_path("#{dir}/../../../../spec/spec_helper")
+require File.expand_path("#{dir}/../../rspec/stories/helper")
 
 require 'spec/rails/story_adapter'

data/vendor/plugins/typo_textfilter_code/lib/typo_textfilter_code.rb

@@ -1,10 +1,18 @@
-require 'syntax/convertors/html'
+require 'coderay'
 
 class Typo
   class Textfilter
     class Code < TextFilterPlugin::MacroPre
       plugin_display_name "Code"
-      plugin_description "Apply syntax highlighting to a code block"
+      plugin_description "Apply coderay highlighting to a code block"
+
+      DEFAULT_OPTIONS = {:css => :class, 
+        :wrap => :span, 
+        :line_numbers => nil, 
+        :tab_width => 2, 
+        :bold_every => 5, 
+        :hint => false, 
+        :line_number_start => 1}
 
       def self.help_text
         %{
@@ -18,36 +26,33 @@ You can use `<typo:code>` to include syntax-highlighted code blocks.  Example:
     end
     </typo:code>
 
-This uses the Ruby [Syntax](http://syntax.rubyforge.org/) module.  Options:
+This uses the Ruby [Syntax](http://coderay.rubychan.de) module.  Options:
 
 * **lang**.  Sets the programming language.  Currently supported languages are
-`ruby`, `yaml`, and `xml`.  Other languages will format correctly but will not
+`ruby`, `C`, `Delphi`, `HTML`, `RHTML`, `Nitro-XHTML`, `CSS`, `Diff`, `Java`, `Javascript` and `yaml`.  Other languages will format correctly but will not
 have syntax highlighting.
 * **linenumber**.  Turns on line numbering.  Use `linenumber="true"` to enable.
 * **title**.  Adds a title block to the top of the code block.
-* **class**.  Adds a new CSS class to the wrapper around the code block.
 }
       end
 
-      def self.macrofilter(blog,content,attrib,params,text="")
-        lang       = attrib['lang'] || 'default'
+      def self.macrofilter(blog, content, attrib, params, text="")
+        lang       = attrib['lang']
         title      = attrib['title']
-        cssclass   = attrib['class']
-        linenumber = attrib['linenumber']
+        if attrib['linenumber'] == "true"
+          options = DEFAULT_OPTIONS.merge(:line_numbers => :table,
+                                  :wrap => :div)
+        else
+          options = DEFAULT_OPTIONS
+        end
 
         text = text.to_s.gsub(/\r/,'').gsub(/\A\n/,'').chomp
 
-        convertor = Syntax::Convertors::HTML.for_syntax lang
-        text = convertor.convert(text)
-        text.gsub!(/<pre>/,"<pre><code class=\"typocode_#{lang} #{cssclass}\"><notextile>")
-        text.gsub!(/<\/pre>/,"</notextile></code></pre>")
-
-        if(linenumber)
-          lines = text.split(/\n/).size
-          linenumbers = (1..lines).to_a.collect{|line| line.to_s}.join("\n")
-
-          text = "<table class=\"typocode_linenumber\"><tr><td class=\"lineno\">\n<pre>\n#{linenumbers}\n</pre>\n</td><td width=\"100%\">#{text}</td></tr></table>"
+        begin
+          text = CodeRay.scan(text, lang.to_sym).span(options)
+        rescue
         end
+        text = "<notextile>#{text}</notextile>"
 
         if(title)
           titlecode="<div class=\"codetitle\">#{title}</div>"
@@ -55,7 +60,7 @@ have syntax highlighting.
           titlecode=''
         end
 
-        "<div class=\"typocode\">#{titlecode}#{text}</div>"
+        "<div class=\"CodeRay\"><pre>#{titlecode}#{text}</pre></div>"
       end
     end
   end

data/vendor/plugins/typo_textfilter_flickr/lib/typo_textfilter_flickr.rb

@@ -1,5 +1,5 @@
 require 'net/http'
-require 'flickr/flickr'
+require 'flickr'
 
 class Typo
   class Textfilter

data/vendor/plugins/typo_textfilter_lightbox/lib/typo_textfilter_lightbox.rb

@@ -1,5 +1,5 @@
 require 'net/http'
-require 'flickr/flickr'
+require 'flickr'
 
 class Typo
   class Textfilter

data/vendor/plugins/will_paginate/.manifest

@@ -0,0 +1,49 @@
+CHANGELOG.rdoc
+LICENSE
+README.rdoc
+Rakefile
+examples
+examples/apple-circle.gif
+examples/index.haml
+examples/index.html
+examples/pagination.css
+examples/pagination.sass
+init.rb
+lib
+lib/will_paginate
+lib/will_paginate.rb
+lib/will_paginate/array.rb
+lib/will_paginate/collection.rb
+lib/will_paginate/core_ext.rb
+lib/will_paginate/finder.rb
+lib/will_paginate/named_scope.rb
+lib/will_paginate/named_scope_patch.rb
+lib/will_paginate/version.rb
+lib/will_paginate/view_helpers.rb
+test
+test/boot.rb
+test/collection_test.rb
+test/console
+test/database.yml
+test/finder_test.rb
+test/fixtures
+test/fixtures/admin.rb
+test/fixtures/developer.rb
+test/fixtures/developers_projects.yml
+test/fixtures/project.rb
+test/fixtures/projects.yml
+test/fixtures/replies.yml
+test/fixtures/reply.rb
+test/fixtures/schema.rb
+test/fixtures/topic.rb
+test/fixtures/topics.yml
+test/fixtures/user.rb
+test/fixtures/users.yml
+test/helper.rb
+test/lib
+test/lib/activerecord_test_case.rb
+test/lib/activerecord_test_connector.rb
+test/lib/load_fixtures.rb
+test/lib/view_test_process.rb
+test/tasks.rake
+test/view_test.rb

data/vendor/plugins/will_paginate/CHANGELOG.rdoc

@@ -0,0 +1,110 @@
+== 2.3.6, released 2008-10-26
+
+* Rails 2.2 fix: stop using `extract_attribute_names_from_match` inernal AR method, it no longer exists
+
+== 2.3.5, released 2008-10-07
+
+* update the backported named_scope implementation for Rails versions older than 2.1
+* break out of scope of paginated_each() yielded block when used on named scopes
+* fix paginate(:from)
+
+== 2.3.4, released 2008-09-16
+
+* Removed gem dependency to Active Support (causes trouble with vendored rails).
+* Rails 2.1: fix a failing test and a deprecation warning.
+* Cope with scoped :select when counting.
+
+== 2.3.3, released 2008-08-29
+
+* Ensure that paginate_by_sql doesn't change the original SQL query.
+* RDoc love (now live at http://mislav.caboo.se/static/will_paginate/doc/)
+* Rename :prev_label to :previous_label for consistency. old name still functions but is deprecated
+* ActiveRecord 2.1: Remove :include option from count_all query when it's possible.
+
+== 2.3.2, released 2008-05-16
+
+* Fixed LinkRenderer#stringified_merge by removing "return" from iterator block
+* Ensure that 'href' values in pagination links are escaped URLs
+
+== 2.3.1, released 2008-05-04
+
+* Fixed page numbers not showing with custom routes and implicit first page
+* Try to use Hanna for documentation (falls back to default RDoc template if not)
+
+== 2.3.0, released 2008-04-29
+
+* Changed LinkRenderer to receive collection, options and reference to view template NOT in
+  constructor, but with the #prepare method. This is a step towards supporting passing of
+  LinkRenderer (or subclass) instances that may be preconfigured in some way
+* LinkRenderer now has #page_link and #page_span methods for easier customization of output in
+  subclasses
+* Changed page_entries_info() method to adjust its output according to humanized class name of
+  collection items. Override this with :entry_name parameter (singular).
+    
+    page_entries_info(@posts)
+    #-> "Displaying all 12 posts"
+    page_entries_info(@posts, :entry_name => 'item')
+    #-> "Displaying all 12 items"
+    
+== 2.2.3, released 2008-04-26
+
+* will_paginate gem is no longer published on RubyForge, but on
+  gems.github.com:
+  
+    gem sources -a http://gems.github.com/  (you only need to do this once)
+    gem install mislav-will_paginate
+    
+* extract reusable pagination testing stuff into WillPaginate::View
+* rethink the page URL construction mechanizm to be more bulletproof when
+  combined with custom routing for page parameter
+* test that anchor parameter can be used in pagination links
+
+== 2.2.2, released 2008-04-21
+
+* Add support for page parameter in custom routes like "/foo/page/2"
+* Change output of "page_entries_info" on single-page collection and erraneous
+  output with empty collection as reported by Tim Chater
+  
+== 2.2.1, released 2008-04-08
+
+* take less risky path when monkeypatching named_scope; fix that it no longer
+  requires ActiveRecord::VERSION
+* use strings in "respond_to?" calls to work around a bug in acts_as_ferret
+  stable (ugh)
+* add rake release task
+
+
+== 2.2.0, released 2008-04-07
+
+=== API changes
+* Rename WillPaginate::Collection#page_count to "total_pages" for consistency.
+  If you implemented this interface, change your implementation accordingly.
+* Remove old, deprecated style of calling Array#paginate as "paginate(page,
+  per_page)". If you want to specify :page, :per_page or :total_entries, use a
+  parameter hash.
+* Rename LinkRenderer#url_options to "url_for" and drastically optimize it
+
+=== View changes
+* Added "prev_page" and "next_page" CSS classes on previous/next page buttons
+* Add examples of pagination links styling in "examples/index.html"
+* Change gap in pagination links from "..." to
+  "<span class="gap">&hellip;</span>".
+* Add "paginated_section", a block helper that renders pagination both above and
+  below content in the block
+* Add rel="prev|next|start" to page links
+
+=== Other
+
+* Add ability to opt-in for Rails 2.1 feature "named_scope" by calling
+  WillPaginate.enable_named_scope (tested in Rails 1.2.6 and 2.0.2)
+* Support complex page parameters like "developers[page]"
+* Move Array#paginate definition to will_paginate/array.rb. You can now easily
+  use pagination on arrays outside of Rails:
+
+    gem 'will_paginate'
+    require 'will_paginate/array'
+    
+* Add "paginated_each" method for iterating through every record by loading only
+  one page of records at the time
+* Rails 2: Rescue from WillPaginate::InvalidPage error with 404 Not Found by
+  default

data/vendor/plugins/will_paginate/LICENSE

@@ -0,0 +1,18 @@
+Copyright (c) 2007 PJ Hyett and Mislav Marohnić
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of 
+this software and associated documentation files (the "Software"), to deal in 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of 
+the Software, and to permit persons to whom the Software is furnished to do so, 
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS 
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.