neuron 0.0.6 → 0.0.7

data/lib/neuron/authorization.rb

@@ -1,4 +1,5 @@
 require 'neuron'
+require 'cancan'
 require 'active_support/concern'
 
 module Neuron
@@ -12,20 +13,75 @@ module Neuron
         end
       end
 
-      if defined?(::Devise)
-        def access_denied(exception = nil)
-          if user_signed_in?
-            redirect_to '/422.html'
-          else
-            redirect_to new_user_session_path, alert: I18n.t('devise.failure.unauthenticated')
+      module ClassMethods
+        def authorize_resources(options = {})
+          include Neuron::Authorization::Controller::ControllerExtension
+
+          before_filter :authorize_resource
+          has_scope(:authorize, type: :boolean, default: true) do |controller, scope|
+            scope.accessible_by(controller.current_ability, controller.send(:authorization_action))
           end
         end
-      else
-        def access_denied(exception = nil)
+      end
+
+      def access_denied(exception = nil)
+        if user_signed_in?
           redirect_to '/422.html'
+        else
+          redirect_to new_user_session_path, alert: I18n.t('devise.failure.unauthenticated')
         end
       end
 
+      module ControllerExtension
+        protected
+
+        def authorization_action
+          @authorization_action ||= action_name.to_sym
+        end
+
+        def authorization_resource
+          @authorization_resource ||= case authorization_action
+                                      when :index
+                                        resource_class
+                                      when :new, :create
+                                        build_resource
+                                      else
+                                        resource
+                                      end
+        end
+
+        def authorize_resource
+          authorize!(authorization_action, authorization_resource)
+        end
+
+        def build_resource
+          get_resource_ivar || set_resource_ivar(end_of_association_chain.send(method_for_build)).tap do |resource|
+            current_ability.attributes_for(authorization_action, resource_class).each do |attribute, value|
+              resource.send("#{attribute}=", value) if attribute.is_a?(Symbol)
+            end
+            resource.attributes = resource_params
+          end
+        end
+
+        private
+
+        # Evaluate the parent given. This is used to nest parents in the
+        # association chain.
+        def evaluate_parent(parent_symbol, parent_config, chain = nil) #:nodoc:
+          instantiated_object = instance_variable_get("@#{parent_config[:instance_name]}")
+          return instantiated_object if instantiated_object
+
+          parent = if chain
+                     chain.send(parent_config[:collection_name])
+                   else
+                     parent_config[:parent_class]
+                   end.accessible_by(current_ability, :read)
+
+          parent = parent.send(parent_config[:finder], params[parent_config[:param]])
+
+          instance_variable_set("@#{parent_config[:instance_name]}", parent)
+        end
+      end
     end
 
     module View

data/lib/neuron/controller.rb

@@ -8,11 +8,8 @@ module Neuron
     def self.setup!
       if defined?(::ActionController)
         ActionController::Base.send(:include, Neuron::Controller)
-        if defined?(::InheritedResources)
-          ActionController::Base.send(:include, Neuron::Resources::Controller)
-          require 'neuron/integrations/cancan_inherited_resources' if defined?(::CanCan)
-        end
-        ActionController::Base.send(:include, Neuron::Authorization::Controller) if defined?(::CanCan)
+        ActionController::Base.send(:include, Neuron::Resources::Controller)      if defined?(::InheritedResources)
+        ActionController::Base.send(:include, Neuron::Authorization::Controller)  if defined?(::CanCan)
       end
     end
 

data/lib/neuron/railtie.rb

@@ -3,7 +3,13 @@ require 'rails'
 require 'rails/engine'
 
 class Neuron::Railtie < Rails::Engine
-  config.app_generators.stylesheets false
+  config.neuron = Neuron
+
+  if config.respond_to?(:app_generators)
+    config.app_generators.stylesheets false
+  else
+    config.generators.stylesheets false
+  end
 
   config.to_prepare do
     Neuron.setup!

data/lib/neuron/resources.rb

@@ -1,38 +1,94 @@
 require 'neuron'
+require 'inherited_resources'
+require 'has_scope'
 
 module Neuron
   module Resources
+    class << self
+      attr_accessor :default_options
+    end
+
+    self.default_options = {
+      order: true,
+      paginate: defined?(::WillPaginate),
+      authorize: defined?(::CanCan)
+    }
+
     module Controller
       extend ActiveSupport::Concern
 
       module ClassMethods
         def resources(options = {})
+          options = options.reverse_merge(options)
+
+          unless respond_to?(:resource_options)
+            class_attribute :resource_options
+          end
+          self.resource_options = options
+          prepend_before_filter :set_default_collection_scopes
+
           inherit_resources
           append_neuron_view_path_resolver
-          if options[:orders] == true
+
+          if options[:order] == true
             order_scopes
-          elsif options[:orders]
-            order_scopes(options[:orders])
+          elsif options[:order]
+            order_scopes(options[:order])
+          end
+
+          if options[:paginate] == true
+            paginate_scope
+          elsif options[:paginate]
+            paginate_scope(options[:paginate])
+          end
+
+          if options[:authorize]
+            authorize_resources(options[:authorize])
           end
         end
+
         # Adds default ordering scopes for #index action
         # @param [Hash] options options hash
         # @option options [Array, Symbol, String] :ascending default ascending scopes
         # @option options [Array, Symbol, String] :descending default descending scopes
         def order_scopes(options = {})
           with_options only: :index, type: :array do |index|
