rwiki 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/features/delete_page.feature

@@ -16,19 +16,16 @@ Feature: Delete a page
     Then I should not see the node titled "home"
 
   @javascript
-  Scenario: Delete a page when tab is open
-    When I click the node with path "./home.txt"
-    And I double click the node with path "./folder"
-    And I double click the node with path "./folder/subfolder"
-    And I click the node with path "./folder/subfolder/ruby.txt"
+  Scenario: Delete a page when a tab is open
+    When I open the page for the tree node with path "./home.txt"
+    And I open the page for the tree node with path "./folder/subfolder/ruby.txt"
     And I right click the node with path "./home.txt"
     And I follow "Delete node"
     Then I should see dialog box titled "Confirm"
 
     When I press "Yes" within the dialog box
     Then I should not see the node titled "home"
-    And I should have the following open tabs:
-      | ruby |
+    And I should see active tab titled "ruby"
     And I should see page title "Rwiki ./folder/subfolder/ruby.txt"
 
     When I right click the node with path "./folder/subfolder/ruby.txt"

data/features/display_page.feature

@@ -4,32 +4,30 @@ Feature: Display a page
     Given I open the application
 
   @javascript
-  Scenario: Display the home.txt page
-    When I click the node with path "./home.txt"
+  Scenario Outline: Display the page
+    When I open the page for the tree node with path "<path>"
+    Then I should see active tab titled "<title>"
+    And I should see generated content for the node with path "<path>"
 
-    Then I should have the following open tabs:
-      | home |
-    And I should see page title "Rwiki ./home.txt"
-    And I should see generated content for the node with path "./home.txt"
-
-  @javascript
-  Scenario: Display the ./folder/test.txt page
-    When I double click the node with path "./folder"
-    And I click the node with path "./folder/test.txt"
-
-    Then I should have the following open tabs:
-      | test |
-    And I should see page title "Rwiki ./folder/test.txt"
-    And I should see generated content for the node with path "./folder/test.txt"
+  Examples:
+    | path                        | title  |
+    | ./home.txt                  | home   |
+    | ./test.txt                  | test   |
+    | ./folder/test.txt           | test   |
+    | ./folder/test 1.txt         | test 1 |
+    | ./folder/test 2.txt         | test 2 |
+    | ./folder/subfolder/ruby.txt | ruby   |
 
   @javascript
-  Scenario: Display the several page
-    When I click the node with path "./home.txt"
-    And I double click the node with path "./folder"
-    And I click the node with path "./folder/test.txt"
+  Scenario: Display the several pages
+    When I open the page for the tree node with path "./home.txt"
+    And I open the page for the tree node with path "./folder/test.txt"
+    And I open the page for the tree node with path "./folder/subfolder/ruby.txt"
 
     Then I should have the following open tabs:
       | home |
       | test |
-    And I should see page title "Rwiki ./folder/test.txt"
-    And I should see generated content for the node with path "./folder/test.txt"
+      | ruby |
+    Then I should see active tab titled "ruby"
+    And I should see page title "Rwiki ./folder/subfolder/ruby.txt"
+    And I should see generated content for the node with path "./folder/subfolder/ruby.txt"

data/features/fuzzy_finder.feature

@@ -5,6 +5,13 @@ Feature: Tree Panel
 
   @javascript
   Scenario: Find a page
+    Given this scenario is pending
+
     When I press "Find page"
     And I fill in the input with "test" within the dialog box
-    
+    And I select the first search result
+
+    Then I should have the following open tabs:
+      | home |
+    And I should see page title "Rwiki ./test.txt"
+    And I should see generated content for the node with path "./test.txt"

data/features/history.feature

@@ -14,38 +14,49 @@ Feature: History
     And I should see generated content for the node with path "./home.txt"
 
   @javascript
-  Scenario: After reload the application last opened page should be loaded
-    When I double click the node with path "./folder"
-    And I click the node with path "./folder/test.txt"
+  Scenario Outline: After reload the application last opened page should be loaded
+    When I open the page for the tree node with path "<path>"
     And I reload the application
 
