oldskool 0.0.2 → 0.0.3

data/lib/oldskool/router.rb

@@ -11,38 +11,42 @@ module Oldskool
     def route(params)
       defaulting = false
 
+      k = ""
+      q = params[:q].strip
+
       if params[:q] =~ /^(\w+?)(\s.+)*$/
         k = $1
         q = $2.strip rescue ""
-        default = nil
-        handler = nil
+      end
 
-        @config[:keywords].each do |keyword|
-          default = keyword if [keyword[:keywords]].flatten.include?(:default)
+      default = nil
+      handler = nil
 
-          handler = keyword if [keyword[:keywords]].flatten.include?(k)
+      @config[:keywords].each do |keyword|
+        default = keyword if [keyword[:keywords]].flatten.include?(:default)
 
-          break if handler
-        end
+        handler = keyword if [keyword[:keywords]].flatten.include?(k)
 
-        if (!handler && default)
-          defaulting = true
-          handler = default
-        elsif !handler
-          return error("No handler for keyword #{k} found and no default handler specified")
-        end
+        break if handler
+      end
+
+      if (!handler && default)
+        defaulting = true
+        handler = default
+      elsif !handler
+        return error("No handler for keyword #{k} found and no default handler specified")
+      end
 
-        handler_class = "%sHandler" % [handler[:type].to_s.capitalize]
+      handler_class = "%sHandler" % [handler[:type].to_s.capitalize]
 
-        if Oldskool.constants.include?(handler_class)
-          if defaulting
-            Oldskool.const_get(handler_class).new(params, handler, @config).handle_request("", params[:q])
-          else
-            Oldskool.const_get(handler_class).new(params, handler, @config).handle_request(k, q)
-          end
+      if Oldskool.constants.include?(handler_class)
+        if defaulting
+          Oldskool.const_get(handler_class).new(params, handler, @config).handle_request("", params[:q])
         else
-          return error("Do not know how to handle type %s keywords" % [ handler[:type] ])
+          Oldskool.const_get(handler_class).new(params, handler, @config).handle_request(k, q)
         end
+      else
+        return error("Do not know how to handle type %s keywords" % [ handler[:type] ])
       end
     end
   end

data/lib/oldskool/sinatra_app.rb

@@ -43,9 +43,11 @@ module Oldskool
       if params[:q]
         @result = @router.route(params)
 
-        @sidemenu = @result.delete(:sidemenu)
-        @topmenu = @result.delete(:topmenu)
-        @error = @result.delete(:error)
+        if @result
+          @sidemenu = @result.delete(:sidemenu)
+          @topmenu = @result.delete(:topmenu)
+          @error = @result.delete(:error)
+        end
 
         case (template = @result[:template])
           when :redirect

data/lib/oldskool/url_handler.rb

@@ -1,7 +1,5 @@
 module Oldskool
   class UrlHandler
-    include Rack::Utils
-
     def initialize(params, keyword, config)
       @params = params
       @keyword = keyword
@@ -10,7 +8,7 @@ module Oldskool
     end
 
     def handle_request(keyword, query)
-      url = @keyword[:url].gsub(/%Q%/, escape_html(query))
+      url = @keyword[:url].gsub(/%Q%/, URI.escape(query))
 
       {:template => :redirect, :url => url}
     end

data/lib/oldskool/version.rb

@@ -1,3 +1,3 @@
 module Oldskool
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/views/layout.erb

@@ -17,7 +17,7 @@
             <% end %>
           </ul>
           <% end %>
-          <form action="/do" method="get" class="pull-right"><input name="q" type="text" placeholder="#" /></form>
+          <form action="/do" method="get" class="pull-right"><input name="q" type="text" placeholder="#" value="<%= params[:q] == nil ? "" : h(params[:q]) %>"/></form>
         </div>
       </div>
     </div>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oldskool
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-15 00:00:00 +00:00
+date: 2012-01-19 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,27 +69,27 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/oldskool/router.rb
+- lib/oldskool.rb
 - lib/oldskool/error_handler.rb
-- lib/oldskool/url_handler.rb
 - lib/oldskool/version.rb
 - lib/oldskool/sinatra_app.rb
-- lib/oldskool.rb
+- lib/oldskool/url_handler.rb
+- lib/oldskool/router.rb
+- views/do.erb
 - views/layout.erb
 - views/index.erb
 - views/opensearch_xml.erb
-- views/do.erb
+- public/favicon.ico
 - public/js/less-1.1.3.min.js
-- public/lib/forms.less
-- public/lib/scaffolding.less
-- public/lib/bootstrap.less
-- public/lib/tables.less
 - public/lib/patterns.less
-- public/lib/reset.less
-- public/lib/mixins.less
+- public/lib/bootstrap.less
 - public/lib/variables.less
+- public/lib/mixins.less
 - public/lib/type.less
-- public/favicon.ico
+- public/lib/forms.less
+- public/lib/tables.less
+- public/lib/scaffolding.less
+- public/lib/reset.less
 - config/oldskool.yaml.dist
 - config.ru
 - Gemfile