toy-locomotive 0.0.11 → 0.1.0

data/lib/toy-locomotive/resources/controller.rb

@@ -2,14 +2,40 @@ module ToyLocomotive::Resources::Controller
 
   module ClassMethods
     def extract_resources args
-      actions = [:index, :new, :create, :show, :edit, :update, :destroy]
-      return actions if args == :all
-      return args[:only] if args[:only]
-      actions - args[:except]
+      actions = {}
+      crud = [:index, :new, :create, :show, :edit, :update, :destroy]
+      if args.first == :all
+        actions[:crud] << crud
+        hash = args.last
+      else
+        hash = args.first
+      end
+      actions[:crud] = hash[:only] if hash[:only]
+      actions[:crud] = crud - hash[:except] if hash[:except]
+      actions[:member] = hash[:member]
+      actions[:collection] = hash[:collection]
+      actions[:static] = hash[:static]
+      actions
+    end
+
+    def resources *args
+      res = extract_resources(args)
+      res[:crud].each{|action| send :"set_action_#{action}"} if res[:crud]
+      res[:member].each{|action| set_member_action(action)} if res[:member]
+      res[:collection].each{|action| set_collection_action(action)} if res[:collection]
+      res[:static].each{|action| set_static_action(action)} if res[:static]
+    end
+
+    def set_static_action action
+      get action.to_s do end
+    end
+
+    def set_member_action action
+      get action.to_s, on: 'member' do end
     end
 
-    def resources args
-      extract_resources(args).each{|action| send :"set_action_#{action}"}
+    def set_collection_action action
+      get action.to_s, on: 'collection' do end
     end
 
     def set_action_new

data/lib/toy-locomotive/router/controller.rb

@@ -17,6 +17,7 @@ module ToyLocomotive::Router::Controller
     end
 
     def route_as
+      return "" unless extract_model
       belongs_chain.map{|m| m.to_s.underscore }.join('_') << (belongs_chain.empty? ? extract_model.to_s.underscore : "_#{extract_model.to_s.underscore}")
     end
 
@@ -47,7 +48,9 @@ module ToyLocomotive::Router::Controller
     end
 
     def extract_path path, opts={}
+      return '/' if path == 'root'
       return path if path[0] == '/'
+      return "/#{path.to_s.gsub('_','-').parameterize}" unless extract_model
       return "#{route_chain}#{extract_model.to_route}/#{path.parameterize}" if opts[:on] == 'member' || path == 'edit'
       return "#{route_chain}#{extract_model.to_route}" if ['show','update','destroy'].include?(path)
       return "#{route_chain}/#{extract_model.to_s.underscore.pluralize}" if ['create', 'index'].include?(path)
@@ -59,7 +62,9 @@ module ToyLocomotive::Router::Controller
       return route_as if path == 'show'
       return nil if method != 'get'
       action = extract_action path, opts
-      path[0] == '/' ? action : "#{action}_#{route_as}"
+      as = path[0] == '/' ? action : "#{action}"
+      as << "_#{route_as}" if extract_model
+      as
     end
 
     def extract_action path, opts={}, method='get'
@@ -71,13 +76,13 @@ module ToyLocomotive::Router::Controller
     end
 
     def extract_model
-      extract_controller.singularize.camelize.constantize
+      extract_controller.singularize.camelize.constantize rescue nil
     end
 
     def extract_filter action, path, opts, method
       return if path[0] == '/'
       return if %w(index show new edit destroy update create).include? path
-      send :"add_#{opts[:on]}_filter", action
+      send :"add_#{opts[:on]}_filter", action if opts[:on]
     end
 
     def append_filters!

data/lib/toy-locomotive/version.rb

@@ -1,3 +1,3 @@
 module ToyLocomotive
-  VERSION = "0.0.11"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toy-locomotive
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails