toy-locomotive 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    toy-locomotive (0.0.1)
+    toy-locomotive (0.0.3)
       rails
 
 GEM

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

@@ -0,0 +1,76 @@
+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]
+    end
+
+    def resources args
+      extract_resources(args).each{|action| send :"set_action_#{action}"}
+    end
+
+    def set_action_new
+      get 'new' do
+        extract_parent_vars
+        parent = instance_variable_get (model = self.class.extract_model).belongs_chain.reverse.pop.to_member_var
+        instance_variable_set model.to_member_var, (parent ? parent.send(model.to_s.underscore.pluralize) : model).new
+      end
+    end
+
+    def set_action_index
+      get 'index' do
+        extract_parent_vars
+        extract_collection_var
+      end
+    end
+
+    def set_action_show
+      get 'show' do
+        extract_parent_vars
+        extract_member_var
+      end
+    end
+
+    def set_action_edit
+      get 'edit' do
+        extract_parent_vars
+        extract_member_var
+      end
+    end
+
+    def set_action_create
+      post 'create' do
+        vars = extract_parent_vars
+        parent = instance_variable_get (model = self.class.extract_model).belongs_chain.reverse.pop.to_member_var
+        member = (parent ? parent.send(model.to_s.underscore.pluralize) : model).new(params[model.to_params])
+        instance_variable_set model.to_member_var, member
+        vars = vars << member
+        return redirect_to vars, notice: 'Burrito was successfully created.' if member.save
+        render action: 'new'
+      end
+    end
+
+    def set_action_update
+      put 'update' do
+        vars = extract_parent_vars
+        vars = vars << (member = extract_member_var)
+        return redirect_to vars, notice: 'Burrito was successfully updated.' if member.update_attributes(params[member.class.to_s.underscore.to_sym])
+        render action: 'edit'
+      end
+    end
+
+    def set_action_destroy
+      delete 'destroy' do
+        vars = extract_parent_vars
+        extract_member_var.destroy
+        redirect_to action: :index, notice: 'Burrito was successfully deleted'
+      end
+    end
+
+  end
+
+end
+ActionController::Base.extend ToyLocomotive::Resources::Controller::ClassMethods

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

@@ -5,10 +5,10 @@ module ToyLocomotive::Router::Controller
     %w(get put post delete).each {|via| eval "def #{via} path, opts={}, &blk; match_action \"#{via}\", path, opts, blk; end"}
 
     def match_action method, path, opts, blk
-      action = extract_action path, opts
-      extract_filter action, path, opts
+      action = extract_action path, opts, method
+      extract_filter action, path, opts, method
+      as = extract_as path, opts, method
       path = extract_path path, opts
-      as = extract_as path, opts
       controller = extract_controller
       add_route method, action, path, as, controller
       define_method action, blk
@@ -17,6 +17,7 @@ module ToyLocomotive::Router::Controller
     def add_route method, action, path, as, controller
       ToyLocomotive.routes ||= []
       ToyLocomotive.routes << {method: method, action: action, path: path, controller: controller, as: as}
+      puts ({method: method, action: action, path: path, controller: controller, as: as}.inspect)
     end
 
     def add_member_filter action
@@ -30,15 +31,22 @@ module ToyLocomotive::Router::Controller
     end
 
     def extract_path path, opts={}
-      path[0] == '/' ? path : "#{extract_model.route_chain}#{opts[:on] == 'member' ? extract_model.to_route : "/#{extract_model.to_s.underscore.pluralize}"}/#{path.parameterize}"
+      return path if path[0] == '/'
+      return "#{extract_model.route_chain}#{extract_model.to_route}/#{path.parameterize}" if opts[:on] == 'member' || ['edit','new'].include?(path)
+      return "#{extract_model.route_chain}#{extract_model.to_route}" if ['show','update','destroy'].include?(path)
+      return "#{extract_model.route_chain}/#{extract_model.to_s.underscore.pluralize}" if ['create', 'index'].include?(path)
+      "#{extract_model.route_chain}/#{extract_model.to_s.underscore.pluralize}/#{path.parameterize}"
     end
 
-    def extract_as path, opts={}
+    def extract_as path, opts={}, method='get'
+      return extract_model.to_as.pluralize if path == 'index'
+      return extract_model.to_as if path == 'show'
+      return nil if method != 'get'
       action = extract_action path, opts
       path[0] == '/' ? action : "#{action}_#{extract_model.to_as}"
     end
 
