compass-jquery-plugin 0.3.0.beta.21 → 0.3.0.beta.22

data/lib/jquery/flash_messages.rb

@@ -1,45 +1,45 @@
-module FlashMessages
-  module ControllerMethods
-    TYPES = [:success, :notice, :warning, :error]
-    
-    TYPES.each do |type|
-      define_method(type) do |msg|
-        flash[type] = msg
-      end
-      
-      define_method("#{type}_now") do |msg|
-        flash.now[type] = msg
-      end
-    end
-  end
-
-  module Display
-#    def flash_messages
-#      returning html = String.new do
-#        flash.each do |css_class, message|
-#          html << content_tag(:div, content_tag(:div, nil, :class => :icon) + message, :class => css_class)
-#        end
-#      end
-#    end
-    
-  FLASH_NOTICE_KEYS = [:error, :warning, :notice, :success]
-
-  def flash_messages
-    return unless messages = flash.keys.select{|k| FLASH_NOTICE_KEYS.include?(k)}
-    formatted_messages = messages.map do |type|      
-      content_tag(:div, nil, :class => type.to_s) do
-        message_for_item(flash[type], flash["#{type}_item".to_sym])
-      end
-    end
-    formatted_messages.join
-  end
-
-    def message_for_item(message, item = nil)
-      if item.is_a?(Array)
-        content_tag(:div, nil, :class => :icon) + message % link_to(*item)
-      else
-        content_tag(:div, nil, :class => :icon) + message % item
-      end
-    end
-  end
-end
+module FlashMessages
+  module ControllerMethods
+    TYPES = [:success, :notice, :warning, :error]
+    
+    TYPES.each do |type|
+      define_method(type) do |msg|
+        flash[type] = msg
+      end
+      
+      define_method("#{type}_now") do |msg|
+        flash.now[type] = msg
+      end
+    end
+  end
+
+  module Display
+#    def flash_messages
+#      returning html = String.new do
+#        flash.each do |css_class, message|
+#          html << content_tag(:div, content_tag(:div, nil, :class => :icon) + message, :class => css_class)
+#        end
+#      end
+#    end
+    
+    FLASH_NOTICE_KEYS = [:error, :warning, :notice, :success]
+  
+    def flash_messages
+      return unless messages = flash.keys.select{|k| FLASH_NOTICE_KEYS.include?(k)}
+      formatted_messages = messages.map do |type|      
+        content_tag(:div, nil, :class => type.to_s + " ui-corner-all") do
+          message_for_item(flash[type], flash["#{type}_item".to_sym])
+        end
+      end
+      formatted_messages.join
+    end
+
+    def message_for_item(message, item = nil)
+      if item.is_a?(Array)
+        content_tag(:div, nil, :class => :icon) + message % link_to(*item)
+      else
+        content_tag(:div, nil, :class => :icon) + message % item
+      end
+    end
+  end
+end

data/lib/jquery/gridify/grid.rb

