puffer 0.1.0 → 0.1.1

data/lib/puffer/backends/models/user/mongoid.rb

@@ -0,0 +1,15 @@
+module Puffer
+  module User
+    class Mongoid
+      include ::Mongoid::Document
+
+      self.collection_name = 'puffer_users' 
+
+      field :email, :type => String
+      field :password_digest, :type => String
+      field :roles, :type => String
+
+      include Puffer::User::Base
+    end
+  end
+end

data/lib/puffer/component.rb

@@ -35,8 +35,8 @@ module Puffer
       helper 'puffer/helpers/component', 'puffer/helpers/puffer'
 
       attr_reader :parent_controller, :field, :identifer, :record, :records, :resource, :opts
-      delegate :env, :request, :params, :session, :_members, :_collections, :to => :parent_controller
-      helper_method :params, :session, :_members, :_collections, :parent_controller, :field, :identifer, :component_id, :event_url, :event_path, :record, :records, :resource, :opts
+      delegate :env, :request, :params, :session, :to => :parent_controller
+      helper_method :params, :session, :parent_controller, :field, :identifer, :component_id, :event_url, :event_path, :record, :records, :resource, :opts
 
       def initialize field
         super()

data/lib/puffer/controller/auth.rb

@@ -4,7 +4,7 @@ module Puffer
     # controllers. Puffer's authentification system is simple. In general, you
     # should use different kinds of routing and controllers namespaces for
     # partial access of different user types.
-    # 
+    #
     # Method +has_puffer_access?+ with current namespace name as a parameter.
     # If you want to use appication's own auth system - just redefine this
     # method in your ApplicationController.
@@ -17,58 +17,59 @@ module Puffer
         helper_method :current_puffer_user
       end
 
-      module InstanceMethods
-
-        # Return current user instance, used for authorization. This method can
-        # be redefined in ApplicationController if you want to use application's
-        # auth system. 
-        # 
-        # ex:
-        #
-        #   class ApplicationController < ActionController::Base
-        #     def current_puffer_user
-        #       current_user
-        #     end
-        #   end
-        # 
-        # In this case returner user model instance should respond to has_role?
-        # method, or you should properly redefine +has_puffer_access?+ See
-        # +has_puffer_access?+ source and docs.
-        def current_puffer_user
-          @current_puffer_user ||= super rescue (::Admin::SessionsController.model.to_adapter.find_first(:conditions => {:_id => session[:puffer_user_id]}) if session[:puffer_user_id])
-        end
-
-        # This method is also part of auth system and it can be redefined at the
-        # ApplicationController.
-        #
-        # ex:
-        #
-        #   class ApplicationController < ActionController::Base
-        #     # <tt>current_puffer_user.admin?</tt>
-        #     # <tt>current_puffer_user.manager?</tt>
-        #     # <tt>current_puffer_user.seo?</tt>
-        #     def has_puffer_access? namespace
-        #       current_puffer_user.send("#{namespace}?")
-        #     end
-        #   end
-        def has_puffer_access? namespace
-          super rescue (current_puffer_user && current_puffer_user.has_role?(namespace))
+      # Return current user instance, used for authorization. This method can
+      # be redefined in ApplicationController if you want to use application's
+      # auth system.
+      #
+      # ex:
+      #
+      #   class ApplicationController < ActionController::Base
+      #     def current_puffer_user
+      #       current_user
+      #     end
+      #   end
+      #
+      # In this case returner user model instance should respond to has_role?
+      # method, or you should properly redefine +has_puffer_access?+ See
+      # +has_puffer_access?+ source and docs.
+      def current_puffer_user
+        @current_puffer_user ||= begin
+          super
+        rescue NoMethodError
+          ::Admin::SessionsController.model.to_adapter.get(session[:puffer_user_id])
         end
+      end
 
-        # Used in before_filter to prevent unauthorized access
-        def require_puffer_user
-          unless has_puffer_access?(puffer_namespace)
-            redirect_to new_admin_session_url(:return_to => request.fullpath)
-            return false
-          end
-        end
+      # This method is also part of auth system and it can be redefined at the
+      # ApplicationController.
+      #
+      # ex:
+      #
+      #   class ApplicationController < ActionController::Base
+      #     # <tt>current_puffer_user.admin?</tt>
+      #     # <tt>current_puffer_user.manager?</tt>
+      #     # <tt>current_puffer_user.seo?</tt>
+      #     def has_puffer_access? namespace
+      #       current_puffer_user.send("#{namespace}?")
+      #     end
+      #   end
+      def has_puffer_access? namespace
+        super
+      rescue NoMethodError
+        (current_puffer_user && current_puffer_user.has_role?(namespace))
+      end
 
-        def redirect_back_or default
-          redirect_to(params[:return_to].presence || default)
+      # Used in before_filter to prevent unauthorized access
+      def require_puffer_user
+        unless has_puffer_access?(puffer_namespace)
+          redirect_to new_admin_session_url(:return_to => request.fullpath)
+          return false
         end
-
       end
 
+      def redirect_back_or default
+        redirect_to(params[:return_to].presence || default)
+      end
     end
   end
 end

