restful-controller 0.0.2 → 0.0.3

data/lib/restful_controller.rb

@@ -1,3 +1,4 @@
+require 'rails/all'
 require 'restful_controller/action_controller/base'
 
 require 'restful_controller/base'

data/lib/restful_controller/action_controller/base.rb

@@ -1,5 +1,7 @@
-class ActionController::Base
-  def self.restful_controller(*actions)
-    RestfulController::Base.inject(self, actions)
+module ActionController
+  class Base
+    def self.restful_controller(*actions)
+      RestfulController::Base.inject(self, *actions)
+    end
   end
 end

data/lib/restful_controller/actions/create.rb

@@ -2,7 +2,13 @@ module RestfulController
   module Actions
     module Create
       def create
-        self.class.model_class.create(model_params)
+        model = self.class.model_class.build(model_params)
+        instance_variable_set("@#{self.class.model_name}", model)
+        if model.save
+          redirect_to model, notice: "#{model.name} was successfully created."
+        else
+          render action: 'new'
+        end
       end
     end
   end

data/lib/restful_controller/actions/destroy.rb

@@ -2,7 +2,7 @@ module RestfulController
   module Actions
     module Destroy
       def destroy
-        instance_variable_get("@#{self.class.model_name.pluralize}").destroy
+        instance_variable_get("@#{self.class.model_name}").destroy
       end
     end
   end

data/lib/restful_controller/actions/new.rb

@@ -2,7 +2,7 @@ module RestfulController
   module Actions
     module New
       def new
-        model = self.class.model_class.new
+        model = self.class.model_class.build
         instance_variable_set("@#{self.class.model_name}", model)
       end
     end

data/lib/restful_controller/actions/update.rb

@@ -2,7 +2,11 @@ module RestfulController
   module Actions
     module Update
       def update
-        instance_variable_get("@#{self.class.model_name.pluralize}").update_attributes(model_params)
+        if instance_variable_get("@#{self.class.model_name}").update_attributes(model_params)
+          redirect_to instance_variable_get("@#{self.class.model_name}"), notice: "Was successfully updated."
+        else
+          render action: 'edit'
+        end
       end
     end
   end

data/lib/restful_controller/base.rb

@@ -2,7 +2,7 @@ module RestfulController
   class Base
     ACTIONS = [:index, :show, :edit, :update, :create, :destroy, :new]
 
-    def self.inject(base, actions = nil)
+    def self.inject(base, actions = [])
       actions_to_include = actions_to_include(actions)
       base.class_eval do
         include Helpers
@@ -19,11 +19,10 @@ module RestfulController
           ACTIONS
         elsif actions.length == 1 && actions.first.is_a?(Hash)
           hash = actions.first
-          key = hash.keys.first
-          if key == :except
-            ACTIONS - Array(hash[key])
-          elsif key == :only
-            Array(hash[key])
+          if hash[:except]
+            ACTIONS - Array(hash[:except])
+          elsif hash[:only]
+            Array(hash[:only])
           end
         else
           actions

data/lib/restful_controller/filters.rb

@@ -2,6 +2,12 @@ module RestfulController
   module Filters
     extend ActiveSupport::Concern
     included do
+      # set_post
+      define_method "set_#{model_name}" do
+        model = self.class.model_class.find(params[:id])
+        instance_variable_set("@#{self.class.model_name}", model)
+      end
+
       append_before_filter "set_#{model_name}", only: [:show, :edit, :update, :destroy]
     end
   end

data/lib/restful_controller/helpers.rb

@@ -2,14 +2,6 @@ module RestfulController
   module Helpers
     extend ActiveSupport::Concern
 
-    included do
-      # set_post
-      define_method "set_#{model_name}" do
-        model = self.class.model_class.find(params[:id])
-        instance_variable_set("@#{self.class.model_name}", model)
-      end
-    end
-
     def model_params
       send("#{self.class.model_name}_params")
     end
@@ -23,6 +15,5 @@ module RestfulController
         controller_name.classify.constantize
       end
     end
-
   end
 end

data/lib/restful_controller/version.rb

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

data/restful-controller.gemspec

@@ -15,8 +15,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = RestfulController::VERSION
 
-  gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'actionpack'
+  gem.add_development_dependency 'actionpack', '~> 3.1'
+  gem.add_development_dependency 'activesupport', '~> 3.1'
 end

data/spec/fixtures/application.rb

@@ -0,0 +1,21 @@
+require 'active_support/all'
+require 'action_controller'
+require 'action_dispatch'
+
+module Rails
+  class App
+    def env_config; {} end
+    def routes
+      return @routes if defined?(@routes)
+      @routes = ActionDispatch::Routing::RouteSet.new
+      @routes.draw do
+        resources :posts
+      end
+      @routes
+    end
+  end
+
+  def self.application
+    @app ||= App.new
+  end
+end

