dynamic_controller 0.0.8 → 0.0.9

data/lib/dynamic_controller/instance_methods.rb

@@ -1,140 +1,140 @@
-module DynamicController
-  module InstanceMethods
-
-    def self.included(base)
-      base.rescue_from StandardError, with: :handle_error
-
-      if base.include_action?(:index)
-        base.send :define_method, :index do
-          if parent_model
-            model = parent_model.send(controller_name)
-          else
-            model = resource_class
-          end
-
-          empty_collection = model.where('1=2').page(params[:page])
-
-          if search_query_valid?
-            begin
-              self.collection = model.search(search_query).result(distinct: true).page(params[:page])
-              self.collection.all #Force load to handle exception here
-            rescue ActiveRecord::StatementInvalid => ex
-              Rails.logger.debug "Invalid search query: #{params[:q]} | Error: #{ex.message}"
-              self.collection = empty_collection
-            end
-          else
-            self.collection = empty_collection
-          end
-
-          Responder.new(self).index
-        end
-      end
-
-      if base.include_action?(:show)
-        base.send :define_method, :show do
-          if parent_model
-            self.model = parent_model.send(controller_name).find(params[:id])
-          else
-            self.model = resource_class.find(params[:id])
-          end
-
-          Responder.new(self).show
-        end
-      end
-
-      if base.include_action?(:new)
-        base.send :define_method, :new do
-          if parent_model
-            self.model = parent_model.send(controller_name).build
-          else
-            self.model = resource_class.new
-          end
-
-          Responder.new(self).new
-        end
-      end
-
-      if base.include_action?(:edit)
-        base.send :define_method, :edit do
-          if parent_model
-            self.model = parent_model.send(controller_name).find(params[:id])
-          else
-            self.model = resource_class.find(params[:id])
-          end
-
-          Responder.new(self).edit
-        end
-      end
-
-      if base.include_action?(:create)
-        base.send :define_method, :create do
-          if parent_model
-            self.model = parent_model.send(controller_name).build(params[controller_name.singularize])
-          else
-            self.model = resource_class.new(params[controller_name.singularize])
-          end
-
-          if model.save
-            flash_message = "#{resource_class.model_name.human} successfully created"
-            if params[:save_and_new]
-              flash[:success] = flash_message
-              redirect_to action: :new
-            else
-              flash.now[:success] = flash_message
-              Responder.new(self).create
-            end
-          else
-            respond_to do |format|
-              format.html { render :new }
-              format.json { render json: model.errors, status: :unprocessable_entity }
-            end
-          end
-        end
-      end
-
-      if base.include_action?(:update)
-        base.send :define_method, :update do
-          if parent_model
-            self.model = parent_model.send(controller_name).find(params[:id])
-          else
-            self.model = resource_class.find(params[:id])
-          end
-
-          if model.update_attributes(params[controller_name.singularize])
-            flash.now[:success] = "#{resource_class.model_name.human} successfully updated"
-            Responder.new(self).update
-          else
-            respond_to do |format|
-              format.html { render :edit }
-              format.json { render json: model.errors, status: :unprocessable_entity }
-            end
-          end
-        end
-
-      end
-
-      if base.include_action?(:destroy)
-        base.send :define_method, :destroy do
-          if parent_model
-            self.model = parent_model.send(controller_name).find(params[:id])
-          else
-            self.model = resource_class.find(params[:id])
-          end
-
-          if model.destroy
-            flash[:warning] = "#{resource_class.model_name.human} successfully removed"
-            Responder.new(self).destroy
-          else
-            flash[:danger] = "#{resource_class.model_name.human} could not be deleted"
-            respond_to do |format|
-              format.html { redirect_to action: :index }
-              format.json { render json: model.errors, status: :unprocessable_entity }
-            end
-          end
-        end
-      end
-
-    end
-
-  end
+module DynamicController
+  module InstanceMethods
+
+    def self.included(base)
+      base.rescue_from StandardError, with: :handle_error
+
+      if base.include_action?(:index)
+        base.send :define_method, :index do
+          if parent_model
+            model = parent_model.send(controller_name)
+          else
+            model = resource_class
+          end
+
+          empty_collection = model.where('1=2').page(params[:page])
+
+          if search_query_valid?
+            begin
+              self.collection = model.search(ransack_query).result(distinct: true).page(params[:page])
+              self.collection.all #Force load to handle exception here
+            rescue ActiveRecord::StatementInvalid => ex
+              Rails.logger.debug "Invalid search query: #{params[:q]} | Error: #{ex.message}"
+              self.collection = empty_collection
+            end
+          else
+            self.collection = empty_collection
+          end
+
+          Responder.new(self).index
+        end
+      end
+
+      if base.include_action?(:show)
+        base.send :define_method, :show do
+          if parent_model
+            self.model = parent_model.send(controller_name).find(params[:id])
+          else
+            self.model = resource_class.find(params[:id])
+          end
+
+          Responder.new(self).show
+        end
+      end
+
+      if base.include_action?(:new)
+        base.send :define_method, :new do
+          if parent_model
+            self.model = parent_model.send(controller_name).build
+          else
+            self.model = resource_class.new
+          end
+
+          Responder.new(self).new
+        end
+      end
+
+      if base.include_action?(:edit)
+        base.send :define_method, :edit do
+          if parent_model
+            self.model = parent_model.send(controller_name).find(params[:id])
+          else
+            self.model = resource_class.find(params[:id])
+          end
+
+          Responder.new(self).edit
+        end
+      end
+
+      if base.include_action?(:create)
+        base.send :define_method, :create do
+          if parent_model
+            self.model = parent_model.send(controller_name).build(params[controller_name.singularize])
+          else
+            self.model = resource_class.new(params[controller_name.singularize])
+          end
+
+          if model.save
+            flash_message = "#{resource_class.model_name.human} successfully created"
+            if params[:save_and_new]
+              flash[:success] = flash_message
+              redirect_to action: :new
+            else
+              flash.now[:success] = flash_message
+              Responder.new(self).create
+            end
+          else
+            respond_to do |format|
+              format.html { render :new }
+              format.json { render json: model.errors, status: :unprocessable_entity }
+            end
+          end
+        end
+      end
+
+      if base.include_action?(:update)
+        base.send :define_method, :update do
+          if parent_model
+            self.model = parent_model.send(controller_name).find(params[:id])
+          else
+            self.model = resource_class.find(params[:id])
+          end
+
+          if model.update_attributes(params[controller_name.singularize])
+            flash.now[:success] = "#{resource_class.model_name.human} successfully updated"
+            Responder.new(self).update
+          else
+            respond_to do |format|
+              format.html { render :edit }
+              format.json { render json: model.errors, status: :unprocessable_entity }
+            end
+          end
+        end
+
+      end
+
+      if base.include_action?(:destroy)
+        base.send :define_method, :destroy do
+          if parent_model
+            self.model = parent_model.send(controller_name).find(params[:id])
+          else
+            self.model = resource_class.find(params[:id])
+          end
+
+          if model.destroy
+            flash[:warning] = "#{resource_class.model_name.human} successfully removed"
+            Responder.new(self).destroy
+          else
+            flash[:danger] = "#{resource_class.model_name.human} could not be deleted"
+            respond_to do |format|
+              format.html { redirect_to action: :index }
+              format.json { render json: model.errors, status: :unprocessable_entity }
+            end
+          end
+        end
+      end
+
+    end
+
+  end
 end

