netzke-basepack 0.7.3 → 0.7.4

data/CHANGELOG.rdoc

@@ -1,6 +1,14 @@
+= 0.7.4 - 2012-03-05
+* bug fix
+  * :enable_pagination is now respected in GridPanel
+  * Virtual columns are not sortable by default now
+  * Datetime column now works
+  * Make Window respect persistence: false
+  * Disable persistence for search window in GridPanel
+
 = 0.7.3 - 2011-10-23
 * bug fix
-  * :sorting_scope config option for GridPanel is now effective
+  * :sorting_scope is now respected in GridPanel
   * regression: filtering on association column is fix (covered with tests)
 
 = 0.7.2 - 2011-10-20

data/javascripts/xdatetime.js

@@ -0,0 +1,195 @@
+/**
+ * @class Ext.ux.form.field.DateTime
+ * @extends Ext.form.FieldContainer
+ * @version 0.2 (July 20th, 2011)
+ * @author atian25 (http://www.sencha.com/forum/member.php?51682-atian25)
+ * @author ontho (http://www.sencha.com/forum/member.php?285806-ontho)
+ * @author jakob.ketterl (http://www.sencha.com/forum/member.php?25102-jakob.ketterl)
+ * @link http://www.sencha.com/forum/showthread.php?134345-Ext.ux.form.field.DateTime
+ */
+Ext.define('Ext.ux.form.field.DateTime', {
+    extend:'Ext.form.FieldContainer',
+    mixins:{
+        field:'Ext.form.field.Field'
+    },
+    alias: 'widget.xdatetime',
+
+    //configurables
+
+    combineErrors: true,
+    msgTarget: 'under',
+    layout: 'hbox',
+    readOnly: false,
+
+    /**
+     * @cfg {String} dateFormat
+     * Convenience config for specifying the format of the date portion.
+     * This value is overridden if format is specified in the dateConfig.
+     * The default is 'Y-m-d'
+     */
+    dateFormat: 'Y-m-d',
+    /**
+     * @cfg {String} timeFormat
+     * Convenience config for specifying the format of the time portion.
+     * This value is overridden if format is specified in the timeConfig.
+     * The default is 'H:i:s'
+     */
+    timeFormat: 'H:i:s',
+//    /**
+//     * @cfg {String} dateTimeFormat
+//     * The format used when submitting the combined value.
+//     * Defaults to 'Y-m-d H:i:s'
+//     */
+//    dateTimeFormat: 'Y-m-d H:i:s',
+    /**
+     * @cfg {Object} dateConfig
+     * Additional config options for the date field.
+     */
+    dateConfig:{},
+    /**
+     * @cfg {Object} timeConfig
+     * Additional config options for the time field.
+     */
+    timeConfig:{},
+
+
+    // properties
+
+    dateValue: null, // Holds the actual date
+    /**
+     * @property dateField
+     * @type Ext.form.field.Date
+     */
+    dateField: null,
+    /**
+     * @property timeField
+     * @type Ext.form.field.Time
+     */
+    timeField: null,
+
+    initComponent: function(){
+        var me = this
+            ,i = 0
+            ,key
+            ,tab;
+
+        me.items = me.items || [];
+
+        me.dateField = Ext.create('Ext.form.field.Date', Ext.apply({
+            format:me.dateFormat,
+            flex:1,
+            isFormField:false, //exclude from field query's
+            submitValue:false
+        }, me.dateConfig));
+        me.items.push(me.dateField);
+
+        me.timeField = Ext.create('Ext.form.field.Time', Ext.apply({
+            format:me.timeFormat,
+            flex:1,
+            isFormField:false, //exclude from field query's
+            submitValue:false
+        }, me.timeConfig));
+        me.items.push(me.timeField);
+
+        for (; i < me.items.length; i++) {
+            me.items[i].on('focus', Ext.bind(me.onItemFocus, me));
+            me.items[i].on('blur', Ext.bind(me.onItemBlur, me));
+            me.items[i].on('specialkey', function(field, event){
+                key = event.getKey();
+                tab = key == event.TAB;
+
+                if (tab && me.focussedItem == me.dateField) {
+                    event.stopEvent();
+                    me.timeField.focus();
+                    return;
+                }
+
+                me.fireEvent('specialkey', field, event);
+            });
+        }
+
+        me.callParent();
+
+        // this dummy is necessary because Ext.Editor will not check whether an inputEl is present or not
+        this.inputEl = {
+            dom:{},
+            swallowEvent:function(){}
+        };
+
+        me.initField();
+    },
+
+    focus:function(){
+        this.callParent();
+        this.dateField.focus();
+    },
+
+    onItemFocus:function(item){
+        if (this.blurTask){
+            this.blurTask.cancel();
+        }
+        this.focussedItem = item;
+    },
+
+    onItemBlur:function(item){
+        var me = this;
+        if (item != me.focussedItem){ return; }
+        // 100ms to focus a new item that belongs to us, otherwise we will assume the user left the field
+        me.blurTask = new Ext.util.DelayedTask(function(){
+            me.fireEvent('blur', me);
+        });
+        me.blurTask.delay(100);
+    },
+
+    getValue: function(){
+        var value = null
+            ,date = this.dateField.getSubmitValue()
+            ,time = this.timeField.getSubmitValue()
+            ,format;
+
+        if (date){
+            if (time){
+                format = this.getFormat();
+                value = Ext.Date.parse(date + ' ' + time, format);
+            } else {
+                value = this.dateField.getValue();
+            }
+        }
+        return value;
+    },
+
+    getSubmitValue: function(){
+//        var value = this.getValue();
+//        return value ? Ext.Date.format(value, this.dateTimeFormat) : null;
+
+        var me = this
+            ,format = me.getFormat()
+            ,value = me.getValue();
+
+        return value ? Ext.Date.format(value, format) : null;
+    },
+
+    setValue: function(value){
+        if (Ext.isString(value)){
+            value = Ext.Date.parse(value, this.getFormat()); //this.dateTimeFormat
+        }
+        this.dateField.setValue(value);
+        this.timeField.setValue(value);
+    },
+
+    getFormat: function(){
+        return (this.dateField.submitFormat || this.dateField.format) + " " + (this.timeField.submitFormat || this.timeField.format);
+    },
+
+    // Bug? A field-mixin submits the data from getValue, not getSubmitValue
+    getSubmitData: function(){
+        var me = this
+            ,data = null;
+
+        if (!me.disabled && me.submitValue && !me.isFileUpload()) {
+            data = {};
+            data[me.getName()] = '' + me.getSubmitValue();
+        }
+        return data;
+    }
+});

