puffer 0.0.15 → 0.0.16

data/lib/puffer/controller/mutate.rb

@@ -5,25 +5,42 @@ module Puffer
       def self.included base
         base.class_eval do
           extend ClassMethods
+          include InstanceMethods
 
           layout 'puffer'
           helper :puffer
-          helper_method :puffer?
-
-          view_paths_fallbacks :puffer
+          helper_method :puffer?, :namespace
         end
       end
 
-      def puffer?; true; end
+      module InstanceMethods
+
+        def puffer?
+          self.class.puffer?
+        end
+
+        def namespace
+          self.class.namespace
+        end
+
+      end
 
       module ClassMethods
 
+        def puffer?
+          true
+        end
+
+        def namespace
+          to_s.underscore.split('/').first
+        end
+
         def model_name
-          @model_name ||= ((puffer? and configuration.model) || controller_name.singularize).to_s
+          @model_name ||= (configuration.model_name || controller_name.singularize).to_s
         end
 
         def model
-          @model ||= model_name.classify.constantize if model_name.present?
+          @model ||= model_name.classify.constantize rescue nil
         end
 
         def view_paths_fallbacks *args
@@ -40,8 +57,6 @@ module Puffer
           view_paths_fallbacks view_paths._fallbacks, args
         end
 
-        def puffer?; true; end
-
       end
 
     end

data/lib/puffer/extensions/controller.rb

@@ -17,6 +17,15 @@ module Puffer
 
           def puffer?; false; end
 
+          def pufferize!
+            include Puffer::Controller::Mutate
+            include Puffer::Controller::Helpers
+            include Puffer::Controller::Dsl
+            include Puffer::Controller::Mapping
+            include Puffer::Controller::Config
+            include Puffer::Controller::Generated
+          end
+
         end
 
       end

data/lib/puffer/extensions/form.rb

@@ -6,8 +6,10 @@ module Puffer
         field = if args.first.is_a? Puffer::Fields::Field
           args.first
         else
-          Puffer::Fields::Field.new object.class, *args
+          options = args.extract_options!
+          Puffer::Fields::Field.new args, options
         end
+        field.resource = object.class
         input = Puffer::Inputs.map_field field
         input.new(self, @template, field).render
       end

data/lib/puffer/extensions/mapper.rb

@@ -21,11 +21,13 @@ module Puffer
         end
 
         def puffer_controller controller
-          puffer = Rails.application.routes.puffer
-          prefix = @scope[:module]
-          puffer[prefix] ||= ActiveSupport::OrderedHash.new
-          puffer[prefix][controller.configuration.group] ||= []
-          puffer[prefix][controller.configuration.group] << controller
+          if controller.configuration.group
+            puffer = Rails.application.routes.puffer
+            namespace = @scope[:module]
+            puffer[namespace] ||= ActiveSupport::OrderedHash.new
+            puffer[namespace][controller.configuration.group] ||= []
+            puffer[namespace][controller.configuration.group] << controller
+          end
         end
 
         def puffer_resource(*resources, &block)
@@ -158,14 +160,14 @@ module Puffer
           include InstanceMethods
 
           alias_method_chain :clear!, :puffer
-          attr_accessor_with_default :puffer, {}
+          attr_accessor_with_default :puffer, ActiveSupport::OrderedHash.new
         end
       end
 
       module InstanceMethods
 
         def clear_with_puffer!
-          self.puffer = {}
+          self.puffer = ActiveSupport::OrderedHash.new
           clear_without_puffer!
         end
 

data/lib/puffer/fields/field.rb

@@ -4,10 +4,10 @@ module Puffer
 
       attr_accessor :resource, :field, :options
 
-      def initialize resource, field, options = {}
-        @resource = resource
+      def initialize field, *resource_and_options
         @field = field.to_s
-        @options = options
+        @options = resource_and_options.extract_options!
+        @resource = resource_and_options.first
       end
 
       def native?
@@ -39,7 +39,7 @@ module Puffer
       end
 
       def reflection
-        @reflection ||= model.reflect_on_association(name.to_sym)
+        @reflection ||= model && model.reflect_on_association(name.to_sym)
       end
 
       def collection?
@@ -51,15 +51,15 @@ module Puffer
       end
 
       def model
-        unless @model
-          @model = resource
+        @model ||= begin
           associations = field.split('.')
           associations.pop
