puffer 0.0.3 → 0.0.4

data/lib/generators/puffer/install/templates/puffer/javascripts/rails.js

@@ -0,0 +1,175 @@
+(function() {
+  // Technique from Juriy Zaytsev
+  // http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
+  function isEventSupported(eventName) {
+    var el = document.createElement('div');
+    eventName = 'on' + eventName;
+    var isSupported = (eventName in el);
+    if (!isSupported) {
+      el.setAttribute(eventName, 'return;');
+      isSupported = typeof el[eventName] == 'function';
+    }
+    el = null;
+    return isSupported;
+  }
+
+  function isForm(element) {
+    return Object.isElement(element) && element.nodeName.toUpperCase() == 'FORM'
+  }
+
+  function isInput(element) {
+    if (Object.isElement(element)) {
+      var name = element.nodeName.toUpperCase()
+      return name == 'INPUT' || name == 'SELECT' || name == 'TEXTAREA'
+    }
+    else return false
+  }
+
+  var submitBubbles = isEventSupported('submit'),
+      changeBubbles = isEventSupported('change')
+
+  if (!submitBubbles || !changeBubbles) {
+    // augment the Event.Handler class to observe custom events when needed
+    Event.Handler.prototype.initialize = Event.Handler.prototype.initialize.wrap(
+      function(init, element, eventName, selector, callback) {
+        init(element, eventName, selector, callback)
+        // is the handler being attached to an element that doesn't support this event?
+        if ( (!submitBubbles && this.eventName == 'submit' && !isForm(this.element)) ||
+             (!changeBubbles && this.eventName == 'change' && !isInput(this.element)) ) {
+          // "submit" => "emulated:submit"
+          this.eventName = 'emulated:' + this.eventName
+        }
+      }
+    )
+  }
+
+  if (!submitBubbles) {
+    // discover forms on the page by observing focus events which always bubble
+    document.on('focusin', 'form', function(focusEvent, form) {
+      // special handler for the real "submit" event (one-time operation)
+      if (!form.retrieve('emulated:submit')) {
+        form.on('submit', function(submitEvent) {
+          var emulated = form.fire('emulated:submit', submitEvent, true)
+          // if custom event received preventDefault, cancel the real one too
+          if (emulated.returnValue === false) submitEvent.preventDefault()
+        })
+        form.store('emulated:submit', true)
+      }
+    })
+  }
+
+  if (!changeBubbles) {
+    // discover form inputs on the page
+    document.on('focusin', 'input, select, texarea', function(focusEvent, input) {
+      // special handler for real "change" events
+      if (!input.retrieve('emulated:change')) {
+        input.on('change', function(changeEvent) {
+          input.fire('emulated:change', changeEvent, true)
+        })
+        input.store('emulated:change', true)
+      }
+    })
+  }
+
+  function handleRemote(element) {
+    var method, url, params;
+
+    var event = element.fire("ajax:before");
+    if (event.stopped) return false;
+
+    if (element.tagName.toLowerCase() === 'form') {
+      method = element.readAttribute('method') || 'post';
+      url    = element.readAttribute('action');
+      params = element.serialize();
+    } else {
+      method = element.readAttribute('data-method') || 'get';
+      url    = element.readAttribute('href');
+      params = {};
+    }
+
+    new Ajax.Request(url, {
+      method: method,
+      parameters: params,
+      evalScripts: true,
+
+      onComplete:    function(request) { element.fire("ajax:complete", request); },
+      onSuccess:     function(request) { element.fire("ajax:success",  request); },
+      onFailure:     function(request) { element.fire("ajax:failure",  request); }
+    });
+
+    element.fire("ajax:after");
+  }
+
+  function handleMethod(element) {
+    var method = element.readAttribute('data-method'),
+        url = element.readAttribute('href'),
+        csrf_param = $$('meta[name=csrf-param]')[0],
+        csrf_token = $$('meta[name=csrf-token]')[0];
+
+    var form = new Element('form', { method: "POST", action: url, style: "display: none;" });
+    element.parentNode.insert(form);
+
+    if (method !== 'post') {
+      var field = new Element('input', { type: 'hidden', name: '_method', value: method });
+      form.insert(field);
+    }
+
+    if (csrf_param) {
+      var param = csrf_param.readAttribute('content'),
+          token = csrf_token.readAttribute('content'),
+          field = new Element('input', { type: 'hidden', name: param, value: token });
+      form.insert(field);
+    }
+
+    form.submit();
+  }
+
+
+  document.on("click", "*[data-confirm]", function(event, element) {
+    var message = element.readAttribute('data-confirm');
+    if (!confirm(message)) event.stop();
+  });
+
+  document.on("click", "a[data-remote]", function(event, element) {
+    if (event.stopped) return;
+    handleRemote(element);
+    event.stop();
+  });
+
+  document.on("click", "a[data-method]", function(event, element) {
+    if (event.stopped) return;
+    handleMethod(element);
+    event.stop();
+  });
+
+  document.on("submit", function(event) {
+    var element = event.findElement(),
+        message = element.readAttribute('data-confirm');
+    if (message && !confirm(message)) {
+      event.stop();
+      return false;
+    }
+
+    var inputs = element.select("input[type=submit][data-disable-with]");
+    inputs.each(function(input) {
+      input.disabled = true;
+      input.writeAttribute('data-original-value', input.value);
+      input.value = input.readAttribute('data-disable-with');
+    });
+
+    var element = event.findElement("form[data-remote]");
+    if (element) {
+      handleRemote(element);
+      event.stop();
+    }
+  });
+
+  document.on("ajax:after", "form", function(event, element) {
+    var inputs = element.select("input[type=submit][disabled=true][data-disable-with]");
+    inputs.each(function(input) {
+      input.value = input.readAttribute('data-original-value');
+      input.removeAttribute('data-original-value');
+      input.disabled = false;
+    });
+  });
+})();

