puffer 0.0.29 → 0.0.30

data/lib/puffer/resource/routing.rb

@@ -15,7 +15,7 @@ module Puffer
       end
 
       def new_url *args
-        new_polymorphic_url *route_args(controller_name.singularize, *args)
+        new_polymorphic_url *route_args(name.to_s.singularize, *args)
       end
 
       def edit_url *args
@@ -25,12 +25,12 @@ module Puffer
 
       def route_args *args
         options = args.extract_options!
-        resource = args.shift
-        return args + [namespace] + ancestors.map(&:route_member) + [resource], options
+        resource = Array.wrap(args)
+        return [scope] + ancestors.map(&:route_member) + resource, options
       end
 
       def route_member suggest = nil
-        plural? ? (suggest || member) : controller_name.singularize
+        plural? ? (suggest || member) : name.to_s.singularize
       end
 
       def default_url_options *args

data/lib/puffer/resource/tree.rb

@@ -0,0 +1,36 @@
+module Puffer
+  class Resource
+    class Tree
+      attr_accessor :nodes
+
+      def initialize
+        @nodes = []
+      end
+
+      def append_node *args
+        options = args.extract_options!
+        parent = args.first
+
+        parent = case parent
+        when Integer then
+          nodes[parent]
+        when Puffer::Resource::Node, nil then
+          parent
+        else
+          return
+        end
+
+        push Puffer::Resource::Node.new(parent, options)
+        size.pred
+      end
+
+      def roots
+        nodes.select &:root?
+      end
+
+      def method_missing method, *args, &block
+        nodes.send method, *args, &block if nodes.respond_to? method
+      end      
+    end
+  end
+end