-          while @model.reflect_on_association(association = swallow_nil{associations.shift.to_sym}) do
-            @model = @model.reflect_on_association(association).klass
+          temp = resource
+          while temp.reflect_on_association(association = swallow_nil{associations.shift.to_sym}) do
+            temp = temp.reflect_on_association(association).klass
           end
-        end
-        @model
+          temp
+        end if resource
       end
 
       def association_columns
@@ -67,14 +67,14 @@ module Puffer
         @reflection_fields ||= begin
           fields = Puffer::Fields.new
           options[:columns].each do |field_name|
-            fields.field reflection.klass, field_name
+            fields.field field_name, reflection.klass
           end
           fields
         end
       end
 
       def column
-        @column ||= model.columns_hash[name]
+        @column ||= model && model.columns_hash[name]
       end
 
       def query_column

data/lib/puffer/resource/routing.rb

@@ -26,7 +26,7 @@ module Puffer
       def route_args *args
         options = args.extract_options!
         resource = args.shift
-        return args + [prefix] + ancestors.map(&:route_member) + [resource], options
+        return args + [namespace] + ancestors.map(&:route_member) + [resource], options
       end
 
       def route_member suggest = nil

data/lib/puffer/resource.rb

@@ -11,14 +11,14 @@ module Puffer
     include Routing
     include Scoping
 
-    attr_reader :request, :params, :prefix, :action, :controller_name, :model_name, :controller, :model
+    attr_reader :request, :params, :namespace, :action, :controller_name, :model_name, :controller, :model
 
     def initialize params, request = nil
+      params = Marshal.load Marshal.dump(params)
       @action = params.delete :action
-      @controller = "#{params[:controller]}_controller".camelize.constantize
+      @controller = "#{params.delete :controller}_controller".camelize.constantize
       @controller_name = controller.controller_name
-      controller_segments = params.delete(:controller).split('/')
-      @prefix = controller_segments.first
+      @namespace = controller.namespace
       @model_name = controller.model_name if controller.puffer?
       @model = controller.model if controller.puffer?
       @params = params