data/lib/puffer/base.rb

@@ -2,7 +2,7 @@ module Puffer
   class Base < ApplicationController
     unloadable
 
-    respond_to :html
+    respond_to :html, :js
 
     include Puffer::Controller::Mutate
     include Puffer::Controller::Dsl

data/lib/puffer/controller/dsl.rb

@@ -33,31 +33,30 @@ module Puffer
         end
 
         def index_fields
-          puffer_fields[:index] || []
+          puffer_fields[:index] || Puffer::Fields.new
         end
 
         def show_fields
-          puffer_fields[:show] || puffer_fields[:index] || []
+          puffer_fields[:show] || puffer_fields[:index] || Puffer::Fields.new
         end
 
         def form_fields
-          puffer_fields[:form] || []
+          puffer_fields[:form] || Puffer::Fields.new
         end
 
         def create_fields
-          puffer_fields[:create] || puffer_fields[:form] || []
+          puffer_fields[:create] || puffer_fields[:form] || Puffer::Fields.new
         end
 
         def update_fields
-          puffer_fields[:update] || puffer_fields[:form] || []
+          puffer_fields[:update] || puffer_fields[:form] || Puffer::Fields.new
         end
 
         def field name, options = {}
-          puffer_fields[@puffer_option] ||= []
-          field = ::Puffer::Field.new(current_resource.model, name, options)
-          generate_association_actions field if field.association?
-          generate_change_actions field if field.toggable?
-          puffer_fields[@puffer_option] << field
+          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?
         end
 
       end

data/lib/puffer/controller/helpers.rb

@@ -4,7 +4,7 @@ module Puffer
 
       def self.included base
         base.class_eval do
-          helper_method :resource_session, :searchable_fields, :boolean_fields, :puffer_navigation
+          helper_method :resource_session, :puffer_navigation
         end
       end
 
@@ -21,14 +21,6 @@ module Puffer
         session[:resources][name]
       end
 
-      def searchable_fields fields
-        @searchable_fields ||= fields.map { |f| f if [:text, :string, :integer, :decimal, :float].include? f.type }.compact
-      end
-
-      def boolean_fields
-        @boolean_fields ||= index_fields.map { |f| f if ['boolean'].include? f.type.to_s }.compact
-      end
-
     end
   end
 end

