puffer 0.0.19 → 0.0.20

data/lib/puffer/resource.rb

@@ -11,18 +11,19 @@ module Puffer
     include Routing
     include Scoping
 
-    attr_reader :request, :params, :namespace, :action, :controller_name, :model_name, :controller, :model
+    attr_reader :controller, :params, :namespace, :action, :controller_name, :model_name, :controller_class, :model
+    delegate :env, :request, :to => :controller, :allow_nil => true
 
-    def initialize params, request = nil
-      params = Marshal.load Marshal.dump(params)
+    def initialize params, controller = nil
+      params = ActiveSupport::HashWithIndifferentAccess.new.deep_merge params
       @action = params.delete :action
-      @controller = "#{params.delete :controller}_controller".camelize.constantize
-      @controller_name = controller.controller_name
-      @namespace = controller.namespace
-      @model_name = controller.model_name if controller.puffer?
-      @model = controller.model if controller.puffer?
+      @controller_class = "#{params.delete :controller}_controller".camelize.constantize
+      @controller_name = controller_class.controller_name
+      @namespace = controller_class.namespace
+      @model_name = controller_class.model_name if controller_class.puffer?
+      @model = controller_class.model if controller_class.puffer?
       @params = params
-      @request = request
+      @controller = controller
     end
 
     def plural?
@@ -52,7 +53,7 @@ module Puffer
           end
           parent_params.merge! :id => params[parent_name.to_s.singularize.foreign_key]
 
-          Resource.new parent_params, request
+          self.class.new parent_params, controller
         else
           nil
         end
@@ -90,7 +91,7 @@ module Puffer
         end
         child_params.merge! controller_name.singularize.foreign_key => params[:id] if params[:id]
 
-        Resource.new child_params, request
+        self.class.new child_params, controller
       end
     end
 
@@ -99,7 +100,7 @@ module Puffer
     end
 
     def collection
-      collection_scope.includes(includes).where(searches(params[:search])).order(order).paginate :page => params[:page]
+      collection_scope.includes(includes).where(searches(params[:search])).order(order).page(params[:page])
     end
 
     def member

data/lib/puffer/resource/routing.rb

@@ -34,7 +34,7 @@ module Puffer
       end
 
       def default_url_options *args
-        Puffer::Base.default_url_options *args
+        Puffer::Base.default_url_options(*args)
       end
 
     end

data/lib/puffer/resource/scoping.rb

@@ -3,7 +3,7 @@ module Puffer
     module Scoping
 
       def includes
-        controller.index_fields.includes
+        controller_class.index_fields.includes
       end
 
       def order
@@ -11,7 +11,7 @@ module Puffer
       end
 
       def searches query
-        controller.index_fields.searches query
+        controller_class.index_fields.searches query
       end
 
     end

