netzke-basepack 0.8.0 → 0.8.1

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-# 0.8.0 - WIP
+# 0.8.1 - 2012-12-15
+* bug fix
+  * TabPanel now shows the active tab's nested component upon loading
+  * Accordion now shows the active pane's nested component upon loading
+
+* improvements
+  * Add support for validation errors on before_destroy (by firemind)
+
+# 0.8.0 - 2012-12-09
 * Basepack component renaming:
   * GridPanel -> Grid
   * FormPanel -> Form

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

@@ -30,10 +30,23 @@ module Netzke
           endpoint :delete_data do |params, this|
             if !config[:prohibit_delete]
               record_ids = ActiveSupport::JSON.decode(params[:records])
-              data_adapter.destroy(record_ids)
+              success = true
+              record_ids.each {|id|
+                record = data_adapter.find_record(id)
+                if !record.destroy
+                  success = false
+                  record.errors.to_a.each do |msg|
+                    flash :error => msg
+                  end
+                end
+              }
               on_data_changed
-              this.netzke_feedback I18n.t('netzke.basepack.grid.deleted_n_records', :n => record_ids.size)
-              this.load_store_data get_data
+              if success
+                this.netzke_feedback I18n.t('netzke.basepack.grid.deleted_n_records', :n => record_ids.size)
+                this.load_store_data get_data
+              else
+                this.netzke_feedback @flash
+              end
             else
               this.netzke_feedback I18n.t('netzke.basepack.grid.cannot_delete')
             end

data/lib/netzke/basepack/version.rb

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

data/lib/netzke/basepack/wrap_lazy_loaded.rb

@@ -5,22 +5,23 @@ module Netzke
     # Used, for instance, in TabPanel and Accordion to dynamically load components on expanding a panel or clicking
     # a tab.
     module WrapLazyLoaded
-      def extend_item(item)
-        item = super
+      def js_configure(cfg)
+        super
+        cfg.items = cfg.items.each_with_index.map do |item,i|
+          c = components[item[:netzke_component]].try(:merge, item)
 
-        c = components[item[:netzke_component]].try(:merge, item)
-
-        # when a nested component with lazy loading is detected, it gets replaced with a 'fit' panel,
-        # into which later the component itself is dynamically loaded on request.
-        if c && !c[:eager_loading]
-          { layout: :fit,
-            wrapped_component: c[:item_id],
-            title: c[:title] || c[:item_id].humanize,
-            icon_cls: c[:icon_cls],
-            disabled: c[:disabled]
-          }
-        else
-          item
+          # when a nested component with lazy loading is detected, it gets replaced with a 'fit' panel,
+          # into which later the component itself is dynamically loaded on request.
+          if c && !c[:eager_loading] && i != config.active_tab.to_i # so it works for both TabPanel and Accordion
+            { layout: :fit,
+              wrapped_component: c[:item_id],
+              title: c[:title] || c[:item_id].humanize,
+              icon_cls: c[:icon_cls],
+              disabled: c[:disabled]
+            }
+          else
+            item
+          end
         end
       end
     end