data/lib/puffer/controller/mutate.rb

@@ -37,10 +37,6 @@ module Puffer
           true
         end
 
-        def configure &block
-          block.bind(current_config).call
-        end
-
       end
 
     end

data/lib/puffer/fields/field.rb

@@ -0,0 +1,58 @@
+module Puffer
+  class Fields
+    class Field
+
+      attr_accessor :resource, :field, :options
+
+      def initialize resource, field, options = {}
+        @resource = resource
+        @field = field.to_s
+        @options = options
+      end
+
+      def native?
+        model == resource
+      end
+
+      def name
+        field.split('.').last
+      end
+
+      def label
+        @label ||= options[:label] || model.human_attribute_name(name)
+      end
+
+      def order
+        @order ||= options[:order] || query_column
+      end
+
+      def type
+        @type ||= options[:type] ? options[:type].to_sym : (column ? column.type : :string)
+      end
+
+      def to_s
+        field
+      end
+
+      def model
+        unless @model
+          @model = resource
+          associations = field.split('.')
+          while @model.reflect_on_association(association = associations.shift.to_sym) do
+            @model = @model.reflect_on_association(association).klass
+          end
+        end
+        @model
+      end
+
+      def column
+        @column ||= model.columns_hash[name]
+      end
+
+      def query_column
+        "#{model.table_name}.#{name}" if column
+      end
+
+    end
+  end
+end

data/lib/puffer/fields.rb

@@ -0,0 +1,17 @@
+module Puffer
+  class Fields < Array
+
+    def field *args
+      push Field.new(*args)
+    end
+
+    def searchable
+      @searchable ||= reject { |f| ![:text, :string, :integer, :decimal, :float].include? f.type }
+    end
+
+    def boolean
+      @boolean ||= reject { |f| f.type != :boolean }
+    end
+
+  end
+end

data/lib/puffer/resource/scoping.rb

@@ -2,7 +2,13 @@ module Puffer
   class Resource
     module Scoping
 
+      def includes
 
+      end
+
+      def order
+
+      end
 
     end
   end

data/lib/puffer/resource.rb

@@ -29,8 +29,8 @@ module Puffer
       params[:plural]
     end
 
-    def human_name
-      model_name.humanize
+    def human
+      model.model_name.human
     end
 
     def parent
@@ -92,7 +92,7 @@ module Puffer
 
     def collection
       scope = parent ? parent.member.send(model_name.pluralize) : model
-      scope.paginate :page => params[:page]
+      scope.includes(includes).joins(includes).order(order).paginate :page => params[:page]
     end
 
     def member
@@ -112,7 +112,7 @@ module Puffer
         if plural?
           parent.member.send(model_name.pluralize).new attributes
         else
-          parent.member.send("build_#{model_name}")
+          parent.member.send("build_#{model_name}", attributes)
         end
       else
         model.new attributes
@@ -131,7 +131,7 @@ module Puffer
       method = method.to_s
       if method.match(/path$/)
         options = args.extract_options!
-        return send method.gsub(/path$/, 'url'), *(args << options.merge(:routing_type => :path))
+        return send method.gsub(/path$/, 'url'), *(args << options.merge(:routing_type => :path)) if defined? method.gsub(/path$/, 'url')
       end
       model.send method, *args, &block
     end

