RubyGems - netzke-core - Versions diffs - 0.7.7 → 0.8.0 - Mend

netzke-core 0.7.7 → 0.8.0

Files changed (192) hide show

data/test/core_test_app/app/components/stateful_component_with_shared_state.rb ADDED Viewed

@@ -0,0 +1,11 @@
+# This component shares state with StatefulComponent by setting +persistence_key+ to that component's js_id (which is used as persestence_key by default)
+class StatefulComponentWithSharedState < Netzke::Base
+  def configure(c)
+    super
+    c.persistence = true
+    c.persistence_key = :stateful_component
+    # title will be gotten from component's state
+    c.title = state[:title] || "Default Title"
+  end
+end

data/test/core_test_app/app/components/window_with_simple_component.rb ADDED Viewed

@@ -0,0 +1,14 @@
+class WindowWithSimpleComponent < SimpleWindow
+  js_configure do |c|
+    c.layout = :fit
+  end
+  def configure(c)
+    c.items = [:simple_component]
+    super
+  end
+  component :simple_component do |c|
+    c.title = "Simple Component Inside Window"
+  end
+end

data/test/core_test_app/app/views/layouts/application.html.erb CHANGED Viewed

@@ -3,7 +3,7 @@
 <head>
   <title>Netzke Core Test App</title>
   <%= csrf_meta_tag %>
-  <%= netzke_init %>
+  <%= load_netzke minified: true %>
 </head>
 <body>

data/test/core_test_app/app/views/simple_rails/multiple_nested.html.erb CHANGED Viewed

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

data/test/core_test_app/app/views/simple_rails/panel.html.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ <%= netzke :panel, class_name: "Netzke::Core::Panel" %>

data/test/core_test_app/config/database.yml.travis CHANGED Viewed

@@ -2,12 +2,10 @@
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test: &test
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
-  database: nct_test
+  adapter: sqlite3
+  database: db/test.sqlite3
   pool: 5
-  username:
+  timeout: 5000
 cucumber:
   <<: *test

data/test/core_test_app/config/environments/production.rb CHANGED Viewed

@@ -29,7 +29,7 @@ RailsApp::Application.configure do
   # Disable Rails's static asset server
   # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
+  # config.serve_static_assets = false
   # Enable serving of images, stylesheets, and javascripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"

data/test/core_test_app/config/initializers/netzke.rb CHANGED Viewed

@@ -1,4 +1,6 @@
 Netzke::Core.setup do |config|
   config.js_direct_max_retries = 2
   # config.ext_uri = "/extjs4"
-end
+end
+ConfigurableOnClassLevel.title = "Overridden"

data/test/core_test_app/config/locales/en.yml CHANGED Viewed

@@ -4,15 +4,20 @@
 en:
   server_caller:
     actions:
-      bug_server: "Call server"
+      bug_server:
+        text: Call server
+        tooltip: This bugs server
+        icon: tick
   extended_server_caller:
     actions:
-      bug_server: "Call server extensively"
-      bug_server_tooltip: "With custom tooltip"
+      bug_server:
+        text: Call server extensively
+        tooltip: This bugs server in its own way
   localized_panel:
     title: Localized Panel
     property_one: First property
     property_two: Second property
     action_two: Second action
     actions:
-      action_one: First action
+      action_one:
+        text: First action

data/test/core_test_app/config/locales/es.yml CHANGED Viewed

@@ -8,5 +8,7 @@ es:
     property_two: Segunda propriedad
     action_two: Segunda acción
     actions:
-      action_one: Primera acción
-      action_three: Tercera acción
+      action_one:
+        text: Primera acción
+      action_three:
+        text: Tercera acción

data/test/core_test_app/config/routes.rb CHANGED Viewed

@@ -1,4 +1,6 @@
 RailsApp::Application.routes.draw do
+  netzke "/some/path/netzke" # the path is optional
   # The priority is based upon order of creation:
   # first created -> highest priority.
@@ -61,13 +63,5 @@ RailsApp::Application.routes.draw do
   # Components configured in Rails views
   match 'simple_rails/:action' => 'simple_rails', :as => 'simple_rails_views'
-  # Touch components
-  match 'components/touch/:component' => 'touch#index', :as => "touch_components"
-  # Non-Netzke Ext components
-  match 'ext/:component' => 'components#ext', :as => "ext"
   match ':controller(/:action(/:id(.:format)))'