-    def extract_action path, opts={}
+    def extract_action path, opts={}, method='get'
       (opts[:as] || (path == '/' ? 'root' : path)).parameterize.underscore
     end
 
@@ -50,8 +58,9 @@ module ToyLocomotive::Router::Controller
       extract_controller.singularize.camelize.constantize
     end
 
-    def extract_filter action, path, opts
+    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
     end
 

data/lib/toy-locomotive/version.rb

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

data/lib/toy-locomotive.rb

@@ -4,10 +4,12 @@ require "toy-locomotive/version"
 module ToyLocomotive
 
   module Router; end
+  module Resources; end
   mattr_accessor :routes
 
 end
 
 require "toy-locomotive/router/model"
 require "toy-locomotive/router/controller"
+require "toy-locomotive/resources/controller"
 require "toy-locomotive/initializer"

data/spec/lib/resources_controller_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe DogsController do
+  describe 'extract_resources' do
+
+    it 'acepts :all as param' do
+      DogsController.extract_resources(:all).should == [:index, :new, :create, :show, :edit, :update, :destroy]
+    end
+    it 'acepts :only as param' do
+      DogsController.extract_resources(only: [:index, :show]).should == [:index, :show]
+    end
+    it 'acepts :except as param' do
+      DogsController.extract_resources(except: [:index, :destroy]).should == [:new, :create, :show, :edit, :update]
+    end
+  end
+
+  describe 'set_action' do
+    it "executes index" do
+      DogsController.resources(only: [:index])
+      DogsController.new.index.class.should == Array
+    end
+
+    it "executes new" do
+      DogsController.resources(only: [:new])
+      DogsController.new.new.human.should == Human.first
+    end
+
+    it "executes show" do
+      DogsController.resources(only: [:show])
+      DogsController.new.show.should == Dog.first
+    end
+
+    it "executes edit" do
+      DogsController.resources(only: [:edit])
+      DogsController.new.show.should == Dog.first
+    end
+
+  end
+end

data/spec/lib/router_controller_spec.rb

@@ -68,4 +68,41 @@ describe DogsController do
     end
   end
 
+  describe 'resources' do
+    it "gets an index" do
+      DogsController.get('index') { 'index' }
+      DogsController.new.index.should == 'index'
+    end
+
+    it "gets a show" do
+      DogsController.get('show') { 'show' }
+      DogsController.new.show.should == 'show'
+    end
+
+    it "gets a new" do
+      DogsController.get('new') { 'new' }
+      DogsController.new.new.should == 'new'
+    end
+
+    it "gets a edit" do
+      DogsController.get('edit') { 'edit' }
+      DogsController.new.edit.should == 'edit'
+    end
+
+    it "puts a update" do
+      DogsController.put('update') { 'update' }
+      DogsController.new.update.should == 'update'
+    end
+
+    it "posts a create" do
+      DogsController.post('create') { 'create' }
+      DogsController.new.create.should == 'create'
+    end
+
+    it "deletes a destroy" do
+      DogsController.delete('destroy') { 'destroy' }
+      DogsController.new.destroy.should == 'destroy'
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toy-locomotive
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &26691096 !ruby/object:Gem::Requirement
+  requirement: &25866492 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26691096
+  version_requirements: *25866492
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &26690760 !ruby/object:Gem::Requirement
+  requirement: &25865832 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26690760
+  version_requirements: *25865832
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &26690316 !ruby/object:Gem::Requirement
+  requirement: &25865424 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26690316
+  version_requirements: *25865424
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &26689824 !ruby/object:Gem::Requirement
+  requirement: &25864668 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26689824
+  version_requirements: *25864668
 description: a Different aproach to Rails applications
 email:
 - mortaro@towsta.com
@@ -68,10 +68,12 @@ files:
 - Rakefile
 - lib/toy-locomotive.rb
 - lib/toy-locomotive/initializer.rb
+- lib/toy-locomotive/resources/controller.rb
 - lib/toy-locomotive/router/controller.rb
 - lib/toy-locomotive/router/model.rb
 - lib/toy-locomotive/version.rb
 - readme
+- spec/lib/resources_controller_spec.rb
 - spec/lib/router_controller_spec.rb
 - spec/lib/router_model_spec.rb
 - spec/lib/toy_locomotive_spec.rb