rwiki 0.2.2 → 0.2.3

data/README.textile

@@ -22,15 +22,15 @@ h2. Screenshots
 
 h3. Browsing pages
 
-!http://img809.imageshack.us/img809/5460/snapshot6.png(test)!
+!http://img534.imageshack.us/img534/9779/rwikishowpage.png(test)!
 
 h3. Editing a page
 
-!http://img703.imageshack.us/img703/9992/snapshot7h.png(test)!
+!http://img17.imageshack.us/img17/5865/rwikieditingpage.png(test)!
 
 h3. FuzzyFinder
 
-!http://img404.imageshack.us/img404/2449/snapshot8w.png(test)!
+!http://img197.imageshack.us/img197/107/rwikifuzzyfinder.png(test)!
 
 h2. Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/features/create_page.feature

@@ -22,6 +22,7 @@ Feature: Create page
       | The new page |
     And I should see page title "Rwiki ./folder/The new page.txt"
     And I should see "The new page" within "h1"
+    And I should see generated content for the node with path "./folder/The new page.txt"
 
   @javascript
   Scenario: Create an existing page
@@ -38,7 +39,7 @@ Feature: Create page
     Then I should see the node titled "test"
 
     When I click the node with path "./folder/test.txt"
-    Then I should see "Test 1" within "h3"
+    Then I should see generated content for the node with path "./folder/test.txt"
 
   @javascript
   Scenario: Create a folder

data/features/display_page.feature

@@ -10,9 +10,7 @@ Feature: Display a page
     Then I should have the following open tabs:
       | home |
     And I should see page title "Rwiki ./home.txt"
-    And I should see "Sample page" within "h1"
-    And I should see "Lorem ipsum.."
-    And I should see "Sample section" within "h2"
+    And I should see generated content for the node with path "./home.txt"
 
   @javascript
   Scenario: Display the ./folder/test.txt page
@@ -22,11 +20,7 @@ Feature: Display a page
     Then I should have the following open tabs:
       | test |
     And I should see page title "Rwiki ./folder/test.txt"
-    And I should see "Test 1" within "h3"
-    And I should see "Item one"
-    And I should see "Item two"
-    And I should see "Item three"
-    And I should see "Last item"
+    And I should see generated content for the node with path "./folder/test.txt"
 
   @javascript
   Scenario: Display the several page
@@ -38,3 +32,4 @@ Feature: Display a page
       | 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"

data/features/editor.feature

@@ -19,9 +19,11 @@ Feature: Editing a page
     And I press "Save"
     Then I should not see the window
     And I should see "A new page header" within "h1"
+    And I should see generated content for the node with path "./home.txt"
 
     When I reload the application
     Then I should see "A new page header" within "h1"
+    And I should see generated content for the node with path "./home.txt"
 
   @javascript
   Scenario: Edit and Save and continue
@@ -31,8 +33,9 @@ Feature: Editing a page
 
     When I fill in "editor" with "h1. A new page header"
     And I press "Save and continue"
-    Then I should see "A new page header" within "h1"
-
+    Then I should see the window titled "Editing page ./home.txt"
+    And I should see "A new page header" within "h1"
+    And I should see generated content for the node with path "./home.txt"
 
   @javascript
     Scenario: Edit and Cancel
@@ -43,3 +46,4 @@ Feature: Editing a page
     When I fill in "editor" with "h1. A new page header"
     And I press "Cancel"
     Then I should see "Sample page" within "h1"
+    And I should see generated content for the node with path "./home.txt"

data/features/history.feature

@@ -11,6 +11,7 @@ Feature: History
       | home |
     And the node with path "./home.txt" should be selected
     Then I should see "Sample page" within "h1"
+    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
@@ -21,7 +22,7 @@ Feature: History
     Then I should have the following open tabs:
       | test |
     And I should see page title "Rwiki ./folder/test.txt"
-    And I should see "Test 1" within "h3"
+    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
 
   @javascript
@@ -33,14 +34,18 @@ Feature: History
 
     When 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"
 
     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"
 
     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"
 
     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"

data/features/rename_page.feature

@@ -18,6 +18,7 @@ Feature: Rename a node
 
     When I click the node with path "./The new home.txt"
     Then I should see "Sample page" within "h1"
+    And I should see generated content for the node with path "./The new home.txt"
 
   @javascript
   Scenario: Rename a page to existing name
@@ -33,9 +34,10 @@ Feature: Rename a node
 
     When I click the node with path "./home.txt"
     Then I should see "Sample page" within "h1"
+    And I should see generated content for the node with path "./home.txt"
 
     When I click the node with path "./test.txt"
-    Then I should see "This is a test"
+    Then I should see generated content for the node with path "./test.txt"
     And I should see page title "Rwiki ./test.txt"
     And I should have the following open tabs:
       | home |
@@ -58,6 +60,7 @@ Feature: Rename a node
       | test         |
       | The new home |
     And I should see page title "Rwiki ./The new home.txt"
+    And I should see generated content for the node with path "./The new home.txt"
 
   @javascript
   Scenario: Rename a folder
@@ -76,11 +79,12 @@ Feature: Rename a node
 
     When I double click the node with path "./The new folder name"
     And I click the node with path "./The new folder name/test.txt"
-    Then I should see "Test 1" within "h3"
+    And I should see generated content for the node with path "./The new folder name/test.txt"
 
     When I reload the application
     Then I should see the node titled "The new folder name"
     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"
-    Then I should see "Test 1" within "h3"
+    And I should see generated content for the node with path "./The new folder name/test.txt"
+
     

data/features/step_definitions/common_steps.rb

