puffer 0.0.20 → 0.0.21

data/app/views/puffer/tree_base/toggle.js.erb

@@ -0,0 +1,6 @@
+<% nodes = capture do %>
+  <% puffer_tree_node records do |record, children| %>
+    <%= render :partial => 'record', :object => record, :locals => {:children => children} %>
+  <% end %>
+<% end %>
+$('<%= dom_id @parent %>').replace('<%= escape_javascript nodes %>')

data/app/views/puffer/tree_base/tree.html.erb

@@ -0,0 +1,9 @@
+<% @title = resource.human %>
+<h1><%= @title %> Tree</h1>
+<% if records.present? %>
+  <%= puffer_tree records, :class => 'puffer_tree' do |record, children| %>
+    <%= render :partial => 'record', :object => record, :locals => {:children => children} %>
+  <% end %>
+<% else %>
+  <p>Sorry, but there is no records in <%= resource.human %></p>
+<% end %>

data/config/puffer_routes.rb

@@ -0,0 +1,8 @@
+Rails.application.routes.draw do
+
+  namespace :puffer do
+    root :to => 'dashboard#index'
+    resource :session
+  end
+  
+end

data/lib/puffer/controller/dsl.rb

@@ -29,21 +29,28 @@ module Puffer
           block.bind(_collections).call if block_given?
         end
 
-        def define_fields *actions
+        def define_fieldset *actions
+          options = actions.extract_options!
+          fallbacks = Array.wrap(options.delete(:fallbacks))
+
           actions.each do |action|
             class_attribute "_#{action}_fields"
-            send "_#{action}_fields=", Puffer::Fields.new unless send("_#{action}_fields?")
+            send "_#{action}_fields=", Puffer::FieldSet.new unless send("_#{action}_fields?")
             helper_method "#{action}_fields"
 
             self.class.instance_eval do
               define_method action do |&block|
-                @_fields = send("_#{action}_fields=", Puffer::Fields.new)
+                @_fields = send("_#{action}_fields=", Puffer::FieldSet.new)
                 block.call if block
                 remove_instance_variable :@_fields
               end
 
               define_method "#{action}_fields" do
-                send "_#{action}_fields"
+                actions = [action] + fallbacks
+                last = actions.pop
+                actions.map do |action|
+                  send("_#{action}_fields").presence
+                end.compact.first || send("_#{last}_fields")
               end
             end
 

data/lib/puffer/engine.rb

@@ -1,5 +1,9 @@
 module Puffer
   class Engine < Rails::Engine
     config.autoload_paths << File.join(root, 'lib')
+
+    initializer 'puffer.add_puffer_namespace_routes', :after => :add_builtin_route do |app|
+      app.routes_reloader.paths.unshift File.join(root, 'config/puffer_routes.rb')
+    end
   end
 end

data/lib/puffer/extensions/controller.rb

@@ -21,7 +21,6 @@ module Puffer
             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

data/lib/puffer/extensions/form.rb

@@ -3,12 +3,7 @@ module Puffer
     module FormBuilder
 
       def puffer_field *args
-        field = if args.first.is_a? Puffer::Fields::Field
-          args.first
-        else
-          options = args.extract_options!
-          Puffer::Fields::Field.new args, options
-        end
+        field = args.first.is_a?(Puffer::Fields::Field) ? args.first : Puffer::Fields::Field.new(*args)
         field.resource = object.class
         field.input self
       end

data/lib/puffer/extensions/mapper.rb

@@ -24,6 +24,13 @@ module Puffer
           if controller.configuration.group
             puffer = Rails.application.routes.puffer
             namespace = @scope[:module]
+
+            unless puffer[namespace]
+              @scope[:module] = 'puffer'
+              root :to => 'dashboard#index'
+              @scope[:module] = namespace
+            end
+
             puffer[namespace] ||= ActiveSupport::OrderedHash.new
             puffer[namespace][controller.configuration.group] ||= []
             puffer[namespace][controller.configuration.group] << controller

data/lib/puffer/field.rb

