cat_router 0.1.2 → 0.1.3

data/README.rdoc

@@ -12,6 +12,11 @@ Add this line to your Gemfile (and run bundle install):
 
   gem 'cat_router'
 
+Generate migration 
+
+  rails g cat_router
+  rake db:migrate
+
 Open config/routes.rb and add this to the end
   
   # define custom routes CatRouter::Routes.draw action.
@@ -19,26 +24,17 @@ Open config/routes.rb and add this to the end
   #   match 'my_slug', :to => "controller#action"
   # end
   
-  # CatRouter implementation 
-  CatRouter::Routes.draw
-
-Generate migration 
-
-  rails g cat_router
-  rake db:migrate
+  # CatRouter implementation (application controller will handle all requests 
+  # over a handle_cat_routes action)
+  CatRouter::Routes.draw('application#handle_cat_routes')
 
-Open app/controllers/application_controller.rb and add locale setter like this
+Open app/controllers/application_controller.rb and load it
 
   class ApplicationController < ActionController::Base
-    before_filter :set_locale
-  private
-    def set_locale
-      I18n.locale = :en
-      I18n.locale = params[:locale] if params[:locale]
-    end
+    acts_as_cat_router
   end
 
-The plugin comes with a CatRoute model and CatRouterController. You can append the default model or controller by creating a new 
+The plugin comes with a CatRoute model. You can append the default model or controller by creating a new 
 app/models/cat_route.rb file with content
 
   class CatRoute

data/lib/cat_router/class_methods.rb

@@ -0,0 +1,2 @@
+module CatRouter::ClassMethods
+end

data/lib/cat_router/hook.rb

@@ -0,0 +1,9 @@
+module CatRouter::Hook
+  def acts_as_cat_router(*args)
+    options = args.extract_options!
+
+    # now do the things that make the controller
+    include CatRouter::InstanceMethods
+    before_filter :set_locale
+  end
+end

data/lib/cat_router/instance_methods.rb

@@ -0,0 +1,14 @@
+module CatRouter::InstanceMethods
+  
+  def set_locale
+    puts 'set_locale!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
+    I18n.locale = :sl
+    I18n.locale = params[:locale] if params[:locale]
+  end
+  
+  def handle_cat_routes
+    @cat_route = CatRoute.with_slug(params[:slug] ? params[:slug] : '').first
+    render :layout => true, :inline => @cat_route.html ? @cat_route.html : ''
+  end
+  
+end

data/lib/cat_router/railtie.rb

@@ -0,0 +1,12 @@
+require "action_controller"
+require "rails"
+require "action_view/railtie"
+require 'cat_router'
+
+module CatRouter
+  class Railtie < Rails::Railtie
+    config.to_prepare do
+      ActionController::Base.send(:extend, CatRouter::Hook)
+    end
+  end
+end

data/lib/cat_router/routes.rb

@@ -1,12 +1,11 @@
 module CatRouter
   module Routes
 
-    def self.draw
+    def self.draw(to)
       Rails.application.routes.draw do
-        match "/:locale(/*slug(.:extension))", :as => :cat_router, :to => 'cat_router#router', :constraints => { :locale => /[a-z]{2,2}/ }
-        root :to => "cat_router#router"
+        match "/:locale(/*slug(.:extension))", :as => :cat_router, :to => to, :constraints => { :locale => /[a-z]{2,2}/ }
+        root :to => to
       end
-
     end
 
   end

data/lib/cat_router/version.rb

@@ -2,7 +2,7 @@ module CatRouter
   module Version
     MAJOR = 0
     MINOR = 1
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/cat_router.rb

@@ -1,12 +1,16 @@
+require 'active_support/core_ext'
+require File.join(File.dirname(__FILE__), "cat_router/railtie")
+
 module CatRouter
+  autoload :Version, File.join(File.dirname(__FILE__), "cat_router/version")
+  autoload :Routes, File.join(File.dirname(__FILE__), "cat_router/routes")
+  autoload :Hook, File.join(File.dirname(__FILE__), "cat_router/hook")
+  autoload :InstanceMethods, File.join(File.dirname(__FILE__), "cat_router/instance_methods")
+  autoload :ClassMethods, File.join(File.dirname(__FILE__), "cat_router/class_methods")
 end
 
-[ File.join(File.dirname(__FILE__), 'cat_router', 'routes.rb'),
-  File.join(File.dirname(__FILE__), 'cat_router', 'version.rb'),
-  File.join(File.dirname(__FILE__), '..', 'app', 'models', 'cat_route.rb'),
-  File.join(File.dirname(__FILE__), '..', 'app', 'controllers', 'cat_router_controller.rb'),
+[ File.join(File.dirname(__FILE__), '..', 'app', 'models', 'cat_route.rb'),
   File.join(Rails.root||RAILS_ROOT, 'app', 'models', 'cat_route.rb'),
-  File.join(Rails.root||RAILS_ROOT, 'app', 'controllers', 'cat_router_controller.rb')
 ].each do |path|
   if File.exists?(path)
     require path 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cat_router
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Kristijan Sedlak
@@ -30,8 +30,11 @@ extra_rdoc_files:
 - MIT-LICENSE
 files: 
 - Rakefile
-- app/controllers/cat_router_controller.rb
 - app/models/cat_route.rb
+- lib/cat_router/class_methods.rb
+- lib/cat_router/hook.rb
+- lib/cat_router/instance_methods.rb
+- lib/cat_router/railtie.rb
 - lib/cat_router/routes.rb
 - lib/cat_router/version.rb
 - lib/cat_router.rb

data/app/controllers/cat_router_controller.rb

@@ -1,14 +0,0 @@
-class CatRouterController < ApplicationController
-  
-  def router
-    handle
-  end
-
-protected
-
-  def handle
-    @cat_route = CatRoute.with_slug(params[:slug] ? params[:slug] : '').first
-    render :layout => true, :inline => @cat_route.html ? @cat_route.html : ''
-  end
-  
-end