@@ -1,147 +1,147 @@
-require 'jquery/gridify/assertions'
-require 'jquery/gridify/grid_options'
-require 'jquery/gridify/grid_view'
-require 'jquery/gridify/grid_column'
-require 'jquery/gridify/grid_finder'
-
-# NOTE: for readablity/clarity, native jqGrid options should be string; Ruby ones as syms
-
-module Gridify
-  class Grid
-    include Assertions
-
-    # todo: change this so klass is optional, decouple from active record
-    def initialize( klass, *args, &block )
-      #debugger
-      options = args.extract_options! # => args.last.is_a?(Hash) ? args.pop : {}
-      assert_exclusive_keys( options, :only, :except)
-      
-      @resource = klass.to_s.tableize.pluralize
-      @name = args.first || :grid
-      
-      # non-persistent options
-      # generate model unless explicitly say no
-      build_model = options.delete(:build_model) == false ? false : true
-      only = options.delete(:only)
-      except = options.delete(:except)
-      col_presets = options.delete(:colModel)
-      
-      # assign options
-      update options
-      
-      # build columns from ActiveRecord model (klass)
-      if klass.present? && build_model
-        @model = build_columns klass, only, except, col_presets
-      end
-      
-      instance_eval(&block) if block
-      #(note instance_eval cannot access things outside its scope; otherwise do this:
-      #yield self if block_given?
-    end
-    
-    def update( options )
-      options.each {|atr, val| send( "#{atr}=", val )}
-      # exception "invalid option..."
-    end
-
-    def column( name, options={} )
-      name = name.to_s
-      klass = resource.classify.constantize
-      # TODO: set edit options based on ar_column 
-      # TODO: edit
-      # TODO: handle file input types
-      # TODO: custom input types 
-      if col = columns_hash[name]
-        # update an existing column
-        col.update options
-        
-      elsif ar = klass.columns.detect {|c| c.name==name}
-        #debugger
-        # create column from database schema
-        edit = editable && 
-          # only edit accessible attributes
-          (klass.accessible_attributes.nil? || klass.accessible_attributes.include?(ar.name))
-        args = {
-          :ar_column => ar,
-          :name => ar.name,
-          :value_type => ar.type,
-          :searchable => searchable,
-          :sortable => sortable,
-          :editable => edit
-        }.merge(options)
-        colModel << GridColumn.new( args)
-        
-      else
-        # create column from scratch
-        args = {
-          :name => name,
-          :value_type => :string,
-          :searchable => searchable,
-          :sortable => sortable,
-          :editable => edit
-        }.merge(options)
-        colModel << GridColumn.new( args)
-      end
-    end
-  
-    def column_names
-      colModel.collect {|col| col.name.titleize }
-    end
-    
-    def column_model
-      colModel.collect {|col| col.properties }
-    end
-    
-    # normally we need to keep columns an ordered array, sometimes its convenient to have a hash
-    def columns_hash
-      colModel.inject({}) {|h, col| h[col.name] = col; h }
-    end
-    
-    protected
-    
-    # # isnt there something in rails to do this already?
-    # def parse_options( keys, options )
-    #   ops = keys.inject({}) do |h, k| 
-    #     val = options.delete(k) 
-    #     h[k] = val unless val.nil?
-    #     h
-    #   end
-    #   ops || {}
-    # end
-
-    # generate list of columns based on AR model
-    # option:  :only or :except
-    #          :col_options  hash of hash of preset values for columns (eg from cookie) { :title => {:width => 98}}
-    def build_columns( klass, only, except, presets )
-      #debugger
-      # stringify
-      only = Array(only).map {|s| s.to_s }
-      except = Array(except).map {|s| s.to_s }
-      presets ||= {}
-      presets.stringify_keys!
-      
-      self.colModel = klass.columns.collect do |ar|
-        #debugger
-        next if only.present? && !only.include?(ar.name)
-        next if except.present? && except.include?(ar.name)
-        is_key = (ar.name=='id')
-        edit = editable && !is_key && 
-          # only edit accessible attributes
-          (klass.accessible_attributes.nil? || klass.accessible_attributes.include?(ar.name))
-        args = {
-          :ar_column => ar,
-          :name => ar.name,
-          :value_type => ar.type,
-          :key => is_key,
-          #:hidden => is_key,
-          :searchable => searchable,
-          :sortable => sortable,
-          :editable => edit
-        }
-
-        # create column with default args merged with options given for this column
-        GridColumn.new args.merge( presets[ar.name]||{} )
-      end.compact      
-    end    
-  end
-end
+require 'jquery/gridify/assertions'
+require 'jquery/gridify/grid_options'
+require 'jquery/gridify/grid_view'
+require 'jquery/gridify/grid_column'
+require 'jquery/gridify/grid_finder'
+
+# NOTE: for readablity/clarity, native jqGrid options should be string; Ruby ones as syms
+
+module Gridify
+  class Grid
+    include Assertions
+
+    # todo: change this so klass is optional, decouple from active record
+    def initialize( klass, *args, &block )
+      #debugger
+      options = args.extract_options! # => args.last.is_a?(Hash) ? args.pop : {}
+      assert_exclusive_keys( options, :only, :except)
+      
+      @resource = klass.to_s.tableize.pluralize
+      @name = args.first || :grid
+      
+      # non-persistent options
+      # generate model unless explicitly say no
+      build_model = options.delete(:build_model) == false ? false : true
+      only = options.delete(:only)
+      except = options.delete(:except)
+      col_presets = options.delete(:colModel)
+      col_include = options[:colInclude]
+      
+      # assign options
+      update options
+      
+      # build columns from ActiveRecord model (klass)
+      if klass.present? && build_model
+        @model = build_columns(klass, only, except, col_presets, col_include)
+      end
+      
+      instance_eval(&block) if block
+      #(note instance_eval cannot access things outside its scope; otherwise do this:
+      #yield self if block_given?
+    end
+    
+    def update( options )
+      options.each {|atr, val| send( "#{atr}=", val )}
+      # exception "invalid option..."
+    end
+
+    def column( name, options={} )
+      name = name.to_s
+      klass = resource.classify.constantize
+      # TODO: set edit options based on ar_column 
+      # TODO: edit
+      # TODO: handle file input types
+      # TODO: custom input types 
+      if col = columns_hash[name]
+        # update an existing column
+        col.update options
+        
+      elsif ar = klass.columns.detect {|c| c.name==name}
+        #debugger
+        # create column from database schema
+        edit = editable && 
+          # only edit accessible attributes
+          (klass.accessible_attributes.nil? || klass.accessible_attributes.include?(ar.name))
+        args = {
+          :ar_column => ar,
+          :name => ar.name,
+          :value_type => ar.type,
+          :searchable => searchable,
+          :sortable => sortable,
+          :editable => edit
+        }.merge(options)
+        colModel << GridColumn.new( args)
+        
+      else
+        # create column from scratch
+        args = {
+          :name => name,
+          :value_type => :string,
+          :searchable => searchable,
+          :sortable => sortable,
+          :editable => edit
+        }.merge(options)
+        colModel << GridColumn.new( args)
+      end
+    end
+  
+    def column_names
+      colModel.collect {|col| col.name.titleize }
+    end
+    
+    def column_model
+      colModel.collect {|col| col.properties }
+    end
+    
+    # normally we need to keep columns an ordered array, sometimes its convenient to have a hash
+    def columns_hash
+      colModel.inject({}) {|h, col| h[col.name] = col; h }
+    end
+    
+    protected
+    
+    # # isnt there something in rails to do this already?
+    # def parse_options( keys, options )
+    #   ops = keys.inject({}) do |h, k| 
+    #     val = options.delete(k) 
+    #     h[k] = val unless val.nil?
+    #     h
+    #   end
+    #   ops || {}
+    # end
+
+    # generate list of columns based on AR model
+    # option:  :only or :except
+    #          :col_options  hash of hash of preset values for columns (eg from cookie) { :title => {:width => 98}}
+    def build_columns( klass, only, except, presets, col_include )
+      #debugger
+      # stringify
+      only = Array(only).map {|s| s.to_s }
+      except = Array(except).map {|s| s.to_s }
+      presets ||= {}
+      presets.stringify_keys!
+      
+      self.colModel = klass.columns.collect do |ar|
+        #debugger
+        next if only.present? && !only.include?(ar.name)
+        next if except.present? && except.include?(ar.name)
+        is_key = (ar.name=='id')
+        edit = editable && !is_key && 
+          # only edit accessible attributes
+          (klass.accessible_attributes.nil? || klass.accessible_attributes.include?(ar.name))
+        args = {
+          :ar_column => ar,
+          :name => ar.name,
+          :value_type => ar.type,
+          :key => is_key,
+          #:hidden => is_key,
+          :searchable => searchable,
+          :sortable => sortable,
+          :editable => edit
+        }
+        # create column with default args merged with options given for this column
+        GridColumn.new args.merge( presets[ar.name]||{} )
+      end.compact
+    end
+  end
+end

