puffer 0.0.5 → 0.0.6

data/lib/puffer/controller/dsl.rb

@@ -4,59 +4,57 @@ module Puffer
 
       def self.included base
         base.class_eval do
-          class_attribute :puffer_fields
-          self.puffer_fields = {}
-
           extend ClassMethods
+          include ActionMethods
+          extend ActionMethods
 
-          helper_method :index_fields, :show_fields, :form_fields, :create_fields, :update_fields
-        end
-      end
-
-      [:index, :show, :form, :create, :update].each do |sym|
-        define_method "#{sym}_fields" do
-          self.class.send "#{sym}_fields"
+          %w(index show form create update).each do |action|
+            class_attribute "_#{action}_fields"
+            send "_#{action}_fields=", Puffer::Fields.new unless send("_#{action}_fields").present?
+            helper_method "#{action}_fields"
+          end
         end
       end
 
       module ClassMethods
 
-        def configure &block
-          block.bind(current_config).call
+        %w(index show form create update).each do |action|
+          define_method action do |&block|
+            @_fields = send "_#{action}_fields"
+            @_fields.clear
+            block.call if block
+            @_fields = nil
+          end
         end
 
-        [:index, :show, :form, :create, :update].each do |sym|
-          define_method sym do
-            @puffer_option = sym
-            yield if block_given?
-          end
+        def field name, options = {}
+          field = @_fields.field(model, name, options) if @_fields
+          #generate_association_actions field if field.association?
+          #generate_change_actions field if field.toggable?
         end
 
+      end
+
+      module ActionMethods
+
         def index_fields
-          puffer_fields[:index] || Puffer::Fields.new
+          _index_fields
         end
 
         def show_fields
-          puffer_fields[:show] || puffer_fields[:index] || Puffer::Fields.new
+          _show_fields.presence || _index_fields
         end
 
         def form_fields
-          puffer_fields[:form] || Puffer::Fields.new
+          _form_fields
         end
 
         def create_fields
-          puffer_fields[:create] || puffer_fields[:form] || Puffer::Fields.new
+          _create_fields.presence || _form_fields
         end
 
         def update_fields
-          puffer_fields[:update] || puffer_fields[:form] || Puffer::Fields.new
-        end
-
-        def field name, options = {}
-          puffer_fields[@puffer_option] ||= Puffer::Fields.new
-          field = puffer_fields[@puffer_option].field(current_resource.model, name, options)
-          #generate_association_actions field if field.association?
-          #generate_change_actions field if field.toggable?
+          _update_fields.presence || _form_fields
         end
 
       end

data/lib/puffer/controller/helpers.rb

@@ -4,21 +4,66 @@ module Puffer
 
       def self.included base
         base.class_eval do
-          helper_method :resource_session, :puffer_navigation
+          include InstanceMethods
+          extend ClassMethods
+
+          helper_method :resource_session, :puffer_navigation, :sidebar_puffer_navigation, :resource, :record, :records
         end
       end
 
-      def puffer_navigation
+      module ClassMethods
+
+        def model_name
+          @model_name ||= ((puffer? and configuration.model) || controller_name.singularize).to_s
+        end
+
+        def model
+          @model ||= model_name.classify.constantize rescue nil
+        end
 
       end
 
-      def resource_session
-        postfix = params[:action] =~ /associated_/ ? params[:action] : ''
-        name = "#{current_resource.model_name}#{postfix}".to_sym
-        session[:resources] ||= {}
-        session[:resources][name] ||= {}
-        session[:resources][name][:boolean] ||= {}
-        session[:resources][name]
+      module InstanceMethods
+
+        def puffer_navigation
+          Rails.application.routes.puffer[resource.prefix].values.map(&:first).each do |controller|
+            title = controller.configuration.group.to_s.humanize
+            path = send("#{resource.prefix}_#{controller.controller_name}_path")
+            current = puffer? && resource.root.controller.configuration.group == controller.configuration.group
+            yield title, path, current
+          end
+        end
+
+        def sidebar_puffer_navigation
+          (Rails.application.routes.puffer[resource.prefix][configuration.group] || []).each do |controller|
+            title = controller.model.model_name.human
+            path = send("#{resource.prefix}_#{controller.controller_name}_path")
+            current = controller.controller_name == resource.controller_name
+            yield title, path, current
+          end if puffer?
+        end
+
+        def resource_session
+          postfix = params[:action] =~ /associated_/ ? params[:action] : ''
+          name = "#{resource.model_name}#{postfix}".to_sym
+          session[:resources] ||= {}
+          session[:resources][name] ||= {}
+          session[:resources][name][:boolean] ||= {}
+          session[:resources][name]
+        end
+
+        def resource
+          @resource ||= Puffer::Resource.new params, request
+        end
+
+        def record
+          @record || instance_variable_get("@#{resource.model_name}")
+        end
+
+        def records
+          @records || instance_variable_get("@#{resource.model_name.pluralize}")
+        end
+
       end
 
     end