@@ -0,0 +1,87 @@
+module Puffer
+  class Field
+
+    attr_accessor :resource, :field_name, :options, :fields
+
+    def initialize field_name, *resource_and_options, &block
+      @field_name = field_name.to_s
+      @options = resource_and_options.extract_options!
+      @resource = resource_and_options.first
+      @fields = Puffer::FieldSet.new
+      block.bind(self).call if block
+    end
+
+    def field name, options = {}, &block
+      @fields.field(name, swallow_nil{reflection.klass}, options, &block)
+    end
+
+    def native?
+      model == resource
+    end
+
+    def name
+      @name ||= field_name.split('.').last
+    end
+
+    def path
+      @path ||= field_name.split('.')[0..-2].join('.')
+    end
+
+    def human
+      @human ||= model && model.human_attribute_name(name)
+    end
+
+    def order
+      @order ||= options[:order] || query_column
+    end
+
+    def type
+      @type ||= options[:type] ? options[:type].to_sym : (Puffer::Customs.type_for(self) || (column ? column.type : :string))
+    end
+
+    def to_s
+      field_name
+    end
+
+    def reflection
+      @reflection ||= model && model.reflect_on_association(name.to_sym)
+    end
+
+    def collection?
+      [:has_many, :has_and_belongs_to_many].include? type
+    end
+
+    def input_options
+      options[:html] || {}
+    end
+
+    def input builder
+      Puffer::Customs.input_for(self).render builder, self
+    end
+
+    def model
+      @model ||= begin
+        associations = field_name.split('.')
+        associations.pop
+        temp = resource
+        while temp.reflect_on_association(association = swallow_nil{associations.shift.to_sym}) do
+          temp = temp.reflect_on_association(association).klass
+        end
+        temp
+      end if resource
+    end
+
+    def association_columns
+      @association_columns ||= fields
+    end
+
+    def column
+      @column ||= model && model.columns_hash[name]
+    end
+
+    def query_column
+      "#{model.table_name}.#{name}" if column
+    end
+
+  end
+end

data/lib/puffer/{fields.rb → field_set.rb}

@@ -1,8 +1,8 @@
 module Puffer
-  class Fields < Array
+  class FieldSet < Array
 
     def field *args, &block
-      push Field.new(*args, &block)
+      push Puffer::Field.new(*args, &block)
       last
     end
 

data/lib/puffer.rb

@@ -6,6 +6,8 @@ module Puffer
 
 end
 
+require 'kaminari'
+
 require 'puffer/engine'
 require 'puffer/extensions/activerecord'
 require 'puffer/extensions/controller'