data/lib/netzke/active_record/attributes.rb

@@ -184,7 +184,7 @@ module Netzke
         end
 
         # a work-around for to_json not taking the current timezone into account when serializing ActiveSupport::TimeWithZone
-        v = v.to_datetime.to_s(:db) if [ActiveSupport::TimeWithZone, Date].include?(v.class)
+        v = v.to_datetime.to_s(:db) if [ActiveSupport::TimeWithZone].include?(v.class)
 
         v
       end
@@ -242,4 +242,4 @@ module Netzke
 
     end
   end
-end
+end

data/lib/netzke/basepack.rb

@@ -17,10 +17,9 @@ module Netzke
 
       # Called from netzke-basepack.rb
       def init
-        # Netzke::Core.ext_javascripts << "#{File.dirname(__FILE__)}/../../javascripts/datetimefield.js"
+        Netzke::Core.ext_javascripts << "#{File.dirname(__FILE__)}/../../javascripts/xdatetime.js"
         Netzke::Core.ext_javascripts << "#{File.dirname(__FILE__)}/../../javascripts/basepack.js"
 
-        Netzke::Core.ext_stylesheets << "#{File.dirname(__FILE__)}/../../stylesheets/datetimefield.css"
         Netzke::Core.ext_stylesheets << "#{File.dirname(__FILE__)}/../../stylesheets/basepack.css"
       end
 

data/lib/netzke/basepack/data_accessor.rb

@@ -23,7 +23,7 @@ module Netzke
 
             if assoc.klass.column_names.include?(assoc_method)
               # apply query
-              relation = relation.where(:"#{assoc_method}".like => "#{query}%") if query.present?
+              relation = relation.where(["#{assoc_method} like ?", "%#{query}%"]) if query.present?
               relation.all.map{ |r| [r.id, r.send(assoc_method)] }
             else
               relation.all.map{ |r| [r.id, r.send(assoc_method)] }.select{ |id,value| value =~ /^#{query}/ }
@@ -43,8 +43,6 @@ module Netzke
               end
             end
             return res
-
-
           end
         end
       end

data/lib/netzke/basepack/form_panel.rb

@@ -106,16 +106,7 @@ module Netzke
 
       # A hash of record data including the meta field
       def js_record_data
-        hsh = record.to_hash(fields).merge(:_meta => meta_field).literalize_keys
-
-        # HACK: a dirty hack cutting off the time part from the datetime string to please the form's datefield - until we have a real datetimefield
-        hsh.each_pair do |k,v|
-          if v && [:datetime, :date].include?(fields[k.to_sym].try(:fetch, :attr_type, nil))
-            hsh[k] = v.split.first
-          end
-        end
-
-        hsh
+        record.to_hash(fields).merge(:_meta => meta_field).literalize_keys
       end
 
       def record

data/lib/netzke/basepack/form_panel/fields.rb

@@ -101,9 +101,8 @@ module Netzke
             set_default_read_only(field)
 
             # temporal datetime setup, while we don't have real datetime field
-            if field[:attr_type] == :datetime || field[:attr_type] == :date
-              field[:format] ||= "Y-m-d" # needed for
-              field[:submit_format] = "Y-m-d"
+            if field[:attr_type] == :date
+              field[:format] ||= "Y-m-d"
             end
 
             # provide our special combobox with our id
@@ -187,10 +186,7 @@ module Netzke
               :integer => :numberfield,
               :boolean => config[:multi_edit] ? :tricheckbox : :checkboxfield,
               :date => :datefield,
-              # WIP: waiting for datetime.js implementation for ExtJS 4
-              # :datetime => :datetimefield,
-              :datetime => :datefield,
-
+              :datetime => :xdatetime,
               :text => :textarea,
               :json => :jsonfield,
               :string => :textfield

data/lib/netzke/basepack/grid_panel.rb

@@ -40,6 +40,7 @@ module Netzke
     # * +enable_edit_in_form+ - (defaults to true) provide buttons into the toolbar that activate editing/adding records via a form
     # * +enable_extended_search+ - (defaults to true) provide a button into the toolbar that shows configurable search form
     # * +enable_context_menu+ - (defaults to true) enable rows context menu
+    # * +context_menu+ - an array of actions (e.g. [:edit.action, "-", :del.action] - see the Actions section) or +false+ to disable the context menu
     # * +enable_rows_reordering+ - (defaults to false) enable reordering of rows with drag-n-drop; underlying model (specified in +model+) must implement "acts_as_list"-compatible functionality
     # * +enable_pagination+ - (defaults to true) enable pagination
     # * +rows_per_page+ - (defaults to 30) number of rows per page (ignored when +enable_pagination+ is set to +false+)
@@ -74,6 +75,8 @@ module Netzke
     #       }
     #     end
     #
+    # * +format+ - the format to display data in case of date and datetime columns, e.g. 'Y-m-d g:i:s'.
+    #
     # Besides these options, a column can receive any meaningful config option understood by Ext.grid.column.Column.
     #
     # == One-to-many association support

data/lib/netzke/basepack/grid_panel/columns.rb

@@ -214,7 +214,8 @@ module Netzke
           end
 
           def set_default_sortable(c)
-            c[:sortable] = !c[:virtual] || c[:sorting_scope] if c[:sortable].nil? # TODO: optimize - don't set it to false
+            # this *has* to be set to false if we don't want the column to be sortable (it's sortable by default in Ext)
+            c[:sortable] = !(c[:virtual] && !c[:sorting_scope]) if c[:sortable].nil?
           end
 
           def set_default_filterable(c)
@@ -309,8 +310,7 @@ module Netzke
               :integer => :numberfield,
               :boolean => :checkbox,
               :date => :datefield,
-              # :datetime => :datetimefield, WIP: waiting for Ext 4 fix
-              :datetime => :datefield,
+              :datetime => :xdatetime,
               :text => :textarea,
               :string => :textfield
             }
