puffer 0.0.7 → 0.0.8

data/lib/generators/puffer/install/templates/puffer/javascripts/right-autocompleter.js

@@ -0,0 +1,18 @@
+/**
+ * RightJS-UI: Autocompleter
+ * http://rightjs.org/ui/autocompleter
+ *
+ * Copyright (C) 2010 Nikolay Nemshilov
+ */
+var Autocompleter=RightJS.Autocompleter=function(h,c){function l(a,b,d,e){if(c.Fx)if(d===undefined){d=a.options.fxName;if(e===undefined){e={duration:a.options.fxDuration,onFinish:c(a.fire).bind(a,b)};if(b==="hide")e.duration=(c.Fx.Durations[e.duration]||e.duration)/2}}if(!c.Fx||!d)a.fire(b);return a.$super(d,e)}function m(a,b,d){var e=(this.reAnchor||(this.reAnchor=new c.Element("div",{"class":"rui-re-anchor"})).insert(this)).insertTo(a,"after").position(),f=a.dimensions(),i=parseInt(a.getStyle("borderTopWidth")),
+j=parseInt(a.getStyle("borderLeftWidth")),q=parseInt(a.getStyle("borderRightWidth")),r=parseInt(a.getStyle("borderBottomWidth"));a=f.top-e.y+i;e=f.left-e.x+j;j=f.width-j-q;f=f.height-i-r;this.setStyle("visibility:hidden").show(null);if(b==="right")e+=j-this.size().x;else a+=f;this.moveTo(e,a);if(d)b==="left"||b==="right"?this.setHeight(f):this.setWidth(j);this.setStyle("visibility:visible").hide(null)}var g=c,n=c.$,s=c.$w,t=c.Xhr,o=c.RegExp,u=c.isArray,p=new c.Class(c.Element,{initialize:function(a){this.$super("div",
+{"class":"rui-spinner"});this.dots=[];for(var b=0;b<(a||4);b++)this.dots.push(new c.Element("div"));this.dots[0].addClass("glowing");this.insert(this.dots);c(this.shift).bind(this).periodical(300)},shift:function(){if(this.visible()){var a=this.dots.pop();this.dots.unshift(a);this.insert(a,"top")}}}),k=new (function(a,b){if(!b){b=a;a="DIV"}var d=new c.Class(c.Element.Wrappers[a]||c.Element,{initialize:function(e,f){this.key=e;var i=[{"class":"rui-"+e}];this instanceof c.Input||this instanceof c.Form||
+i.unshift(a);this.$super.apply(this,i);if(c.isString(f))f=c.$(f);if(f instanceof c.Element){this._=f._;if("$listeners"in f)f.$listeners=f.$listeners;f={}}this.setOptions(f,this);return c.Wrapper.Cache[c.$uid(this._)]=this},setOptions:function(e,f){f=f||this;c.Options.setOptions.call(this,c.Object.merge(e,eval("("+(f.get("data-"+this.key)||"{}")+")")));return this}});d=new c.Class(d,b);c.Observer.createShortcuts(d.prototype,d.EVENTS||[]);return d})("UL",{include:{show:function(a,b){this.constructor.current=
+this;return l(this,"show",a,b)},hide:function(a,b){this.constructor.current=null;return l(this,"show",a,b)},showAt:function(a,b,d){this.hide(null).shownAt=a=c.$(a);m.call(this,a,b,d);return this.show()},toggleAt:function(a,b,d){return this.hidden()?this.showAt(a,b,d):this.hide()}},extend:{version:"2.2.0",EVENTS:s("show hide update load select done"),Options:{url:h.location.href,param:"search",method:"get",minLength:1,threshold:200,cache:true,local:null,fxName:"slide",fxDuration:"short",spinner:"native",
+cssRule:"input[data-autocompleter]"}},initialize:function(a,b){this.input=n(a);this.$super("autocompleter",b).addClass("rui-dd-menu").onMousedown(this.clicked);this.input.autocompleter=this},destroy:function(){delete this.input.autocompleter;return this},prev:function(){return this.pick("prev")},next:function(){return this.pick("next")},done:function(a){if(a=a||this.first("li.current")){a.radioClass("current");this.input.setValue(g(a.html()).stripTags());this.fire("done")}return this.hide()},setOptions:function(a){this.$super(a,
+this.input);a=this.options;g(a.url).includes("%{search}")||(a.url+=(g(a.url).includes("?")?"&":"?")+a.param+"=%{search}")},pick:function(a){var b=this.children(),d=b.first("hasClass","current"),e=b.indexOf(d);if(a=="prev")d=e<1?b.last():b[e<0?0:e-1];else if(a=="next")d=e<0||e==b.length-1?b.first():b[e+1];return this.fire("select",{item:d.radioClass("current")})},clicked:function(a){this.done(a.stop().find("li"))},keypressed:function(){if(this.input.value().length>=this.options.minLength){this.timeout&&
+this.timeout.cancel();this.timeout=g(this.trigger).bind(this).delay(this.options.threshold)}else return this.hide()},trigger:function(){this.timeout=null;this.cache=this.cache||{};var a=this.input.value(),b=this.options;if(a.length<b.minLength)return this.hide();if(this.cache[a])this.suggest(this.cache[a],a);else if(u(b.local))this.suggest(this.findLocal(a),a);else this.request=t.load(b.url.replace("%{search}",encodeURIComponent(a)),{method:b.method,spinner:this.getSpinner(),onComplete:g(function(d){this.fire("load").suggest(d.text,
+a)}).bind(this)})},suggest:function(a,b){if(this.options.cache)this.cache[b]=a;if(g(a).blank())this.hide();else{this.update(a.replace(/<ul[^>]*>|<\/ul>/im,""));this.fire("update");if(!this._connected||this.hidden()){this.showAt(this.input,"bottom","resize");this._connected=true}}return this},findLocal:function(a){var b=new o("("+o.escape(a)+")","ig");return g(this.options.local).map(function(d){if(d.match(b))return"<li>"+d.replace(b,"<strong>$1</strong>")+"</li>"}).compact().join("")},getSpinner:function(){var a=
+this.options,b=a.spinner;if(b=="native"){b=a.spinner=(new p(3)).insertTo(this);b.addClass("rui-autocompleter-spinner")}b instanceof p&&m.call(b,this.input,"right","resize");return b}});n(h).on({focus:function(a){if((a=a.target)&&a instanceof c.Element&&(a.autocompleter||a.match(k.Options.cssRule)))a.autocompleter||new k(a)},blur:function(a){(a=a.target?a.target.autocompleter:null)&&a.visible()&&a.hide()},keydown:function(a){var b=a.target?a.target.autocompleter:null;if(b&&b.visible()){var d={27:"hide",
+38:"prev",40:"next",13:"done"}[a.keyCode];if(d){a.stop();b[d]()}}},keyup:function(a){var b=a.target?a.target.autocompleter:null;b&&!g([9,27,37,38,39,40,13]).include(a.keyCode)&&b.keypressed(a)}});(function(){var a=h.createElement("style"),b=h.createTextNode(" *.rui-dd-menu, *.rui-dd-menu li{margin:0;padding:0;border:none;background:none;list-style:none;font-weight:normal;float:none} *.rui-dd-menu{display:none;position:absolute;z-index:9999;background:white;border:1px solid #BBB;border-radius:.2em;-moz-border-radius:.2em;-webkit-border-radius:.2em;box-shadow:#DDD .2em .2em .4em;-moz-box-shadow:#DDD .2em .2em .4em;-webkit-box-shadow:#DDD .2em .2em .4em} *.rui-dd-menu li{padding:.2em .4em;border-top:none;border-bottom:none;cursor:pointer} *.rui-dd-menu li.current{background:#DDD} *.rui-dd-menu li:hover{background:#EEE}dl.rui-dd-menu dt{padding:.3em .5em;cursor:default;font-weight:bold;font-style:italic;color:#444;background:#EEE}dl.rui-dd-menu dd li{padding-left:1.5em}div.rui-spinner,div.rui-spinner div{margin:0;padding:0;border:none;background:none;list-style:none;font-weight:normal;float:none;display:inline-block; *display:inline; *zoom:1;border-radius:.12em;-moz-border-radius:.12em;-webkit-border-radius:.12em}div.rui-spinner{text-align:center;white-space:nowrap;background:#EEE;border:1px solid #DDD;height:1.2em;padding:0 .2em}div.rui-spinner div{width:.4em;height:70%;background:#BBB;margin-left:1px}div.rui-spinner div:first-child{margin-left:0}div.rui-spinner div.glowing{background:#777}div.rui-re-anchor{margin:0;padding:0;background:none;border:none;float:none;display:inline;position:absolute;z-index:9999}.rui-autocompleter{border-top-color:#DDD !important;border-top-left-radius:0 !important;border-top-right-radius:0 !important;-moz-border-radius-topleft:0 !important;-moz-border-radius-topright:0 !important;-webkit-border-top-left-radius:0 !important;-webkit-border-top-right-radius:0 !important}.rui-autocompleter-spinner{border:none !important;background:none !important;position:absolute;z-index:9999}.rui-autocompleter-spinner div{margin-top:.2em !important; *margin-top:0.1em !important}");
+a.type="text/css";if(a.styleSheet)a.styleSheet.cssText=b.nodeValue;else a.appendChild(b);h.getElementsByTagName("head")[0].appendChild(a)})();return k}(document,RightJS);

