doozer 0.2.2 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.5

data/doozer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{doozer}
-  s.version = "0.2.2"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["grippy"]
-  s.date = %q{2009-10-23}
+  s.date = %q{2009-10-26}
   s.default_executable = %q{doozer}
   s.description = %q{This GEM provides a small, barebones framework for creating MVC Rack applications.}
   s.email = %q{gmelton@whorde.com}

data/lib/doozer/route.rb

@@ -1,4 +1,5 @@
 require 'doozer/app'
+require 'doozer/view_helpers'
 
 module Doozer
   module Routing
@@ -19,6 +20,8 @@ module Doozer
         # init magic routes :conrtoller/:action or just /:action with predefined :controller
         # Routes.init_magic_routes
         
+        Routes.init_view_helpers
+        
         # sort routes here
         @@parts.sort! do |a, b| a[1].length <=> b[1].length end
         @@parts.reverse!
@@ -186,6 +189,13 @@ module Doozer
           ## loop route/methods pairs
           # save new path for action controller
       end
+    
+      def self.init_view_helpers
+        for k, route in @@dict
+          Doozer::ViewHelpers.module_eval(route.url_helper_method)
+        end
+      end
+    
     end
 
     class Route
@@ -287,6 +297,44 @@ module Doozer
         end        
         return hashish
       end
+      
+      # Parses route tokens and returns a helper method which evntually module_eval'd into Doozer::ViewHelpers
+      def url_helper_method
+        method_name=[@name]
+        # method_name.push(@format) if @format != :html
+        method_name.push('url')
+        signature = []
+        signature.push('(')
+        if not @tokens.empty?
+          t = []
+          for token in @tokens
+            if token.index('.')
+              t.push(token.split('.')[0])
+            else
+              t.push(token)
+            end
+          end
+          signature.push(t.join(', '))
+        end
+        signature.push(')')
+        
+        url_method = []
+        url_method.push("url({:name=>:#{@name}")
+        if not @tokens.empty?
+          t = []
+          for token in @tokens
+            if token.index('.')
+              token = token.split('.')[0]
+            end
+            t.push(" :#{token.to_sym}=>#{token}")
+          end
+          url_method.push(",#{t.join(',')}")
+        end
+        url_method.push("})")
+        method = """def #{method_name.join('_')}#{signature.join('')}; #{url_method} end"""
+        return method
+      end
+      
     end
   end
 end

data/lib/doozer/scripts/console.rb

@@ -1,2 +1,2 @@
-require 'doozer'
+#assumes boot.rb has already been loaded into the console
 Doozer::Initializer.console(@env)

data/lib/doozer/scripts/migrate.rb

@@ -86,9 +86,9 @@ Doozer::Initializer.boot(@env)
 # need to grab all the current migrations. assumes there isn't a migration with 000_*_.rb
 migrations = [nil].concat( Dir.glob(File.join(APP_PATH,'db/*_*.rb')) )
 
-p "Loading migration files"
-p "Version: #{@version}"
-p "Direction: #{@direction}"
+printf "Loading migration files\n"
+printf "Version: #{@version}\n"
+printf "Direction: #{@direction}\n"
 
 if @version > 0
   file = migrations[@version]

data/lib/doozer/version.rb

@@ -2,7 +2,7 @@ module Doozer
   module Version
     MAJOR=0
     MINOR=2
-    PATCH=2
+    PATCH=5
     STRING=[MAJOR, MINOR, PATCH].join('.')
   end
 end

data/lib/doozer/view_helpers.rb

@@ -165,9 +165,10 @@ module Doozer
       props.join("&")
     end    
     
-    # Safe encodes a string by entity encodes all less then and greater then signs
+    # Safe encodes a string by entity encoding all less then and greater then signs
     #
     def h(s)
+      s.gsub!(/&/,'&')
       s.gsub!(/</,'&lt;')
       s.gsub!(/>/,'&gt;')
       return s

data/templates/skeleton/config/boot.rb

@@ -1,4 +1,4 @@
-DOOZER_GEM_VERSION='0.1.5'
+DOOZER_GEM_VERSION='0.2.5'
 
 require 'date'
 require 'rubygems'
@@ -7,11 +7,5 @@ begin
   gem 'doozer', "= #{DOOZER_GEM_VERSION}"
   require 'doozer'
 rescue Gem::LoadError
-  # "grippy-doozer-#{DOOZER_GEM_VERSION} gem not installed. checking different gem name..."
-  begin
-    gem 'grippy-doozer', "= #{DOOZER_GEM_VERSION}"
-    require 'doozer'
-  rescue Gem::LoadError
-    raise "grippy-doozer-#{DOOZER_GEM_VERSION} gem not installed"
-  end
+  raise "grippy-doozer-#{DOOZER_GEM_VERSION} gem not installed"
 end

data/templates/skeleton/config/routes.rb