data/lib/puffer/controller/config.rb

@@ -25,16 +25,14 @@ module Puffer
         puffer_class_attribute :scope
         #  order - default order option. Is a string with field name and direction. Ex: 'email', 'first_name asc', 'title desc'
         puffer_class_attribute :order
+        # obviously< records per page
+        puffer_class_attribute :per_page, 30
 
         helper_method :configuration
       end
 
-      module InstanceMethods
-
-        def configuration
-          self.class.configuration
-        end
-
+      def configuration
+        self.class.configuration
       end
 
       module ClassMethods

data/lib/puffer/controller/dsl.rb

@@ -14,10 +14,8 @@ module Puffer
         helper_method :_members, :_collections
       end
 
-      module InstanceMethods
-        def fields set
-          self.class.fields set
-        end
+      def fields set
+        self.class.fields set
       end
 
       module ClassMethods

data/lib/puffer/controller/mutate.rb

@@ -5,42 +5,39 @@ module Puffer
 
       included do
         helper 'puffer/helpers/puffer'
-        
+
         delegate :model, :model_name, :to => 'self.class'
         helper_method :puffer_filters, :puffer_namespace, :resource, :record, :records
       end
 
-      module InstanceMethods
-
-        def process_action method_name, *args
-          params[:puffer] = Rails.application.routes.resources_tree[params[:puffer]] if params[:puffer]
-          super
-        end
-
-        def puffer_filters
-          @puffer_filters ||= begin
-            filters = params[Puffer::Filters.model_name.param_key] || {}
-            filters = {:puffer_order => configuration.order}.merge(filters) if configuration.order.present?
-            Puffer::Filters.new filter_fields, filters
-          end
-        end
+      def process_action method_name, *args
+        params[:puffer] = Rails.application.routes.resources_tree[params[:puffer]] if params[:puffer]
+        super
+      end
 
-        def puffer_namespace
-          resource.scope
+      def puffer_filters
+        @puffer_filters ||= begin
+          filters = params[Puffer::Filters.model_name.param_key] || {}
+          filters.reverse_merge! :puffer_order => configuration.order if configuration.order.present?
+          filters.reverse_merge! :puffer_per_page => configuration.per_page if configuration.per_page.present?
+          Puffer::Filters.new filter_fields, filters
         end
+      end
 
-        def resource
-          @resource ||= Puffer::Resource.new params, self
-        end
+      def puffer_namespace
+        request.path_info.split('/').delete_if(&:blank?).first.to_sym
+      end
 
-        def record
-          @record || instance_variable_get("@#{resource.model_name}")
-        end
+      def resource
+        @resource ||= Puffer::Resource.new params, self
+      end
 
-        def records
-          @records || instance_variable_get("@#{resource.model_name.pluralize}")
-        end
+      def record
+        @record || instance_variable_get("@#{resource.model_name}")
+      end
 
+      def records
+        @records || instance_variable_get("@#{resource.model_name.pluralize}")
       end
 
       module ClassMethods

data/lib/puffer/extensions/directive_processor.rb

@@ -5,30 +5,25 @@ module Puffer
     module DirectiveProcessor
       extend ActiveSupport::Concern
 
-      module InstanceMethods
+      def process_require_all_directive(path)
+        raise ArgumentError, "require_all argument must be relative" unless relative?(path)
 
-        def process_require_all_directive(path)
-          raise ArgumentError, "require_all argument must be relative" unless relative?(path)
+        context.environment.paths.each do |root_path|
+          root = Pathname.new(root_path).join(path).expand_path
 
-          context.environment.paths.each do |root_path|
-            root = Pathname.new(root_path).join(path).expand_path
+          if root.exist? && root.directory?
+            context.depend_on(root)
 
-            if root.exist? && root.directory?
-              context.depend_on(root)
-
-              Dir["#{root}/*"].sort.each do |filename|
-                if filename == self.file
-                  next
-                elsif context.asset_requirable?(filename)
-                  context.require_asset(filename)
-                end
+            Dir["#{root}/*"].sort.each do |filename|
+              if filename == self.file
+                next
+              elsif context.asset_requirable?(filename)
+                context.require_asset(filename)
               end
             end
           end
         end
-
       end
-
     end
   end
 end

data/lib/puffer/extensions/engine.rb

@@ -4,22 +4,20 @@ module Puffer
       module Engine
         module Configuration
           extend ActiveSupport::Concern
-          
+
           included do
             alias_method_chain :paths, :components
           end
 
-          module InstanceMethods
-            def paths_with_components
-              @paths ||= begin
-                paths = paths_without_components
-                paths.add 'app/components', :eager_load => true
-                paths
-              end
+          def paths_with_components
+            @paths ||= begin
+              paths = paths_without_components
+              paths.add 'app/components', :eager_load => true
+              paths
             end
           end
         end
-        
+
         extend ActiveSupport::Concern
 
         included do

data/lib/puffer/extensions/{mapper.rb → mapper31.rb}