@@ -321,7 +321,7 @@ module Netzke
               # :integer  => :numbercolumn, # don't like the default formatter
               :boolean  => :checkcolumn,
               :date     => :datecolumn,
-              :datetime => :datecolumn # TODO: replace with datetimepicker
+              #:datetime => :datecolumn # TODO: replace with datetimepicker
             }
           end
 

data/lib/netzke/basepack/grid_panel/javascripts/grid_panel.js

@@ -23,13 +23,27 @@
     // Run through columns and set up different configuration for each
     Ext.each(this.columns, function(c, i){
 
+      this.normalizeRenderer(c);
+
       // Build the field configuration for this column
       var fieldConfig = {name: c.name, defaultValue: c.defaultValue};
 
       if (c.name !== '_meta') fieldConfig.type = this.fieldTypeForAttrType(c.attrType); // field type (grid editors need this to function well)
 
-      if (c.attrType == 'datetime' || c.attrType == 'date') {
+      if (c.attrType == 'datetime') {
         fieldConfig.dateFormat = 'Y-m-d g:i:s'; // in this format we receive dates from the server
+
+        if (!c.renderer) {
+          c.renderer = Ext.util.Format.dateRenderer(c.format || fieldConfig.dateFormat); // format in which the data will be rendered
+        }
+      };
+
+      if (c.attrType == 'date') {
+        fieldConfig.dateFormat = 'Y-m-d'; // in this format we receive dates from the server
+
+        if (!c.renderer) {
+          c.renderer = Ext.util.Format.dateRenderer(c.format || fieldConfig.dateFormat); // format in which the data will be rendered
+        }
       };
 
       fields.push(fieldConfig);
@@ -45,7 +59,6 @@
       //   c.editor = {xtype: "combobox", options: c.comboboxOptions.split('\\n')}
       // }
 
-      this.normalizeRenderer(c);
 
       // Set rendeder for association columns (the one displaying associations by the specified method instead of id)
       if (c.assoc) {
@@ -163,14 +176,23 @@
       this.plugins.push(Ext.create('Ext.grid.plugin.CellEditing', {pluginId: 'celleditor'}));
     }
 
-    // Paging toolbar
+    // Toolbar
     this.dockedItems = this.dockedItems || [];
-    this.dockedItems.push({
-      xtype: 'pagingtoolbar',
-      dock: 'bottom',
-      store: this.store,
-      items: ["-"].concat(this.bbar) // append the old bbar. TODO: get rid of it.
-    });
+    if (this.enablePagination) {
+      this.dockedItems.push({
+        xtype: 'pagingtoolbar',
+        dock: 'bottom',
+        store: this.store,
+        items: this.bbar && ["-"].concat(this.bbar) // append the old bbar. TODO: get rid of it.
+      });
+    } else if (this.bbar) {
+      this.dockedItems.push({
+        xtype: 'toolbar',
+        dock: 'bottom',
+        items: this.bbar
+      });
+    }
+
 
     delete this.bbar;
 

data/lib/netzke/basepack/grid_panel/services.rb

@@ -183,6 +183,8 @@ module Netzke
           #     r.merge(c[:name] => column_values)
           #   end
           # end
+
+          # Returns an array of records.
           def get_records(params)
 
             # Restore params from component_session if requested

data/lib/netzke/basepack/search_window.rb

@@ -20,6 +20,7 @@ module Netzke
         super.tap do |s|
           s[:items] = [:search_panel.component(:prevent_header => true)]
           s[:title] = I18n.t('netzke.basepack.search_window.title')
+          s[:persistence] = false
         end
       end
 

data/lib/netzke/basepack/version.rb

@@ -3,7 +3,7 @@ module Netzke
     module Version
       MAJOR = 0
       MINOR = 7
-      PATCH = 3
+      PATCH = 4
 
       STRING = [MAJOR, MINOR, PATCH].compact.join('.')
     end

data/lib/netzke/basepack/window/javascripts/window.js

@@ -5,14 +5,16 @@
     this.callParent();
 
     // set the move and resize events after window is shown, so that they don't fire at initial rendering
-    this.on("show", function(){
-      this.on("move", this.onMoveResize, this);
-      this.on("resize", this.onMoveResize, this);
-    }, this);
+    if (this.persistence) {
+      this.on("show", function(){
+        this.on("move", this.onMoveResize, this);
+        this.on("resize", this.onMoveResize, this);
+      }, this);
+    }
   },
 
   onMoveResize: function(){
     var x = this.getPosition()[0], y = this.getPosition()[1], w = this.getSize().width, h = this.getSize().height;
     this.setSizeAndPosition({x:x, y:y, w:w, h:h}); // API call
   }
-}
+}