-  netzke
 end

data/test/core_test_app/db/schema.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -17,21 +18,12 @@ ActiveRecord::Schema.define(:version => 20110110132720) do
     t.integer  "user_id"
     t.integer  "role_id"
     t.text     "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
   add_index "netzke_component_states", ["component"], :name => "index_netzke_component_states_on_component"
   add_index "netzke_component_states", ["role_id"], :name => "index_netzke_component_states_on_role_id"
   add_index "netzke_component_states", ["user_id"], :name => "index_netzke_component_states_on_user_id"
-  create_table "netzke_preferences", :force => true do |t|
-    t.string   "key"
-    t.text     "value"
-    t.integer  "user_id"
-    t.integer  "role_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
 end

data/test/core_test_app/features/actions_and_tools.feature CHANGED Viewed

@@ -6,6 +6,7 @@ Feature: Actions
 @javascript
 Scenario: Pressing button should result in corresponding actions
   When I go to the ComponentWithActions test page
+  Then I should not see "Excluded action"
   Then I should see "Disabled action"
   And button "Disabled action" should be disabled

data/test/core_test_app/features/client-server.feature CHANGED Viewed

@@ -9,4 +9,11 @@ Scenario: Ask server to set our title
   Then I should see "Server Caller"
   When I press "Call server"
+  And I wait for response from server
   Then I should see "All quiet here on the server"
+@selenium
+Scenario: Calling an endpoint with callback and scope
+  Given I am on the ServerCaller test page
+  When I press "Call with generic callback and scope"
+  Then I should see "Fancy title set!"

data/test/core_test_app/features/component_loader.feature CHANGED Viewed

@@ -19,18 +19,6 @@ Feature: Component loader
     When I press "Load with feedback"
     Then I should see "Callback invoked!"
-  @selenium
-  Scenario: Component loader should invoke a generic endpoint callback
-    Given I am on the ComponentLoader test page
-    When I press "Load with generic callback"
-    Then I should see "Generic callback invoked!"
-  @selenium
-  Scenario: Component loader should invoke a generic endpoint callback
-    Given I am on the ComponentLoader test page
-    When I press "Load with generic callback and scope"
-    Then I should see "Fancy title set!"
   @selenium
   Scenario: Component loader should load a window component with another component in it
     Given I am on the ComponentLoader test page
@@ -45,8 +33,20 @@ Feature: Component loader
     Then I should see "Simple Component with changed HTML"
   @javascript
-  Scenario: Component loader should report that it can't load a component
+  Scenario: Component loader should report that it can't load a component and stay adequate
     Given I am on the ComponentLoader test page
     When I press "Non-existing component"
     Then I should see "Couldn't load component 'non_existing_component'"
     And I should not see "Loading"
+  @javascript
+  Scenario: Component loader not be able to load a component marked as excluded
+    Given I am on the ComponentLoader test page
+    When I press "Inaccessible"
+    Then I should see "Couldn't load component 'inaccessible'"
+  @javascript
+  Scenario: Loading component's config
+    Given I am on the ComponentLoader test page
+    When I press "Config only"
+    Then I should see "SimpleComponent (overridden)"

data/test/core_test_app/features/composition.feature CHANGED Viewed

@@ -29,3 +29,17 @@ Feature: Composition
     When I press "Update east south from server"
     And I wait for response from server
     Then I should see "Here's an update for south panel in east panel"
+  @javascript
+  Scenario: Instantiation of pre-loaded Netzke components
+    Given I am on the SomeComposite test page
+    When I press "Show hidden window"
+    And I wait for response from server
+    Then I should see "Hidden window gone visible!"
+  @javascript
+  Scenario: Excluding components for the layout
+    When I go to the SimpleTabPanel test page
+    Then tab panel should have tab with title "Server Caller"
+    And tab panel should have tab with title "Extended Server Caller"
+    But tab panel should not have tab with title "Hello World component"

data/test/core_test_app/features/config_to_dsl_delegation.feature ADDED Viewed

@@ -0,0 +1,10 @@
+Feature: Config to dsl delegation
+  In order to value
+  As a role
+  I want feature
+@javascript
+Scenario: A base components delegates its configuration options to DSL
+  When I go to the DslDelegatedProperties test page
+  Then I should see "Title set via DSL"
+  And I should see "HTML set via DSL"

data/test/core_test_app/features/file_inclusion.feature CHANGED Viewed