data/netzke-basepack.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "netzke-basepack"
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nomadcoder"]
-  s.date = "2012-12-09"
+  s.date = "2012-12-15"
   s.description = "A set of feature-rich extendible Netzke components (such as Form, Grid, Window, TabPanel, etc) which can be used as building block for your RIA"
   s.email = "nmcoder@gmail.com"
   s.extra_rdoc_files = [
@@ -189,7 +189,7 @@ Gem::Specification.new do |s|
     "test/basepack_test_app/db/migrate/20110909071740_add_published_on_to_books.rb",
     "test/basepack_test_app/db/schema.rb",
     "test/basepack_test_app/db/seeds.rb",
-    "test/basepack_test_app/features/accordion_panel.feature",
+    "test/basepack_test_app/features/accordion.feature",
     "test/basepack_test_app/features/form_panel.feature",
     "test/basepack_test_app/features/grid_panel.feature",
     "test/basepack_test_app/features/grid_panel_filters.feature",

data/test/basepack_test_app/Gemfile

@@ -4,7 +4,7 @@ source 'http://rubygems.org'
 gem 'rails', '~>3.2.0'
 gem 'mysql2'
 
-gem 'netzke-core', github: "nomadcoder/netzke-core"
+gem 'netzke-core', '~>0.8.0'
 
 group :test do
   gem 'factory_girl'

data/test/basepack_test_app/Gemfile.lock

@@ -1,10 +1,3 @@
-GIT
-  remote: git://github.com/nomadcoder/netzke-core.git
-  revision: 74e19672cd7c270415714f1805f09b3262e577bc
-  specs:
-    netzke-core (0.8.0)
-      activesupport (>= 3.0.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -70,15 +63,18 @@ GEM
     json (1.7.5)
     launchy (2.1.2)
       addressable (~> 2.3)
-    libwebsocket (0.1.6.1)
+    libwebsocket (0.1.7.1)
+      addressable
       websocket
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    multi_json (1.3.7)
+    multi_json (1.4.0)
     mysql2 (0.3.11)
+    netzke-core (0.8.0)
+      activesupport (>= 3.1.0)
     nokogiri (1.5.5)
     pickle (0.4.11)
       cucumber (>= 0.8)
@@ -109,7 +105,7 @@ GEM
     rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec-core (2.12.0)
+    rspec-core (2.12.1)
     rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.0)
@@ -121,7 +117,7 @@ GEM
       rspec-expectations (~> 2.12.0)
       rspec-mocks (~> 2.12.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.26.0)
+    selenium-webdriver (2.27.1)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
@@ -153,7 +149,7 @@ DEPENDENCIES
   factory_girl
   launchy
   mysql2
-  netzke-core!
+  netzke-core (~> 0.8.0)
   pickle
   rails (~> 3.2.0)
   rspec-rails

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

@@ -3,7 +3,6 @@ class SimplePanel < Netzke::Base
 
   js_configure do |c|
     c.title = "SimplePanel"
-    c.html = "Original HTML"
     c.on_update_html = <<-JS
       function(){
         this.updateHtmlFromServer();
@@ -12,8 +11,13 @@ class SimplePanel < Netzke::Base
   end
 
   def configure(c)
-    super
+    c.html = "Original HTML"
     c.bbar = [:update_html]
+    super
+  end
+
+  def self.server_side_config_options
+    super << :update_text
   end
 
   endpoint :update_html_from_server do |params, this|

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

@@ -1,4 +1,11 @@
 class SomeAccordion < Netzke::Basepack::Accordion
+  # This component will be rendered immediately in the first tab
+  #
+  component :panel_zero do |c|
+    c.klass = SimplePanel
+    c.title = "Panel Zero"
+  end
+
   # This component will be dynamically loaded on expanding the second accordion pane
   component :simple_panel do |c|
     c.update_text = "Update for Panel Two"
@@ -10,6 +17,7 @@ class SomeAccordion < Netzke::Basepack::Accordion
   def configure(c)
     c.title = "Some Accordion"
     c.items = [
+      :panel_zero,
       { :html => "I'm a simple Ext.Panel", :title => "Panel One" },
       :simple_panel
     ]

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

@@ -1,9 +1,16 @@
 class SomeTabPanel < Netzke::Basepack::TabPanel
+  # This component will be rendered immediately in the first tab
+  #
+  component :tab_one do |c|
+    c.klass = SimplePanel
+    c.title = "Panel Zero"
+  end
+
   # This component will be dynamically loaded on expanding the second accordion pane
   component :simple_panel do |c|
     c.update_text = "Update for Panel Two"
     c.title = "Panel Two"
-    c.prevent_header = true
+    c.header = false
     c.border = false
 
     # optionally, you can force a certain component to be eagerly loaded:
@@ -15,6 +22,7 @@ class SomeTabPanel < Netzke::Basepack::TabPanel
     c.active_tab = 0
 
     c.items = [
+      :tab_one,
       { :html => "I'm a simple Ext.Panel", :title => "Panel One" },
       :simple_panel
     ]

data/test/basepack_test_app/app/models/user.rb

@@ -2,4 +2,10 @@ class User < ActiveRecord::Base
   # scope :latest, lambda {|param| where(:created_at.gt => param)}
   belongs_to :role
   has_one :address
+
+  before_destroy :is_admin
+  def is_admin
+    errors.add :base, "Can't delete Admin User." if self.first_name == "Admin"
+    errors.blank?
+  end
 end

data/test/basepack_test_app/features/{accordion_panel.feature → accordion.feature}

@@ -5,8 +5,10 @@ Feature: Accordion panel
 
 @javascript
 Scenario: Lazy loading of a component into a panel when the latter gets expanded
-  Given I am on the SomeAccordion test page
+  When I go to the SomeAccordion test page
+  Then expanded panel should have button "Update html"
   When I expand "Panel Two"
-  Then I should see "Original HTML"
+  And I sleep 1 second
+  Then expanded panel should have button "Update html"
   When I press "Update html"
   Then I should see "Update for Panel Two"

data/test/basepack_test_app/features/grid_panel.feature

@@ -52,6 +52,17 @@ Scenario: Deleting a record
   Then I should see "Deleted 1 record(s)"
   Then a user should not exist with first_name: "Anton"
 
+@javascript
+Scenario: Try deleting an undeletable record
+  Given a user exists with first_name: "Admin", last_name: "Admin"
+  When I go to the UserGrid test page
+  And I select all rows in the grid
+  And I press "Delete"
+  Then I should see "Are you sure?"
+  When I press "Yes"
+  Then I should see "Can't delete Admin User"
+  Then a user should exist with first_name: "Admin"
+
 @javascript
 Scenario: Multi-editing records
   Given a user exists with first_name: "Carlos", last_name: "Castaneda"

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

@@ -147,3 +147,22 @@ Then /^I should not see window$/ do
     return out;
   JS
 end
+
+Then /^active tab should have button "(.*?)"$/ do |text|
+  page.driver.browser.execute_script(<<-JS).should == true
+    var tp = Ext.ComponentQuery.query('tabpanel')[0],
+        at = tp.getActiveTab();
+    return !!at.down('button[text="#{text}"]');
+  JS
+end
+
+Then /^expanded panel should have button "(.*?)"$/ do |text|
+  page.driver.browser.execute_script(<<-JS).should == true
+    for (var prop in Netzke.page) {
+      var panel = Netzke.page[prop];
+      break;
+    }
+    ap = panel.down("[collapsed=false]");
+    return !!ap.down('button[text="#{text}"]');
+  JS
+end

data/test/basepack_test_app/features/tab_panel.feature

@@ -5,8 +5,9 @@ Feature: Tab panel
 
 @javascript
 Scenario: Lazy loading of a component into a tab when the latter gets open
-  Given I am on the SomeTabPanel test page
+  When I go to the SomeTabPanel test page
+  Then active tab should have button "Update html"
   When I press "Panel Two"
-  Then I should see "Original HTML"
+  Then active tab should have button "Update html"
   When I press "Update html"
   Then I should see "Update for Panel Two"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netzke-basepack
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2012-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netzke-core
@@ -208,7 +208,7 @@ files:
 - test/basepack_test_app/db/migrate/20110909071740_add_published_on_to_books.rb
 - test/basepack_test_app/db/schema.rb
 - test/basepack_test_app/db/seeds.rb
-- test/basepack_test_app/features/accordion_panel.feature
+- test/basepack_test_app/features/accordion.feature
 - test/basepack_test_app/features/form_panel.feature
 - test/basepack_test_app/features/grid_panel.feature
 - test/basepack_test_app/features/grid_panel_filters.feature