data/lib/dynamic_controller/resource.rb

@@ -1,21 +1,21 @@
-module DynamicController
-  class Resource
-    attr_reader :resource_class,
-                :param_name,
-                :instance_variable_name,
-                :children_name
-
-    def initialize(options={})
-      raise 'Param resource_class must be a class' if !options.has_key?(:resource_class) || !options[:resource_class].is_a?(Class)
-      @resource_class = options[:resource_class]
-      @param_name = options[:param_name] || "#{resource_class.to_s.demodulize.underscore}_id"
-      @instance_variable_name = options[:instance_variable_name] || "@#{resource_class.to_s.demodulize.underscore}"
-      @children_name = options[:children_name] || resource_class.to_s.demodulize.pluralize.underscore
-    end
-
-    def find(id)
-      resource_class.find(id)
-    end
-
-  end
-end
+module DynamicController
+  class Resource
+    attr_reader :resource_class,
+                :param_name,
+                :instance_variable_name,
+                :children_name
+
+    def initialize(options={})
+      raise 'Param resource_class must be a class' if !options.has_key?(:resource_class) || !options[:resource_class].is_a?(Class)
+      @resource_class = options[:resource_class]
+      @param_name = options[:param_name] || "#{resource_class.to_s.demodulize.underscore}_id"
+      @instance_variable_name = options[:instance_variable_name] || "@#{resource_class.to_s.demodulize.underscore}"
+      @children_name = options[:children_name] || resource_class.to_s.demodulize.pluralize.underscore
+    end
+
+    def find(id)
+      resource_class.find(id)
+    end
+
+  end
+end

data/lib/dynamic_controller/responder.rb