data/lib/generators/puffer/install/templates/puffer/stylesheets/puffer.css

@@ -88,7 +88,7 @@ h1
     *display: inline;
     zoom: 1;
     color: #ddd;
-    padding: 3px 12px;
+    padding: 7px 12px;
     font-size: 11pt;
     text-decoration: none;
     text-shadow: #304759 -1px -1px 0;
@@ -120,6 +120,16 @@ h1
     border-bottom-right-radius: 3px;
 }
 
+.sidebar .navigation li .additional dt
+{
+    margin-bottom: 2px;
+}
+
+.sidebar .navigation li .additional dd
+{
+    margin-bottom: 8px;
+}
+
 .columns
 {
 	width: 100%;
@@ -170,7 +180,7 @@ h1
     border-top-left-radius: 5px;
     border-bottom-left-radius: 5px;
     background: #fff;
-    padding: 15px;
+    padding: 30px;
 }
 
 .list_table
@@ -186,6 +196,11 @@ h1
     -webkit-border-radius: 5px;
 }
 
+.list_table *
+{
+    font-size: 8pt;
+}
+
 .list_table tr
 {
     vertical-align: top;
@@ -258,6 +273,40 @@ h1
     background: #f4f4f4;
 }
 
+label, input, textarea
+{
+	font-family: Helvetica, Arial, sans-serif;
+}
+
+input[type=text], input[type=password], textarea
+{
+    border: #ccc solid 1px;
+    font-size: 11pt;
+    padding: 3px 0;
+    border-radius: 3px;
+}
+
+input[type=text]:focus, input[type=password]:focus, textarea:focus
+{
+    border: #536C80 solid 1px;
+}
+
+input[type=submit]
+{
+    border: 0;
+    border-radius: 3px;
+    background: #536C80;
+    color: #ddd;
+    text-shadow: -1px -1px 0 #304759;
+    padding: 3px 10px;
+    font-size: 11pt;
+}
+
+#search
+{
+    width: 120px;
+}
+
 .form
 {
     margin-bottom: 30px;
@@ -269,21 +318,73 @@ h1
     margin-bottom: 8px;
 }
 