@@ -1,6 +1,6 @@
 """ 
 Drawing
-name, path w/ symbols, options={controller, action, status, formats, app=>HelloWorld.new}
+name, path w/ symbols, options={controller, action, status, formats, optional( layout, app=>HelloWorld.new)}
 
 Name - This is the symbol you name your route. Urls generation is mapped to this key.
 Path - This is the url path. May contain token symbols which are exposed to the controller
@@ -8,40 +8,83 @@ Options -
   controller, 
   action, 
   status, 
-  formats=>[:xml, json, etc]
-
+  formats=>[:xml, json, etc],
+  layout
+  
 Supports the following conventions:
-root      ''             :controller=>'something'
-articles  '/articles'     :controller=>'article', :action=>'list'
-article   '/article/:id'  :controller=>'article', :action=>'show'
+  :root      ''             :controller=>'something'
+  :articles  '/articles'     :controller=>'article', :action=>'list'
+  :article   '/article/:id'  :controller=>'article', :action=>'show'
 
 Formats
-Adding formats symbolzes automatically creates new routes for the formats symbols provided. 
-The appropriate content-type is returned with the response.
-You can access the format with @format in your controllers.
-Supported formats are: :json, :js, :xml, :rss, :atom
-All routes default to :html format
+  Adding formats symbols automatically creates new routes for the formats symbols provided. 
+  The appropriate content-type is returned with the response.
+  You can access the format with @format in your controllers.
+  Supported formats are: :json, :js, :xml, :rss, :atom
+  All routes default to :html format
 
 Example:
   
   map.add :format_example, '/format_example', {:controller=>'index', :action=>'format_example', :status=>200, :formats=>[:json, :xml]}
   
   Automatically creates routes for :html, :json, and :xml with the appropriate content types
-  
+
   :html format (default)
   map.add :format_example, '/format_example', {:controller=>'index', :action=>'format_example', :status=>200} 
+
   :json format
   map.add :format_example_json, '/format_example.json', {:controller=>'index', :action=>'format_example', :status=>200}
+
   :xml format
   map.add :format_example_xml, '/format_example.xml', {:controller=>'index', :action=>'format_example', :status=>200}
+
+Layouts
   
+  All routes use the layouts/default.format.erb view. You can override this by passing the layout symbol in the options hash like this:
+  map.add :layout_example, '/layout_example', {:controller=>'index', :action=>'layout_example', :status=>200, :layout=>'other'}
+  
+View/Layouts with Formats
+
+  If you define non-html formats you need to be aware of a few caveats.
+  
+  map.add :layout_format_example, 
+          '/layout_format_example', 
+          {:controller=>'index', :action=>'layout_format_example', :status=>200, :layout=>'other', :formats=>[:json]}
+          
+  When calling the above route with json format:
+    You will need to have a layouts/other.json.erb file along with an index/layout_format_example.json.erb file to render the view
+
+  See Doozer::Controller#render for more examples on how to override this from controllers actions.
+
+Controller/View Helpers
+Route url generation is accessible in the following ways:
+  Defauls method for generating route urls:
+    url({:name=>:some_route ... :key=>'some value'})
+  -or-
+  Magic helper methods for generating route urls. The param order is taken right from the order of the parsed route tokens.
+
+    route_name_url - default html, no params
+    route_name_url(param1, params2)  - default html,  w/ params
+    route_name_format_url(param1, params2) - non html w/ params
+    
+    Example:
+      some_route_url
+      some_route_json_url(param1, param2, param3)
+
+In addition, you can also wrap the urls with a link tag like this:
+  link('anchor text', route_args, link_args)
+  Example:
+    link('homepage', {:name=>:index}, {:class=>'link_css', :id=>'home'})
+    -or-
+    link('homepage', index_url, {:class=>'link_css', :id=>'home'})
 
-Magic Routes
-This route automatically creates routes for all actions on controller 'something_not_called_fubar'
-fubar/:action :controller=>'something_not_called_fubar'
 
-This creates routes for all controller actions residing in the application.
-:controller/:action
+Not Currently Supported...
+  Magic Routes
+  This route automatically creates routes for all actions on controller 'something_not_called_fubar'
+  fubar/:action :controller=>'something_not_called_fubar'
+  This creates routes for all controller actions residing in the application.
+  :controller/:action
 
 Additional Rackup Apps
 You can create additional rackup apps and assign them to a route

data/templates/skeleton/script/console

@@ -1,14 +1,15 @@
 #!/usr/bin/env ruby
 require 'irb'
 APP_PATH = Dir.pwd
-require File.join(APP_PATH, 'config/boot')
+boot = File.join(APP_PATH, 'config/boot')
+require boot
 
 @env = (ARGV.length > 0) ? ARGV[0] : 'development'
 ARGV.delete(@env) if ARGV.include?(@env)
 @env = @env.to_sym
 printf "[Doozer #{Doozer::Version::STRING}]\n"
 # see http://ruby-doc.org/core/ for more options
-IRB.conf[:LOAD_MODULES] = ["irb/completion", "#{DOOZER_PATH}/doozer/scripts/console"]
+IRB.conf[:LOAD_MODULES] = ["irb/completion", boot, "#{DOOZER_PATH}/doozer/scripts/console"]
 IRB.conf[:USE_READLINE] = true
 IRB.load_modules()
 IRB.parse_opts()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: doozer
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors: 
 - grippy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-23 00:00:00 -07:00
+date: 2009-10-26 00:00:00 -07:00
 default_executable: doozer
 dependencies: []