@@ -39,7 +39,7 @@ module Puffer
         parent_name = parent_ancestors.pop
         if parent_name
           parent_params = ActiveSupport::HashWithIndifferentAccess.new({
-            :controller => "#{prefix}/#{parent_name.to_s.pluralize}",
+            :controller => "#{namespace}/#{parent_name.to_s.pluralize}",
             :action => 'index',
             :plural => parent_name.plural?,
             :ancestors => parent_ancestors,
@@ -77,7 +77,7 @@ module Puffer
     def children(custom_params = {})
       @children ||= params[:children].map do |child_name|
         child_params = ActiveSupport::HashWithIndifferentAccess.new(custom_params.deep_merge({
-          :controller => "#{prefix}/#{child_name.to_s.pluralize}",
+          :controller => "#{namespace}/#{child_name.to_s.pluralize}",
           :action => 'index',
           :plural => child_name.plural?,
           :ancestors => params[:ancestors].dup.push((plural? ? controller_name : controller_name.singularize).to_sym),

data/puffer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer}
-  s.version = "0.0.15"
+  s.version = "0.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
-  s.date = %q{2011-02-10}
+  s.date = %q{2011-02-12}
   s.description = %q{In Soviet Russia puffer admins you}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [
@@ -25,10 +25,12 @@ Gem::Specification.new do |s|
     "VERSION",
     "app/cells/puffer/base/additional.html.erb",
     "app/cells/puffer/base_cell.rb",
-    "app/controllers/admin/dashboard_controller.rb",
+    "app/controllers/puffer/dashboard_base.rb",
+    "app/controllers/puffer/sessions_base.rb",
     "app/helpers/puffer_helper.rb",
-    "app/views/admin/dashboard/index.html.erb",
     "app/views/layouts/puffer.html.erb",
+    "app/views/layouts/puffer_dashboard.html.erb",
+    "app/views/layouts/puffer_sessions.html.erb",
     "app/views/puffer/_form.html.erb",
     "app/views/puffer/associated/_many.html.erb",
     "app/views/puffer/associated/many.rjs",
@@ -38,7 +40,8 @@ Gem::Specification.new do |s|
     "app/views/puffer/index.html.erb",
     "app/views/puffer/new.html.erb",
     "app/views/puffer/show.html.erb",
-    "app/views/puffer/toggle.rjs",
+    "app/views/puffer_dashboard/index.html.erb",
+    "app/views/puffer_sessions/new.html.erb",
     "autotest/discover.rb",
     "config/routes.rb",
     "lib/generators/puffer/controller/USAGE",
@@ -46,6 +49,7 @@ Gem::Specification.new do |s|
     "lib/generators/puffer/controller/templates/controller.rb",
     "lib/generators/puffer/install/USAGE",
     "lib/generators/puffer/install/install_generator.rb",
+    "lib/generators/puffer/install/templates/dashboard_controller.rb",
     "lib/generators/puffer/install/templates/puffer.rb",
     "lib/generators/puffer/install/templates/puffer/javascripts/puffer.js",
     "lib/generators/puffer/install/templates/puffer/javascripts/rails.js",
@@ -54,6 +58,7 @@ Gem::Specification.new do |s|
     "lib/generators/puffer/install/templates/puffer/javascripts/right.js",
     "lib/generators/puffer/install/templates/puffer/stylesheets/puffer.css",
     "lib/generators/puffer/install/templates/puffer/stylesheets/reset.css",
+    "lib/generators/puffer/install/templates/sessions_controller.rb",
     "lib/puffer.rb",
     "lib/puffer/base.rb",
     "lib/puffer/controller/actions.rb",
@@ -94,6 +99,8 @@ Gem::Specification.new do |s|
     "spec/dummy/app/controllers/admin/tags_controller.rb",
     "spec/dummy/app/controllers/admin/users_controller.rb",
     "spec/dummy/app/controllers/application_controller.rb",
+    "spec/dummy/app/controllers/puffer/dashboard_controller.rb",
+    "spec/dummy/app/controllers/puffer/sessions_controller.rb",
     "spec/dummy/app/helpers/application_helper.rb",
     "spec/dummy/app/models/category.rb",
     "spec/dummy/app/models/friendship.rb",
@@ -174,6 +181,8 @@ Gem::Specification.new do |s|
     "spec/dummy/app/controllers/admin/tags_controller.rb",
     "spec/dummy/app/controllers/admin/users_controller.rb",
     "spec/dummy/app/controllers/application_controller.rb",
+    "spec/dummy/app/controllers/puffer/dashboard_controller.rb",
+    "spec/dummy/app/controllers/puffer/sessions_controller.rb",
     "spec/dummy/app/helpers/application_helper.rb",
     "spec/dummy/app/models/category.rb",
     "spec/dummy/app/models/friendship.rb",

data/spec/dummy/app/controllers/admin/categories_controller.rb

@@ -1,6 +1,6 @@
 class Admin::CategoriesController < Puffer::Base
 
-  configure do
+  setup do
     group :posting
   end
 

data/spec/dummy/app/controllers/admin/posts_controller.rb

@@ -1,17 +1,19 @@
 class Admin::PostsController < Puffer::Base
 
-  configure do
+  setup do
     group :posting
   end
 
   index do
-    field :user
+    field :id
+    field 'user.email'
     field :title
     field :body
   end
 
   form do
-    field :user
+    field :id
+    field :user, :columns => [:email]
     field :title
     field :body
   end

data/spec/dummy/app/controllers/admin/profiles_controller.rb

@@ -1,6 +1,6 @@
 class Admin::ProfilesController < Puffer::Base
 
-  configure do
+  setup do
     group :users
   end
 

data/spec/dummy/app/controllers/admin/users_controller.rb

@@ -1,6 +1,6 @@
 class Admin::UsersController < Puffer::Base
 
-  configure do
+  setup do
     group :users
   end
 

data/spec/dummy/app/controllers/puffer/dashboard_controller.rb

@@ -0,0 +1,3 @@
+class Puffer::DashboardController < Puffer::DashboardBase
+
+end

data/spec/dummy/app/controllers/puffer/sessions_controller.rb

@@ -0,0 +1,16 @@
+class Puffer::SessionsController < Puffer::SessionsBase
+
+  def new
+    @record = User.new
+  end
+
+  def create
+    record = User.new
+    respond_with record
+  end
+
+  def destroy
+
+  end
+
+end

data/spec/dummy/config/routes.rb

@@ -1,5 +1,10 @@
 Dummy::Application.routes.draw do
 
+  namespace :puffer do
+    root :to => 'dashboard#index'
+    resource :session
+  end
+
   namespace :admin do
     resources :users do
       resource :profile do
@@ -22,60 +27,4 @@ Dummy::Application.routes.draw do
     end
   end
 
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => "welcome#index"
-
-  # See how all your routes lay out with "rake routes"
-
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id(.:format)))'
 end

data/spec/dummy/public/puffer/stylesheets/puffer.css

@@ -26,6 +26,12 @@ h1
     margin-bottom: 10px;
 }
 
+h2
+{
+    font-size: 17px;
+    margin-bottom: 10px;
+}
+
 .body
 {
 	position: relative;
@@ -49,7 +55,7 @@ h1
     left: 20px;
 }
 
-.logo a
+.logo a, .logo span
 {
     color: #ddd;
     font-size: 30pt;
@@ -58,6 +64,13 @@ h1
     text-shadow: #0A2337 -1px -1px 0;
 }
 
+.logout
+{
+    position: absolute;
+    top: 35px;
+    right: 10px;
+}
+
 .navigation
 {
     position: absolute;
@@ -65,7 +78,19 @@ h1
     bottom: 20px;
 }
 
-.navigation li
+.namespaces
+{
+    position: absolute;
+    right: 10px;
+    top: 0;
+}
+
+.dashboard .navigation
+{
+    margin-bottom: 10px;
+}
+
+.navigation > li, .namespaces > li
 {
     display: inline-block;
     *display: inline;
@@ -74,7 +99,13 @@ h1
     border-radius: 3px;
 }
 
-.navigation li:hover, .navigation li.selected
+.namespaces > li
+{
+    -moz-border-radius: 0 0 3px 3px;
+    border-radius: 0 0 3px 3px;
+}
+
+.navigation > li:hover, .navigation > li.selected, .namespaces > li:hover, .namespaces > li.selected
 {
     -moz-box-shadow: -1px -1px 0 #0A2337;
     -webkit-box-shadow: -1px -1px 0 #0A2337;
@@ -82,7 +113,7 @@ h1
     background: #536C80;
 }
 
-.navigation li>a
+.navigation > li > a, .navigation > li > span, .namespaces > li > a, .namespaces > li > span
 {
     display: inline-block;
     *display: inline;
@@ -94,23 +125,50 @@ h1
     text-shadow: #304759 -1px -1px 0;
 }
 
-.sidebar .navigation
+.namespaces > li > a, .namespaces > li > span
+{
+    padding: 5px 12px;
+}
+
+.sidebar .navigation, .dashboard .navigation
 {
     position: static;
 }
 
-.sidebar .navigation li
+.sidebar .navigation > li, .dashboard .navigation > li
 {
     display: block;
     margin-bottom: 5px;
 }
 
-.sidebar .navigation li>a
+.dashboard .navigation > li
+{
+    background: #536C80;
+}
+
+.dashboard .navigation > li:hover, .dashboard .navigation > li.selected
+{
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+}
+
+.sidebar .navigation > li > a
 {
     display: block;
 }
 
-.sidebar .navigation li .additional
+.sidebar .navigation > li .additional dt
+{
+    margin-bottom: 2px;
+}
+
+.sidebar .navigation > li .additional dd
+{
+    margin-bottom: 8px;
+}
+
+.sidebar .navigation > li .additional, .dashboard .navigation > li ul.additional
 {
     padding: 10px 12px;
     background: #eee;
@@ -120,14 +178,21 @@ h1
     border-bottom-right-radius: 3px;
 }
 
-.sidebar .navigation li .additional dt
+.dashboard .navigation > li ul.additional
 {
-    margin-bottom: 2px;
+    padding: 6px 6px;
 }
 
-.sidebar .navigation li .additional dd
+.dashboard .navigation > li ul.additional li
 {
-    margin-bottom: 8px;
+    list-style: none;
+    padding: 5px 12px;
+}
+
+.dashboard .navigation > li ul.additional li > a
+{
+    color: #222;
+    font-size: 10pt;
 }
 
 .columns
@@ -183,6 +248,19 @@ h1
     padding: 30px;
 }
 
+.sessions
+{
+    min-height: 10px;
+    margin: 50px auto 0 auto;
+    width: 400px;
+}
+
+.dashboard
+{
+    min-height: 10px;
+    margin-left: 20px;
+}
+
 .list_table
 {
     width: 100%;