-    Then I should have the following open tabs:
-      | test |
-    And I should see page title "Rwiki ./folder/test.txt"
-    And I should see generated content for the node with path "./folder/test.txt"
-    And the node with path "./folder/test.txt" should be selected
+    Then I should see active tab titled "<title>"
+    And I should see page title "Rwiki <path>"
+    And I should see generated content for the node with path "<path>"
+    And the node with path "<path>" should be selected
+
+  Examples:
+    | path                        | title  |
+    | ./home.txt                  | home   |
+    | ./test.txt                  | test   |
+    | ./folder/test.txt           | test   |
+    | ./folder/test 1.txt         | test 1 |
+    | ./folder/test 2.txt         | test 2 |
+    | ./folder/subfolder/ruby.txt | ruby   |
 
   @javascript
   Scenario: Browser history
-    When I double click the node with path "./folder"
-    And I click the node with path "./folder/test.txt"
-    And I click the node with path "./test.txt"
-    And I click the node with path "./home.txt"
+    When I open the page for the tree node with path "./folder/test.txt"
+    And I open the page for the tree node with path "./test.txt"
+    And I open the page for the tree node with path "./home.txt"
+    Then I should see active tab titled "home"
 
-    When I press the browser back button
+    And I press the browser back button
     Then the node with path "./test.txt" should be selected
     And I should see generated content for the node with path "./test.txt"
+    And I should see active tab titled "test"
 
     When I press the browser back button
     Then the node with path "./folder/test.txt" should be selected
     And I should see generated content for the node with path "./folder/test.txt"
+    And I should see active tab titled "test"
 
     When I press the browser forward button
     Then the node with path "./test.txt" should be selected
     And I should see generated content for the node with path "./test.txt"
+    And I should see active tab titled "test"
 
     When I create a new page title "A new page" for the node with path "./Info"
     And I press the browser back button
     And I press the browser forward button
     Then the node with path "./Info/A new page.txt" should be selected
     And I should see generated content for the node with path "./Info/A new page.txt"
+    And I should see active tab titled "A new page"

data/features/rename_page.feature

@@ -86,5 +86,3 @@ Feature: Rename a node
     And I double click the node with path "./The new folder name"
     And I click the node with path "./The new folder name/test.txt"
     And I should see generated content for the node with path "./The new folder name/test.txt"
-
-    

data/features/step_definitions/common_steps.rb

@@ -3,6 +3,10 @@ Then /^I enter the break point$/ do
   p 'debugger'
 end
 
+Given /^this scenario is pending$/ do
+  pending # always
+end
+
 When /^I open the application$/ do
   When %Q{I go to the home page}
 end

data/features/step_definitions/dialog_box_steps.rb

@@ -1,6 +1,13 @@
 When /^I fill in the input with "([^"]*)" within the dialog box$/ do |text|
-  field = find('div.x-window input')
+  input_selector = 'div.x-window input'
+
+  field = find(input_selector)
   field.set(text)
+
+  # fire keyup event for trigger the autocomplete
+  Capybara.current_session.execute_script <<-JS
+    $("#{input_selector}").focus().trigger($.Event('keyup'));
+  JS
 end
 
 When /^I press "([^"]*)" within the dialog box$/ do |button|

data/features/step_definitions/fuzzy_finder_steps.rb

@@ -0,0 +1,4 @@
+When /^I select the first search result$/ do
+  search_result = page.find('div.search-item:first')
+  search_result.click
+end

data/features/step_definitions/tab_panel_steps.rb

@@ -17,6 +17,10 @@ When /^I click tab for page "([^"]*)"$/ do |path|
   tab.click
 end
 
+Then /^I should see active tab titled "([^"]*)"$/ do |title|
+  page.find('li.x-tab-strip-active').text.should == title
+end
+
 Then /^I should have the following open tabs:$/ do |table|
   actual_table = table(tableish("div.x-tab-panel ul li[@class!='x-tab-edge']", "a.x-tab-right"))
   table.diff!(actual_table)

data/features/step_definitions/tree_panel_steps.rb

@@ -1,3 +1,26 @@
+When /^I expand the parent for the node with path "([^"]*)"$/ do |path|
+  parts = path.split('/')[0..-2]
+  parts.each_index do |i|
+    partial_path = parts[0..i].join('/')
+
+    # check if node is expanded
+    is_expanded = Capybara.current_session.evaluate_script <<-JS
+      node = Rwiki.treePanel.findNodeByPath('#{partial_path}').isExpanded();
+    JS
+
+    unless is_expanded
+      Then %{I double click the node with path "#{partial_path}"}
+    end
+  end
+end
+
+When /^I open the page for the tree node with path "([^"]*)"$/ do |path|
+  When %{I expand the parent for the node with path "#{path}"}
+  And %{I click the node with path "#{path}"}
+  And %{I should see page title "Rwiki #{path}"}
+  And %{I should see generated content for the node with path "#{path}"}
+end
+
 Then /^I should see the node titled "([^"]*)"$/ do |title|
   Then %{I should see "#{title}" within "div#tree"}
 end