data/puffer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer}
-  s.version = "0.0.19"
+  s.version = "0.0.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
-  s.date = %q{2011-03-01}
+  s.date = %q{2011-07-27}
   s.description = %q{In Soviet Russia puffer admins you}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [
@@ -17,32 +17,41 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rspec",
+    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
+    "Guardfile",
     "MIT-LICENSE",
     "README.md",
     "Rakefile",
     "VERSION",
-    "app/cells/puffer/base/additional.html.erb",
-    "app/cells/puffer/base_cell.rb",
-    "app/controllers/puffer/dashboard_base.rb",
-    "app/controllers/puffer/sessions_base.rb",
+    "app/assets/javascripts/puffer/application.js",
+    "app/assets/javascripts/puffer/puffer.js",
+    "app/assets/javascripts/puffer/rails.js",
+    "app/assets/javascripts/puffer/right-autocompleter.js",
+    "app/assets/javascripts/puffer/right-calendar.js",
+    "app/assets/javascripts/puffer/right.js",
+    "app/assets/stylesheets/puffer/application.css",
+    "app/assets/stylesheets/puffer/puffer.css",
+    "app/assets/stylesheets/puffer/reset.css",
+    "app/controllers/puffer/dashboard.rb",
+    "app/controllers/puffer/sessions.rb",
     "app/helpers/puffer_helper.rb",
     "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",
-    "app/views/puffer/associated/one.js.erb",
-    "app/views/puffer/association/_many.html.erb",
-    "app/views/puffer/edit.html.erb",
-    "app/views/puffer/index.html.erb",
-    "app/views/puffer/new.html.erb",
-    "app/views/puffer/show.html.erb",
-    "app/views/puffer_dashboard/index.html.erb",
-    "app/views/puffer_sessions/new.html.erb",
-    "autotest/discover.rb",
+    "app/views/puffer/base/_form.html.erb",
+    "app/views/puffer/base/associated/_many.html.erb",
+    "app/views/puffer/base/associated/many.rjs",
+    "app/views/puffer/base/associated/one.js.erb",
+    "app/views/puffer/base/association/_many.html.erb",
+    "app/views/puffer/base/edit.html.erb",
+    "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",
+    "config/locales/puffer.yml",
     "config/routes.rb",
     "lib/generators/puffer/controller/USAGE",
     "lib/generators/puffer/controller/controller_generator.rb",
@@ -50,14 +59,6 @@ Gem::Specification.new do |s|
     "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",
-    "lib/generators/puffer/install/templates/puffer/javascripts/right-autocompleter.js",
-    "lib/generators/puffer/install/templates/puffer/javascripts/right-calendar.js",
-    "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",
@@ -87,12 +88,15 @@ Gem::Specification.new do |s|
     "lib/puffer/inputs/password.rb",
     "lib/puffer/inputs/select.rb",
     "lib/puffer/inputs/text.rb",
-    "lib/puffer/path_set.rb",
     "lib/puffer/resource.rb",
     "lib/puffer/resource/routing.rb",
     "lib/puffer/resource/scoping.rb",
     "puffer.gemspec",
+    "spec/dummy/.rvmrc",
     "spec/dummy/Rakefile",
+    "spec/dummy/app/assets/images/rails.png",
+    "spec/dummy/app/assets/javascripts/application.js",
+    "spec/dummy/app/assets/stylesheets/application.css",
     "spec/dummy/app/controllers/admin/categories_controller.rb",
     "spec/dummy/app/controllers/admin/news_controller.rb",
     "spec/dummy/app/controllers/admin/posts_controller.rb",
@@ -112,7 +116,7 @@ Gem::Specification.new do |s|
     "spec/dummy/app/models/tag.rb",
     "spec/dummy/app/models/tagging.rb",
     "spec/dummy/app/models/user.rb",
-    "spec/dummy/app/views/admin/users/index.html.erb",
+    "spec/dummy/app/views/layouts/application.html.erb",
     "spec/dummy/config.ru",
     "spec/dummy/config/application.rb",
     "spec/dummy/config/boot.rb",
@@ -124,9 +128,9 @@ Gem::Specification.new do |s|
     "spec/dummy/config/initializers/backtrace_silencers.rb",
     "spec/dummy/config/initializers/inflections.rb",
     "spec/dummy/config/initializers/mime_types.rb",
-    "spec/dummy/config/initializers/puffer.rb",
     "spec/dummy/config/initializers/secret_token.rb",
     "spec/dummy/config/initializers/session_store.rb",
+    "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",
@@ -138,25 +142,12 @@ Gem::Specification.new do |s|
     "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",
     "spec/dummy/public/500.html",
     "spec/dummy/public/favicon.ico",
-    "spec/dummy/public/javascripts/application.js",
-    "spec/dummy/public/javascripts/controls.js",
-    "spec/dummy/public/javascripts/dragdrop.js",
-    "spec/dummy/public/javascripts/effects.js",
-    "spec/dummy/public/javascripts/prototype.js",
-    "spec/dummy/public/javascripts/rails.js",
-    "spec/dummy/public/puffer/javascripts/puffer.js",
-    "spec/dummy/public/puffer/javascripts/rails.js",
-    "spec/dummy/public/puffer/javascripts/right-autocompleter.js",
-    "spec/dummy/public/puffer/javascripts/right-calendar.js",
-    "spec/dummy/public/puffer/javascripts/right.js",
-    "spec/dummy/public/puffer/stylesheets/puffer.css",
-    "spec/dummy/public/puffer/stylesheets/reset.css",
-    "spec/dummy/public/stylesheets/.gitkeep",
+    "spec/dummy/public/robots.txt",
     "spec/dummy/script/rails",
     "spec/fabricators/categories_fabricator.rb",
     "spec/fabricators/news_fabricator.rb",
@@ -168,7 +159,6 @@ Gem::Specification.new do |s|
     "spec/lib/extensions/core_spec.rb",
     "spec/lib/fields_spec.rb",
     "spec/lib/params_spec.rb",
-    "spec/lib/render_fallback_spec.rb",
     "spec/lib/resource/routing_spec.rb",
     "spec/lib/resource_spec.rb",
     "spec/puffer_spec.rb",
@@ -176,108 +166,55 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/puffer/puffer}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Admin interface builder}
-  s.test_files = [
-    "spec/dummy/app/controllers/admin/categories_controller.rb",
-    "spec/dummy/app/controllers/admin/news_controller.rb",
-    "spec/dummy/app/controllers/admin/posts_controller.rb",
-    "spec/dummy/app/controllers/admin/profiles_controller.rb",
-    "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",
-    "spec/dummy/app/models/news.rb",
-    "spec/dummy/app/models/post.rb",
-    "spec/dummy/app/models/post_category.rb",
-    "spec/dummy/app/models/profile.rb",
-    "spec/dummy/app/models/tag.rb",
-    "spec/dummy/app/models/tagging.rb",
-    "spec/dummy/app/models/user.rb",
-    "spec/dummy/config/application.rb",
-    "spec/dummy/config/boot.rb",
-    "spec/dummy/config/environment.rb",
-    "spec/dummy/config/environments/development.rb",
-    "spec/dummy/config/environments/production.rb",
-    "spec/dummy/config/environments/test.rb",
-    "spec/dummy/config/initializers/backtrace_silencers.rb",
-    "spec/dummy/config/initializers/inflections.rb",
-    "spec/dummy/config/initializers/mime_types.rb",
-    "spec/dummy/config/initializers/puffer.rb",
-    "spec/dummy/config/initializers/secret_token.rb",
-    "spec/dummy/config/initializers/session_store.rb",
-    "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/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/fabricators/categories_fabricator.rb",
-    "spec/fabricators/news_fabricator.rb",
-    "spec/fabricators/posts_fabricator.rb",
-    "spec/fabricators/profiles_fabricator.rb",
-    "spec/fabricators/tags_fabricator.rb",
-    "spec/fabricators/users_fabricator.rb",
-    "spec/integration/navigation_spec.rb",
-    "spec/lib/extensions/core_spec.rb",
-    "spec/lib/fields_spec.rb",
-    "spec/lib/params_spec.rb",
-    "spec/lib/render_fallback_spec.rb",
-    "spec/lib/resource/routing_spec.rb",
-    "spec/lib/resource_spec.rb",
-    "spec/puffer_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["~> 3.0.4"])
-      s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
-      s.add_runtime_dependency(%q<cells>, ["~> 3.4.4"])
-      s.add_development_dependency(%q<capybara>, [">= 0.4.0"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.1.0.rc4"])
+      s.add_runtime_dependency(%q<kaminari>, [">= 0"])
+      s.add_runtime_dependency(%q<apotomo>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
-      s.add_development_dependency(%q<autotest>, [">= 0"])
+      s.add_development_dependency(%q<capybara>, [">= 0"])
+      s.add_development_dependency(%q<database_cleaner>, [">= 0"])
+      s.add_development_dependency(%q<guard>, [">= 0"])
+      s.add_development_dependency(%q<libnotify>, [">= 0"])
+      s.add_development_dependency(%q<guard-rspec>, [">= 0"])
       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<mongrel>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, ["~> 3.0.4"])
-      s.add_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
-      s.add_dependency(%q<cells>, ["~> 3.4.4"])
-      s.add_dependency(%q<capybara>, [">= 0.4.0"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_dependency(%q<rails>, [">= 3.1.0.rc4"])
+      s.add_dependency(%q<kaminari>, [">= 0"])
+      s.add_dependency(%q<apotomo>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
-      s.add_dependency(%q<autotest>, [">= 0"])
+      s.add_dependency(%q<capybara>, [">= 0"])
+      s.add_dependency(%q<database_cleaner>, [">= 0"])
+      s.add_dependency(%q<guard>, [">= 0"])
+      s.add_dependency(%q<libnotify>, [">= 0"])
+      s.add_dependency(%q<guard-rspec>, [">= 0"])
       s.add_dependency(%q<forgery>, [">= 0"])
       s.add_dependency(%q<fabrication>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<mongrel>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, ["~> 3.0.4"])
-    s.add_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
-    s.add_dependency(%q<cells>, ["~> 3.4.4"])
-    s.add_dependency(%q<capybara>, [">= 0.4.0"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+    s.add_dependency(%q<rails>, [">= 3.1.0.rc4"])
+    s.add_dependency(%q<kaminari>, [">= 0"])
+    s.add_dependency(%q<apotomo>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
-    s.add_dependency(%q<autotest>, [">= 0"])
+    s.add_dependency(%q<capybara>, [">= 0"])
+    s.add_dependency(%q<database_cleaner>, [">= 0"])
+    s.add_dependency(%q<guard>, [">= 0"])
+    s.add_dependency(%q<libnotify>, [">= 0"])
+    s.add_dependency(%q<guard-rspec>, [">= 0"])
     s.add_dependency(%q<forgery>, [">= 0"])
     s.add_dependency(%q<fabrication>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<mongrel>, [">= 0"])
   end
 end
 

data/spec/dummy/.rvmrc

@@ -0,0 +1 @@
+rvm use --create 1.9.2@puffer

data/spec/dummy/Rakefile

@@ -1,7 +1,7 @@
+#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
-require 'rake'
 
 Dummy::Application.load_tasks

data/spec/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,9 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/spec/dummy/app/assets/stylesheets/application.css

@@ -0,0 +1,7 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require_tree . 
+*/

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

@@ -13,7 +13,9 @@ class Admin::PostsController < Puffer::Base
 
   form do
     field :id
-    field :user, :columns => [:email]
+    field :user do
+      field :email
+    end
     field :title
     field :body
   end

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

@@ -12,7 +12,10 @@ class Admin::ProfilesController < Puffer::Base
   end
 
   form do
-    field :user, :columns => [:email, :password]
+    field :user do
+      field :email
+      field :password
+    end
     field :name
     field :surname
     field :birth_date

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

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

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

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