data/puffer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer}
-  s.version = "0.0.29"
+  s.version = "0.0.30"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{pyromaniac}]
-  s.date = %q{2011-09-12}
+  s.date = %q{2011-10-22}
   s.description = %q{In Soviet Russia puffer admins you}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [
@@ -54,10 +54,12 @@ Gem::Specification.new do |s|
     "app/components/password/form.html.erb",
     "app/components/password_component.rb",
     "app/components/references_many/form.html.erb",
+    "app/components/references_many/index.html.erb",
     "app/components/references_many_component.rb",
     "app/components/references_one/choose.html.erb",
     "app/components/references_one/form.html.erb",
     "app/components/references_one_component.rb",
+    "app/components/select/filter.html.erb",
     "app/components/select/form.html.erb",
     "app/components/select_component.rb",
     "app/components/string/form.html.erb",
@@ -81,7 +83,6 @@ Gem::Specification.new do |s|
     "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",
     "app/views/puffer/base/_table.html.erb",
     "app/views/puffer/base/edit.html.erb",
     "app/views/puffer/base/index.html.erb",
@@ -98,7 +99,6 @@ Gem::Specification.new do |s|
     "lib/generators/puffer/component/USAGE",
     "lib/generators/puffer/component/component_generator.rb",
     "lib/generators/puffer/component/templates/component.rb",
-    "lib/generators/puffer/component/templates/component_spec.rb",
     "lib/generators/puffer/controller/USAGE",
     "lib/generators/puffer/controller/controller_generator.rb",
     "lib/generators/puffer/controller/templates/controller.rb",
@@ -112,17 +112,20 @@ Gem::Specification.new do |s|
     "lib/puffer/engine.rb",
     "lib/puffer/extensions/controller.rb",
     "lib/puffer/extensions/core.rb",
+    "lib/puffer/extensions/directive_processor.rb",
     "lib/puffer/extensions/engine.rb",
     "lib/puffer/extensions/form.rb",
     "lib/puffer/extensions/mapper.rb",
     "lib/puffer/field.rb",
     "lib/puffer/field_set.rb",
+    "lib/puffer/filters.rb",
     "lib/puffer/orm_adapter/active_record.rb",
     "lib/puffer/orm_adapter/base.rb",
     "lib/puffer/orm_adapter/mongoid.rb",
     "lib/puffer/resource.rb",
+    "lib/puffer/resource/node.rb",
     "lib/puffer/resource/routing.rb",
-    "lib/puffer/resource/scoping.rb",
+    "lib/puffer/resource/tree.rb",
     "puffer.gemspec",
     "spec/app/components/base_component_spec.rb",
     "spec/app/components/boolean_component_spec.rb",
@@ -148,11 +151,15 @@ 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/orms/mongoid_tests_controller.rb",
+    "spec/dummy/app/controllers/orms/active_record_orm_primals_controller.rb",
+    "spec/dummy/app/controllers/orms/mongoid_orm_primals_controller.rb",
     "spec/dummy/app/helpers/application_helper.rb",
+    "spec/dummy/app/models/active_record_orm.rb",
+    "spec/dummy/app/models/active_record_orm/primal.rb",
     "spec/dummy/app/models/category.rb",
     "spec/dummy/app/models/friendship.rb",
-    "spec/dummy/app/models/mongoid_test.rb",
+    "spec/dummy/app/models/mongoid_orm.rb",
+    "spec/dummy/app/models/mongoid_orm/primal.rb",
     "spec/dummy/app/models/news.rb",
     "spec/dummy/app/models/post.rb",
     "spec/dummy/app/models/post_category.rb",
@@ -191,6 +198,7 @@ Gem::Specification.new do |s|
     "spec/dummy/db/migrate/20110107082706_create_friendships.rb",
     "spec/dummy/db/migrate/20110301072545_create_news.rb",
     "spec/dummy/db/migrate/20110912114129_create_puffer_users.rb",
+    "spec/dummy/db/migrate/20110930183902_create_active_record_orm_primals.rb",
     "spec/dummy/db/schema.rb",
     "spec/dummy/db/seeds.rb",
     "spec/dummy/public/404.html",
@@ -199,18 +207,27 @@ Gem::Specification.new do |s|
     "spec/dummy/public/favicon.ico",
     "spec/dummy/public/robots.txt",
     "spec/dummy/script/rails",
+    "spec/fabricators/active_record_orm/primal.rb",
     "spec/fabricators/categories_fabricator.rb",
+    "spec/fabricators/mongoid_orm/primal.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/generators/puffer/component/component_generator_spec.rb",
+    "spec/generators/puffer/controller/controller_generator_spec.rb",
+    "spec/helpers/puffer_helper_spec.rb",
     "spec/integration/navigation_spec.rb",
     "spec/lib/component_spec.rb",
     "spec/lib/extensions/core_spec.rb",
     "spec/lib/fields_spec.rb",
-    "spec/lib/params_spec.rb",
+    "spec/lib/filters_spec.rb",
+    "spec/lib/orm_adapter/active_record_spec.rb",
+    "spec/lib/orm_adapter/base_shared.rb",
+    "spec/lib/orm_adapter/mongoid_spec.rb",
     "spec/lib/resource/routing_spec.rb",
+    "spec/lib/resource/tree_spec.rb",
     "spec/lib/resource_spec.rb",
     "spec/puffer_spec.rb",
     "spec/spec_helper.rb"
@@ -234,6 +251,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
       s.add_development_dependency(%q<capybara>, [">= 0"])
       s.add_development_dependency(%q<database_cleaner>, [">= 0"])
+      s.add_development_dependency(%q<ammeter>, [">= 0"])
       s.add_development_dependency(%q<guard>, [">= 0"])
       s.add_development_dependency(%q<libnotify>, [">= 0"])
       s.add_development_dependency(%q<guard-rspec>, [">= 0"])
@@ -252,6 +270,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec-rails>, [">= 0"])
       s.add_dependency(%q<capybara>, [">= 0"])
       s.add_dependency(%q<database_cleaner>, [">= 0"])
