netzke-core 0.7.0 → 0.7.1

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+= v0.7.1 - 2011-08-17
+* bug fix
+  * Multiple compound Netzke components in the same Rails view were causing JS errors
+
 = v0.7.0 - 2011-08-09
 * Ext JS 4 compatibility
 
@@ -32,7 +36,7 @@
   * feedback in favor of netzkeFeedback
   * Ext.container.Container#instantiateChild should not be used
 
-= v0.6.7 - to be released
+= v0.6.7 - 2011-08-16
 * enhancements
   * No more using +method_missing+ for invoking endpoints.
   * New "cache" option for `netzke_init` which gets passed to `javascript_include_tag` (no support for css caching of this type yet)

data/lib/netzke/core/version.rb

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

data/lib/netzke/railz/action_view_ext.rb

@@ -52,8 +52,8 @@ module Netzke
 
         content_for :netzke_on_ready, raw("#{cmp.js_component_instance}\n\n#{cmp.js_component_render}")
 
-        # Now mark this component's class as rendered (by storing it's xtype), so that we only generate it once per view
-        @rendered_classes << class_name.to_s.gsub("::", "").downcase unless @rendered_classes.include?(class_name)
+        # Now mark all this component's dependency classes (including self) as rendered (by storing their xtypes), so that we only generate a class once per view
+        @rendered_classes = (@rendered_classes + cmp.dependency_classes.map(&:js_xtype)).uniq
 
         # Return the html for this component
         raw(cmp.js_component_html)