@@ -5,6 +5,6 @@ Feature: File inclusion
 @javascript
 Scenario: A component with external JS file included
-  Given I am on the ComponentWithIncludedJs test page
+  Given I am on the ComponentWithRequiredJs test page
   When I press "Print message"
   Then I should see "Some message shown in the body"

data/test/core_test_app/features/i18n.feature CHANGED Viewed

@@ -17,8 +17,9 @@ Scenario: LocalizedPanel should be available in 2 languages
   And I should see "Primera acción"
   And I should see "Segunda acción"
-  When I press "Tercera acción"
-  Then I should see "Cargando..."
+  # Ext.LoadMask.prototype.msg is not translated in Ext 4.1.1
+  # When I press "Tercera acción"
+  # Then I should see "Cargando..."
   When I go to the "es" version of the ExtendedLocalizedPanel page
   Then I should see "Panel Localizada"
@@ -26,10 +27,9 @@ Scenario: LocalizedPanel should be available in 2 languages
   And I should see "Action one"
   And I should see "Segunda acción"
+  # Making sure that the locale is restored to "en" in the end
   When I go to the "en" version of the ExtendedLocalizedPanel page
   Then I should see "Localized Panel"
   And I should see "First property, Second property"
   And I should see "Action one"
   And I should see "Second action"
-  # NOTE: make sure that the locale is restored to "en" in the end!

data/test/core_test_app/features/js_include.feature CHANGED Viewed

@@ -17,4 +17,4 @@ Feature: JsMixins
   Scenario: ExtendedComponentWithJsMixin should behave, too
     Given I am on the ExtendedComponentWithJsMixin test page
     When I press "Action three"
-    Then I should see "Action Three triggered!"
+    Then I should see "Modified action Three triggered!"

data/test/core_test_app/features/persistence.feature CHANGED Viewed

@@ -5,14 +5,30 @@ Feature: Persistence
   @javascript
   Scenario: The component with persistence should be able to store and retrieve a persistence setting
-    When I go to the ComponentWithSessionPersistence test page
+    When I go to the StatefulComponent test page
     Then I should see "Default Title"
     And I should see "Default HTML"
-    But I should not see "Title From Session"
+    But I should not see "Title From State"
     And I should not see "HTML from session"
-    When I press "Tell server to store new title"
+    When I press "Set session and state"
     And I wait for response from server
-    And I go to the ComponentWithSessionPersistence test page
-    Then I should see "Title From Session"
+    And I go to the StatefulComponent test page
+    Then I should see "Title From State"
     And I should see "HTML from session"
+    When I press "Reset session and state"
+    And I wait for response from server
+    And I go to the StatefulComponent test page
+    Then I should see "Default Title"
+    And I should see "Default HTML"
+    But I should not see "Title From State"
+    And I should not see "HTML from session"
+  @javascript
+  Scenario: Sharing persistence key
+    When I go to the StatefulComponent test page
+    And I press "Set session and state"
+    And I wait for response from server
+    And I go to the StatefulComponentWithSharedState test page
+    Then I should see "Title From State"

data/test/core_test_app/features/step_definitions/generic_steps.rb CHANGED Viewed

@@ -41,6 +41,20 @@ When /^I press tool "([^"]*)"$/ do |tool|
   find("##{id} img").click
 end
+Then /^tab panel should have tab with title "(.*?)"$/ do |arg1|
+  page.driver.browser.execute_script(<<-JS).should == true
+    var tabPanel = Ext.ComponentQuery.query('tabpanel')[0];
+    return !!tabPanel.down('[title="#{arg1}"]');
+  JS
+end
+Then /^tab panel should not have tab with title "(.*?)"$/ do |arg1|
+  page.driver.browser.execute_script(<<-JS).should == true
+    var tabPanel = Ext.ComponentQuery.query('tabpanel')[0];
+    return !tabPanel.down('[title="#{arg1}"]');
+  JS
+end
 When /^I wait for response from server$/ do
   page.wait_until{ page.driver.browser.execute_script("return !Netzke.ajaxIsLoading()") }
 end

data/test/core_test_app/features/support/paths.rb CHANGED Viewed

@@ -23,9 +23,6 @@ module NavigationHelpers
     when /the (.*) test page/
       components_path(:component => $1)
-    when /the (.*) page for touch/
-      touch_components_path(:component => $1)
     when /the "(.+)" version of the (.*) page/
       components_path(:component => $2, :locale => $1)