data/lib/puffer/controller/mutate.rb

@@ -4,38 +4,20 @@ module Puffer
 
       def self.included base
         base.class_eval do
-          class_attribute :current_config
-          self.current_config = Puffer::Controller::Config.new
-
           extend ClassMethods
 
           layout 'puffer'
+          helper_method :puffer?
 
-          helper_method :current_resource, :current_config, :record, :records
-
-          rescue_from ActionView::MissingTemplate do |exception|
-            render current_resource.template(exception.path.split('/').last)
-          end
+          self.view_paths = Puffer::PathSet.new view_paths
         end
       end
 
-      def current_resource
-        @current_resource ||= Puffer::Resource.new params, request
-      end
-
-      def record
-        @record || instance_variable_get("@#{current_resource.model_name}")
-      end
-
-      def records
-        @records || instance_variable_get("@#{current_resource.model_name.pluralize}")
-      end
+      def puffer?; true; end
 
       module ClassMethods
 
-        def puffer?
-          true
-        end
+        def puffer?; true; end
 
       end
 

data/lib/puffer/engine.rb

@@ -0,0 +1,9 @@
+module Puffer
+  class Engine < Rails::Engine
+    config.autoload_paths << File.join(root, 'lib')
+
+    initializer 'puffer.add_cells_paths', :after => :add_view_paths do
+      Cell::Base.prepend_view_path(Cells::DEFAULT_VIEW_PATHS.map { |path| File.join(root, path) })
+    end
+  end
+end

data/lib/puffer/extensions/controller.rb

@@ -6,14 +6,16 @@ module Puffer
         def self.included base
           base.class_eval do
             extend ClassMethods
+
+            helper_method :puffer?
           end
         end
 
+        def puffer?; false; end
+
         module ClassMethods
 
-          def puffer?
-            false
-          end
+          def puffer?; false; end
 
         end
 

data/lib/puffer/extensions/form.rb

@@ -0,0 +1,14 @@
+module Puffer
+  module Extensions
+    module FormBuilder
+
+      def puffer_field field
+        input = Puffer::Inputs.map_field field
+        input.new(self, @template, field).render
+      end
+
+    end
+  end
+end
+
+ActionView::Helpers::FormBuilder.send :include, Puffer::Extensions::FormBuilder

data/lib/puffer/extensions/mapper.rb

@@ -21,6 +21,14 @@ module Puffer
           puffer_resources(*resources, &block) || original_resources(*resources, &block)
         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
+        end
+
         def puffer_resource(*resources, &block)
           options = resources.extract_options!
 
@@ -36,6 +44,8 @@ module Puffer
           @scope[:ancestors] ||= []
           @scope[:children] ||= []
 
+          puffer_controller controller if @scope[:ancestors] == []
+
           resource_scope(resource) do
             siblings = @scope[:children].dup
             @scope[:children] = []
@@ -83,6 +93,8 @@ module Puffer
           @scope[:ancestors] ||= []
           @scope[:children] ||= []
 
+          puffer_controller controller if @scope[:ancestors] == []
+
           resource_scope(resource) do
             siblings = @scope[:children].dup
             @scope[:children] = []
@@ -119,7 +131,31 @@ module Puffer
       end
 
     end