+.form li .label
+{
+    margin-bottom: 3px;
+}
+
+.form li .label *
+{
+    display: inline;
+}
+
 .form li label
 {
-    display: block;
-    font-size: 11pt;
+    font-size: 10pt;
     font-weight: bold;
 }
 
 .form li input[type=text], .form li input[type=password], .form li textarea
 {
-    border: #ccc solid 1px;
     width: 100%;
-    font-size: 12pt;
 }
 
  .form li textarea
 {
     height: 60px;
 }
+
+.field_error
+{
+    color: #C83E3E;
+}
+
+.association
+{
+    position: relative;
+}
+
+.association input[disabled]
+{
+    text-indent: 25px;
+}
+
+.association .association_clear
+{
+    position: absolute;
+    top: 4px;
+    left: 9px;
+    cursor: pointer;
+    display: none;
+}
+
+.association .association_clear:hover
+{
+    color: #b00;
+    text-shadow: 1px 1px 2px #555;
+}
+
+.association input[disabled] ~ .association_clear
+{
+    display: block;
+}
+
+.association .rui-autocompleter li .description
+{
+    display: none;
+}
+
+.association .rui-autocompleter li:hover .description
+{
+    display: block;
+}

data/lib/puffer/base.rb

@@ -6,6 +6,7 @@ module Puffer
     include Puffer::Controller::Helpers
     include Puffer::Controller::Dsl
     include Puffer::Controller::Config