data/puffer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
-  s.date = %q{2010-12-30}
+  s.date = %q{2011-01-03}
   s.description = %q{In Soviet Russia puffer admins you}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [
@@ -43,6 +43,13 @@ Gem::Specification.new do |s|
     "lib/generators/puffer/controller/templates/controller.rb",
     "lib/generators/puffer/install/USAGE",
     "lib/generators/puffer/install/install_generator.rb",
+    "lib/generators/puffer/install/templates/puffer.rb",
+    "lib/generators/puffer/install/templates/puffer/javascripts/application.js",
+    "lib/generators/puffer/install/templates/puffer/javascripts/controls.js",
+    "lib/generators/puffer/install/templates/puffer/javascripts/dragdrop.js",
+    "lib/generators/puffer/install/templates/puffer/javascripts/effects.js",
+    "lib/generators/puffer/install/templates/puffer/javascripts/prototype.js",
+    "lib/generators/puffer/install/templates/puffer/javascripts/rails.js",
     "lib/puffer.rb",
     "lib/puffer/base.rb",
     "lib/puffer/controller/actions.rb",
@@ -54,7 +61,8 @@ Gem::Specification.new do |s|
     "lib/puffer/extensions/controller.rb",
     "lib/puffer/extensions/core.rb",
     "lib/puffer/extensions/mapper.rb",
-    "lib/puffer/field.rb",
+    "lib/puffer/fields.rb",
+    "lib/puffer/fields/field.rb",
     "lib/puffer/railtie.rb",
     "lib/puffer/resource.rb",
     "lib/puffer/resource/routing.rb",
@@ -117,6 +125,7 @@ Gem::Specification.new do |s|
     "spec/fabricators/tags_fabricator.rb",
     "spec/fabricators/users_fabricator.rb",
     "spec/integration/navigation_spec.rb",
+    "spec/lib/fields_spec.rb",
     "spec/lib/params_spec.rb",
     "spec/lib/render_fallback_spec.rb",
     "spec/lib/resource/routing_spec.rb",
@@ -126,7 +135,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/puffer/puffer}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.1}
   s.summary = %q{Admin interface builder}
   s.test_files = [
     "spec/dummy/app/controllers/admin/categories_controller.rb",
@@ -169,6 +178,7 @@ Gem::Specification.new do |s|
     "spec/fabricators/tags_fabricator.rb",
     "spec/fabricators/users_fabricator.rb",
     "spec/integration/navigation_spec.rb",
+    "spec/lib/fields_spec.rb",
     "spec/lib/params_spec.rb",
     "spec/lib/render_fallback_spec.rb",
     "spec/lib/resource/routing_spec.rb",
@@ -178,12 +188,11 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     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.3"])
-      s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0.beta"])
+      s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
       s.add_development_dependency(%q<capybara>, [">= 0.4.0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
@@ -193,7 +202,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<rails>, ["~> 3.0.3"])
-      s.add_dependency(%q<will_paginate>, ["~> 3.0.beta"])
+      s.add_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
       s.add_dependency(%q<capybara>, [">= 0.4.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
@@ -204,7 +213,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rails>, ["~> 3.0.3"])
-    s.add_dependency(%q<will_paginate>, ["~> 3.0.beta"])
+    s.add_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
     s.add_dependency(%q<capybara>, [">= 0.4.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])

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

@@ -1,3 +1,13 @@
 class Admin::CategoriesController < Puffer::Base
 
+  index do
+    field :id
+    field :title
+  end
+
+  form do
+    field :id
+    field :title
+  end
+
 end

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

@@ -1,3 +1,15 @@
 class Admin::PostsController < Puffer::Base
 
+  index do
+    field :user
+    field :title
+    field :body
+  end
+
+  form do
+    field :user
+    field :title
+    field :body
+  end
+
 end

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

@@ -1,3 +1,17 @@
 class Admin::ProfilesController < Puffer::Base
 
+  index do
+    field :user
+    field :name
+    field :surname
+    field :birth_date
+  end
+
+  form do
+    field :user
+    field :name
+    field :surname
+    field :birth_date
+  end
+
 end

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

@@ -1,3 +1,11 @@
 class Admin::TagsController < Puffer::Base
 
+  index do
+    field :name
+  end
+
+  form do
+    field :name
+  end
+
 end

data/spec/lib/fields_spec.rb

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

data/spec/lib/params_spec.rb

@@ -23,7 +23,7 @@ describe "Params" do
 =end
 
   before :each do
-    @resource = mock(Puffer::Resource, :collection => [], :member => nil, :template => {:nothing => true})
+    @resource = mock(Puffer::Resource, :collection => [], :member => nil, :template => {:nothing => true}, :includes => nil)
     Puffer::Resource.stub(:new) {@resource}
   end