dynamic_controller 0.0.8 → 0.0.9

data/README.md

@@ -1,80 +1,80 @@
-# DynamicController
-
-Simple way to add CRUD actions into Rails controllers.
-
-Suppoted formats HTML and JSON.
-
-Tested with Ruby 1.9.3 and Rails 3.2.8.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'dynamic_controller'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install dynamic_controller
-
-## Adding CRUD actions to resource controller
-
-    class UsersController < ApplicationController
-      has_crud_actions
-    end
-
-has_crud_actions adds index, show, new, edit, create, update and destroy actions to controller
-
-## Explicit action specification
-
-    class UsersController < ApplicationController
-      has_crud_actions only: [:index, :new, :create]
-    end
-
-or
-
-    class UsersController < ApplicationController
-      has_crud_actions except: :destroy
-    end
-
-
-## Nested resources support
-
-    class ProfilesController < ApplicationController
-      has_crud_actions
-      nested_of User
-    end
-
-If has more than one nested level should use
-
-    class StreetsController < ApplicationController
-      has_crud_actions
-      nested_of Country
-      nested_of City
-    end
-
-## Redefining responder
-
-    class LanguagesController < ApplicationController
-      has_crud_actions
-
-      respond_to_create :html do
-        redirect_to action: :index
-      end
-
-      respond_to_update do |format|
-        format.html { redirect_to action: :index }
-        format.json { render json: @language }
-      end
-    end
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+# DynamicController
+
+Simple way to add CRUD actions into Rails controllers.
+
+Suppoted formats HTML and JSON.
+
+Tested with Ruby 1.9.3 and Rails 3.2.8.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'dynamic_controller'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install dynamic_controller
+
+## Adding CRUD actions to resource controller
+
+    class UsersController < ApplicationController
+      has_crud_actions
+    end
+
+has_crud_actions adds index, show, new, edit, create, update and destroy actions to controller
+
+## Explicit action specification
+
+    class UsersController < ApplicationController
+      has_crud_actions only: [:index, :new, :create]
+    end
+
+or
+
+    class UsersController < ApplicationController
+      has_crud_actions except: :destroy
+    end
+
+
+## Nested resources support
+
+    class ProfilesController < ApplicationController
+      has_crud_actions
+      nested_of User
+    end
+
+If has more than one nested level should use
+
+    class StreetsController < ApplicationController
+      has_crud_actions
+      nested_of Country
+      nested_of City
+    end
+
+## Redefining responder
+
+    class LanguagesController < ApplicationController
+      has_crud_actions
+
+      respond_to_create :html do
+        redirect_to action: :index
+      end
+
+      respond_to_update do |format|
+        format.html { redirect_to action: :index }
+        format.json { render json: @language }
+      end
+    end
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/dynamic_controller.gemspec

@@ -1,27 +1,27 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "dynamic_controller/version"
-
-Gem::Specification.new do |s|
-  s.name        = 'dynamic_controller'
-  s.version     = DynamicController::VERSION
-  s.authors     = ['Gabriel Naiman']
-  s.email       = ['gabynaiman@gmail.com']
-  s.homepage    = 'https://github.com/gabynaiman/dynamic_controller'
-  s.summary     = 'Simple way to add CRUD actions into Rails controllers'
-  s.description = 'Simple way to add CRUD actions into Rails controllers'
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  s.add_dependency 'ransack'
-  s.add_dependency 'kaminari'
-  s.add_dependency 'nql', '0.0.4'
-
-  s.add_development_dependency 'rails'
-  s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rspec-rails'
-  s.add_development_dependency 'factory_girl_rails'
-end
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "dynamic_controller/version"
+
+Gem::Specification.new do |s|
+  s.name        = 'dynamic_controller'
+  s.version     = DynamicController::VERSION
+  s.authors     = ['Gabriel Naiman']
+  s.email       = ['gabynaiman@gmail.com']
+  s.homepage    = 'https://github.com/gabynaiman/dynamic_controller'
+  s.summary     = 'Simple way to add CRUD actions into Rails controllers'
+  s.description = 'Simple way to add CRUD actions into Rails controllers'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_dependency 'ransack'
+  s.add_dependency 'kaminari'
+  s.add_dependency 'nql', '0.0.4'
+
+  s.add_development_dependency 'rails'
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'factory_girl_rails'
+end

data/lib/dynamic_controller/action_controller_extension.rb