data/puffer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer}
-  s.version = "0.0.20"
+  s.version = "0.0.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
-  s.date = %q{2011-07-27}
+  s.date = %q{2011-08-01}
   s.description = %q{In Soviet Russia puffer admins you}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [
@@ -33,11 +33,18 @@ Gem::Specification.new do |s|
     "app/assets/javascripts/puffer/right.js",
     "app/assets/stylesheets/puffer/application.css",
     "app/assets/stylesheets/puffer/puffer.css",
+    "app/assets/stylesheets/puffer/puffer_tree.css",
     "app/assets/stylesheets/puffer/reset.css",
-    "app/controllers/puffer/dashboard.rb",
-    "app/controllers/puffer/sessions.rb",
+    "app/controllers/puffer/base.rb",
+    "app/controllers/puffer/dashboard_base.rb",
+    "app/controllers/puffer/dashboard_controller.rb",
+    "app/controllers/puffer/sessions_base.rb",
+    "app/controllers/puffer/sessions_controller.rb",
+    "app/controllers/puffer/tree_base.rb",
     "app/helpers/puffer_helper.rb",
+    "app/helpers/puffer_tree_helper.rb",
     "app/views/layouts/puffer.html.erb",
+    "app/views/layouts/puffer_base.html.erb",
     "app/views/layouts/puffer_dashboard.html.erb",
     "app/views/layouts/puffer_sessions.html.erb",
     "app/views/puffer/base/_form.html.erb",
@@ -49,25 +56,22 @@ Gem::Specification.new do |s|
     "app/views/puffer/base/index.html.erb",
     "app/views/puffer/base/new.html.erb",
     "app/views/puffer/base/show.html.erb",
-    "app/views/puffer/dashboard/index.html.erb",
-    "app/views/puffer/sessions/new.html.erb",
+    "app/views/puffer/dashboard_base/index.html.erb",
+    "app/views/puffer/sessions_base/new.html.erb",
+    "app/views/puffer/tree_base/_record.html.erb",
+    "app/views/puffer/tree_base/toggle.js.erb",
+    "app/views/puffer/tree_base/tree.html.erb",
     "config/locales/puffer.yml",
-    "config/routes.rb",
+    "config/puffer_routes.rb",
     "lib/generators/puffer/controller/USAGE",
     "lib/generators/puffer/controller/controller_generator.rb",
     "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/sessions_controller.rb",
     "lib/puffer.rb",
-    "lib/puffer/base.rb",
     "lib/puffer/controller/actions.rb",
     "lib/puffer/controller/config.rb",
     "lib/puffer/controller/dsl.rb",
     "lib/puffer/controller/generated.rb",
     "lib/puffer/controller/helpers.rb",
-    "lib/puffer/controller/mapping.rb",
     "lib/puffer/controller/mutate.rb",
     "lib/puffer/customs.rb",
     "lib/puffer/engine.rb",
@@ -76,8 +80,8 @@ Gem::Specification.new do |s|
     "lib/puffer/extensions/core.rb",
     "lib/puffer/extensions/form.rb",
     "lib/puffer/extensions/mapper.rb",
-    "lib/puffer/fields.rb",
-    "lib/puffer/fields/field.rb",
+    "lib/puffer/field.rb",
+    "lib/puffer/field_set.rb",
     "lib/puffer/inputs/association.rb",
     "lib/puffer/inputs/base.rb",
     "lib/puffer/inputs/boolean.rb",
@@ -104,7 +108,6 @@ 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",
@@ -133,15 +136,16 @@ Gem::Specification.new do |s|
     "spec/dummy/config/initializers/wrap_parameters.rb",
     "spec/dummy/config/locales/en.yml",
     "spec/dummy/config/routes.rb",
-    "spec/dummy/db/migrate/20100930132559_create_admin_users.rb",
-    "spec/dummy/db/migrate/20100930132656_create_admin_posts.rb",
-    "spec/dummy/db/migrate/20100930132726_create_admin_categories.rb",
+    "spec/dummy/db/migrate/20100930132559_create_users.rb",
+    "spec/dummy/db/migrate/20100930132656_create_posts.rb",
+    "spec/dummy/db/migrate/20100930132726_create_categories.rb",
     "spec/dummy/db/migrate/20100930132837_create_post_categories.rb",
     "spec/dummy/db/migrate/20100930133425_create_admin_profiles.rb",
     "spec/dummy/db/migrate/20101011155830_create_tags.rb",
     "spec/dummy/db/migrate/20101011160326_create_taggings.rb",
     "spec/dummy/db/migrate/20110107082706_create_friendships.rb",
     "spec/dummy/db/migrate/20110301072545_create_news.rb",
+    "spec/dummy/db/schema.rb",
     "spec/dummy/db/seeds.rb",
     "spec/dummy/public/404.html",
     "spec/dummy/public/422.html",
@@ -173,7 +177,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.1.0.rc4"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.1.0.rc5"])
       s.add_runtime_dependency(%q<kaminari>, [">= 0"])
       s.add_runtime_dependency(%q<apotomo>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
@@ -186,8 +190,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<forgery>, [">= 0"])
       s.add_development_dependency(%q<fabrication>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<nested_set>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.1.0.rc4"])
+      s.add_dependency(%q<rails>, [">= 3.1.0.rc5"])
       s.add_dependency(%q<kaminari>, [">= 0"])
       s.add_dependency(%q<apotomo>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
@@ -200,9 +205,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<forgery>, [">= 0"])
       s.add_dependency(%q<fabrication>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<nested_set>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.1.0.rc4"])
+    s.add_dependency(%q<rails>, [">= 3.1.0.rc5"])
     s.add_dependency(%q<kaminari>, [">= 0"])
     s.add_dependency(%q<apotomo>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
@@ -215,6 +221,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<forgery>, [">= 0"])
     s.add_dependency(%q<fabrication>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<nested_set>, [">= 0"])
   end
 end
 

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

@@ -1,4 +1,4 @@
-class Admin::CategoriesController < Puffer::Base
+class Admin::CategoriesController < Puffer::TreeBase
 
   setup do
     group :posting
@@ -12,6 +12,9 @@ class Admin::CategoriesController < Puffer::Base
   form do
     field :id
     field :title
+    field :parent do
+      field :title
+    end
   end
 
 end

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

@@ -5,14 +5,12 @@ class Admin::PostsController < Puffer::Base
   end
 
   index do
-    field :id
     field 'user.email'
     field :title
     field :body
   end
 
   form do
-    field :id
     field :user do
       field :email
     end

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

@@ -1,4 +1,4 @@
-class Puffer::SessionsController < Puffer::Sessions
+class Puffer::SessionsController < Puffer::SessionsBase
 
   def new
     @record = User.new

data/spec/dummy/app/models/category.rb

@@ -1,4 +1,6 @@
 class Category < ActiveRecord::Base
   has_many :post_categories
   has_many :posts, :through => :post_categories
+
+  acts_as_nested_set
 end

data/spec/dummy/config/application.rb

@@ -4,6 +4,7 @@ require 'rails/all'
 
 Bundler.require
 require 'puffer'
+require 'nested_set'
 
 module Dummy
   class Application < Rails::Application

data/spec/dummy/config/routes.rb

@@ -1,12 +1,5 @@
 Dummy::Application.routes.draw do
 
-  match '/admin' => 'puffer/dashboard#index', :as => :admin
-
-  namespace :puffer do
-    root :to => 'dashboard#index'
-    resource :session
-  end
-
   namespace :admin do
     resources :users do
       resource :profile do

data/spec/dummy/db/migrate/{20100930132559_create_admin_users.rb → 20100930132559_create_users.rb}

@@ -1,4 +1,4 @@
-class CreateAdminUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration
   def self.up
     create_table :users do |t|
       t.string :email

data/spec/dummy/db/migrate/{20100930132656_create_admin_posts.rb → 20100930132656_create_posts.rb}

@@ -1,4 +1,4 @@
-class CreateAdminPosts < ActiveRecord::Migration
+class CreatePosts < ActiveRecord::Migration
   def self.up
     create_table :posts do |t|
       t.integer :user_id

data/spec/dummy/db/migrate/{20100930132726_create_admin_categories.rb → 20100930132726_create_categories.rb}

@@ -1,8 +1,13 @@
-class CreateAdminCategories < ActiveRecord::Migration
+class CreateCategories < ActiveRecord::Migration
   def self.up
     create_table :categories do |t|
       t.string :title
 
+      t.integer :parent_id
+      t.integer :lft
+      t.integer :rgt
+      t.integer :depth, :default => 0
+
       t.timestamps
     end
   end

data/spec/dummy/db/schema.rb

@@ -0,0 +1,87 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20110301072545) do
+
+  create_table "categories", :force => true do |t|
+    t.string   "title"
+    t.integer  "parent_id"
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.integer  "depth",      :default => 0
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "friendships", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "friend_id"
+    t.string   "state"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "news", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "post_categories", :force => true do |t|
+    t.integer  "post_id"
+    t.integer  "category_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "posts", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "profiles", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "name"
+    t.string   "surname"
+    t.date     "birth_date"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "taggings", :force => true do |t|
+    t.string  "name"
+    t.integer "tag_id"
+    t.integer "taggable_id"
+    t.string  "taggable_type"
+  end
+
+  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
+  add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"
+
+  create_table "tags", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "users", :force => true do |t|
+    t.string   "email"
+    t.string   "password"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end

data/spec/dummy/db/seeds.rb

@@ -5,3 +5,30 @@
 #
 #   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
 #   Mayor.create(name: 'Emanuel', city: cities.first)
+
+categories = {
+  'Category #1' => {
+    'Category #11' => {},
+    'Category #12' => {
+      'Category #121' => {
+        'Category #1211' => {}
+      },
+      'Category #122' =>{}
+    },
+    'Category #13' => {
+      'Category #131' => {}
+    }
+  },
+  'Category #2' => {
+    'Category #21' => {}
+  }
+}
+
+def create_category hash, parent = nil
+  hash.each do |(title, children)|
+    c = Category.create :title => title, :parent => parent
+    create_category children, c
+  end
+end
+
+create_category categories

data/spec/lib/fields_spec.rb

@@ -7,49 +7,49 @@ end
 describe "Field" do
 
   it "#model" do
-    field = Puffer::Fields::Field.new 'user.profile.name', Post
+    field = Puffer::Field.new 'user.profile.name', Post
     field.model.should == Profile
-    field = Puffer::Fields::Field.new 'user.email', Post
+    field = Puffer::Field.new 'user.email', Post
     field.model.should == User
-    field = Puffer::Fields::Field.new 'user', Post
+    field = Puffer::Field.new 'user', Post
     field.model.should == Post
-    field = Puffer::Fields::Field.new 'title', Post
+    field = Puffer::Field.new 'title', Post
     field.model.should == Post
   end
 
   it "#name" do
-    field = Puffer::Fields::Field.new 'user.profile.name', Post
+    field = Puffer::Field.new 'user.profile.name', Post
     field.name.should == 'name'
   end
 
   it "#query_column" do
-    field = Puffer::Fields::Field.new 'user.profile.name', Post
+    field = Puffer::Field.new 'user.profile.name', Post
     field.query_column.should == 'profiles.name'
-    field = Puffer::Fields::Field.new 'user.email', Post
+    field = Puffer::Field.new 'user.email', Post
     field.query_column.should == 'users.email'
-    field = Puffer::Fields::Field.new 'user.full_name', Post
+    field = Puffer::Field.new 'user.full_name', Post
     field.query_column.should == nil
   end
 
   it "#column" do
-    field = Puffer::Fields::Field.new 'user.profile.name', Post
+    field = Puffer::Field.new 'user.profile.name', Post
     field.column.name.should == 'name'
-    field = Puffer::Fields::Field.new 'user.full_name', Post
+    field = Puffer::Field.new 'user.full_name', Post
     field.column.should == nil
   end
 
   it '#type' do
-    field = Puffer::Fields::Field.new 'user.created_at', Post
+    field = Puffer::Field.new 'user.created_at', Post
     field.type.should == :datetime
   end
 
   it '#type with virtual field' do
-    field = Puffer::Fields::Field.new 'user.full_name', Post
+    field = Puffer::Field.new 'user.full_name', Post
     field.type.should == :string
   end
 
   it '#type was specified' do
-    field = Puffer::Fields::Field.new 'user.full_name', Post, :type => :text
+    field = Puffer::Field.new 'user.full_name', Post, :type => :text
     field.type.should == :text
   end