markaby 0.6.8 → 0.6.9

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+= 0.6.9
+
+* Bug fix for url_for.  Previously, you'd need to capture { *_path } instead of
+  using the named route directly.  Only affected rails 2.3.4+.
+
 = 0.6.8 (2010-06-03)
 
 * Add a regression for issue Github #17 (for judofyr / Camping)

data/Markaby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{markaby}
-  s.version = "0.6.8"
+  s.version = "0.6.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["_why", "Tim Fletcher", "John Barton", "spox", "smtlaissezfaire"]
-  s.date = %q{2010-06-03}
+  s.date = %q{2010-08-03}
   s.description = %q{Tim Fletcher and _why's ruby driven HTML templating system}
   s.email = %q{scott@railsnewbie.com}
   s.extra_rdoc_files = [
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
      "spec/markaby/rails/views/markaby/render_mab_without_explicit_render_call.mab",
      "spec/markaby/rails/views/markaby/render_with_ivar.mab",
      "spec/markaby/rails/views/markaby/renders_erb.rhtml",
+     "spec/markaby/rails/views/markaby/routes.mab",
      "spec/markaby/rails_spec.rb",
      "spec/markaby/rails_version_spec.rb",
      "spec/markaby/tilt/erb.erb",

data/README.rdoc

@@ -33,7 +33,9 @@ Install it as a plugin:
 
   script/plugin install git://github.com/markaby/markaby.git
 
-If you are loading it in a different way (from a gem), make sure it's on the LOAD_PATH, and add the following (in environment.rb):
+If you are loading it in a different way (from a gem), make sure
+it's on the LOAD_PATH, and add the following in
+an initializer (config/initializers/markaby.rb will work):
 
   require 'markaby'
   require 'markaby/rails'

data/VERSION

@@ -1 +1 @@
-0.6.8
+0.6.9

data/lib/markaby/rails/current.rb

@@ -43,4 +43,32 @@ module Markaby
   end
 end
 
+# allow fragments to act as strings.  url_for has a
+# nasty case statment in it:
+#
+# case options
+# when String
+#   ...
+#
+# which essential is doing the following:
+#
+# String === options
+#
+# We prefer to override url_for rather than String#===
+#
+ActionView::Helpers::UrlHelper.class_eval do
+  alias_method :url_for_aliased_by_markaby, :url_for
+
+  def url_for(options={})
+    options ||= {}
+
+    url = case options
+    when Markaby::Fragment
+      url_for_aliased_by_markaby(options.to_s)
+    else
+      url_for_aliased_by_markaby(options)
+    end
+  end
+end
+
 ActionView::Template.register_template_handler(:mab, Markaby::Rails::TemplateHandler)

data/spec/markaby/rails/spec_helper.rb

@@ -16,6 +16,14 @@ if RUNNING_RAILS
 
   $:.unshift MARKABY_ROOT
   require 'init'
+
+  ActionController::Routing::Routes.draw do |map|
+    map.new_user "/users/new", :controller => "users", :action => "new"
+
+    # default routes
+    map.connect ':controller/:action/:id.:format'
+    map.connect ':controller/:action/:id'
+  end
 else
   warn "Skipping rails specific tests"
 end

data/spec/markaby/rails/views/markaby/routes.mab

@@ -0,0 +1 @@
+link_to "Foo", new_user_path

data/spec/markaby/rails_spec.rb

@@ -112,6 +112,9 @@ if RUNNING_RAILS
 
       render :template => "markaby/form_for_with_multiple_fields"
     end
+
+    def routes
+    end
   end
 
   class MarkabyOnRailsTest < ActionController::TestCase
@@ -239,6 +242,14 @@ if RUNNING_RAILS
       assert_equal expected_output,
                    @response.body
     end
+
+    def test_routes_work
+      get :routes
+      assert_response :success
+
+      expected_output = "<a href=\"/users/new\">Foo</a>"
+      assert_equal expected_output, @response.body
+    end
   end
 
   describe "rails version" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: markaby
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 6
-  - 8
-  version: 0.6.8
+  - 9
+  version: 0.6.9
 platform: ruby
 authors: 
 - _why
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 -04:00
+date: 2010-08-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,7 @@ files:
 - spec/markaby/rails/views/markaby/render_mab_without_explicit_render_call.mab
 - spec/markaby/rails/views/markaby/render_with_ivar.mab
 - spec/markaby/rails/views/markaby/renders_erb.rhtml
+- spec/markaby/rails/views/markaby/routes.mab
 - spec/markaby/rails_spec.rb
 - spec/markaby/rails_version_spec.rb
 - spec/markaby/tilt/erb.erb