@@ -34,3 +34,11 @@ When /^I create a new page title "([^"]*)" for the node with path "([^"]*)"$/ do
   And %{I press "OK" within the dialog box}
   Then %{I should see the node titled "#{title}"}
 end
+
+Then /^I should see generated content for the node with path "([^"]*)"$/ do |path|
+  # TODO refactor this code
+  wiki_page_html = Rwiki::Models::Page.new(path).to_html.gsub(/([^>]*)(?=<[^>]*?>)/im, '')
+  page_html = Nokogiri::HTML(page.body).css('div.page-container:not(.x-hide-display)').first.inner_html.gsub(/([^>]*)(?=<[^>]*?>)/im, '')
+
+  page_html.should == wiki_page_html
+end

data/lib/rwiki/app.rb

@@ -31,6 +31,14 @@ module Rwiki
       page.to_json
     end
 
+    get '/node/print' do
+      path = params[:path].strip
+      page = Page.new(path)
+      @html = page.to_html
+
+      erb :print, :layout => false
+    end
+
     # update page content
     put '/node' do
       path = params[:path].strip

data/lib/rwiki/models/node.rb

@@ -17,8 +17,8 @@ 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('.'))
+        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/lib/rwiki/models/page.rb

@@ -14,6 +14,7 @@ module Rwiki::Models
     def raw_content
       @raw_content ||= read_file
     end
+    alias :to_textile :raw_content
 
     def raw_content=(raw)
       @raw_content = raw
@@ -23,6 +24,7 @@ module Rwiki::Models
     def html_content
       @html_content ||= parse_content
     end
+    alias :to_html :html_content
 
     def title
       base_name.gsub(/#{PAGE_FILE_EXTENSION}$/, '')
@@ -43,7 +45,7 @@ module Rwiki::Models
     end
 
     def to_hash
-      super.merge({ :rawContent => raw_content, :htmlContent => html_content })
+      super.merge({ :rawContent => to_textile, :htmlContent => to_html })
     end
 
     private
@@ -55,10 +57,11 @@ module Rwiki::Models
     def parse_content
       coderay!
 
-      toc = generate_toc
-      add_anchors_to_headers!
+#      toc = generate_toc
+#      add_anchors_to_headers!
       
-      return toc + RedCloth.new(raw_content).to_html
+#      return toc + RedCloth.new(raw_content).to_html
+      return RedCloth.new(raw_content).to_html
     end
 
     def coderay!

data/public/javascripts/Rwiki/TabPanel.js

@@ -16,6 +16,11 @@ Rwiki.TabPanel = Ext.extend(Ext.TabPanel, {
         iconCls: 'icon-edit',
         scope: this,
         handler: this.onEditPage
+      }, {
+        text: 'Print page',
+        iconCls: 'icon-print',
+        scope: this,
+        handler: this.onPrint
       }, {
         text: 'Find page',
         iconCls: 'icon-search',
@@ -164,5 +169,13 @@ Rwiki.TabPanel = Ext.extend(Ext.TabPanel, {
   onFuzzyFinder: function() {
     var fuzzyFinder = new Rwiki.FuzzyFinderDialog();
     fuzzyFinder.show();
+  },
+
+  onPrint: function() {
+    var currentTab = this.getActiveTab();
+    if (currentTab) {
+      var path = currentTab.getPagePath();
+      window.open('/node/print?path=' + path, 'mywindow', 'width=800,height=600')
+    }
   }
 });

data/public/stylesheets/style.css

@@ -81,3 +81,7 @@
 .icon-cancel {
   background-image: url(../images/icons/cancel.png) !important;
 }
+
+.icon-print {
+  background-image: url(../images/icons/printer.png) !important;
+}

data/rwiki.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rwiki}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Łukasz Bandzarewicz"]
-  s.date = %q{2011-01-23}
+  s.date = %q{2011-01-24}
   s.default_executable = %q{rwiki}
   s.description = %q{Personal wiki based on ExtJS}
   s.email = %q{lucassus@gmail.com}
@@ -2091,7 +2091,8 @@ Gem::Specification.new do |s|
     "tmp/fssm_test.rb",
     "vendor/.gitkeep",
     "views/index.erb",
-    "views/layout.erb"
+    "views/layout.erb",
+    "views/print.erb"
   ]
   s.homepage = %q{http://github.com/lucassus/rwiki}
   s.licenses = ["MIT"]

data/views/layout.erb

@@ -61,5 +61,5 @@
     <%= yield %>
   </body>
 
-  <link href='http://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css' />
+  <!--<link href='http://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css' />-->
 </html>

data/views/print.erb

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8"/>
+  <title>Rwiki</title>
+
+  <link rel="stylesheet" type="text/css" href="/stylesheets/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/stylesheets/page.css"/>
+  <link rel="stylesheet" type="text/css" href="/stylesheets/coderay.css"/>
+
+  <script language="Javascript1.2">
+      <!--
+      function printpage() {
+          window.print();
+      }
+      //-->
+  </script>
+</head>
+
+<body onload="printpage();">
+<%= @html %>
+</body>
+
+</html>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - "\xC5\x81ukasz Bandzarewicz"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-23 00:00:00 +01:00
+date: 2011-01-24 00:00:00 +01:00
 default_executable: rwiki
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -2334,6 +2334,7 @@ files:
 - vendor/.gitkeep
 - views/index.erb
 - views/layout.erb
+- views/print.erb
 has_rdoc: true
 homepage: http://github.com/lucassus/rwiki
 licenses: 
@@ -2348,7 +2349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3933874289465481879
+      hash: 1194724360297676042
       segments: 
       - 0
       version: "0"