data/netzke-basepack.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{netzke-basepack}
-  s.version = "0.7.3"
+  s.name = "netzke-basepack"
+  s.version = "0.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Sergei Kozlov}]
-  s.date = %q{2011-10-23}
-  s.description = %q{A set of full-featured extendible Netzke components (such as FormPanel, GridPanel, Window, BorderLayoutPanel, etc) which can be used as building block for your RIA}
-  s.email = %q{sergei@playcode.nl}
+  s.authors = ["Sergei Kozlov"]
+  s.date = "2012-03-05"
+  s.description = "A set of full-featured extendible Netzke components (such as FormPanel, GridPanel, Window, BorderLayoutPanel, etc) which can be used as building block for your RIA"
+  s.email = "sergei@playcode.nl"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     "init.rb",
     "install.rb",
     "javascripts/basepack.js",
-    "javascripts/datetimefield.js",
+    "javascripts/xdatetime.js",
     "lib/generators/netzke/basepack_generator.rb",
     "lib/generators/netzke/templates/assets/ts-checkbox.gif",
     "lib/generators/netzke/templates/create_netzke_field_lists.rb",
@@ -269,25 +269,11 @@ Gem::Specification.new do |s|
     "test/unit/tab_panel_test.rb",
     "uninstall.rb"
   ]
-  s.homepage = %q{http://netzke.org}
-  s.post_install_message = %q{
-========================================================================
-
-           Thanks for installing netzke-basepack!
-
-  Don't forget to run "rails generate netzke:baspack" to copy necessary
-  assets to your public folder!
-
-  Netzke home page:     http://netzke.org
-  Netzke Google Groups: http://groups.google.com/group/netzke
-  Netzke tutorials:     http://blog.writelesscode.com
-
-========================================================================
-
-}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Pre-built Rails + ExtJS components for your RIA}
+  s.homepage = "http://netzke.org"
+  s.post_install_message = "\n========================================================================\n\n           Thanks for installing netzke-basepack!\n\n  Don't forget to run \"rails generate netzke:baspack\" to copy necessary\n  assets to your public folder!\n\n  Netzke home page:     http://netzke.org\n  Netzke Google Groups: http://groups.google.com/group/netzke\n  Netzke tutorials:     http://blog.writelesscode.com\n\n========================================================================\n\n"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Pre-built Rails + ExtJS components for your RIA"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/basepack_test_app/Gemfile.lock

@@ -44,54 +44,53 @@ GEM
     acts_as_list (0.1.4)
     addressable (2.2.6)
     arel (2.2.1)
-    bcrypt-ruby (3.0.0)
+    bcrypt-ruby (3.0.1)
     builder (3.0.0)
-    capybara (1.1.0)
+    capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.2.2)
+    childprocess (0.2.8)
       ffi (~> 1.0.6)
-    cucumber (1.0.2)
+    cucumber (1.1.4)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.5)
+      gherkin (~> 2.7.1)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
-    cucumber-rails (1.0.2)
-      capybara (>= 1.0.0)
-      cucumber (~> 1.0.0)
-      nokogiri (>= 1.4.6)
-    database_cleaner (0.6.7)
+      term-ansicolor (>= 1.0.6)
+    cucumber-rails (1.2.1)
+      capybara (>= 1.1.2)
+      cucumber (>= 1.1.3)
+      nokogiri (>= 1.5.0)
+    database_cleaner (0.7.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    factory_girl (2.1.0)
-    ffi (1.0.9)
-    gherkin (2.4.16)
+    factory_girl (2.3.2)
+      activesupport
+    ffi (1.0.11)
+    gherkin (2.7.2)
       json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.5.4)