+    include Puffer::Controller::Generated
 
     respond_to :html, :js
 
@@ -28,19 +29,19 @@ module Puffer
     def create
       @record = resource.new_member
       @record.save
-      respond_with @record, :location => resource.index_path
+      respond_with @record, :location => resource.collection_path
     end
 
     def update
       @record = resource.member
       @record.update_attributes resource.attributes
-      respond_with @record, :location => resource.index_path
+      respond_with @record, :location => resource.collection_path
     end
 
     def destroy
       @record = resource.member
       @record.destroy
-      redirect_to (request.referrer || resource.index_path)
+      redirect_to (request.referrer || resource.collection_path)
     end
 
   end

data/lib/puffer/controller/actions.rb

@@ -1,79 +1,13 @@
 module Puffer
   module Controller
-    module Actions
+    class Actions < Array
 
-      def self.included base
-        base.class_eval do
-          extend ClassMethods
+      %w(match get post put delete).each do |method|
+        define_method method do |*args|
+          push args.unshift(method)
         end
       end
 
-      module ClassMethods
-
-        def generate_association_actions field
-          field.collection? ? generate_collection_association_actions(field) : generate_single_association_actions(field)
-        end
-
-        def generate_single_association_actions field
-          define_method "associated_#{field}_choosing" do
-            @record = model.find params[:id]
-            @records = field.association.klass.scoped(:conditions => search_query(field.association_fields)).paginate(:page => params[:page], :include => includes(field.association_fields))
-            @field = field
-            render 'puffer/associated/one'
-          end
-        end
-
-        def generate_collection_association_actions field
-          define_method "associated_#{field}" do
-            @record = model.find params[:id]
-            @records = field.association.klass.scoped(:conditions => {:id => params[:ids]}).scoped(:conditions => search_query(field.association_fields)).paginate(:page => params[:page], :include => includes(field.association_fields))
-            @field = field
-            render 'puffer/associated/many'
-          end
-
-          define_method "associated_#{field}_choosing" do
-            @record = model.find params[:id]
-            @records = field.association.klass.scoped(:conditions => search_query(field.association_fields)).paginate(:page => params[:page], :include => includes(field.association_fields))
-            @choosen = field.association.klass.scoped(:conditions => {:id => params[:ids]}).scoped(:conditions => search_query(field.association_fields)).paginate(:page => params[:page], :include => includes(field.association_fields))
-            @field = field
-            render 'puffer/associated/many'
-          end
-        end
-
-        def generate_change_actions field
-          define_method "toggle_#{field}" do
-            @record = model.find params[:id]
-            @field = field
-            @record.toggle! field.name.to_sym
-            render 'puffer/toggle'
-          end
-        end
-
-      private
-
-        def route_member_actions
-          unless @route_member_actions
-            @route_member_actions = {}
-            actions.each do |action|
-              @route_member_actions.merge!(action => :get)
-            end
-            [:form_fields, :update_fields, :create_fields].each do |fields|
-              fields = send fields
-              fields.each do |field|
-                if field.association?
-                  field.collection? ? @route_member_actions.merge!("associated_#{field}" => :get, "associated_#{field}_choosing" => :get) : @route_member_actions.merge!("associated_#{field}_choosing" => :get)
-                end
-              end if fields
-            end
-            index_fields.each do |field|
-              @route_member_actions.merge!("toggle_#{field}" => :post) if field.toggable?
-            end if index_fields
-          end
-          @route_member_actions
-        end
-
-      end
-
     end
   end
 end

data/lib/puffer/controller/dsl.rb

@@ -10,26 +10,44 @@ module Puffer
 
           %w(index show form create update).each do |action|
             class_attribute "_#{action}_fields"