@@ -1,71 +1,71 @@
-module DynamicController
-  class Responder
-
-    def initialize(controller)
-      @controller = controller
-    end
-
-    def index
-      action :index,
-             html: Proc.new {},
-             json: Proc.new { render json: collection }
-    end
-
-    def show
-      action :show,
-             html: Proc.new {},
-             json: Proc.new { render json: model }
-    end
-
-    def new
-      action :new,
-             html: Proc.new {}
-    end
-
-    def edit
-      action :edit,
-             html: Proc.new {}
-    end
-
-    def create
-      action :create,
-             html: Proc.new { redirect_to action: :show, id: model.id },
-             json: Proc.new { render json: model, status: :created }
-    end
-
-    def update
-      action :update,
-             html: Proc.new { redirect_to action: :show, id: model.id },
-             json: Proc.new { head :no_content }
-    end
-
-    def destroy
-      action :destroy,
-             html: Proc.new { redirect_to action: :index },
-             json: Proc.new { head :no_content }
-    end
-
-    private
-
-    def action(name, blocks={})
-      @controller.instance_eval do
-        if self.class.redefined_responder_to?(name)
-          respond_to do |format|
-            self.instance_exec format, &self.class.redefined_responder_to(name)
-          end
-        else
-          respond_to do |format|
-            self.class.responder_formats.each do |mime|
-              if self.class.redefined_responder_to?(name, mime)
-                format.send(mime) { self.instance_eval &self.class.redefined_responder_to(name, mime) }
-              elsif blocks[mime]
-                format.send(mime) { self.instance_eval &blocks[mime] }
-              end
-            end
-          end
-        end
-      end
-    end
-
-  end
+module DynamicController
+  class Responder
+
+    def initialize(controller)
+      @controller = controller
+    end
+
+    def index
+      action :index,
+             html: Proc.new {},
+             json: Proc.new { render json: collection }
+    end
+
+    def show
+      action :show,
+             html: Proc.new {},
+             json: Proc.new { render json: model }
+    end
+
+    def new
+      action :new,
+             html: Proc.new {}
+    end
+
+    def edit
+      action :edit,
+             html: Proc.new {}
+    end
+
+    def create
+      action :create,
+             html: Proc.new { redirect_to action: :show, id: model.id },
+             json: Proc.new { render json: model, status: :created }
+    end
+
+    def update
+      action :update,
+             html: Proc.new { redirect_to action: :show, id: model.id },
+             json: Proc.new { head :no_content }
+    end
+
+    def destroy
+      action :destroy,
+             html: Proc.new { redirect_to action: :index },
+             json: Proc.new { head :no_content }
+    end
+
+    private
+
+    def action(name, blocks={})
+      @controller.instance_eval do
+        if self.class.redefined_responder_to?(name)
+          respond_to do |format|
+            self.instance_exec format, &self.class.redefined_responder_to(name)
+          end
+        else
+          respond_to do |format|
+            self.class.responder_formats.each do |mime|
+              if self.class.redefined_responder_to?(name, mime)
+                format.send(mime) { self.instance_eval &self.class.redefined_responder_to(name, mime) }
+              elsif blocks[mime]
+                format.send(mime) { self.instance_eval &blocks[mime] }
+              end
+            end
+          end
+        end
+      end
+    end
+
+  end
 end

data/lib/dynamic_controller/version.rb

@@ -1,3 +1,3 @@
-module DynamicController
-  VERSION = '0.0.8'
-end
+module DynamicController
+  VERSION = '0.0.9'
+end

data/lib/dynamic_controller.rb

@@ -1,18 +1,18 @@
-require 'ransack'
-require 'kaminari'
-require 'nql'
-
-module DynamicController
-  ACTIONS = [:index, :show, :new, :create, :edit, :update, :destroy]
-end
-
-require 'dynamic_controller/version'
-require 'dynamic_controller/resource'
-require 'dynamic_controller/responder'
-require 'dynamic_controller/helper_methods'
-require 'dynamic_controller/class_methods'
-require 'dynamic_controller/instance_methods'
-require 'dynamic_controller/action_controller_extension'
-
-ActionController::Base.send :extend, DynamicController::ActionControllerExtension
-
+require 'ransack'
+require 'kaminari'
+require 'nql'
+
+module DynamicController
+  ACTIONS = [:index, :show, :new, :create, :edit, :update, :destroy]
+end
+
+require 'dynamic_controller/version'
+require 'dynamic_controller/resource'
+require 'dynamic_controller/responder'
+require 'dynamic_controller/helper_methods'
+require 'dynamic_controller/class_methods'
+require 'dynamic_controller/instance_methods'
+require 'dynamic_controller/action_controller_extension'
+
+ActionController::Base.send :extend, DynamicController::ActionControllerExtension
+

data/spec/controller_factory.rb

@@ -1,23 +1,23 @@
-class AllActionsController < ActionController::Base
-  has_crud_actions
-end
-
-class OnlyIndexController < ActionController::Base
-  has_crud_actions only: :index
-end
-
-class ExceptIndexController < ActionController::Base
-  has_crud_actions except: :index
-end
-
-class OnlyAndExceptController < ActionController::Base
-  has_crud_actions only: [:index, :new, :create, :edit], except: [:edit, :destroy]
-end
-
-class XlsResponderController < ActionController::Base
-  has_crud_actions
-
-  respond_to_index :xls do
-    render xls: nil
-  end
+class AllActionsController < ActionController::Base
+  has_crud_actions
+end
+
+class OnlyIndexController < ActionController::Base
+  has_crud_actions only: :index
+end
+
+class ExceptIndexController < ActionController::Base
+  has_crud_actions except: :index
+end
+
+class OnlyAndExceptController < ActionController::Base
+  has_crud_actions only: [:index, :new, :create, :edit], except: [:edit, :destroy]
+end
+
+class XlsResponderController < ActionController::Base
+  has_crud_actions
+
+  respond_to_index :xls do
+    render xls: nil
+  end
 end