-    json_pure (1.5.4)
-      spruz (~> 0.2.8)
+    json (1.6.4)
     launchy (2.0.5)
       addressable (~> 2.2.6)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    multi_json (1.0.3)
-    mysql2 (0.3.7)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    mysql2 (0.3.11)
     nokogiri (1.5.0)
-    pickle (0.4.8)
+    pickle (0.4.10)
       cucumber (>= 0.8)
       rake
-    polyglot (0.3.2)
-    rack (1.3.2)
+    polyglot (0.3.3)
+    rack (1.3.6)
     rack-cache (1.0.3)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -115,44 +114,44 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2)
-    rdoc (3.9.4)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rspec-rails (2.6.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.6.0)
-    rubyzip (0.9.4)
-    selenium-webdriver (2.5.0)
-      childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
-      json_pure
+    rspec-mocks (2.8.0)
+    rspec-rails (2.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.8.0)
+    rubyzip (0.9.5)
+    selenium-webdriver (2.16.0)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0.9)
+      multi_json (~> 1.0.4)
       rubyzip
     spork (0.8.5)
-    sprockets (2.0.0)
+    sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
-    spruz (0.2.13)
-    sqlite3 (1.3.4)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.5)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    term-ansicolor (1.0.6)
+    term-ansicolor (1.0.7)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
-    will_paginate (3.0.0)
+    tzinfo (0.3.31)
+    will_paginate (3.0.2)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 

data/test/basepack_test_app/app/components/book_form_with_custom_fields.rb

@@ -12,7 +12,8 @@ class BookFormWithCustomFields < Netzke::Basepack::FormPanel
         :author__first_name,
         :author__last_name,
         :digitized,
-        :exemplars
+        :exemplars,
+        :last_read_at
       ]
     )
   end

data/test/basepack_test_app/app/components/window_component_loader.rb