data/spec/fixtures/controllers.rb

@@ -0,0 +1,9 @@
+class TestController < ActionController::Base
+  include Rails.application.routes.url_helpers
+
+  def render(*attributes); end
+end
+
+class PostsController < TestController
+  restful_controller
+end

data/spec/fixtures/models.rb

@@ -0,0 +1,7 @@
+class Post
+  attr_accessor :id
+
+  def initialize
+    @id = 1
+  end
+end

data/spec/restful-controller/base_spec.rb

@@ -1 +1,20 @@
-require 'spec_helper'
+require 'spec_helper'
+
+describe RestfulController::Base do
+  describe '.actions_to_include' do
+    it 'accepts array' do
+      actions = [:index, :show]
+      RestfulController::Base.actions_to_include(actions).should eq([:index, :show])
+    end
+
+    it 'uses :only' do
+      actions = [{only: [:index, :show]}]
+      RestfulController::Base.actions_to_include(actions).should eq([:index, :show])
+    end
+
+    it 'uses :except' do
+      actions = [{except: [:index]}]
+      RestfulController::Base.actions_to_include(actions).should eq([:show, :edit, :update, :create, :destroy, :new])
+    end
+  end
+end

data/spec/restful-controller/controller_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+require 'fixtures/application'
+require 'fixtures/controllers'
+require 'fixtures/models'
+require 'rspec/rails'
+
+describe PostsController, type: :controller do
+  before do
+    @post = Post.new
+    @post_params = { title: "Title" }
+    PostsController.any_instance.stub(:post_params).and_return(@post_params)
+  end
+
+  describe '#show' do
+    it "has @post" do
+      Post.stub(:find).with(@post.id.to_s).and_return(@post)
+      get :show, id: @post.id
+      assigns(:post).should eq(@post)
+    end
+  end
+
+  describe '#edit' do
+    it "has @post" do
+      Post.stub(:find).with(@post.id.to_s).and_return(@post)
+      get :edit, id: @post.id
+      assigns(:post).should eq(@post)
+    end
+  end
+
+  describe '#update' do
+    it 'updates @post' do
+      Post.stub(:find).with(@post.id.to_s).and_return(@post)
+
+      @post.should_receive(:update_attributes).with(@post_params)
+
+      put :update, {id: @post.id, post: @post_params }
+    end
+  end
+
+  describe '#index' do
+    it 'has @posts' do
+      Post.stub(:all).and_return([@post])
+
+      get :index, {id: @post.id}
+
+      assigns(:posts).should eq([@post])
+    end
+  end
+
+  describe '#destroy' do
+    it 'destroys @post' do
+      Post.stub(:find).with(@post.id.to_s).and_return(@post)
+
+      @post.should_receive(:destroy)
+
+      delete :destroy, {id: @post.id}
+    end
+  end
+
+  describe '#create' do
+    it 'builds and saves @post' do
+      Post.should_receive(:build).with(@post_params).and_return(@post)
+      @post.should_receive(:save)
+      post :create, {id: @post.id, post: @post_params }
+      assigns(:post).should eq(@post)
+    end
+  end
+
+  describe '#new' do
+    it 'builds @post' do
+      Post.should_receive(:build).and_return(@post)
+      get :new, {id: @post.id}
+      assigns(:post).should eq(@post)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,2 @@
-require 'rspec'
-require 'pry'
 require 'restful-controller'
+require 'pry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restful-controller
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-19 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -75,6 +75,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description: Restful Controllers for your Rails app
 email:
 - alexander@say26.com
@@ -103,7 +135,11 @@ files:
 - lib/restful_controller/helpers.rb
 - lib/restful_controller/version.rb
 - restful-controller.gemspec
+- spec/fixtures/application.rb
+- spec/fixtures/controllers.rb
+- spec/fixtures/models.rb
 - spec/restful-controller/base_spec.rb
+- spec/restful-controller/controller_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/AlexanderZaytsev/restful-controller
 licenses: []
@@ -119,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4425193934035644459
+      hash: -3875835659632608554
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4425193934035644459
+      hash: -3875835659632608554
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -136,5 +172,9 @@ signing_key:
 specification_version: 3
 summary: It's like scaffolding, but invisible
 test_files:
+- spec/fixtures/application.rb
+- spec/fixtures/controllers.rb
+- spec/fixtures/models.rb
 - spec/restful-controller/base_spec.rb
+- spec/restful-controller/controller_spec.rb
 - spec/spec_helper.rb