data/features/step_definitions/wait_steps.rb

@@ -11,7 +11,7 @@ Given /^I wait for load the tree$/ do
   end
 end
 
-Given /^I wait for load an ajax call complete$/ do
+Given /^I wait for an ajax call complete$/ do
   timeout = 10
   wait_until(timeout) do
     Capybara.current_session.evaluate_script <<-JS

data/features/support/env.rb

@@ -9,12 +9,11 @@ require File.expand_path(File.join(File.dirname(__FILE__), '../../test/tmpdir_he
 Rwiki::App.set(:environment, :test)
 
 Capybara.default_selector = :css
+
+require 'selenium/webdriver'
 Capybara.register_driver :selenium do |app|
-  Capybara::Driver::Selenium
   profile = Selenium::WebDriver::Firefox::Profile.new
-#  profile.add_extension(File.expand_path("features/support/firebug-1.6.1-fx.xpi"))
-
-  Capybara::Driver::Selenium.new(app, { :browser => :firefox, :profile => profile })
+  Capybara::Driver::Selenium.new(app, :profile => profile)
 end
 
 World do
@@ -27,7 +26,7 @@ World do
 
   AfterStep do
     Given %Q{I wait for load the tree}
-    And %Q{I wait for load an ajax call complete}
+    And %Q{I wait for an ajax call complete}
   end
 
   Before do

data/features/tab_panel.feature

@@ -5,8 +5,8 @@ Feature: Tab Panel
 
   @javascript
   Scenario: Close a tab
-    When I click the node with path "./home.txt"
-    And I click the node with path "./test.txt"
+    When I open the page for the tree node with path "./home.txt"
+    And I open the page for the tree node with path "./test.txt"
 
     Then I should have the following open tabs:
       | home |
@@ -22,9 +22,9 @@ Feature: Tab Panel
     Then I should have no open tabs
 
   @javascript
-  Scenario: Switching a tabs
-    When I click the node with path "./home.txt"
-    And I click the node with path "./test.txt"
+  Scenario: Switching the tabs
+    When I open the page for the tree node with path "./home.txt"
+    And I open the page for the tree node with path "./test.txt"
     Then I should see "This is a test"
 
     When I click tab for page "./home.txt"

data/lib/rwiki/models/node.rb

@@ -17,8 +17,10 @@ module Rwiki::Models
       end
 
       def fuzzy_finder(query)
-        finder = FuzzyFileFinder.new(full_path_for('.'))
-        matches = finder.find(query).sort_by { |m| [-m[:score], m[:path]] }
+        @finder ||= FuzzyFileFinder.new(full_path_for('.'))
+        @finder.rescan!
+
+        matches = @finder.find(query).sort_by { |m| [-m[:score], m[:path]] }
         matches.each do |m|
           m[:path] = '.' + m[:path].gsub(full_path_for('.'), '') 
         end

data/public/javascripts/Rwiki.js

@@ -23,46 +23,41 @@ Rwiki.init = function() {
   Rwiki.ajaxCallCompleted = true;
   Rwiki.treeLoaded = false;
 
-  var treePanel = new Rwiki.TreePanel();
-  Rwiki.treePanel = treePanel;
+  Rwiki.treePanel = new Rwiki.TreePanel();
   var nodeManager = Rwiki.NodeManager.getInstance();
 
   nodeManager.on('rwiki:beforePageLoad', function() {
     Rwiki.ajaxCallCompleted = false;
+    Rwiki.statusBar.showBusy();
   });
 
   nodeManager.on('rwiki:pageLoaded', function() {
     Rwiki.ajaxCallCompleted = true;
+    Rwiki.statusBar.clearStatus({useDefaults: true});
   });
 
-  treePanel.getLoader().on('load', function() {
+  Rwiki.statusBar = new Ext.ux.StatusBar({
+    statusAlign: 'right',
+    defaultText: 'Ready',
+    iconCls: 'x-status-valid'
+  });
+
+  Rwiki.treePanel.getLoader().on('load', function() {
     Rwiki.treeLoaded = true;
     Rwiki.treePanel.openNodeFromLocationHash();
   });
 
-  treePanel.relayEvents(nodeManager,
-    ['rwiki:pageLoaded', 'rwiki:folderCreated', 'rwiki:pageCreated', 'rwiki:nodeRenamed', 'rwiki:nodeDeleted']);
-
-  var tabPanel = new Rwiki.TabPanel();
-  Rwiki.tabPanel = tabPanel;
-  tabPanel.relayEvents(nodeManager,
-    ['rwiki:pageLoaded', 'rwiki:folderCreated', 'rwiki:pageCreated', 'rwiki:pageSaved', 'rwiki:nodeRenamed', 'rwiki:nodeDeleted']);
-  tabPanel.relayEvents(treePanel, ['pageSelected']);
-
-  var editorPanel = new Rwiki.EditorPanel();
-  editorPanel.relayEvents(Rwiki.NodeManager.getInstance(), ['rwiki:pageLoaded']);
-
-  var window = new Rwiki.EditorWindow(editorPanel);
+  Rwiki.tabPanel = new Rwiki.TabPanel({
+    bbar: Rwiki.statusBar
+  });
+  Rwiki.tabPanel.relayEvents(Rwiki.treePanel, ['rwiki:pageSelected']);
 
-  function showEditor(path) {
-    if (!window.isVisible()) {
-      window.setPagePath(path);
-      window.show();
+  var editorWindow = new Rwiki.EditorWindow();
+  Rwiki.tabPanel.on('rwiki:editPage', function(path) {
+    if (!editorWindow.isVisible()) {
+      editorWindow.setPagePath(path);
+      editorWindow.show();
     }
-  }
-
-  tabPanel.on('rwiki:editPage', function(path) {
-    showEditor(path);
   });
 
   // Handle this change event in order to restore the UI to the appropriate history state
@@ -73,14 +68,14 @@ Rwiki.init = function() {
   // Create layout
 
   var navigationPanel = new Rwiki.NavigationPanel({
-    items: [treePanel]
+    items: [Rwiki.treePanel]
   });
 
   var app = new Ext.Viewport({
     layout: 'border',
     plain: true,
     renderTo: Ext.getBody(),
-    items: [navigationPanel, tabPanel]
+    items: [navigationPanel, Rwiki.tabPanel]
   });
 
   app.show();
@@ -91,22 +86,22 @@ Rwiki.init = function() {
     alt: true,
     stopEvent: true,
     fn: function() {
-      tabPanel.onEditPage();
+      Rwiki.tabPanel.onEditPage();
     }
   }, {
     key: "t",
     ctrl: true,
     stopEvent: true,
     fn: function() {
-      tabPanel.onFuzzyFinder();
+      Rwiki.tabPanel.onFuzzyFinder();
     }
   }, {
     key: "w",
     ctrl: true,
     stopEvent: true,
     fn: function() {
-      var tab = tabPanel.getActiveTab();
-      tabPanel.remove(tab);
+      var tab = Rwiki.tabPanel.getActiveTab();
+      Rwiki.tabPanel.remove(tab);
     }
   }]);
   

data/public/javascripts/Rwiki/EditorPanel.js

@@ -24,12 +24,15 @@ Rwiki.EditorPanel = Ext.extend(Ext.Panel, {
   initEvents: function() {
     Rwiki.EditorPanel.superclass.initEvents.apply(this, arguments);
 
+    this.relayEvents(Rwiki.NodeManager.getInstance(), ['rwiki:pageLoaded']);
     this.on('rwiki:pageLoaded', this.onPageLoaded);
   },
 
-  onPageLoaded: function(data) {
-    this.editor.setPagePath(data.path);
-    this.editor.setContent(data.rawContent);
+  onPageLoaded: function(page) {
+    this.editor.setPagePath(page.getPath());
+    this.editor.setContent(page.getRawContent());
+
+    Ext.get('editor-container').unmask();
   },
 
   getPagePath: function() {

data/public/javascripts/Rwiki/EditorWindow.js

@@ -1,7 +1,9 @@
 Ext.ns('Rwiki');
 
 Rwiki.EditorWindow = Ext.extend(Ext.Window, {
-  constructor: function(editorPanel) {
+  constructor: function() {
+    this.editorPanel = new Rwiki.EditorPanel();
+
     Ext.apply(this, {
       maximizable: true,
       modal: true,
@@ -13,7 +15,7 @@ Rwiki.EditorWindow = Ext.extend(Ext.Window, {
       plain: true,
       bodyStyle: 'padding: 5px;',
       buttonAlign: 'center',
-      items: editorPanel,
+      items: this.editorPanel,
       buttons: [
         {
           text: 'Save',
@@ -37,7 +39,6 @@ Rwiki.EditorWindow = Ext.extend(Ext.Window, {
     });
 
     Rwiki.EditorWindow.superclass.constructor.apply(this, arguments);
-    this.editorPanel = editorPanel;
   },
 
   setPagePath: function(path) {
@@ -48,15 +49,21 @@ Rwiki.EditorWindow = Ext.extend(Ext.Window, {
   show: function() {
     Rwiki.NodeManager.getInstance().loadPage(this.pagePath);
     Rwiki.EditorWindow.superclass.show.apply(this, arguments);
+
+    Ext.get('editor-container').mask('Loading the page...');
   },
 
-  onSaveButton: function() {
+  savePage: function() {
     Rwiki.NodeManager.getInstance().savePage(this.pagePath, this.editorPanel.getRawContent());
+  },
+
+  onSaveButton: function() {
+    this.savePage();
     this.hide();
   },
 
   onSaveAndContinueButton: function() {
-    Rwiki.NodeManager.getInstance().savePage(this.pagePath, this.editorPanel.getRawContent());
+    this.savePage();
   },
 
   onCancelButton: function() {

data/public/javascripts/Rwiki/Node.js

@@ -0,0 +1,37 @@
+Ext.ns('Rwiki');
+
+Rwiki.Node = function(data) {
+  this._data = data;
+};
+
+Rwiki.Node.prototype = {
+
+  getData: function() {
+    return this._data;
+  },
+
+  getHtmlContent: function() {
+    return this._data.htmlContent;
+  },
+
+  getRawContent: function() {
+    return this._data.rawContent;
+  },
+
+  getPath: function() {
+    return this._data.path;
+  },
+
+  getParentPath: function() {
+    return this._data.parentPath;
+  },
+
+  getBaseName: function() {
+    return this.getPath().split('/').pop();
+  },
+
+  getTitle: function() {
+    return this.getBaseName().replace(new RegExp('\.txt$'), '');
+  }
+
+};

data/public/javascripts/Rwiki/NodeManager.js

@@ -22,10 +22,12 @@ Rwiki.NodeManager = Ext.extend(Ext.util.Observable, {
     );
   },
 
-  loadPage: function(path) {
+loadPage: function(path) {
     var self = this;
-    self.fireEvent('rwiki:beforePageLoad', path);
-    
+
+    var page = new Rwiki.Node({ path: path });
+    self.fireEvent('rwiki:beforePageLoad', page);
+        
     $.ajax({
       type: 'GET',
       url: '/node',
@@ -34,7 +36,8 @@ Rwiki.NodeManager = Ext.extend(Ext.util.Observable, {
         path: path
       },
       success: function(data) {
-        self.fireEvent('rwiki:pageLoaded', data);
+        page = new Rwiki.Node(data);
+        self.fireEvent('rwiki:pageLoaded', page);
       }
     });
   },
@@ -70,7 +73,8 @@ Rwiki.NodeManager = Ext.extend(Ext.util.Observable, {
         isFolder: false
       },
       success: function(data) {
-        self.fireEvent('rwiki:pageCreated', data);
+        var page = new Rwiki.Node(data);
+        self.fireEvent('rwiki:pageCreated', page);
       }
     });
   },
@@ -87,7 +91,8 @@ Rwiki.NodeManager = Ext.extend(Ext.util.Observable, {
         rawContent: rawContent
       },
       success: function(data) {
-        self.fireEvent('rwiki:pageSaved', data);
+        var page = new Rwiki.Node(data);
+        self.fireEvent('rwiki:pageSaved', page);
       }
     });
   },
@@ -104,7 +109,8 @@ Rwiki.NodeManager = Ext.extend(Ext.util.Observable, {
         newName: newName
       },
       success: function(data) {
-        self.fireEvent('rwiki:nodeRenamed', data);
+        var page = new Rwiki.Node(data);
+        self.fireEvent('rwiki:nodeRenamed', page);
       }
     });
   },
@@ -135,7 +141,8 @@ Rwiki.NodeManager = Ext.extend(Ext.util.Observable, {
         newParentPath: newParentPath
       },
       success: function(data) {
-        self.fireEvent('rwiki:nodeRenamed', data);
+        var page = new Rwiki.Node(data);
+        self.fireEvent('rwiki:nodeRenamed', page);
       }
     });
 

data/public/javascripts/Rwiki/TabPanel.js

@@ -37,32 +37,40 @@ Rwiki.TabPanel = Ext.extend(Ext.TabPanel, {
 
     this.addEvents('rwiki:editPage');
 
-    this.on('pageSelected', this.onPageSelected),
+    this.on('rwiki:pageSelected', this.onPageSelected),
     this.on('tabchange', this.onTabChange);
 
     this.on('rwiki:pageCreated', this.onPageCreated);
     this.on('rwiki:pageLoaded', this.onPageLoaded);
     this.on('rwiki:pageSaved', this.onPageSaved);
-    this.on('rwiki:nodeRenamed', this.onNodeRanamed);
+    this.on('rwiki:nodeRenamed', this.onNodeRenamed);
     this.on('rwiki:nodeDeleted', this.onNodeDeleted);
+
+    this.relayEvents(Rwiki.NodeManager.getInstance(), [
+      'rwiki:pageLoaded',
+      'rwiki:folderCreated',
+      'rwiki:pageCreated',
+      'rwiki:pageSaved',
+      'rwiki:nodeRenamed',
+      'rwiki:nodeDeleted']);
   },
 
-  findOrCreatePageTab: function(path) {
-    var tab = this.findTabByPagePath(path);
+  findOrCreatePageTab: function(page) {
+    var tab = this.findTabByPagePath(page.getPath());
     
     if (!tab) {
-      tab = this.createPageTab(path);
+      tab = this.createPageTab(page);
     } 
 
     return tab;
   },
 
-  createPageTab: function(path, title) {
+  createPageTab: function(page) {
     var tab = new Rwiki.TabPanel.PageTab({
-      title: title
+      title: page.getTitle()
     });
 
-    tab.setPagePath(path);
+    tab.setPagePath(page.getPath());
     this.add(tab);
     
     return tab;
@@ -81,47 +89,51 @@ Rwiki.TabPanel = Ext.extend(Ext.TabPanel, {
     });
   },
 
-  onPageSelected: function(path) {
-    var tab = this.findOrCreatePageTab(path);
+  onPageSelected: function(page) {
+    var tab = this.findOrCreatePageTab(page);
     tab.show();
   },
 
   onTabChange: function(panel, tab) {
     if (tab) {
+      if (tab.isLoading()) {
+        return;
+      }
+
       Ext.History.add(tab.getPagePath());
       document.title = 'Rwiki ' + tab.getPagePath();
       Rwiki.NodeManager.getInstance().loadPage(tab.getPagePath());
+      tab.setIsLoading(true);
     } else {
       document.title = 'Rwiki';
       Rwiki.NodeManager.getInstance().fireEvent('rwiki:lastPageClosed');
     }
   },
 
-  onPageCreated: function(data) {
-    var tab = this.createPageTab(data.path, data.text);
+  onPageCreated: function(page) {
+    var tab = this.createPageTab(page);
     tab.show();
   },
 
-  onPageLoaded: function(data) {
-    var tab = this.findOrCreatePageTab(data.path);
-    var title = data.baseName.replace(new RegExp('\.txt$'), '');
-    
-    tab.setTitle(title);
-    tab.setContent(data.htmlContent);
+  onPageLoaded: function(page) {
+    var tab = this.findOrCreatePageTab(page);
+
+    tab.setTitle(page.getTitle());
+    tab.setContent(page.getHtmlContent());
     tab.show();
+
+    tab.setIsLoading(false);
   },
 
-  onPageSaved: function(data) {
-    var tab = this.findTabByPagePath(data.path);
+  onPageSaved: function(page) {
+    var tab = this.findTabByPagePath(page.getPath());
     if (tab == null) return;
 
-    tab.setContent(data.htmlContent);
+    tab.setContent(page.getHtmlContent());
   },
 
-  onNodeRanamed: function(data) {
-    var oldPath = data.oldPath;
-    var path = data.path;
-
+  onNodeRenamed: function(page) {
+    var oldPath = page.getData().oldPath;
     var currentTab = this.getActiveTab();
 
     var tab = null;
@@ -130,18 +142,17 @@ Rwiki.TabPanel = Ext.extend(Ext.TabPanel, {
       tab = this.findTabByPagePath(oldPath);
       if (tab == null) return;
 
-      tab.setPagePath(path);
-      var title = data.baseName.replace(new RegExp('\.txt$'), '');
-      tab.setTitle(title);
+      tab.setPagePath(page.getPath());
+      tab.setTitle(page.getTitle());
 
       if (tab == currentTab) {
-        document.title = 'Rwiki ' + path;
+        document.title = 'Rwiki ' + page.getPath();
       }
     } else {
       var tabs = this.findTabsByParentPath(oldPath);
       for (var i = 0; i < tabs.length; i++) {
         tab = tabs[i];
-        var newPath = tab.getPagePath().replace(oldPath, path);
+        var newPath = tab.getPagePath().replace(oldPath, page.getPath());
         tab.setPagePath(newPath);
 
         if (tab == currentTab) {
@@ -175,7 +186,7 @@ Rwiki.TabPanel = Ext.extend(Ext.TabPanel, {
     var currentTab = this.getActiveTab();
     if (currentTab) {
       var path = currentTab.getPagePath();
-      window.open('/node/print?path=' + path, 'mywindow', 'width=800,height=600')
+      window.open('/node/print?path=' + path, 'Rwiki ' + path, 'width=800,height=600,scrollbars=yes')
     }
   }
 });

data/public/javascripts/Rwiki/TabPanel/PageTab.js

@@ -11,6 +11,21 @@ Rwiki.TabPanel.PageTab = Ext.extend(Ext.Container, {
     Rwiki.TabPanel.PageTab.superclass.constructor.apply(this, arguments);
   },
 
+  isLoading: function() {
+    return this._isLoading;
+  },
+
+  setIsLoading: function(isLoading) {
+    this._isLoading = isLoading;
+
+    if (isLoading) {
+      this.mask = new Ext.LoadMask(Ext.get(this.id), {msg: 'Loading the Page...'});
+      this.mask.show();
+    } else if (this.mask) {
+      this.mask.hide();
+    }
+  },
+
   getPagePath: function() {
     return this.path;
   },
@@ -19,11 +34,8 @@ Rwiki.TabPanel.PageTab = Ext.extend(Ext.Container, {
     this.path = path;
   },
 
-  /**
-   * Update the page content.
-   */
   setContent: function(htmlContent) {
-    pageContainer = this.getPageContainer();
+    var pageContainer = this.getPageContainer();
     pageContainer.html(htmlContent);
   },
 

data/public/javascripts/Rwiki/TreePanel.js

@@ -38,7 +38,7 @@ Rwiki.TreePanel = Ext.extend(Ext.tree.TreePanel, {
     this.root.expand();
 
     new Ext.tree.TreeSorter(this, {
-      folderSort: false
+      folderSort: true
     });
 
     var self = this;
@@ -55,7 +55,7 @@ Rwiki.TreePanel = Ext.extend(Ext.tree.TreePanel, {
       self.filter.filterTree(text);
     });
 
-    this.addEvents('pageSelected');
+    this.addEvents('rwiki:pageSelected');
   },
 
   initEvents: function() {
@@ -69,6 +69,13 @@ Rwiki.TreePanel = Ext.extend(Ext.tree.TreePanel, {
     this.on('rwiki:nodeRenamed', this.onNodeRenamed);
     this.on('rwiki:nodeDeleted', this.onNodeDeleted);
     this.on('beforemovenode', this.onBeforeMoveNode);
+
+    this.relayEvents(Rwiki.NodeManager.getInstance(), [
+      'rwiki:pageLoaded',
+      'rwiki:folderCreated',
+      'rwiki:pageCreated',
+      'rwiki:nodeRenamed',
+      'rwiki:nodeDeleted']);
   },
 
   onContextMenu: function(node, e) {
@@ -83,13 +90,12 @@ Rwiki.TreePanel = Ext.extend(Ext.tree.TreePanel, {
 
   onClick: function(node) {
     if (!node.isLeaf()) return;
-
-    var path = node.getPath();
-    this.fireEvent('pageSelected', path);
+    var page = new Rwiki.Node({ path: node.getPath() });
+    this.fireEvent('rwiki:pageSelected', page);
   },
 
-  onPageLoaded: function(data) {
-    var node = this.findNodeByPath(data.path);
+  onPageLoaded: function(page) {
+    var node = this.findNodeByPath(page.getPath());
     if (node) {
       node.select();
     }
@@ -109,27 +115,25 @@ Rwiki.TreePanel = Ext.extend(Ext.tree.TreePanel, {
     parentNode.appendChild(node);
   },
 
-  onPageCreated: function(data) {
-    var node = new Rwiki.TreePanel.Node({
-      baseName: data.baseName,
-      text: data.baseName.replace(new RegExp('\.txt$'), ''),
+  onPageCreated: function(page) {
+    var treeNode = new Rwiki.TreePanel.Node({
+      baseName: page.getBaseName(),
+      text: page.getTitle(),
       cls: 'page',
       expandable: false,
       leaf: true
     });
 
-    var parentNode = this.findNodeByPath(data.parentPath);
+    var parentNode = this.findNodeByPath(page.getParentPath());
     parentNode.expand();
-    parentNode.appendChild(node);
-    node.select();
+    parentNode.appendChild(treeNode);
+    treeNode.select();
   },
 
-  onNodeRenamed: function(data) {
-    var node = this.findNodeByPath(data.oldPath);
-    node.setBaseName(data.baseName);
-
-    var title = data.baseName.replace(new RegExp('\.txt$'), '');
-    node.setText(title);
+  onNodeRenamed: function(page) {
+    var treeNode = this.findNodeByPath(page.getData().oldPath);
+    treeNode.setBaseName(page.getBaseName());
+    treeNode.setText(page.getTitle());
   },
 
   onNodeDeleted: function(data) {

data/rwiki.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rwiki}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Łukasz Bandzarewicz"]
-  s.date = %q{2011-01-24}
+  s.date = %q{2011-01-31}
   s.default_executable = %q{rwiki}
   s.description = %q{Personal wiki based on ExtJS}
   s.email = %q{lucassus@gmail.com}
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
     "features/step_definitions/common_steps.rb",
     "features/step_definitions/common_transforms.rb",
     "features/step_definitions/dialog_box_steps.rb",
+    "features/step_definitions/fuzzy_finder_steps.rb",
     "features/step_definitions/history_steps.rb",
     "features/step_definitions/tab_panel_steps.rb",
     "features/step_definitions/tree_panel_steps.rb",
@@ -1086,6 +1087,7 @@ Gem::Specification.new do |s|
     "public/javascripts/Rwiki/EditorWindow.js",
     "public/javascripts/Rwiki/FuzzyFinderDialog.js",
     "public/javascripts/Rwiki/NavigationPanel.js",
+    "public/javascripts/Rwiki/Node.js",
     "public/javascripts/Rwiki/NodeManager.js",
     "public/javascripts/Rwiki/TabPanel.js",
     "public/javascripts/Rwiki/TabPanel/PageTab.js",

data/views/layout.erb

@@ -32,6 +32,7 @@
     <script type="text/javascript" src="/javascripts/Rwiki/EditorPanel/Editor.js"></script>
     <script type="text/javascript" src="/javascripts/Rwiki/FuzzyFinderDialog.js"></script>
     <script type="text/javascript" src="/javascripts/Rwiki/NodeManager.js"></script>
+    <script type="text/javascript" src="/javascripts/Rwiki/Node.js"></script>
     <script type="text/javascript" src="/javascripts/Rwiki/TabPanel.js"></script>
     <script type="text/javascript" src="/javascripts/Rwiki/TabPanel/PageTab.js"></script>
     <script type="text/javascript" src="/javascripts/Rwiki/TreePanel.js"></script>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - "\xC5\x81ukasz Bandzarewicz"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 +01:00
+date: 2011-01-31 00:00:00 +01:00
 default_executable: rwiki
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -282,6 +282,7 @@ files:
 - features/step_definitions/common_steps.rb
 - features/step_definitions/common_transforms.rb
 - features/step_definitions/dialog_box_steps.rb
+- features/step_definitions/fuzzy_finder_steps.rb
 - features/step_definitions/history_steps.rb
 - features/step_definitions/tab_panel_steps.rb
 - features/step_definitions/tree_panel_steps.rb
@@ -1328,6 +1329,7 @@ files:
 - public/javascripts/Rwiki/EditorWindow.js
 - public/javascripts/Rwiki/FuzzyFinderDialog.js
 - public/javascripts/Rwiki/NavigationPanel.js
+- public/javascripts/Rwiki/Node.js
 - public/javascripts/Rwiki/NodeManager.js
 - public/javascripts/Rwiki/TabPanel.js
 - public/javascripts/Rwiki/TabPanel/PageTab.js
@@ -2349,7 +2351,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1194724360297676042
+      hash: -2476446300087577750
       segments: 
       - 0
       version: "0"