@@ -1,7 +1,7 @@
 class WindowComponentLoader < Netzke::Base
   component :some_window, {
     :persistence => true,
-    :class_name => "Basepack::Window",
+    :class_name => "Netzke::Basepack::Window",
     :title => "Some Window Component",
     :lazy_loading => true,
     :width => 400,

data/test/basepack_test_app/db/seeds.rb

@@ -7,12 +7,14 @@
 #   Mayor.create(:name => 'Daley', :city => cities.first)
 
 Role.delete_all
+puts "Creating roles..."
 Role.create([
   {:name => "writer"},
   {:name => "reader"}
 ])
 
 User.delete_all
+puts "Creating users..."
 User.create([
   {:first_name => "Mark", :last_name => "Twain", :role => Role.find_by_name("writer")},
   {:first_name => "Carlos", :last_name => "Castaneda", :role => Role.find_by_name("writer")},
@@ -21,6 +23,7 @@ User.create([
 ])
 
 Author.delete_all
+puts "Creating authors..."
 Author.create([
   {:first_name => "Carlos", :last_name => "Castaneda"},
   {:first_name => "Herman", :last_name => "Hesse"}
@@ -30,6 +33,7 @@ Book.delete_all
 
 hesse = Author.find_by_last_name("Hesse")
 castaneda = Author.find_by_last_name("Castaneda")
+puts "Creating books..."
 Book.create([
   {:title => "Journey to Ixtlan", :author => castaneda},
   {:title => "The Tales of Power", :author => castaneda},

data/test/basepack_test_app/features/form_panel.feature

@@ -13,9 +13,9 @@ Scenario: UserForm should be rendered properly along with the data for the first
 
 @javascript
   Scenario: A form should be rendered properly along with the data for the specified record
-    Given a book exists with title: "Great Book", last_read_at: "2005-01-23"
+    Given a book exists with title: "Great Book", last_read_at: "2005-01-23 11:12:13"
     When I go to the BookFormWithDefaults test page
-    Then the form should show title: "Great Book", last_read_at: "2005-01-23"
+    Then the form should show title: "Great Book", last_read_at: "2005-01-23 11:12:13"
 
 @javascript
 Scenario: Editing the record
@@ -115,7 +115,16 @@ Scenario: Editing and immediately submitting the form
   Scenario: Setting date
     Given a book exists with title: "Some Title"
     When I go to the BookFormWithDefaults test page
-    Then I fill in "Last read at:" with "2005-01-23"
+    Then I fill in "Published on" with "2005-01-23"
     And I press "Apply"
     And I wait for the response from the server
-    Then a book should exist with last_read_at: "2005-01-23"
+    Then a book should exist with published_on: "2005-01-23"
+
+@javascript
+  Scenario: Setting datetime
+    Given a book exists with title: "Some Title"
+    When I go to the BookFormWithDefaults test page
+    Then I fill in Ext field "Last read at" with "2005-01-23 11:12:13"
+    And I press "Apply"
+    And I wait for the response from the server
+    Then a book should exist with last_read_at: "2005-01-23 11:12:13"

data/test/basepack_test_app/features/grid_panel.feature

@@ -4,13 +4,13 @@ Feature: Grid panel
   I want feature
 
 @javascript
-Scenario: UserGrid should correctly display data
+Scenario: BookGrid should correctly display data
   Given an author exists with first_name: "Vladimir", last_name: "Nabokov"
-  And a book exists with author: that author, title: "Lolita", last_read_at: "2011-12-13", published_on: "2005-01-30"
+  And a book exists with author: that author, title: "Lolita", last_read_at: "2011-12-13 11:12:13", published_on: "2005-01-30"
 
   When I go to the BookGrid test page
   Then I should see "Nabokov, Vladimir"
-  And I should see "12/13/2011"
+  And I should see "2011-12-13 11:12:13"
   And I should see "01/30/2005"
 
 @javascript
@@ -235,6 +235,12 @@ Scenario: GridPanel with overridden columns
   Then I should see "LOLITA"
   And I should see "Nabokov, Vladimir"
 
+@javascript
+  Scenario: Virtual attributes should not be sortable
+    Given a book exists with title: "Some Title"
+    When I go to the BookGridWithVirtualAttributes test page
+    Then the grid's column "In abundance" should not be sortable
+
 @javascript
   Scenario: Virtual attributes should not be editable
     Given a book exists with title: "Some Title"
@@ -248,4 +254,4 @@ Scenario: GridPanel with overridden columns
     And I click the "Delete row" action icon
     And I press "Yes"
     Then I should see "Deleted 1 record(s)"
-    And a book should not exist with title: "Some Title"
+    And a book should not exist with title: "Some Title"

data/test/basepack_test_app/features/step_definitions/form_panel_steps.rb

@@ -23,8 +23,24 @@ Then /the form should show #{capture_fields}$/ do |fields|
     var form = Ext.ComponentQuery.query('form')[0].getForm();
     var values = {#{fields}};
     for (var fieldName in values) {
-      if ((form.findField(fieldName).getValue() != values[fieldName]) && (form.findField(fieldName).getRawValue() != values[fieldName])) return false;
+      var field = form.findField(fieldName);
+
+      if (field.getXType() == 'xdatetime') {
+        // Treat xdatetime specially
+        var oldValue = field.getValue();
+        field.setValue(values[fieldName]);
+        return oldValue == field.getValue();
+      } else {
+        return (field.getValue() == values[fieldName] || field.getRawValue() == values[fieldName]);
+      }
     }
     return true;
   JS
 end
+
+Then /^I fill in Ext field "([^"]*)" with "([^"]*)"$/ do |field_label, value|
+  page.driver.browser.execute_script <<-JS
+    var field = Ext.ComponentQuery.query("[fieldLabel='#{field_label}']")[0];
+    field.setValue("#{value}");
+  JS
+end

data/test/basepack_test_app/features/step_definitions/grid_panel_steps.rb

@@ -165,6 +165,14 @@ Then /^the grid should have records sorted by "([^"]*)"\s?(asc|desc)?$/ do |colu
   JS
 end
 
+Then /^the grid's column "([^"]*)" should not be sortable$/ do |column_name|
+  column = column_name.downcase.gsub(' ', '_')
+  page.driver.browser.execute_script(<<-JS).should_not be_true
+    var col = Ext.ComponentQuery.query('gridcolumn[name="#{column}"]')[0];
+    return col.sortable;
+  JS
+end
+
 Then /^the grid's column "([^"]*)" should not be editable$/ do |column_name|
   column = column_name.downcase.gsub(' ', '_')
   page.driver.browser.execute_script(<<-JS).should be_true
@@ -175,4 +183,4 @@ end
 
 When /^I click the "([^"]*)" action icon$/ do |action_name|
   find("img[data-qtip='#{action_name}']").click
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netzke-basepack
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-23 00:00:00.000000000Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netzke-core
-  requirement: &70314345257960 !ruby/object:Gem::Requirement
+  requirement: &70335624108560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.4
   type: :runtime
   prerelease: false
-  version_requirements: *70314345257960
+  version_requirements: *70335624108560
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70314345257080 !ruby/object:Gem::Requirement
+  requirement: &70335624108080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70314345257080
+  version_requirements: *70335624108080
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70314345256340 !ruby/object:Gem::Requirement
+  requirement: &70335624107600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70314345256340
+  version_requirements: *70335624107600
 description: A set of full-featured extendible Netzke components (such as FormPanel,
   GridPanel, Window, BorderLayoutPanel, etc) which can be used as building block for
   your RIA
@@ -66,7 +66,7 @@ files:
 - init.rb
 - install.rb
 - javascripts/basepack.js
-- javascripts/datetimefield.js
+- javascripts/xdatetime.js
 - lib/generators/netzke/basepack_generator.rb
 - lib/generators/netzke/templates/assets/ts-checkbox.gif
 - lib/generators/netzke/templates/create_netzke_field_lists.rb
@@ -329,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Pre-built Rails + ExtJS components for your RIA

data/javascripts/datetimefield.js

@@ -1,24 +0,0 @@
-/**
- * Ext.ux.DateTimePicker & Ext.ux.form.DateTimeField
- * http://www.sencha.com/forum/showthread.php?98292-DateTime-field-again-and-again-)
- * Copyright(c) 2011, Andrew Pleshkov andrew.pleshkov@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-Ext.namespace("Ext.ux");(function(){var a=Ext.ux;a.BaseTimePicker=Ext.extend(Ext.Panel,{timeFormat:"g:i A",header:true,nowText:"Now",doneText:"Done",hourIncrement:1,minIncrement:1,hoursLabel:"Hours",minsLabel:"Minutes",cls:"ux-base-time-picker",width:210,layout:"form",labelAlign:"top",initComponent:function(){this.addEvents("select");this.hourSlider=new Ext.slider.SingleSlider({increment:this.hourIncrement,minValue:0,maxValue:23,fieldLabel:this.hoursLabel,listeners:{change:this._updateTimeValue,scope:this},plugins:new Ext.slider.Tip()});this.minSlider=new Ext.slider.SingleSlider({increment:this.minIncrement,minValue:0,maxValue:59,fieldLabel:this.minsLabel,listeners:{change:this._updateTimeValue,scope:this},plugins:new Ext.slider.Tip()});this.setCurrentTime(false);this.items=[this.hourSlider,this.minSlider];this.bbar=[{text:this.nowText,handler:this.setCurrentTime,scope:this},"->",{text:this.doneText,handler:this.onDone,scope:this}];a.BaseTimePicker.superclass.initComponent.call(this)},setCurrentTime:function(b){this.setValue(new Date(),!!b)},onDone:function(){this.fireEvent("select",this,this.getValue())},setValue:function(c,b){this.hourSlider.setValue(c.getHours(),b);this.minSlider.setValue(c.getMinutes(),b);this._updateTimeValue()},_extractValue:function(){var b=new Date();b.setHours(this.hourSlider.getValue());b.setMinutes(this.minSlider.getValue());return b},getValue:function(){return this._extractValue()},_updateTimeValue:function(){var b=this._extractValue().format(this.timeFormat);if(this.rendered){this.setTitle(b)}},afterRender:function(){a.BaseTimePicker.superclass.afterRender.call(this);this._updateTimeValue()},destroy:function(){this.purgeListeners();this.hourSlider=null;this.minSlider=null;a.BaseTimePicker.superclass.destroy.call(this)}});Ext.reg("basetimepicker",a.BaseTimePicker)})();Ext.namespace("Ext.ux");(function(){var a=Ext.ux;var c="ux-date-time-picker";a.DateTimePicker=Ext.extend(Ext.BoxComponent,{timeLabel:"Time",timeFormat:"g:i A",changeTimeText:"Change...",doneText:"Done",initComponent:function(){a.DateTimePicker.superclass.initComponent.call(this);this.addEvents("select");this.timePickerButton=new Ext.Button({text:this.changeTimeText,handler:this._showTimePicker,scope:this});this._initDatePicker();this.timeValue=new Date();if(this.value){this.setValue(this.value);delete this.value}},_initTimePicker:function(){if(!this.timeMenu){var d=this.initialConfig.timeMenu;if(d&&d.xtype){this.timeMenu=Ext.create(d)}else{var e=Ext.create(Ext.applyIf(this.initialConfig.timePicker||{},{timeFormat:this.timeFormat}),"basetimepicker");this.timeMenu=new b(e,d||{})}if(!Ext.isFunction(this.timeMenu.getPicker)){throw"Your time menu must provide the getPicker() method"}this.timeMenu.on("timeselect",this.onTimeSelect,this)}},_initDatePicker:function(){var e=this.initialConfig.datePicker||{};e.internalRender=this.initialConfig.internalRender;Ext.applyIf(e,{format:this.dateFormat||Ext.DatePicker.prototype.format});var d=this.datePicker=Ext.create(e,"datepicker");d.update=d.update.createSequence(function(){if(this.el!=null&&this.datePicker.rendered){var f=this.datePicker.el.getWidth();this.el.setWidth(f+this.el.getBorderWidth("lr")+this.el.getPadding("lr"))}},this)},_renderDatePicker:function(g){var e=this.datePicker;e.render(g);var j=e.getEl().child(".x-date-bottom");var f=j.getSize(true);var h=["position: absolute","bottom: 0","left: 0","overflow: hidden","width: "+f.width+"px","height: "+f.height+"px"].join(";");var i=g.createChild({tag:"div",cls:"x-date-bottom",style:h,children:[{tag:"table",cellspacing:0,style:"width: 100%",children:[{tag:"tr",children:[{tag:"td",align:"left"},{tag:"td",align:"right"}]}]}]});if(e.showToday){var d={};Ext.each(["text","tooltip","handler","scope"],function(k){d[k]=e.todayBtn.initialConfig[k]});this.todayBtn=new Ext.Button(d).render(i.child("td:first"))}this.doneBtn=new Ext.Button({text:this.doneText,handler:this.onDone,scope:this}).render(i.child("td:last"))},_getFormattedTimeValue:function(d){return d.format(this.timeFormat)},_renderValueField:function(f){var e=c+"-value-ct";var d=!Ext.isEmpty(this.timeLabel)?'<span class="'+e+'-value-label">'+this.timeLabel+":</span>&nbsp;":"";var h=f.insertFirst({tag:"div",cls:[e,"x-date-bottom"].join(" ")});var g=h.createChild({tag:"table",cellspacing:0,style:"width: 100%",children:[{tag:"tr",children:[{tag:"td",align:"left",cls:e+"-value-cell",html:'<div class="'+e+'-value-wrap">'+d+'<span class="'+e+'-value">'+this._getFormattedTimeValue(this.timeValue)+"</span></div>"},{tag:"td",align:"right",cls:e+"-btn-cell"}]}]});this.timeValueEl=g.child("."+e+"-value");this.timeValueEl.on("click",this._showTimePicker,this);this.timePickerButton.render(g.child("td:last"))},onRender:function(e,d){this.el=e.createChild({tag:"div",cls:c,children:[{tag:"div",cls:c+"-inner"}]},d);a.DateTimePicker.superclass.onRender.call(this,e,d);var f=this.el.first();this._renderDatePicker(f);this._renderValueField(f)},_updateTimeValue:function(d){this.timeValue=d;if(this.timeValueEl!=null){this.timeValueEl.update(this._getFormattedTimeValue(d))}},setValue:function(d){this._updateTimeValue(d);this.datePicker.setValue(d.clone())},getValue:function(){var d=this.datePicker.getValue();var e=this.timeValue.getElapsed(this.timeValue.clone().clearTime());return new Date(d.getTime()+e)},onTimeSelect:function(f,d,e){this._updateTimeValue(e)},_showTimePicker:function(){this._initTimePicker();this.timeMenu.getPicker().setValue(this.timeValue,false);if(this.timeMenu.isVisible()){this.timeMenu.hide()}else{this.timeMenu.show(this.timePickerButton.el,null,this.parentMenu)}},onDone:function(){this.fireEvent("select",this,this.getValue())},destroy:function(){Ext.destroy(this.timePickerButton);this.timePickerButton=null;if(this.timeValueEl){this.timeValueEl.remove();this.timeValueEl=null}Ext.destroy(this.datePicker);this.datePicker=null;if(this.timeMenu){Ext.destroy(this.timeMenu);this.timeMenu=null}if(this.todayBtn){Ext.destroy(this.todayBtn);this.todayBtn=null}if(this.doneBtn){Ext.destroy(this.doneBtn);this.doneBtn=null}this.parentMenu=null;a.DateTimePicker.superclass.destroy.call(this)}});Ext.reg("datetimepicker",a.DateTimePicker);var b=a.DateTimePicker.Menu=Ext.extend(Ext.menu.Menu,{enableScrolling:false,hideOnClick:false,plain:true,showSeparator:false,constructor:function(e,d){d=d||{};if(d.picker){delete d.picker}this.picker=Ext.create(e);b.superclass.constructor.call(this,Ext.applyIf({items:this.picker},d));this.addEvents("timeselect");this.picker.on("select",this.onTimeSelect,this)},getPicker:function(){return this.picker},onTimeSelect:function(d,e){this.hide();this.fireEvent("timeselect",this,d,e)},destroy:function(){this.purgeListeners();this.picker=null;b.superclass.destroy.call(this)}})})();Ext.namespace("Ext.ux.form");(function(){var c=Ext.ux.form;var a=Ext.isIE7&&Ext.isStrict;var b=Ext.extend(Ext.menu.Menu,{enableScrolling:false,plain:true,showSeparator:false,hideOnClick:true,pickerId:null,cls:"x-date-menu x-date-time-menu",constructor:function(e,d){b.superclass.constructor.call(this,Ext.applyIf({items:e},d||{}));this.primaryPicker=e;e.parentMenu=this;this.on("beforeshow",this.onBeforeShow,this);this.strict=a;if(this.strict){this.on("show",this.onShow,this,{single:true,delay:20})}this.picker=e.datePicker;this.relayEvents(e,["select"]);this.on("show",e.focus,e);this.on("select",this.menuHide,this);if(this.handler){this.on("select",this.handler,this.scope||this)}},menuHide:function(){if(this.hideOnClick){this.hide(true)}},onBeforeShow:function(){if(this.picker){this.picker.hideMonthPicker(true)}},onShow:function(){var d=this.picker.getEl();d.setWidth(d.getWidth())},destroy:function(){this.primaryPicker=null;this.picker=null;b.superclass.destroy.call(this)}});c.DateTimeField=Ext.extend(Ext.form.DateField,{timeFormat:"g:i A",defaultAutoCreate:{tag:"input",type:"text",size:"22",autocomplete:"off"},initComponent:function(){c.DateTimeField.superclass.initComponent.call(this);this.dateFormat=this.dateFormat||this.format;var d=this._createPicker();this.format=this.dateFormat+" "+this.timeFormat;this.menu=new b(d,{hideOnClick:false})},_createPicker:function(){var d=this.initialConfig.picker||{};Ext.apply(d,{ctCls:"x-menu-date-item",internalRender:a||!Ext.isIE});Ext.applyIf(d,{dateFormat:this.dateFormat,timeFormat:this.timeFormat});return Ext.create(d,"datetimepicker")},onTriggerClick:function(){c.DateTimeField.superclass.onTriggerClick.apply(this,arguments);this.menu.primaryPicker.setValue(this.getValue()||new Date())}});Ext.reg("datetimefield",c.DateTimeField)})();