data/netzke-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{netzke-core}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergei Kozlov"]
-  s.date = %q{2011-08-09}
+  s.date = %q{2011-08-17}
   s.description = %q{Allows building ExtJS/Rails reusable code in a DRY way}
   s.email = %q{sergei@playcode.nl}
   s.extra_rdoc_files = [
@@ -132,7 +132,7 @@ Gem::Specification.new do |s|
     "test/rails_app/app/components/touch/simple_carousel.rb",
     "test/rails_app/app/controllers/application_controller.rb",
     "test/rails_app/app/controllers/components_controller.rb",
-    "test/rails_app/app/controllers/multiple_components_controller.rb",
+    "test/rails_app/app/controllers/simple_rails_controller.rb",
     "test/rails_app/app/controllers/touch_controller.rb",
     "test/rails_app/app/controllers/welcome_controller.rb",
     "test/rails_app/app/helpers/application_helper.rb",
@@ -142,7 +142,9 @@ Gem::Specification.new do |s|
     "test/rails_app/app/views/layouts/application.html.erb",
     "test/rails_app/app/views/layouts/nested.html.erb",
     "test/rails_app/app/views/layouts/touch.html.erb",
-    "test/rails_app/app/views/multiple_components/set_one.html.erb",
+    "test/rails_app/app/views/simple_rails/multiple_nested.html.erb",
+    "test/rails_app/app/views/simple_rails/multiple_of_different_class.html.erb",
+    "test/rails_app/app/views/simple_rails/multiple_of_same_class.html.erb",
     "test/rails_app/config.ru",
     "test/rails_app/config/application.rb",
     "test/rails_app/config/boot.rb",
@@ -180,6 +182,7 @@ Gem::Specification.new do |s|
     "test/rails_app/features/nested_views.feature",
     "test/rails_app/features/persistence.feature",
     "test/rails_app/features/plugin.feature",
+    "test/rails_app/features/rails_views.feature",
     "test/rails_app/features/scopes.feature",
     "test/rails_app/features/step_definitions/custom_css_steps.rb",
     "test/rails_app/features/step_definitions/generic_steps.rb",
@@ -229,93 +232,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{Build ExtJS/Rails components with minimum effort}
-  s.test_files = [
-    "test/rails_app/app/components/border_layout_panel.rb",
-    "test/rails_app/app/components/component_loader.rb",
-    "test/rails_app/app/components/component_with_actions.rb",
-    "test/rails_app/app/components/component_with_custom_css.rb",
-    "test/rails_app/app/components/component_with_included_js.rb",
-    "test/rails_app/app/components/component_with_js_mixin.rb",
-    "test/rails_app/app/components/component_with_nested_through.rb",
-    "test/rails_app/app/components/component_with_session_persistence.rb",
-    "test/rails_app/app/components/deprecated/server_caller.rb",
-    "test/rails_app/app/components/dynamic_tab_panel.rb",
-    "test/rails_app/app/components/ext_direct/composite.rb",
-    "test/rails_app/app/components/ext_direct/details.rb",
-    "test/rails_app/app/components/ext_direct/selector.rb",
-    "test/rails_app/app/components/ext_direct/statistics.rb",
-    "test/rails_app/app/components/extended_component_with_actions.rb",
-    "test/rails_app/app/components/extended_component_with_js_mixin.rb",
-    "test/rails_app/app/components/extended_localized_panel.rb",
-    "test/rails_app/app/components/extended_server_caller.rb",
-    "test/rails_app/app/components/hello_world_component.rb",
-    "test/rails_app/app/components/kinda_complex_component.rb",
-    "test/rails_app/app/components/kinda_complex_component/basic_stuff.rb",
-    "test/rails_app/app/components/kinda_complex_component/extra_stuff.rb",
-    "test/rails_app/app/components/loader_of_component_with_custom_css.rb",
-    "test/rails_app/app/components/localized_panel.rb",
-    "test/rails_app/app/components/nested_component.rb",
-    "test/rails_app/app/components/panel_with_plugin.rb",
-    "test/rails_app/app/components/panel_with_tools.rb",
-    "test/rails_app/app/components/plugin_with_components.rb",
-    "test/rails_app/app/components/scoped_components/deep_scoped_components/some_deep_scoped_component.rb",
-    "test/rails_app/app/components/scoped_components/extended_scoped_component.rb",
-    "test/rails_app/app/components/scoped_components/some_scoped_component.rb",
-    "test/rails_app/app/components/server_caller.rb",
-    "test/rails_app/app/components/server_counter.rb",
-    "test/rails_app/app/components/simple_component.rb",
-    "test/rails_app/app/components/simple_panel.rb",
-    "test/rails_app/app/components/simple_tab_panel.rb",
-    "test/rails_app/app/components/simple_window.rb",
-    "test/rails_app/app/components/some_composite.rb",
-    "test/rails_app/app/components/some_ext_component.rb",
-    "test/rails_app/app/components/some_plugin.rb",
-    "test/rails_app/app/components/touch/hello_world_component.rb",
-    "test/rails_app/app/components/touch/server_caller.rb",
-    "test/rails_app/app/components/touch/simple_carousel.rb",
-    "test/rails_app/app/controllers/application_controller.rb",
-    "test/rails_app/app/controllers/components_controller.rb",
-    "test/rails_app/app/controllers/multiple_components_controller.rb",
-    "test/rails_app/app/controllers/touch_controller.rb",
-    "test/rails_app/app/controllers/welcome_controller.rb",
-    "test/rails_app/app/helpers/application_helper.rb",
-    "test/rails_app/app/helpers/touch_helper.rb",
-    "test/rails_app/config/application.rb",
-    "test/rails_app/config/boot.rb",
-    "test/rails_app/config/environment.rb",
-    "test/rails_app/config/environments/development.rb",
-    "test/rails_app/config/environments/production.rb",
-    "test/rails_app/config/environments/test.rb",
-    "test/rails_app/config/initializers/backtrace_silencers.rb",
-    "test/rails_app/config/initializers/inflections.rb",
-    "test/rails_app/config/initializers/mime_types.rb",
-    "test/rails_app/config/initializers/netzke.rb",
-    "test/rails_app/config/initializers/secret_token.rb",
-    "test/rails_app/config/initializers/session_store.rb",
-    "test/rails_app/config/routes.rb",
-    "test/rails_app/db/migrate/20110110132720_create_netzke_component_states.rb",
-    "test/rails_app/db/schema.rb",
-    "test/rails_app/db/seeds.rb",
-    "test/rails_app/features/step_definitions/custom_css_steps.rb",
-    "test/rails_app/features/step_definitions/generic_steps.rb",
-    "test/rails_app/features/step_definitions/touch_steps.rb",
-    "test/rails_app/features/step_definitions/web_steps.rb",
-    "test/rails_app/features/support/env.rb",
-    "test/rails_app/features/support/paths.rb",
-    "test/rails_app/spec/component/actions_spec.rb",
-    "test/rails_app/spec/component/base_spec.rb",
-    "test/rails_app/spec/component/component_spec.rb",
-    "test/rails_app/spec/component/composition_spec.rb",
-    "test/rails_app/spec/component/configuration_spec.rb",
-    "test/rails_app/spec/component/javascript_spec.rb",
-    "test/rails_app/spec/component/state_spec.rb",
-    "test/rails_app/spec/core_ext_spec.rb",
-    "test/rails_app/spec/spec_helper.rb",
-    "test/test_helper.rb",
-    "test/unit/core_ext_test.rb",
-    "test/unit/netzke_core_test.rb",
-    "test/unit/netzke_preference_test.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/rails_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: vendor/gems/netzke-persistence
   specs:
-    netzke-persistence (0.1.1)
+    netzke-persistence (0.2.0)
 
 GEM
   remote: http://rubygems.org/

data/test/rails_app/app/components/simple_tab_panel.rb

@@ -1,27 +1,4 @@
 class SimpleTabPanel < Netzke::Base
   js_base_class "Ext.TabPanel"
-
   js_property :active_tab, 0
-
-  # config :items => [{
-  #           # Loading a primitive BorderLayoutPanel here
-  #           :class_name => "BorderLayoutPanel",
-  #           :title => "A border layout panel",
-  #           :items => [{
-  #             :region => :north,
-  #             :height => 100,
-  #             :title => "I'm NOT a Netzke component",
-  #             :html => "I'm a simple panel"
-  #           },{
-  #             :region => :center,
-  #             :class_name => "ServerCaller"
-  #           },{
-  #             :region => :west,
-  #             :width => 300,
-  #             :split => true,
-  #             :class_name => "ExtendedServerCaller"
-  #           }]
-  #       },{
-  #         :class_name => "ExtendedServerCaller"
-  #       }]
 end

data/test/rails_app/app/controllers/simple_rails_controller.rb

@@ -0,0 +1,2 @@
+class SimpleRailsController < ApplicationController
+end

data/test/rails_app/app/controllers/welcome_controller.rb

@@ -1,5 +1,5 @@
 class WelcomeController < ApplicationController
   def index
-    render :text => "This is a test app build into netzke_core"
+    render :text => "This is a test app built into netzke_core"
   end
 end

data/test/rails_app/app/views/simple_rails/multiple_nested.html.erb

@@ -0,0 +1,23 @@
+<%= netzke :tab_panel_one, {
+  :height => 300,
+  :class_name => "SimpleTabPanel",
+  :items => [{
+    :class_name => "ServerCaller",
+    :title => "Server Caller One"
+  },{
+    :class_name => "ServerCaller",
+    :title => "Server Caller Two"
+  }]
+} %>
+
+<%= netzke :tab_panel_two, {
+  :height => 300,
+  :class_name => "SimpleTabPanel",
+  :items => [{
+    :class_name => "ExtendedServerCaller",
+    :title => "Server Caller One"
+  },{
+    :class_name => "ExtendedServerCaller",
+    :title => "Server Caller Two"
+  }]
+} %>

data/test/rails_app/app/views/simple_rails/multiple_of_same_class.html.erb

@@ -0,0 +1,2 @@
+<%= netzke :server_caller_one, :class_name => "ServerCaller", :height => 200 %>
+<%= netzke :server_caller_two, :class_name => "ServerCaller", :height => 200 %>

data/test/rails_app/config/initializers/netzke.rb

@@ -1,4 +1,4 @@
 Netzke::Core.setup do |config|
   # config.js_direct_max_retries = 3
-  config.ext_uri = "/extjs4"
+  # config.ext_uri = "/extjs4"
 end

data/test/rails_app/config/routes.rb

@@ -59,7 +59,7 @@ RailsApp::Application.routes.draw do
   match 'components/:component' => 'components#index', :as => "components"
 
   # Components configured in Rails views
-  match 'components/embedded/:action' => 'components', :as => "embedded_components"
+  match 'simple_rails/:action' => 'simple_rails', :as => 'simple_rails_views'
 
   # Touch components
   match 'components/touch/:component' => 'touch#index', :as => "touch_components"

data/test/rails_app/features/rails_views.feature

@@ -0,0 +1,16 @@
+Feature: Rendering components in the Rails views
+  In order to value
+  As a role
+  I want feature
+
+@javascript
+Scenario: Rendering multiple complex components in a view
+  Given I am on the "multiple_nested" view
+
+  When I press "Call server"
+  And I wait for response from server
+  Then I should see "All quiet here on the server"
+
+  When I press "Call server extensively"
+  And I wait for response from server
+  Then I should see "All quiet here on the server, shiny weather"

data/test/rails_app/features/support/env.rb

@@ -5,10 +5,6 @@
 # files.
 
 ENV["RAILS_ENV"] ||= "test"
-# require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
-# require File.expand_path(File.dirname(__FILE__) + '/../../test/rails_app/config/environment')
-# require File.expand_path(File.dirname(__FILE__) + '/../../lib/netzke-core')
-
 
 require 'cucumber/rails'
 

data/test/rails_app/features/support/paths.rb

@@ -17,17 +17,8 @@ module NavigationHelpers
     #   when /^(.*)'s profile page$/i
     #     user_profile_path(User.find_by_login($1))
 
-    when /the simple panel page/
-      '/panel/simple'
-
-    when /the server caller page/
-      '/panel/server_caller'
-
-    when /the component loader page/
-      '/panel/component_loader'
-
     when /the "(.*)" view/
-      embedded_components_path(:action => $1.gsub(" ", "_"))
+      simple_rails_views_path(:action => $1.gsub(" ", "_"))
 
     when /the (.*) test page/
       components_path(:component => $1)

metadata

@@ -2,7 +2,7 @@
 name: netzke-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 +02:00
+date: 2011-08-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -149,7 +149,7 @@ files:
 - test/rails_app/app/components/touch/simple_carousel.rb
 - test/rails_app/app/controllers/application_controller.rb
 - test/rails_app/app/controllers/components_controller.rb
-- test/rails_app/app/controllers/multiple_components_controller.rb
+- test/rails_app/app/controllers/simple_rails_controller.rb
 - test/rails_app/app/controllers/touch_controller.rb
 - test/rails_app/app/controllers/welcome_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
@@ -159,7 +159,9 @@ files:
 - test/rails_app/app/views/layouts/application.html.erb
 - test/rails_app/app/views/layouts/nested.html.erb
 - test/rails_app/app/views/layouts/touch.html.erb
-- test/rails_app/app/views/multiple_components/set_one.html.erb
+- test/rails_app/app/views/simple_rails/multiple_nested.html.erb
+- test/rails_app/app/views/simple_rails/multiple_of_different_class.html.erb
+- test/rails_app/app/views/simple_rails/multiple_of_same_class.html.erb
 - test/rails_app/config.ru
 - test/rails_app/config/application.rb
 - test/rails_app/config/boot.rb
@@ -197,6 +199,7 @@ files:
 - test/rails_app/features/nested_views.feature
 - test/rails_app/features/persistence.feature
 - test/rails_app/features/plugin.feature
+- test/rails_app/features/rails_views.feature
 - test/rails_app/features/scopes.feature
 - test/rails_app/features/step_definitions/custom_css_steps.rb
 - test/rails_app/features/step_definitions/generic_steps.rb
@@ -259,89 +262,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Build ExtJS/Rails components with minimum effort
-test_files: 
-- test/rails_app/app/components/border_layout_panel.rb
-- test/rails_app/app/components/component_loader.rb
-- test/rails_app/app/components/component_with_actions.rb
-- test/rails_app/app/components/component_with_custom_css.rb
-- test/rails_app/app/components/component_with_included_js.rb
-- test/rails_app/app/components/component_with_js_mixin.rb
-- test/rails_app/app/components/component_with_nested_through.rb
-- test/rails_app/app/components/component_with_session_persistence.rb
-- test/rails_app/app/components/deprecated/server_caller.rb
-- test/rails_app/app/components/dynamic_tab_panel.rb
-- test/rails_app/app/components/ext_direct/composite.rb
-- test/rails_app/app/components/ext_direct/details.rb
-- test/rails_app/app/components/ext_direct/selector.rb
-- test/rails_app/app/components/ext_direct/statistics.rb
-- test/rails_app/app/components/extended_component_with_actions.rb
-- test/rails_app/app/components/extended_component_with_js_mixin.rb
-- test/rails_app/app/components/extended_localized_panel.rb
-- test/rails_app/app/components/extended_server_caller.rb
-- test/rails_app/app/components/hello_world_component.rb
-- test/rails_app/app/components/kinda_complex_component.rb
-- test/rails_app/app/components/kinda_complex_component/basic_stuff.rb
-- test/rails_app/app/components/kinda_complex_component/extra_stuff.rb
-- test/rails_app/app/components/loader_of_component_with_custom_css.rb
-- test/rails_app/app/components/localized_panel.rb
-- test/rails_app/app/components/nested_component.rb
-- test/rails_app/app/components/panel_with_plugin.rb
-- test/rails_app/app/components/panel_with_tools.rb
-- test/rails_app/app/components/plugin_with_components.rb
-- test/rails_app/app/components/scoped_components/deep_scoped_components/some_deep_scoped_component.rb
-- test/rails_app/app/components/scoped_components/extended_scoped_component.rb
-- test/rails_app/app/components/scoped_components/some_scoped_component.rb
-- test/rails_app/app/components/server_caller.rb
-- test/rails_app/app/components/server_counter.rb
-- test/rails_app/app/components/simple_component.rb
-- test/rails_app/app/components/simple_panel.rb
-- test/rails_app/app/components/simple_tab_panel.rb
-- test/rails_app/app/components/simple_window.rb
-- test/rails_app/app/components/some_composite.rb
-- test/rails_app/app/components/some_ext_component.rb
-- test/rails_app/app/components/some_plugin.rb
-- test/rails_app/app/components/touch/hello_world_component.rb
-- test/rails_app/app/components/touch/server_caller.rb
-- test/rails_app/app/components/touch/simple_carousel.rb
-- test/rails_app/app/controllers/application_controller.rb
-- test/rails_app/app/controllers/components_controller.rb
-- test/rails_app/app/controllers/multiple_components_controller.rb
-- test/rails_app/app/controllers/touch_controller.rb
-- test/rails_app/app/controllers/welcome_controller.rb
-- test/rails_app/app/helpers/application_helper.rb
-- test/rails_app/app/helpers/touch_helper.rb
-- test/rails_app/config/application.rb
-- test/rails_app/config/boot.rb
-- test/rails_app/config/environment.rb
-- test/rails_app/config/environments/development.rb
-- test/rails_app/config/environments/production.rb
-- test/rails_app/config/environments/test.rb
-- test/rails_app/config/initializers/backtrace_silencers.rb
-- test/rails_app/config/initializers/inflections.rb
-- test/rails_app/config/initializers/mime_types.rb
-- test/rails_app/config/initializers/netzke.rb
-- test/rails_app/config/initializers/secret_token.rb
-- test/rails_app/config/initializers/session_store.rb
-- test/rails_app/config/routes.rb
-- test/rails_app/db/migrate/20110110132720_create_netzke_component_states.rb
-- test/rails_app/db/schema.rb
-- test/rails_app/db/seeds.rb
-- test/rails_app/features/step_definitions/custom_css_steps.rb
-- test/rails_app/features/step_definitions/generic_steps.rb
-- test/rails_app/features/step_definitions/touch_steps.rb
-- test/rails_app/features/step_definitions/web_steps.rb
-- test/rails_app/features/support/env.rb
-- test/rails_app/features/support/paths.rb
-- test/rails_app/spec/component/actions_spec.rb
-- test/rails_app/spec/component/base_spec.rb
-- test/rails_app/spec/component/component_spec.rb
-- test/rails_app/spec/component/composition_spec.rb
-- test/rails_app/spec/component/configuration_spec.rb
-- test/rails_app/spec/component/javascript_spec.rb
-- test/rails_app/spec/component/state_spec.rb
-- test/rails_app/spec/core_ext_spec.rb
-- test/rails_app/spec/spec_helper.rb
-- test/test_helper.rb
-- test/unit/core_ext_test.rb
-- test/unit/netzke_core_test.rb
-- test/unit/netzke_preference_test.rb
+test_files: []
+

data/test/rails_app/app/controllers/multiple_components_controller.rb

@@ -1,2 +0,0 @@
-class MultipleComponentsController < ApplicationController
-end