@@ -1,17 +1,19 @@
-module DynamicController
-  module ActionControllerExtension
-
-    def has_crud_actions(options={})
-      @resource_options = Hash[options.map { |k, v| [:only, :except].include?(k.to_sym) ? [k, [v].flatten.map(&:to_sym)] : [k, v] }].reverse_merge(only: DynamicController::ACTIONS, except: [])
-      send :extend, ClassMethods
-      send :include, InstanceMethods
-      send :include, HelperMethods
-    end
-
-    def nested_of(resource_class)
-      before_filter :load_parent_models if parent_resources.empty?
-      parent_resources << Resource.new(resource_class: resource_class)
-    end
-
-  end
+module DynamicController
+  module ActionControllerExtension
+
+    def has_crud_actions(options={})
+      @resource_options = Hash[options.map { |k, v| [:only, :except].include?(k.to_sym) ? [k, [v].flatten.map(&:to_sym)] : [k, v] }].reverse_merge(only: DynamicController::ACTIONS, except: [])
+      send :extend, ClassMethods
+      send :include, InstanceMethods
+      send :include, HelperMethods
+
+      helper_method :search_query
+    end
+
+    def nested_of(resource_class)
+      before_filter :load_parent_models if parent_resources.empty?
+      parent_resources << Resource.new(resource_class: resource_class)
+    end
+
+  end
 end

data/lib/dynamic_controller/class_methods.rb

@@ -1,42 +1,42 @@
-module DynamicController
-  module ClassMethods
-
-    def parent_resources
-      @parent_resources ||= []
-    end
-
-    def include_action?(action_name)
-      (@resource_options[:only] - @resource_options[:except]).include?(action_name)
-    end
-
-    def redefined_responders
-      @redefined_responders ||= {}
-    end
-
-    def redefined_responder_to(action, format=nil)
-      redefined_responders[redefined_responder_key(action, format)]
-    end
-
-    def redefined_responder_to?(action, format=nil)
-      redefined_responders.has_key? redefined_responder_key(action, format)
-    end
-
-    def responder_formats
-      @responder_formats ||= [:html, :json]
-    end
-
-    DynamicController::ACTIONS.each do |action|
-      define_method "respond_to_#{action}" do |format=nil, &block|
-        responder_formats << format if format and !responder_formats.include?(format)
-        redefined_responders[redefined_responder_key(action, format)] = block
-      end
-    end
-
-    private
-
-    def redefined_responder_key(action, format=nil)
-      [action, format].compact.join('_').to_sym
-    end
-
-  end
+module DynamicController
+  module ClassMethods
+
+    def parent_resources
+      @parent_resources ||= []
+    end
+
+    def include_action?(action_name)
+      (@resource_options[:only] - @resource_options[:except]).include?(action_name)
+    end
+
+    def redefined_responders
+      @redefined_responders ||= {}
+    end
+
+    def redefined_responder_to(action, format=nil)
+      redefined_responders[redefined_responder_key(action, format)]
+    end
+
+    def redefined_responder_to?(action, format=nil)
+      redefined_responders.has_key? redefined_responder_key(action, format)
+    end
+
+    def responder_formats
+      @responder_formats ||= [:html, :json]
+    end
+
+    DynamicController::ACTIONS.each do |action|
+      define_method "respond_to_#{action}" do |format=nil, &block|
+        responder_formats << format if format and !responder_formats.include?(format)
+        redefined_responders[redefined_responder_key(action, format)] = block
+      end
+    end
+
+    private
+
+    def redefined_responder_key(action, format=nil)
+      [action, format].compact.join('_').to_sym
+    end
+
+  end
 end

data/lib/dynamic_controller/helper_methods.rb