@@ -3,11 +3,11 @@ module Puffer
     # Extends rails mapper to provide resources nesting tree structure with
     # request params. Route defaults contains <tt>:puffer</tt> key with node
     # index in resources tree nodes array. See <tt>Puffer::Resource::Tree</tt>
-    # 
+    #
     # Resource tree depends on routes resources nesting.
     #
     # ex:
-    #   
+    #
     #   namespace :admin do
     #     resources :users do
     #       resource :profile
@@ -24,7 +24,7 @@ module Puffer
     #     {:scope => 'admin', :current => :articles, :children => [], :ancestors => [:users]},
     #     {:scope => 'admin', :current => :orders, :children => [], :ancestors => []},
     #   ]
-    # 
+    #
     # a complete tree structure with nodes array to acces with node index
     # (<tt>Puffer::Resource::Tree#to_struct</tt>).
     #
@@ -41,15 +41,13 @@ module Puffer
       module InstanceMethods
 
         def namespace_with_puffer path, options = {}
-          defaults :puffer_scope => path.to_sym do
-            namespace_without_puffer path, options do
-              yield
-
-              if ::Rails.application.routes.resources_tree.any? {|node| node.scope == @scope[:module].to_sym}
-                old, @scope[:module] = @scope[:module], 'admin'
-                root :to => 'dashboard#index'
-                @scope[:module] = old
-              end
+          namespace_without_puffer path, options do
+            yield
+
+            if ::Rails.application.routes.resources_tree.any? {|node| node.scope == @scope[:module].to_sym}
+              old, @scope[:module] = @scope[:module], 'admin'
+              root :to => 'dashboard#index'
+              @scope[:module] = old
             end
           end
         end

data/lib/puffer/extensions/mapper32.rb

@@ -0,0 +1,108 @@
+module Puffer
+  module Extensions
+    # Extends rails mapper to provide resources nesting tree structure with
+    # request params. Route defaults contains <tt>:puffer</tt> key with node
+    # index in resources tree nodes array. See <tt>Puffer::Resource::Tree</tt>
+    #
+    # Resource tree depends on routes resources nesting.
+    #
+    # ex:
+    #
+    #   namespace :admin do
+    #     resources :users do
+    #       resource :profile
+    #       resources :articles
+    #     end
+    #     resources :orders
+    #   end
+    #
+    # will produce:
+    #
+    #   [
+    #     {:scope => 'admin', :current => :users, :children => [:profile, :articles], :ancestors => []},
+    #     {:scope => 'admin', :current => :profile, :children => [], :ancestors => [:users]},
+    #     {:scope => 'admin', :current => :articles, :children => [], :ancestors => [:users]},
+    #     {:scope => 'admin', :current => :orders, :children => [], :ancestors => []},
+    #   ]
+    #
+    # a complete tree structure with nodes array to acces with node index
+    # (<tt>Puffer::Resource::Tree#to_struct</tt>).
+    #
+    # Also this mapper extension adds come aaditional routes for every pufer
+    # controller and namespace.
+    module Mapper
+      extend ActiveSupport::Concern
+
+      included do
+        alias_method_chain :namespace, :puffer
+        alias_method_chain :resource_scope, :puffer
+      end
+
+      def namespace_with_puffer path, options = {}
+        namespace_without_puffer path, options do
+          yield
+
+          if ::Rails.application.routes.resources_tree.any? {|node| node.scope == @scope[:module].to_sym}
+            old, @scope[:module] = @scope[:module], 'admin'
+            root :to => 'dashboard#index'
+            @scope[:module] = old
+          end
+        end
+      end
+
+      def resource_scope_with_puffer kind, resource, &block
+        controller = "#{[@scope[:module], resource.controller].compact.join("/")}_controller".camelize.constantize rescue nil
+        if controller && controller.puffer?
+          singular = kind == :resource
+          name = (singular ? resource.singular : resource.plural).to_sym
+
+          resource_node = ::Rails.application.routes.resources_tree.append_node swallow_nil{@scope[:defaults][:puffer]},
+            :name => name, :scope => @scope[:module].to_sym, :controller => controller, :singular => singular
+
+          defaults :puffer => resource_node do
+            resource_scope_without_puffer kind, resource do
+              block.call if block
+
+              member do
+                controller._members.each do |action|
+                  send *action.route
+                end
+              end
+
+              collection do
+                controller._collections.each do |action|
+                  send *action.route
+                end
+                get '/event/:fieldset/:field/:event(/:identifer)', :action => :event, :as => :event
+              end
+            end
+          end
+        else
+          resource_scope_without_puffer kind, resource, &block
+        end
+      end
+    end
+
+    module RouteSet
+      extend ActiveSupport::Concern
+
+      included do
+        alias_method_chain :clear!, :puffer
+        attr_writer :resources_tree
+
+        def resources_tree
+          @resources_tree ||= Puffer::Resource::Tree.new
+        end
+      end
+
+      def clear_with_puffer!
+        @resources_tree = nil
+        clear_without_puffer!
+      end
+    end
+
+  end
+end
+
+ActionDispatch::Routing::RouteSet.send :include, Puffer::Extensions::RouteSet
+ActionDispatch::Routing::Mapper.send :include, Puffer::Extensions::Mapper