+      s.add_dependency(%q<ammeter>, [">= 0"])
       s.add_dependency(%q<guard>, [">= 0"])
       s.add_dependency(%q<libnotify>, [">= 0"])
       s.add_dependency(%q<guard-rspec>, [">= 0"])
@@ -271,6 +290,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec-rails>, [">= 0"])
     s.add_dependency(%q<capybara>, [">= 0"])
     s.add_dependency(%q<database_cleaner>, [">= 0"])
+    s.add_dependency(%q<ammeter>, [">= 0"])
     s.add_dependency(%q<guard>, [">= 0"])
     s.add_dependency(%q<libnotify>, [">= 0"])
     s.add_dependency(%q<guard-rspec>, [">= 0"])

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

@@ -6,7 +6,7 @@ class Admin::PostsController < Puffer::Base
 
   index do
     field 'user.email'
-    field :status
+    field :status, :select => Post.statuses
     field :title
     field :body
   end

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

@@ -15,6 +15,7 @@ class Admin::UsersController < Puffer::Base
   index do
     field :email
     field :password, :type => :password
+    field :posts
   end
 
   form do

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,7 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+
+  def has_puffer_access? namespace
+    true
+  end
 end

data/spec/dummy/app/controllers/orms/active_record_orm_primals_controller.rb

@@ -0,0 +1,36 @@
+class Orms::ActiveRecordOrmPrimalsController < Puffer::Base
+
+  setup do
+    group :active_record
+    model_name 'active_record_orm/primal'
+  end
+
+  index do
+    field :string_field
+    field :text_field
+    field :select_field, :select => (1..5).map {|i| "option #{i}"}
+    field :integer_field
+    field :float_field
+    field :decimal_field
+    field :datetime_field
+    field :timestamp_field
+    field :time_field
+    field :date_field
+    field :boolean_field
+  end
+
+  form do
+    field :string_field
+    field :text_field
+    field :select_field, :select => (1..5).map {|i| "option #{i}"}
+    field :integer_field
+    field :float_field
+    field :decimal_field
+    field :datetime_field
+    field :timestamp_field
+    field :time_field
+    field :date_field
+    field :boolean_field
+  end
+
+end

data/spec/dummy/app/controllers/orms/mongoid_orm_primals_controller.rb

@@ -0,0 +1,42 @@
+class Orms::MongoidOrmPrimalsController < Puffer::Base
+
+  setup do
+    group :mongoid
+    model_name 'mongoid_orm/primal'
+  end
+
+  index do
+    field :string_field
+    field :symbol_field
+    field :select_field, :select => (1..5).map {|i| "option #{i}"}
+    field :integer_field
+    field :float_field
+    field :decimal_field
+    field :datetime_field
+    field :time_field
+    field :date_field
+    field :boolean_field
+    field :array_field
+    field :hash_field
+    field :set_field
+    field :range_field
+  end
+
+  form do
+    field :string_field
+    field :symbol_field
+    field :select_field, :select => (1..5).map {|i| "option #{i}"}
+    field :integer_field
+    field :float_field
+    field :decimal_field
+    field :datetime_field
+    field :time_field
+    field :date_field
+    field :boolean_field
+    field :array_field
+    field :hash_field
+    field :set_field
+    field :range_field
+  end
+
+end

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

@@ -0,0 +1,5 @@
+module ActiveRecordOrm
+  def self.table_name_prefix
+    'active_record_orm_'
+  end
+end

data/spec/dummy/app/models/active_record_orm/primal.rb

@@ -0,0 +1,2 @@
+class ActiveRecordOrm::Primal < ActiveRecord::Base
+end

data/spec/dummy/app/models/{mongoid_test.rb → mongoid_orm.rb}

@@ -1,4 +1,4 @@
-class MongoidTest
+class MongoidOrm
   include Mongoid::Document
 
   field :string_field, :type => String

data/spec/dummy/app/models/mongoid_orm/primal.rb