-            send "_#{action}_fields=", Puffer::Fields.new unless send("_#{action}_fields").present?
+            send "_#{action}_fields=", Puffer::Fields.new unless send("_#{action}_fields?")
             helper_method "#{action}_fields"
           end
+
+          class_attribute :_members
+          self._members = Puffer::Controller::Actions.new
+          class_attribute :_collections
+          self._collections = Puffer::Controller::Actions.new
         end
       end
 
       module ClassMethods
 
+        def inherited klass
+          klass._members = _members.dup
+          klass._collections = _collections.dup
+          super
+        end
+
+        def member &block
+          block.bind(_members).call if block_given?
+        end
+
+        def collection &block
+          block.bind(_collections).call if block_given?
+        end
+
         %w(index show form create update).each do |action|
           define_method action do |&block|
-            @_fields = send "_#{action}_fields"
-            @_fields.clear
+            @_fields = send("_#{action}_fields=", Puffer::Fields.new)
             block.call if block
-            @_fields = nil
+            remove_instance_variable :@_fields
           end
         end
 
         def field name, options = {}
           field = @_fields.field(model, name, options) if @_fields
-          #generate_association_actions field if field.association?
+          generate_association_actions field if field.reflection
           #generate_change_actions field if field.toggable?
         end
 

data/lib/puffer/controller/generated.rb

@@ -0,0 +1,65 @@
+module Puffer
+  module Controller
+    module Generated
+
+      def self.included base
+        base.class_eval do
+          extend ClassMethods
+        end
+      end
+
+      module ClassMethods
+
+        def generate_association_actions field
+          field.collection? ? generate_collection_association_actions(field) : generate_single_association_actions(field)
+        end
+
+        def generate_single_association_actions field
+          define_method "associated_#{field}_choosing" do
+            @field = field
+            @record = resource.member if params[:id]
+            @records = field.reflection.klass.includes(field.association_fields.includes).joins(field.association_fields.includes).where(field.association_fields.searches(params[:search])).limit(100).all
+            render 'puffer/associated/one'
+          end
+
+          collection do
+            get "associated_#{field}_choosing"
+          end
+        end
+
+        def generate_collection_association_actions field
+          define_method "associated_#{field}" do
+            @record = resource.member
+            @records = field.association.klass.scoped(:conditions => {:id => params[:ids]}).scoped(:conditions => search_query(field.association_fields)).paginate(:page => params[:page], :include => includes(field.association_fields))
+            @field = field
+            render 'puffer/associated/many'
+          end
+
+          define_method "associated_#{field}_choosing" do
+            @record = resource.member
+            @records = field.association.klass.scoped(:conditions => search_query(field.association_fields)).paginate(:page => params[:page], :include => includes(field.association_fields))
+            @choosen = field.association.klass.scoped(:conditions => {:id => params[:ids]}).scoped(:conditions => search_query(field.association_fields)).paginate(:page => params[:page], :include => includes(field.association_fields))
+            @field = field
+            render 'puffer/associated/many'
+          end
+
+          collection do
+            get "associated_#{field}"
+            get "associated_#{field}_choosing"
+          end
+        end
+
+        def generate_change_actions field
+          define_method "toggle_#{field}" do
+            @record = model.find params[:id]
+            @field = field
+            @record.toggle! field.name.to_sym
+            render 'puffer/toggle'
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/puffer/extensions/activerecord.rb

@@ -8,11 +8,11 @@ module Puffer
         end
 
         def to_title
-          send title_column
+          send title_method
         end
 
-        def title_column
-          self.class.column_names[1].to_sym
+        def title_method
+          self.class.column_names.detect {|c| c =~ /name|title/} || self.class.column_names[1].to_sym
         end
 
       end

data/lib/puffer/extensions/core.rb

@@ -21,11 +21,25 @@ module Puffer
       end
     end
 
+    module Array
+      def to_includes
+        map do |field|
+          sections = field.split('.').map(&:to_sym)
+          hash = sections.pop
+          sections.reverse_each do |section|
+            hash = {section => hash}
+          end
+          hash
+        end
+      end
+    end
+
   end
 end
 
 String.send :include, Puffer::Extensions::String
 Symbol.send :include, Puffer::Extensions::Symbol
+Array.send :include, Puffer::Extensions::Array
 
 Kernel.class_eval do
   def swallow_nil