data/lib/jquery/gridify/grid_column.rb

@@ -1,134 +1,134 @@
-module Gridify
-  class GridColumn
-    
-    attr_accessor :name,                    # attribute name (required)
-                  :label,
-                  :ar_column,               # active_record column
-                  :value_type,              # active_record data type :string, :text, :integer, :float, :boolean, + :currency
-                  :key,                     # true if this is the key (only :id)
-                  
-                  # column formatting
-                  :width,                   # initial width (150)
-                  :fixed_width,             # true = not resized when recalc fit to width
-                  :formatter,               # see jqGrid doc (based on value_type)
-                  :format_options,          # hash, see jqGrid doc (based on value_type)
-                  :align,                   # 'left', 'right', 'center' (left for strings, right for numerics)                  
-                  #:classes,                # optional classes to add to column 
-                  
-                  # column actions
-                  :resizable,               # t/f (true)
-                  :sortable,                # t/f (true) or jqGrid sorttype: :integer, :float, :currency, :date, :text (true)
-                  :searchable,              # true/false (true) or text or select
-                  #:search_options,
-                  :editable,                # true/false (false),
-                  :edit_type,               # text, textarea, select, checkbox, password, button, image and file (based on value_type)
-                  :edit_options,            # html input field options, depends on editable type (eg {"size" => 10, "maxlength" => 15}) see http://www.trirand.com/jqgridwiki/doku.php?id=wiki:common_rules
-                  :validations,             # jqGrid editrules (TODO derive from AR model validations) see http://www.trirand.com/jqgridwiki/doku.php?id=wiki:common_rules
-                                            # "required" "integer" "email" "url" etc
-                  :form_options,            # jqGrid formoptions for formatting input forms
-                  # select types
-                  #:select_url,             # url to dynamically get select options
-                  
-                  # visiblity
-                  #:always_hidden,          # (false)
-                  :sorttype,
-                  :summary_type,
-                  :summary_tpl,
-                  :hidden                   # initial hide state (false)
-     
-    def initialize(options)
-      update options
-    end
-    
-    def update(options)
-      options.each {|atr, val| send( "#{atr}=", val )}
-    end
-    
-    def to_json
-      properties.to_json #_with_js
-    end
-    
-    def properties
-      jqgrid_properties
-    end
-    
-    def resizable
-      if @resizable==false
-        false
-      else
-        # true or nil
-        true
-      end
-    end
-    
-    def fixed_width
-      if @fixed_width==false
-        false
-      elsif @fixed_width.nil?
-        !resizable
-      else
-        @fixed_width
-      end
-    end
-        
-    # ----------------
-    private
-    
-    def jqgrid_type
-      return sortable unless sortable==true
-      case value_type
-      when :string   : 'text'
-      when :text     : 'text'
-      when :integer  : 'integer'
-      when :float    : 'float'
-      when :boolean  : 'boolean'
-      when :datetime : 'date'
-      end
-    end
-    
-    # note, we dont vals[:foo] = foo because dont want to bother generating key if its same as jqGrid default
-    def jqgrid_properties
-      vals = {
-        :name           => name,
-        :index          => name
-      }
-      #xmlmap not required when same as :name
-      # vals[:xmlmap]     = name          if data_type == :xml
-      # vals[:jsonmap]    = name          if data_type == :json
-      
-      vals[:label]      = label || name.titleize
-      vals[:resizable]  = false         if resizable==false
-      vals[:fixed]      = fixed_width   unless fixed_width==false
-      vals[:sortable]   = false         if sortable==false
-      vals[:sorttype]   = jqgrid_type   if sortable 
-      vals[:search]     = false         if searchable==false  
-      vals[:editable]   = true          if editable
-      vals[:align]      = align         if align
-      #vals[:align]      = 'right'       if [:integer, :float, :currency].include?(value_type)
-      case value_type
-      when :datetime
-        vals[:formatter] = 'date'
-        vals[:formatoptions] = { :srcformat => 'UniversalSortableDateTime', :newformat => 'FullDateTime' }
-      end
-      vals[:hidden]         = true         if hidden
-      vals[:width]          = width        if width
-      vals[:formatter]      = formatter    if formatter
-      vals[:formatoptions]  = format_options  if format_options
-      vals[:edittype]       = edit_type    if editable && edit_type
-      vals[:formoptions]    = form_options if editable && form_options
-      vals[:editoptions]    = edit_options if editable && edit_options
-      vals[:editrules]      = validations  if editable && validations
-      
-      vals[:sorttype]       = sorttype if sorttype
-      vals[:summaryType]    = summary_type if summary_type
-      vals[:summaryTpl]     = summary_tpl if summary_tpl
-      # and more...
-        
-      vals
-    end
-    
-  end
-end
-
-#<ActiveRecord::ConnectionAdapters::SQLiteColumn:0x2515a98 @sql_type="varchar(255)", @name="title", @precision=nil, @primary=false, @default=nil, @limit=255, @null=true, @type=:string, @scale=nil>
-
+module Gridify
+  class GridColumn
+    
+    attr_accessor :name,                    # attribute name (required)
+                  :label,
+                  :ar_column,               # active_record column
+                  :value_type,              # active_record data type :string, :text, :integer, :float, :boolean, + :currency
+                  :key,                     # true if this is the key (only :id)
+                  
+                  # column formatting
+                  :width,                   # initial width (150)
+                  :fixed_width,             # true = not resized when recalc fit to width
+                  :formatter,               # see jqGrid doc (based on value_type)
+                  :format_options,          # hash, see jqGrid doc (based on value_type)
+                  :align,                   # 'left', 'right', 'center' (left for strings, right for numerics)                  
+                  #:classes,                # optional classes to add to column 
+                  
+                  # column actions
+                  :resizable,               # t/f (true)
+                  :sortable,                # t/f (true) or jqGrid sorttype: :integer, :float, :currency, :date, :text (true)
+                  :searchable,              # true/false (true) or text or select
+                  #:search_options,
+                  :editable,                # true/false (false),
+                  :edit_type,               # text, textarea, select, checkbox, password, button, image and file (based on value_type)
+                  :edit_options,            # html input field options, depends on editable type (eg {"size" => 10, "maxlength" => 15}) see http://www.trirand.com/jqgridwiki/doku.php?id=wiki:common_rules
+                  :validations,             # jqGrid editrules (TODO derive from AR model validations) see http://www.trirand.com/jqgridwiki/doku.php?id=wiki:common_rules
+                                            # "required" "integer" "email" "url" etc
+                  :form_options,            # jqGrid formoptions for formatting input forms
+                  # select types
+                  #:select_url,             # url to dynamically get select options
+                  
+                  # visiblity
+                  #:always_hidden,          # (false)
+                  :sort_type,
+                  :summary_type,
+                  :summary_tpl,
+                  :hidden                   # initial hide state (false)
+     
+    def initialize(options)
+      update options
+    end
+    
+    def update(options)
+      options.each {|atr, val| send( "#{atr}=", val )}
+    end
+    
+    def to_json
+      properties.to_json #_with_js
+    end
+    
+    def properties
+      jqgrid_properties
+    end
+    
+    def resizable
+      if @resizable==false
+        false
+      else
+        # true or nil
+        true
+      end
+    end
+    
+    def fixed_width
+      if @fixed_width==false
+        false
+      elsif @fixed_width.nil?
+        !resizable
+      else
+        @fixed_width
+      end
+    end
+        
+    # ----------------
+    private
+    
+    def jqgrid_type
+      return sortable unless sortable==true
+      case value_type
+      when :string   : 'text'
+      when :text     : 'text'
+      when :integer  : 'integer'
+      when :float    : 'float'
+      when :boolean  : 'boolean'
+      when :datetime : 'date'
+      end
+    end
+    
+    # note, we dont vals[:foo] = foo because dont want to bother generating key if its same as jqGrid default
+    def jqgrid_properties
+      vals = {
+        :name           => name,
+        :index          => name
+      }
+      #xmlmap not required when same as :name
+      # vals[:xmlmap]     = name          if data_type == :xml
+      # vals[:jsonmap]    = name          if data_type == :json
+      
+      vals[:label]      = label || name.titleize
+      vals[:resizable]  = false         if resizable==false
+      vals[:fixed]      = fixed_width   unless fixed_width==false
+      vals[:sortable]   = false         if sortable==false
+      vals[:sort_type]   = jqgrid_type   if sortable 
+      vals[:search]     = false         if searchable==false  
+      vals[:editable]   = true          if editable
+      vals[:align]      = align         if align
+      #vals[:align]      = 'right'       if [:integer, :float, :currency].include?(value_type)
+      case value_type
+      when :datetime
+        vals[:formatter] = 'date'
+        vals[:formatoptions] = { :srcformat => 'UniversalSortableDateTime', :newformat => 'FullDateTime' }
+      end
+      vals[:hidden]         = true         if hidden
+      vals[:width]          = width        if width
+      vals[:formatter]      = formatter    if formatter
+      vals[:formatoptions]  = format_options  if format_options
+      vals[:edittype]       = edit_type    if editable && edit_type
+      vals[:formoptions]    = form_options if editable && form_options
+      vals[:editoptions]    = edit_options if editable && edit_options
+      vals[:editrules]      = validations  if editable && validations
+      
+      vals[:sort_type]      = sort_type if sort_type
+      vals[:summaryType]    = summary_type if summary_type
+      vals[:summaryTpl]     = summary_tpl if summary_tpl
+      # and more...
+        
+      vals
+    end
+    
+  end
+end
+
+#<ActiveRecord::ConnectionAdapters::SQLiteColumn:0x2515a98 @sql_type="varchar(255)", @name="title", @precision=nil, @primary=false, @default=nil, @limit=255, @null=true, @type=:string, @scale=nil>
+