+
+    module RouteSet
+
+      def self.included base
+        base.class_eval do
+          alias_method :original_clear!, :clear!
+          attr_accessor_with_default :puffer, {}
+
+          include InstanceMethods
+        end
+      end
+
+      module InstanceMethods
+
+        def clear!
+          self.puffer = {}
+          original_clear!
+        end
+
+      end
+
+    end
+
   end
 end
 
+ActionDispatch::Routing::RouteSet.send :include, Puffer::Extensions::RouteSet
 ActionDispatch::Routing::Mapper.send :include, Puffer::Extensions::Mapper

data/lib/puffer/fields.rb

@@ -1,6 +1,27 @@
 module Puffer
   class Fields < Array
 
+    class_attribute :offers
+    self.offers = []
+
+    def self.offer_type &block
+      offers.push block if block_given?
+    end
+
+    def self.offered_type field
+      swallow_nil{ offers.detect { |offer| offer.call(field) }.call(field) }
+    end
+
+    offer_type do |field|
+      :select if field.options.key?(:select)
+    end
+    offer_type do |field|
+      :password if field.name =~ /password/
+    end
+    offer_type do |field|
+      field.model.reflect_on_association(name.to_sym).macro if field.model.reflect_on_association name.to_sym
+    end
+
     def field *args
       push Field.new(*args)
     end

data/lib/puffer/fields/field.rb

@@ -19,7 +19,7 @@ module Puffer
       end
 
       def label
-        @label ||= options[:label] || model.human_attribute_name(name)
+        @label ||= resource.human_attribute_name(field)
       end
 
       def order
@@ -27,18 +27,23 @@ module Puffer
       end
 
       def type
-        @type ||= options[:type] ? options[:type].to_sym : (column ? column.type : :string)
+        @type ||= options[:type] ? options[:type].to_sym : (Puffer::Fields.offered_type(self) || (column ? column.type : :string))
       end
 
       def to_s
         field
       end
 
+      def input_options
+        {}
+      end
+
       def model
         unless @model
           @model = resource
           associations = field.split('.')
-          while @model.reflect_on_association(association = associations.shift.to_sym) do
+          associations.pop
+          while @model.reflect_on_association(association = swallow_nil{associations.shift.to_sym}) do
             @model = @model.reflect_on_association(association).klass
           end
         end

data/lib/puffer/inputs.rb

@@ -0,0 +1,23 @@
+module Puffer
+  module Inputs
+
+    mattr_accessor :mappings
+    self.mappings = {}
+
+    def self.map_type *args
+      to = args.extract_options![:to]
+      raise ArgumentError, "You need to give :to as option to map_type" unless to
+      args.each { |type| mappings[type] = to }
+    end
+
+    map_type :belongs_to, :has_one, :to => Puffer::Inputs::Association
+    map_type :has_many, :has_and_belongs_to_many, :to => Puffer::Inputs::CollectionAssociation
+    map_type :date, :time, :datetime, :timestamp, :to => Puffer::Inputs::DateTime
+
+    def self.map_field field
+      mappings[field.type] || (const_defined?(field.type.to_s.classify) ?
+        "Puffer::Inputs::#{field.type.to_s.classify}".constantize : Puffer::Inputs::Base)
+    end
+
+  end
+end

data/lib/puffer/inputs/association.rb

@@ -0,0 +1,11 @@
+module Puffer
+  module Inputs
+    class Association < Puffer::Inputs::Base
+
+      def input
+        field.type
+      end
+
+    end
+  end
+end

data/lib/puffer/inputs/base.rb

@@ -0,0 +1,39 @@
+module Puffer
+  module Inputs
+    class Base
+
+      attr_accessor :builder, :template, :field
+
+      def initialize builder, template, field
+        @builder = builder
+        @field = field
+        @template = template
+      end
+
+      def render
+        template.html_safe
+      end
+
+      def template
+        <<-INPUT
+          #{label}
+          #{error}
+          #{input}
+        INPUT
+      end
+
+      def label
+        builder.label field
+      end
+
+      def input
+        builder.text_field field, field.input_options
+      end
+
+      def error
+        builder.object.errors[field.name.to_sym].first
+      end
+
+    end
+  end
+end