puffer 0.0.23 → 0.0.24

data/lib/puffer/controller/dsl.rb

@@ -1,15 +1,22 @@
 module Puffer
   module Controller
     module Dsl
+      extend ActiveSupport::Concern
 
-      def self.included base
-        base.class_eval do
-          extend ClassMethods
+      included do
+        class_attribute :_members
+        self._members = Puffer::Controller::Actions.new
+        class_attribute :_collections
+        self._collections = Puffer::Controller::Actions.new
+        class_attribute :_fieldset_fallbacks
+        self._fieldset_fallbacks = HashWithIndifferentAccess.new
 
-          class_attribute :_members
-          self._members = Puffer::Controller::Actions.new
-          class_attribute :_collections
-          self._collections = Puffer::Controller::Actions.new
+        helper_method :_members, :_collections
+      end
+
+      module InstanceMethods
+        def fields set
+          self.class.fields set
         end
       end
 
@@ -18,6 +25,7 @@ module Puffer
         def inherited klass
           klass._members = _members.dup
           klass._collections = _collections.dup
+          klass._fieldset_fallbacks = Marshal.load(Marshal.dump(_fieldset_fallbacks))
           super
         end
 
@@ -31,22 +39,24 @@ module Puffer
 
         def define_fieldset *actions
           options = actions.extract_options!
-          fallbacks = Array.wrap(options.delete(:fallbacks))
+          fallbacks = Array.wrap(options.delete(:fallbacks)).map(&:to_sym)
 
           actions.each do |action|
+            self._fieldset_fallbacks[action] = [action] + fallbacks
+
             class_attribute "_#{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::FieldSet.new)
+                @_fields = send("_#{action}_fields=", Puffer::FieldSet.new(action))
                 block.call if block
                 remove_instance_variable :@_fields
               end
 
               define_method "#{action}_fields" do
-                actions = [action] + fallbacks
+                actions = self._fieldset_fallbacks[action].dup
                 last = actions.pop
                 actions.map do |action|
                   send("_#{action}_fields").presence
@@ -60,10 +70,13 @@ module Puffer
           end
         end
 
+        def fields set
+          send "#{set}_fields"
+        end
+
         def field name, options = {}, &block
           field = @_fields.field(name, model, options, &block) if @_fields
-          generate_association_actions field if field.reflection
-          #generate_change_actions field if field.toggable?
+          #generate_association_actions field if field.reflection
         end
 
       end

data/lib/puffer/engine.rb

@@ -1,5 +1,10 @@
 module Puffer
   class Engine < Rails::Engine
+    config.paths.add 'app/components', :eager_load => true
     config.autoload_paths << File.join(root, 'lib')
+
+    initializer "puffer.add_view_paths", :after => :add_view_paths do |app|
+      Puffer::Component::Base.view_paths = paths["app/components"].existent
+    end
   end
 end

data/lib/puffer/extensions/controller.rb

@@ -2,19 +2,15 @@ module Puffer
   module Extensions
     module ActionController
       module Base
+        extend ActiveSupport::Concern
 
-        def self.included base
-          base.class_eval do
-            extend ClassMethods
+        included do
+          extend ClassMethods
 
-            helper_method :puffer?
-          end
+          helper_method :puffer?, :render_component
         end
 
-        def puffer?; false; end
-
         module ClassMethods
-
           def puffer?; false; end
 
           def pufferize!
@@ -22,9 +18,15 @@ module Puffer
             include Puffer::Controller::Helpers
             include Puffer::Controller::Dsl
             include Puffer::Controller::Config
-            include Puffer::Controller::Generated
           end
+        end
 
+        module InstanceMethods
+          def puffer?; false; end
+
+          def render_component *args
+            Puffer::Component::Base.render_component self, *args
+          end
         end
 
       end

data/lib/puffer/extensions/form.rb

@@ -5,7 +5,8 @@ module Puffer
       def puffer_field *args
         field = args.first.is_a?(Puffer::Field) ? args.first : Puffer::Field.new(*args)
         field.resource = object.class
-        field.input self
+        template = instance_variable_get :@template
+        field.render template.controller, :form, :form => self
       end
 
     end

data/lib/puffer/extensions/mapper.rb

@@ -67,6 +67,7 @@ module Puffer
             @scope[:children] = siblings
 
             collection do
+              get  '/event/:fieldset/:field/:event(/:identifer)', options.merge(:action => :event, :as => :event)
               post :create, options
               controller._collections.each do |args|
                 opts = args.extract_options!.dup