data/test/core_test_app/public/images/icons/accept.png ADDED Viewed

Binary file

data/test/core_test_app/public/images/icons/anchor.png ADDED Viewed

Binary file

data/test/core_test_app/public/images/icons/tick.png ADDED Viewed

Binary file

data/test/core_test_app/spec/action_config_spec.rb ADDED Viewed

@@ -0,0 +1,15 @@
+require 'spec_helper'
+module Netzke::Core
+  describe ActionConfig do
+    it "should preserve localized attributes from superclass if those are not overridden" do
+      sc = ServerCaller.new
+      esc = ExtendedServerCaller.new
+      sc.actions[:bug_server].text.should == "Call server"
+      esc.actions[:bug_server].text.should == "Call server extensively"
+      sc.actions[:bug_server].tooltip.should == "This bugs server"
+      esc.actions[:bug_server].tooltip.should == "This bugs server in its own way"
+    end
+  end
+end

data/test/core_test_app/spec/{component/actions_spec.rb → actions_spec.rb} RENAMED Viewed

@@ -1,25 +1,17 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'netzke-core'
+require 'spec_helper'
-module Netzke
+module Netzke::Core
   describe Actions do
-    # it "should be possible to override toolbars without overriding action settings" do
-    #   ExtendedComponentWithActions.new.actions[:another_action][:disabled].should == true
-    # end
-    class SomeComponent < Base
+    class SomeComponent < Netzke::Base
       action :action_one
       action :action_two
-      action :action_three do
-        {:text => "Action three"}
+      action :action_three do |a|
+        a.text = "Action three"
       end
-      js_property :bbar, [:action_one.action, :action_two.action]
-      def config
-        {
-          :tbar => [:action_three.action]
-        }
+      def configure(c)
+        super
+        c.tbar = [:action_one, :action_two, :action_three]
       end
       def actions
@@ -28,40 +20,50 @@ module Netzke
         })
       end
-      action :action_five, :text => "Action 5"
+      action :action_five do |a|
+        a.text = "Action 5"
+      end
     end
     class ExtendedComponent < SomeComponent
-      js_property :bbar, [:action_one.action, :action_two.action, :action_three.action, :action_four.action, :action_five.action]
-      js_property :tbar, [:action_one.action, :action_two.action, :action_three.action, :action_four.action, :action_five.action]
     end
     class AnotherExtendedComponent < ExtendedComponent
-      action :action_one, :text => "Action 1"
-      action :action_five, :text => "Action Five"
+      action :action_one do |a|
+        a.text = "Action 1"
+      end
-      def action_two_action
-        super.merge(:disabled => true, :text => normalize_action_config(super)[:text] + ", extended")
+      action :action_five do |a|
+        a.text = "Action Five"
       end
-      action :action_three do
-        {:text => "Action 3"}
+      action :action_two do |c|
+        super(c)
+        c.disabled = true
+        c.text = c.text + ", extended"
+      end
+      action :action_three do |a|
+        a.text = "Action 3"
       end
     end
     class YetAnotherExtendedComponent < AnotherExtendedComponent
-      action :action_two, :disabled => false
+      action :action_two do |c|
+        super(c)
+        c.disabled = false
+      end
     end
-    # it "should auto collect actions from both js_methods and config" do
-    #   component = SomeComponent.new
-    #   component.actions.keys.size.should == 5
-    #   component.actions[:action_one][:text].should == "Action one"
-    #   component.actions[:action_two][:text].should == "Action two"
-    #   component.actions[:action_three][:text].should == "Action three"
-    #   component.actions[:action_four][:text].should == "Action 4"
-    #   component.actions[:action_five][:text].should == "Action 5"
-    # end
+    it "should auto collect actions from both js_methods and config" do
+      component = SomeComponent.new
+      component.actions.keys.size.should == 5
+      component.actions[:action_one][:text].should == "Action one"
+      component.actions[:action_two][:text].should == "Action two"
+      component.actions[:action_three][:text].should == "Action three"
+      component.actions[:action_four][:text].should == "Action 4"
+      component.actions[:action_five][:text].should == "Action 5"
+    end
     it "should not override previous actions when reconfiguring bars in child class" do
       component = ExtendedComponent.new
@@ -91,4 +93,4 @@ module Netzke
     end
   end
-end
+end