-            index.has_scope(:ascending) { |controller, scope, values| values.any? ?  scope.asc(*values) : scope }
-            index.has_scope(:descending) { |controller, scope, values| values.any? ?  scope.desc(*values) : scope }
+            index.has_scope(:ascending)   { |controller, scope, values| values.any? ?  scope.asc(*values)  : scope }
+            index.has_scope(:descending)  { |controller, scope, values| values.any? ?  scope.desc(*values) : scope }
           end
-          prepend_before_filter :set_default_order
-          define_method(:set_default_order) do
-            unless params[:ascending] || params[:descending]
-              params[:ascending] = options[:ascending]    if options[:ascending]
-              params[:descending] = options[:descending]  if options[:descending]
+        end
+
+        def paginate_scope(options = {})
+          define_method(:collection_with_pagination) do
+            get_collection_ivar || begin
+              results = end_of_association_chain
+              if (params[:paginate] != "false") && applicable?(options[:if], true) && applicable?(options[:unless], false)
+                results = results.paginate(page: params[:page], per_page: params[:per_page])
+                headers['X-Pagination-TotalEntries']  = results.total_entries.to_s
+                headers['X-Pagination-TotalPages']    = results.total_pages.to_s
+                headers['X-Pagination-CurrentPage']   = results.current_page.to_s
+                headers['X-Pagination-PerPage']       = results.per_page.to_s
+              end
+              set_collection_ivar(results)
             end
-            params[:ascending] = Array(params[:ascending])
-            params[:descending] = Array(params[:descending])
           end
+          alias_method_chain :collection, :pagination
+        end
+      end
+
+      protected
+
+      def set_default_collection_scopes
+        if resource_options[:order]
+          unless params[:ascending] || params[:descending]
+            params[:ascending]  = resource_options[:order][:ascending]   if resource_options[:order][:ascending]
+            params[:descending] = resource_options[:order][:descending]  if resource_options[:order][:descending]
+          end
+          params[:ascending] = Array(params[:ascending])
+          params[:descending] = Array(params[:descending])
+        end
+        if resource_options[:paginate]
+          params[:page] ||= 1
         end
       end
     end

data/lib/neuron/version.rb

@@ -1,3 +1,3 @@
 module Neuron
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/neuron.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency 'rails', '~> 3.0'
   s.add_development_dependency 'rake'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neuron
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-11 00:00:00.000000000Z
+date: 2011-06-12 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &71321020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *71321020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &73648720 !ruby/object:Gem::Requirement
+  requirement: &71320800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73648720
+  version_requirements: *71320800
 description: Code reused in many applications
 email:
 - al@semyonov.us
@@ -45,7 +56,6 @@ files:
 - lib/neuron/application.rb
 - lib/neuron/authorization.rb
 - lib/neuron/controller.rb
-- lib/neuron/integrations/cancan_inherited_resources.rb
 - lib/neuron/navigation.rb
 - lib/neuron/railtie.rb
 - lib/neuron/resolver.rb
@@ -69,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -188768273
+      hash: -338995043
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -78,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -188768273
+      hash: -338995043
 requirements: []
 rubyforge_project: neuron
 rubygems_version: 1.8.5

data/lib/neuron/integrations/cancan_inherited_resources.rb

@@ -1,83 +0,0 @@
-require 'inherited_resources'
-require 'cancan'
-
-module InheritedResources
-  module Actions
-    # GET /resources/1/edit
-    def edit(options={}, &block)
-      authorize! authorization_action, resource
-      respond_with(*(with_chain(resource) << options), &block)
-    end
-    alias :edit! :edit
-  end
-
-  module BaseHelpers
-    protected
-
-    def resource
-      get_resource_ivar ||
-        set_resource_ivar(end_of_association_chain.accessible_by(current_ability, authorization_action).send(method_for_find, params[:id])).tap do |resource|
-          authorize!(authorization_action, resource)
-        end
-    end
-
-    def build_resource
-      get_resource_ivar || set_resource_ivar(end_of_association_chain.send(method_for_build)).tap do |resource|
-        current_ability.attributes_for(authorization_action, resource_class).each do |attribute, value|
-          resource.send("#{attribute}=", value) if attribute.is_a?(Symbol)
-        end
-        resource.attributes = resource_params
-        authorize!(action_name, resource)
-      end
-    end
-
-    def collection
-      get_collection_ivar || begin
-        authorize!(authorization_action, resource_class)
-        set_collection_ivar(end_of_association_chain.accessible_by(current_ability, authorization_action).paginate(page: params[:page]))
-      end
-    end
-
-    def create_resource(object)
-      authorize!(authorization_action, object)
-      object.save
-    end
-
-    def update_resource(object, attributes)
-      authorize!(authorization_action, object)
-      object.update_attributes(attributes)
-    end
-
-    def destroy_resource(object)
-      authorize!(authorization_action, object)
-      object.destroy
-    end
-
-    private
-
-    def authorization_action
-      @authorization_action ||= action_name.to_sym
-    end
-  end
-
-  module BelongsToHelpers
-    private
-
-    # Evaluate the parent given. This is used to nest parents in the
-    # association chain.
-    def evaluate_parent(parent_symbol, parent_config, chain = nil) #:nodoc:
-      instantiated_object = instance_variable_get("@#{parent_config[:instance_name]}")
-      return instantiated_object if instantiated_object
-
-      parent = if chain
-                 chain.send(parent_config[:collection_name])
-               else
-                 parent_config[:parent_class]
-               end.accessible_by(current_ability, :read)
-
-      parent = parent.send(parent_config[:finder], params[parent_config[:param]])
-
-      instance_variable_set("@#{parent_config[:instance_name]}", parent)
-    end
-  end
-end