@@ -128,6 +129,7 @@ module Puffer
 
             collection do
               get  :index, options
+              get  '/event/:fieldset/:field/:event(/:identifer)', options.merge(:action => :event, :as => :event)
               post :create, options
               controller._collections.each do |args|
                 opts = args.extract_options!.dup

data/lib/puffer/field.rb

@@ -1,24 +1,29 @@
 module Puffer
   class Field
 
-    attr_accessor :resource, :field_name, :options, :fields
+    attr_accessor :resource, :field_name, :field_set, :options, :children
 
-    def initialize field_name, *resource_and_options, &block
+    def initialize field_name, resource, *fieldset_and_options, &block
       @field_name = field_name.to_s
-      @options = resource_and_options.extract_options!
-      @resource = resource_and_options.first
-      @fields = Puffer::FieldSet.new
+      @resource = resource
+      @options = fieldset_and_options.extract_options!  
+      @field_set = fieldset_and_options.first
+      @children = Puffer::FieldSet.new swallow_nil{field_set.name}
       block.bind(self).call if block
     end
 
     def field name, options = {}, &block
-      @fields.field(name, swallow_nil{reflection.klass}, options, &block)
+      @children.field(name, swallow_nil{reflection.klass}, options, &block)
     end
 
     def native?
       model == resource
     end
 
+    def to_s
+      field_name
+    end
+
     def name
       @name ||= field_name.split('.').last
     end
@@ -36,27 +41,33 @@ module Puffer
     end
 
     def type
-      @type ||= options[:type] ? options[:type].to_sym : (Puffer::Customs.type_for(self) || (column ? column.type : :string))
+      @type ||= options[:type] || custom_type || column_type || :string
     end
 
-    def to_s
-      field_name
+    def custom_type
+      return :select if options.key?(:select)
+      return :password if name =~ /password/
+      return reflection.macro if reflection
     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
+    def component_class
+      @component_class ||= Puffer::Component.component_for type
+    end
+
+    def component
+      @component ||= component_class.new self
+    end
+
+    def render controller, context, *args
+      component.process controller, context, *args
     end
 
     def model
@@ -71,14 +82,14 @@ module Puffer
       end if resource
     end
 
-    def association_columns
-      @association_columns ||= fields
-    end
-
     def column
       @column ||= model && model.columns_hash[name]
     end
 
+    def column_type
+      column.type if column
+    end
+
     def query_column
       "#{model.table_name}.#{name}" if column
     end

data/lib/puffer/field_set.rb

@@ -1,8 +1,15 @@
 module Puffer
   class FieldSet < Array
 
-    def field *args, &block
-      push Puffer::Field.new(*args, &block)
+    attr_accessor :name
+
+    def initialize name = nil
+      @name = name
+      super()
+    end
+
+    def field name, resource, options, &block
+      push Puffer::Field.new(name, resource, self, options, &block)
       last
     end
 
@@ -22,5 +29,13 @@ module Puffer
       @includes ||= map {|f| f.path unless f.native?}.compact.to_includes
     end
 
+    def [] key
+      if key.is_a?(String) || key.is_a?(Symbol)
+        detect {|f| f.to_s == key.to_s}
+      else
+        super
+      end
+    end
+
   end
 end

data/lib/puffer.rb

@@ -1,11 +1,3 @@
-module Puffer
-
-  def self.customs
-    Puffer::Customs
-  end
-
-end
-
 require 'kaminari'
 
 require 'puffer/engine'
@@ -14,3 +6,28 @@ require 'puffer/extensions/controller'
 require 'puffer/extensions/core'
 require 'puffer/extensions/mapper'
 require 'puffer/extensions/form'
+
+module Puffer
+  
+  module Component
+  	autoload :Base, 'puffer/component'
+
+    mattr_accessor :_mappings
+    self._mappings = {}
+
+    def self.map_component *args
+      to = args.extract_options![:to]
+      args.each { |type| _mappings[type.to_sym] = to }
+    end
+
+    def self.component_for type
+      (_mappings[type.to_sym] || "#{type}_component").to_s.camelize.constantize
+    end
+
+    map_component :belongs_to, :has_one, :to => :ReferencesOneComponent
+    map_component :has_many, :has_and_belongs_to_many, :to => :ReferencesManyComponent
+    map_component :date, :time, :datetime, :timestamp, :to => :DateTimeComponent
+    map_component :integer, :decimal, :to => :StringComponent
+  end
+
+end