@@ -0,0 +1,46 @@
+class MongoidOrm::Primal
+  include Mongoid::Document
+
+  field :string_field, :type => String
+  field :symbol_field, :type => Symbol
+  field :select_field, :type => String
+  field :integer_field, :type => Integer
+  field :float_field, :type => Float
+  field :decimal_field, :type => BigDecimal
+  field :datetime_field, :type => DateTime
+  field :time_field, :type => Time
+  field :date_field, :type => Date
+  field :boolean_field, :type => Boolean
+  field :array_field, :type => Array
+  field :hash_field, :type => Hash
+  field :set_field, :type => ::Set
+  field :range_field, :type => Range
+
+  def array_field_before_type_cast
+    array_field.join(', ') if array_field.present?
+  end
+
+  def array_field= value
+    value = value.split(',').map(&:strip).map(&:presence).compact if value.is_a? String
+    write_attribute :array_field, value
+  end
+
+  def set_field_before_type_cast
+    set_field.to_a.join(', ') if set_field.present?
+  end
+
+  def set_field= value
+    value = value.split(',').map(&:strip).map(&:presence).compact if value.is_a? String
+    write_attribute :set_field, value
+  end
+
+  def range_field_before_type_cast
+    range_field.to_s
+  end
+
+  def range_field= value
+    value = Range.new(*value.split('..', 2).map(&:to_i)) rescue nil if value.is_a? String
+    write_attribute :range_field, value
+  end
+
+end

data/spec/dummy/config/environments/development.rb

@@ -24,4 +24,7 @@ Dummy::Application.configure do
 
   # Do not compress assets
   config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
 end

data/spec/dummy/config/routes.rb

@@ -30,7 +30,8 @@ Dummy::Application.routes.draw do
   end
 
   namespace :orms do
-    resources :mongoid_tests
+    resources :active_record_orm_primals
+    resources :mongoid_orm_primals
   end
 
 end

data/spec/dummy/db/migrate/20110930183902_create_active_record_orm_primals.rb

@@ -0,0 +1,17 @@
+class CreateActiveRecordOrmPrimals < ActiveRecord::Migration
+  def change
+    create_table :active_record_orm_primals do |t|
+      t.string :string_field
+      t.text :text_field
+      t.string :select_field
+      t.integer :integer_field
+      t.float :float_field
+      t.decimal :decimal_field
+      t.datetime :datetime_field
+      t.timestamp :timestamp_field
+      t.time :time_field
+      t.date :date_field
+      t.boolean :boolean_field
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,21 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110912114129) do
+ActiveRecord::Schema.define(:version => 20110930183902) do
+
+  create_table "active_record_orm_primals", :force => true do |t|
+    t.string   "string_field"
+    t.text     "text_field"
+    t.string   "select_field"
+    t.integer  "integer_field"
+    t.float    "float_field"
+    t.decimal  "decimal_field"
+    t.datetime "datetime_field"
+    t.datetime "timestamp_field"
+    t.time     "time_field"
+    t.date     "date_field"
+    t.boolean  "boolean_field"
+  end
 
   create_table "categories", :force => true do |t|
     t.string   "title"

data/spec/fabricators/active_record_orm/primal.rb

@@ -0,0 +1,13 @@
+Fabricator :active_record_orm_primal, :class_name => 'active_record_orm/primal' do
+  string_field { Forgery::LoremIpsum.sentence }
+  text_field { Forgery::LoremIpsum.paragraphs 3 }
+  select_field { sequence(:select_field) {|i| "option #{i}" } }
+  integer_field { sequence :integer_field }
+  float_field { sequence :float_field }
+  decimal_field { sequence :decimal_field }
+  datetime_field { sequence(:datetime_field) {|i| DateTime.now + i.days } }
+  timestamp_field { sequence(:timestamp_field) {|i| DateTime.now + i.days } }
+  time_field { sequence(:time_field) {|i| DateTime.now + i.hours } }
+  date_field { sequence(:date_field) {|i| DateTime.now + i.days } }
+  boolean_field { rand 2 }
+end