@@ -1,92 +1,104 @@
-module DynamicController
-  module HelperMethods
-
-    def resource_class
-      @resource_class ||= (resource_namespace.to_s.split('::') << controller_name.classify).join('::').constantize
-    end
-
-    def resource_namespace
-      self.class.to_s.deconstantize.constantize
-    end
-
-    def collection=(value)
-      instance_variable_set("@#{controller_name}", value)
-    end
-
-    def collection
-      instance_variable_get("@#{controller_name}")
-    end
-
-    def model=(value)
-      instance_variable_set("@#{controller_name.singularize}", value)
-    end
-
-    def model
-      instance_variable_get("@#{controller_name.singularize}")
-    end
-
-    def load_parent_models
-      parent = nil
-      self.class.parent_resources.each do |resource|
-        if parent
-          parent = parent.send(resource.children_name).find(params[resource.param_name])
-        else
-          parent = resource.find params[resource.param_name]
-        end
-        instance_variable_set resource.instance_variable_name, parent
-      end
-    end
-
-    def parent_models
-      return nil if self.class.parent_resources.empty?
-      self.class.parent_resources.map do |resource|
-        instance_variable_get resource.instance_variable_name
-      end
-    end
-
-    def parent_model
-      (parent_models || []).last
-    end
-
-    def handle_error(error)
-      respond_to do |format|
-        format.html { raise error }
-        format.json { render json: error.message, status: :internal_server_error }
-      end
-    end
-
-    def model_extended_attributes
-      resource_class.column_names | resource_class.reflections.map { |k, v| v.klass.column_names.map { |c| "#{k}_#{c}" } }.flatten
-    end
-
-    def search_query
-      params[:q].is_a?(String) ? NQL.to_ransack(params[:q]) : params[:q]
-    end
-
-    def search_query_valid?
-      begin
-        search_node_valid? search_query, model_extended_attributes
-      rescue NQL::InvalidExpressionError => ex
-        Rails.logger.debug "Invalid search query: #{params[:q]} | Error: #{ex.message}"
-        false
-      end
-    end
-
-    def search_node_valid?(node, valid_attributes)
-      return true unless node
-      node.deep_symbolize_keys.each do |k, v|
-        if k == :a
-          return false unless valid_attributes.include?(v['0'.to_sym][:name])
-        else
-          if v.is_a?(Hash)
-            return false unless search_node_valid?(v, valid_attributes)
-          elsif v.is_a?(Array)
-            v.select { |e| e.is_a?(Hash) }.each { |e| return false unless search_node_valid?(e, valid_attributes) }
-          end
-        end
-      end
-      true
-    end
-
-  end
+module DynamicController
+  module HelperMethods
+
+    def resource_class
+      @resource_class ||= (resource_namespace.to_s.split('::') << controller_name.classify).join('::').constantize
+    end
+
+    def resource_namespace
+      self.class.to_s.deconstantize.constantize
+    end
+
+    def collection=(value)
+      instance_variable_set("@#{controller_name}", value)
+    end
+
+    def collection
+      instance_variable_get("@#{controller_name}")
+    end
+
+    def model=(value)
+      instance_variable_set("@#{controller_name.singularize}", value)
+    end
+
+    def model
+      instance_variable_get("@#{controller_name.singularize}")
+    end
+
+    def load_parent_models
+      parent = nil
+      self.class.parent_resources.each do |resource|
+        if parent
+          parent = parent.send(resource.children_name).find(params[resource.param_name])
+        else
+          parent = resource.find params[resource.param_name]
+        end
+        instance_variable_set resource.instance_variable_name, parent
+      end
+    end
+
+    def parent_models
+      return nil if self.class.parent_resources.empty?
+      self.class.parent_resources.map do |resource|
+        instance_variable_get resource.instance_variable_name
+      end
+    end
+
+    def parent_model
+      (parent_models || []).last
+    end
+
+    def handle_error(error)
+      respond_to do |format|
+        format.html { raise error }
+        format.json { render json: error.message, status: :internal_server_error }
+      end
+    end
+
+    def model_extended_attributes
+      resource_class.column_names | resource_class.reflections.map { |k, v| v.klass.column_names.map { |c| "#{k}_#{c}" } }.flatten
+    end
+
+    def search_query
+      return @search_query if @search_query
+
+      query_key = "query_#{params[:controller]}_#{params[:action]}"
+
+      @search_query = if params.has_key?(:q)
+                        session[query_key] = params[:q]
+                      else
+                        session[query_key]
+                      end
+    end
+
+    def ransack_query
+      search_query.is_a?(String) ? NQL.to_ransack(search_query) : search_query
+    end
+
+    def search_query_valid?
+      begin
+        search_node_valid? ransack_query, model_extended_attributes
+      rescue NQL::InvalidExpressionError => ex
+        Rails.logger.debug "Invalid search query: #{params[:q]} | Error: #{ex.message}"
+        false
+      end
+    end
+
+    def search_node_valid?(node, valid_attributes)
+      return true unless node
+      node.deep_symbolize_keys.each do |k, v|
+        if k == :a
+          return false unless valid_attributes.include?(v['0'.to_sym][:name])
+        else
+          if v.is_a?(Hash)
+            return false unless search_node_valid?(v, valid_attributes)
+          elsif v.is_a?(Array)
+            v.select { |e| e.is_a?(Hash) }.each { |e| return false unless search_node_valid?(e, valid_attributes) }
+          end
+        end
+      end
+      true
+    end
+
+  end
 end