data/puffer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer}
-  s.version = "0.0.23"
+  s.version = "0.0.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["pyromaniac"]
-  s.date = %q{2011-08-01}
+  s.authors = [%q{pyromaniac}]
+  s.date = %q{2011-09-09}
   s.description = %q{In Soviet Russia puffer admins you}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [
@@ -26,15 +26,44 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/assets/javascripts/puffer/application.js",
+    "app/assets/javascripts/puffer/paginator.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/javascripts/puffer/right-autocompleter-src.js",
+    "app/assets/javascripts/puffer/right-calendar-src.js",
+    "app/assets/javascripts/puffer/right-dialog-src.js",
+    "app/assets/javascripts/puffer/right-slider-src.js",
+    "app/assets/javascripts/puffer/right-src.js",
     "app/assets/stylesheets/puffer/application.css",
+    "app/assets/stylesheets/puffer/paginator.css",
     "app/assets/stylesheets/puffer/puffer.css",
     "app/assets/stylesheets/puffer/puffer_tree.css",
     "app/assets/stylesheets/puffer/reset.css",
+    "app/assets/stylesheets/puffer/right.css",
+    "app/components/base/form.html.erb",
+    "app/components/base_component.rb",
+    "app/components/boolean/form.html.erb",
+    "app/components/boolean/index.html.erb",
+    "app/components/boolean_component.rb",
+    "app/components/date_time/form.html.erb",
+    "app/components/date_time_component.rb",
+    "app/components/file/form.html.erb",
+    "app/components/file_component.rb",
+    "app/components/hidden/form.html.erb",
+    "app/components/hidden_component.rb",
+    "app/components/password/form.html.erb",
+    "app/components/password_component.rb",
+    "app/components/references_many/form.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/form.html.erb",
+    "app/components/select_component.rb",
+    "app/components/string/form.html.erb",
+    "app/components/string_component.rb",
+    "app/components/text/form.html.erb",
+    "app/components/text_component.rb",
     "app/controllers/admin/dashboard_controller.rb",
     "app/controllers/admin/sessions_controller.rb",
     "app/controllers/puffer/base.rb",
@@ -48,10 +77,7 @@ Gem::Specification.new do |s|
     "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/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/_table.html.erb",
     "app/views/puffer/base/edit.html.erb",
     "app/views/puffer/base/index.html.erb",
     "app/views/puffer/base/new.html.erb",
@@ -63,17 +89,20 @@ Gem::Specification.new do |s|
     "app/views/puffer/tree_base/tree.html.erb",
     "config/locales/puffer.yml",
     "config/routes.rb",
+    "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",
     "lib/puffer.rb",
+    "lib/puffer/component.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/mutate.rb",
-    "lib/puffer/customs.rb",
     "lib/puffer/engine.rb",
     "lib/puffer/extensions/activerecord.rb",
     "lib/puffer/extensions/controller.rb",
@@ -82,20 +111,21 @@ Gem::Specification.new do |s|
     "lib/puffer/extensions/mapper.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",
-    "lib/puffer/inputs/collection_association.rb",
-    "lib/puffer/inputs/date_time.rb",
-    "lib/puffer/inputs/file.rb",
-    "lib/puffer/inputs/hidden.rb",
-    "lib/puffer/inputs/password.rb",
-    "lib/puffer/inputs/select.rb",
-    "lib/puffer/inputs/text.rb",
     "lib/puffer/resource.rb",
     "lib/puffer/resource/routing.rb",
     "lib/puffer/resource/scoping.rb",
     "puffer.gemspec",
+    "spec/app/components/base_component_spec.rb",
+    "spec/app/components/boolean_component_spec.rb",
+    "spec/app/components/date_time_component_spec.rb",
+    "spec/app/components/file_component_spec.rb",
+    "spec/app/components/hidden_component_spec.rb",
+    "spec/app/components/password_component_spec.rb",
+    "spec/app/components/references_many_component_spec.rb",
+    "spec/app/components/references_one_component_spec.rb",
+    "spec/app/components/select_component_spec.rb",
+    "spec/app/components/string_component_spec.rb",
+    "spec/app/components/text_component_spec.rb",
     "spec/dummy/.rvmrc",
     "spec/dummy/Rakefile",
     "spec/dummy/app/assets/images/rails.png",
@@ -105,10 +135,10 @@ Gem::Specification.new do |s|
     "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/sessions_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/sessions_controller.rb",
     "spec/dummy/app/helpers/application_helper.rb",
     "spec/dummy/app/models/category.rb",
     "spec/dummy/app/models/friendship.rb",
@@ -160,6 +190,7 @@ Gem::Specification.new do |s|
     "spec/fabricators/tags_fabricator.rb",
     "spec/fabricators/users_fabricator.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",
@@ -169,15 +200,15 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/puffer/puffer}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Admin interface builder}
 
   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.1.0.rc5"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.1.0"])
       s.add_runtime_dependency(%q<kaminari>, [">= 0"])
       s.add_runtime_dependency(%q<apotomo>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
@@ -192,7 +223,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<nested_set>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.1.0.rc5"])
+      s.add_dependency(%q<rails>, ["~> 3.1.0"])
       s.add_dependency(%q<kaminari>, [">= 0"])
       s.add_dependency(%q<apotomo>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
@@ -208,7 +239,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<nested_set>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.1.0.rc5"])
+    s.add_dependency(%q<rails>, ["~> 3.1.0"])
     s.add_dependency(%q<kaminari>, [">= 0"])
     s.add_dependency(%q<apotomo>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])

data/spec/app/components/base_component_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe BaseComponent do
+
+  include RSpec::Rails::RequestExampleGroup
+
+  context 'index' do
+
+    it 'should render field content' do
+      @category = Fabricate :category
+      get admin_categories_path
+
+      field = controller.index_fields[:title]
+      Puffer::Component::Base.render_component(controller, field, :index, :record => @category).should == @category.title
+    end
+
+  end
+
+end

data/spec/app/components/boolean_component_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe BooleanComponent do
+
+  include RSpec::Rails::RequestExampleGroup
+
+  context 'index' do
+    it 'should render checkbox' do
+      @category = Fabricate :category
+      get admin_categories_path
+
+      field = controller.index_fields[:hidden]
+      component = Puffer::Component::Base.render_component(controller, field, :index, :record => @category)
+
+      p component
+    end
+  end
+
+  context 'form' do
+    it 'should render form field' do
+      @category = Fabricate :category
+      get admin_categories_path
+
+      field = controller.form_fields[:hidden]
+      component = ''
+      controller.view_context.form_for @category, :url => admin_category_path(@category) do |form|
+        component = Puffer::Component::Base.render_component(controller, field, :form, :form => form)
+      end
+
+      component.should have_selector("input[type=hidden][value='0']")
+      component.should have_selector("input[type=checkbox][value='1']")
+      component.should have_selector('label[for=category_hidden]')
+    end
+  end
+
+end

data/spec/app/components/date_time_component_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe DateTimeComponent do
+
+  include RSpec::Rails::RequestExampleGroup
+
+  context 'form' do
+
+    it 'should render form field' do
+      @user = Fabricate :user_with_profile
+      get admin_user_profile_path(@user)
+
+      field = controller.form_fields[:birth_date]
+      field.options[:type] = :date_time
+      component = ''
+      controller.view_context.form_for @user.profile, :url => admin_user_profile_path(@user) do |form|
+        component = Puffer::Component::Base.render_component(controller, field, :form, :form => form)
+      end
+
+      component.should have_selector('label[for=profile_birth_date]')
+      component.should have_selector('input[data-calendar]')
+    end
+
+  end
+
+end

data/spec/app/components/file_component_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe FileComponent do
+
+  include RSpec::Rails::RequestExampleGroup
+
+  context 'form' do
+
+    it 'should render form field' do
+      @post = Fabricate :post
+      get admin_posts_path
+
+      field = controller.form_fields[:filename]
+      component = ''
+      controller.view_context.form_for @post, :url => admin_post_path(@post) do |form|
+        component = Puffer::Component::Base.render_component(controller, field, :form, :form => form)
+      end
+
+      component.should have_selector('label[for=post_filename]')
+      component.should have_selector('input[type=file]')
+    end
+
+  end
+
+end

data/spec/app/components/hidden_component_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe HiddenComponent do
+
+  include RSpec::Rails::RequestExampleGroup
+
+  context 'form' do
+
+    it 'should render form field' do
+      @category = Fabricate :category
+      get admin_categories_path
+
+      field = controller.form_fields[:parent_id]
+      component = ''
+      controller.view_context.form_for @category, :url => admin_category_path(@category) do |form|
+        component = Puffer::Component::Base.render_component(controller, field, :form, :form => form)
+      end
+
+      component.should have_selector("input[type=hidden]")
+    end
+
+  end
+
+end