rwiki 0.2.4 → 0.2.5

data/features/support/paths.rb

@@ -10,7 +10,7 @@ module NavigationHelpers
   def path_to(page_name)
     case page_name
 
-    when /the home\s?page/
+    when /the home page/
       '/'
 
       # Add more mappings here.

data/features/tab_contextmenu.feature

@@ -0,0 +1,44 @@
+Feature: Tab Panel
+
+  Background:
+    Given I open the application
+
+  Scenario Outline: Close tab
+    When I open the page "<path>"
+    And I right click the tab with path "<path>"
+    And I follow "Close Tab"
+    Then I should have no open tabs
+
+  Examples:
+    | path                                         |
+    | /Home                                        |
+    | /Home/About                                  |
+    | /Home/Personal stuff/Notes                   |
+    | /Home/Development/Programming Languages      |
+    | /Home/Personal stuff/Addresses               |
+    | /Home/Development/Programming Languages/Ruby |
+
+  Scenario Outline: Close other tabs
+    When I open the page "/Home"
+    When I open the page "/Home/Development/Programming Languages/Ruby"
+    And I open the page "/Home/About"
+    And I right click the tab with path "<path>"
+    And I follow "Close Other Tabs"
+
+    Then I should have the following open tabs:
+      | <title> |
+    And I should see active tab titled "<title>"
+
+  Examples:
+    | path                                         | title |
+    | /Home                                        | Home  |
+    | /Home/Development/Programming Languages/Ruby | Ruby  |
+    | /Home/About                                  | About |
+
+  Scenario: Close all tabs
+    When I open the page "/Home"
+    When I open the page "/Home/Development/Programming Languages/Ruby"
+    And I open the page "/Home/About"
+    And I right click the tab with path "/Home/About"
+    And I follow "Close All Tabs"
+    Then I should have no open tabs

data/features/tab_panel.feature

@@ -3,45 +3,31 @@ Feature: Tab Panel
   Background:
     Given I open the application
 
-  @javascript
   Scenario: Close a tab
-    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"
+    When I open the page "/Home"
+    And I open the page "/Home/About"
 
     Then I should have the following open tabs:
-      | home |
-      | test |
-    And the node with path "./test.txt" should be selected
+      | Home  |
+      | About |
+    And the tree node "/Home/About" should be selected
 
-    When I close tab for page "./test.txt"
+    When I close a tab for node "/Home/About"
     Then I should have the following open tabs:
-      | home |
-    And the node with path "./test.txt" should be selected
+      | Home |
+    And the tree node "/Home/About" should be selected
 
-    When I close tab for page "./home.txt"
+    When I close a tab for node "/Home"
     Then I should have no open tabs
 
-  @javascript
   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 open the page "/Home"
+    And I open the page "/Home/About"
 
-    When I click tab for page "./home.txt"
-    Then I should see "Sample page" within "h1"
-    And the node with path "./home.txt" should be selected
-    And the node with path "./test.txt" should not be selected
+    When I click a tab for page "/Home"
+    And the tree node "/Home" should be selected
+    And the tree node "/Home/About" should not be selected
 
-    When I click tab for page "./test.txt"
-    Then I should see "This is a test"
-    And the node with path "./test.txt" should be selected
-    And the node with path "./home.txt" should not be selected
-
-  @javascript
-  Scenario: Close tab from context menu
-
-  @javascript
-  Scenario: Close other tabs from context menu
-
-  @javascript
-  Scenario: Close all tabs from context menu
+    When I click a tab for page "/Home/About"
+    And the tree node "/Home/About" should be selected
+    And the tree node "/Home" should not be selected

data/features/tree_panel.feature

@@ -3,22 +3,25 @@ Feature: Tree Panel
   Background:
     Given I open the application
 
-  @javascript
-  Scenario: Browsing a tree
-    Then I should see "empty_folder"
-    And I should see the node titled "folder"
-    And I should see the node titled "subfolder"
-    And I should see the node titled "home"
-    And I should see the node titled "test"
+  Scenario: Browsing the root node
+    Then for the tree node "/Home" I should see following nodes:
+      | About          |
+      | Development    |
+      | Personal stuff |
+    And I should not see the tree node titled "Ruby"
+    And I should not see the tree node titled "Addresses"
 
-    And I should not see the node titled "ruby"
-    And I should not see the node titled "test 1"
-    And I should not see the node titled "test 2"
+  Scenario: Expand the "/Home/Personal stuff" node
+    When I expand the tree node "/Home/Personal stuff"
+    Then for the tree node "/Home/Personal stuff" I should see following nodes:
+      | Addresses |
+      | Notes     |
 
-    When I double click the node with path "./folder"
-    Then I should see the node titled "test"
-    And I should see the node titled "test 1"
-    And I should see the node titled "test 2"
-
-    When I double click the node with path "./folder/subfolder"
-    Then I should see the node titled "ruby"
+  Scenario: Expand the "/Home/Development" node
+    When I expand the tree node "/Home/Development"
+    And I expand the tree node "/Home/Development/Programming Languages"
+    Then for the tree node "/Home/Development/Programming Languages" I should see following nodes:
+      | Java       |
+      | JavaScript |
+      | Python     |
+      | Ruby       |

data/lib/rwiki.rb

@@ -1,12 +1,13 @@
-require 'rubygems' if RUBY_VERSION < "1.9"
-
+require 'redcloth'
 require 'coderay'
-require 'erb'
 require 'json/pure'
-require 'redcloth'
+require 'fuzzy_file_finder'
+require 'find'
+
 require 'sinatra'
 require 'sinatra/base'
-require 'fuzzy_file_finder'
+require 'erb'
+require 'smart_asset'
 
 module Rwiki
 
@@ -15,11 +16,18 @@ module Rwiki
 
   autoload :App, 'rwiki/app'
   autoload :Configuration, 'rwiki/configuration'
-  autoload :Models, 'rwiki/models'
+  autoload :Page, 'rwiki/page'
+  autoload :Rake, 'rwiki/rake'
+  autoload :Utils, 'rwiki/utils'
+  autoload :Version, 'rwiki/version'
 
   def self.debug
     require 'ruby-debug'
     debugger
   end
-  
+
+  def self.configuration
+    Configuration.instance
+  end
+
 end

data/lib/rwiki/app.rb

@@ -1,42 +1,55 @@
 module Rwiki
   class App < Sinatra::Base
-    include Models
 
     set :root, File.join(File.dirname(__FILE__), '../..')
+    set :app_file, File.join(File.dirname(__FILE__), '../../..')
+
+    include SmartAsset::Adapters::Sinatra
 
-    disable :raise_errors
     disable :show_exceptions
-    disable :logging
+    enable :raise_errors
+    enable :logging
 
-    error NodeNotFoundError do
-      message = request.env['sinatra.error'].message
-      { :success => false, :message => message }.to_json
+    configure do
+      Dir.mkdir('log') unless File.exists?('log')
     end
 
-    get '/' do
-      erb :index
+    configure :test do
+      use Rack::CommonLogger, File.new('log/test.log', 'w')
     end
 
-    get '/nodes' do
-      path = params[:path].strip
+    configure :development do
+      use Rack::CommonLogger, File.new('log/development.log', 'w')
+    end
 
-      root_folder = Folder.new(path)
-      root_folder.nodes.to_json
+    error NodeNotFoundError do
+      message = request.env['sinatra.error'].message
+      { :success => false, :message => message }.to_json
     end
 
-    get '/node' do
-      path = params[:path].strip
-      page = Page.new(path)
+    after do
+      if params[:emulateSlowConnection] == 'true'
+        duration = (1..3).to_a.sample
+        sleep(duration)
+      end
+    end
 
-      page.to_json
+    get %r{^/(page(.*))?$} do
+      @json_tree_nodes = Rwiki::Page.new.tree.to_json
+      @page_path = params[:captures].last if params[:captures]
+      erb :index
     end
 
-    get '/node/print' do
-      path = params[:path].strip
-      page = Page.new(path)
-      @html = page.to_html
+    # get the node's content
+    get '/node' do
+      begin
+        path = params[:path].strip
+        page = Page.new(path)
 
-      erb :print, :layout => false
+        page.to_json(:success => true)
+      rescue Rwiki::Page::Error => error
+        { :success => false, :message => error.message }.to_json
+      end
     end
 
     # update page content
@@ -44,11 +57,10 @@ module Rwiki
       path = params[:path].strip
       raw_content = params[:rawContent].force_encoding("UTF-8")
 
-      page = Page.new(path)
-      page.raw_content = raw_content
-      page.save
+      node = Page.new(path)
+      node.update_file_content(raw_content)
 
-      page.to_json
+      node.to_json
     end
 
     # create a new node
@@ -56,25 +68,19 @@ module Rwiki
       parent_path = params[:parentPath].strip
       name = params[:name].strip
 
-      parent_folder = Folder.new(parent_path)
-      if params[:isFolder] == 'true'
-        node = parent_folder.create_sub_folder(name)
-      else
-        node = parent_folder.create_sub_page(name)
-      end
-
-      result = node.to_hash
-      result[:parentPath] = parent_folder.path
+      parent_node = Page.new(parent_path)
+      node = parent_node.add_page(name)
 
-      result.to_json
+      node.to_json
     end
 
+    # rename the node
     post '/node/rename' do
       path = params[:path].strip
       new_name = params[:newName].strip
 
-      node = Node.new_from_path(path)
-      node.rename(new_name)
+      node = Page.new(path)
+      node.rename_to(new_name)
 
       result = node.to_hash
       result[:oldPath] = path
@@ -82,24 +88,27 @@ module Rwiki
       result.to_json
     end
 
+    # move the node
     put '/node/move' do
       path = params[:path].strip
       new_parent_path = params[:newParentPath].strip
 
-      node = Node.new_from_path(path)
-      new_parent = Node.new_from_path(new_parent_path)
-      node.move(new_parent)
+      node = Page.new(path)
+      new_parent = Page.new(new_parent_path)
+
+      success = node.move_to(new_parent)
 
       result = node.to_hash
       result[:oldPath] = path
-      result[:success] = true
+      result[:success] = success
 
       result.to_json
     end
 
+    # delete the node
     delete '/node' do
       path = params[:path].strip
-      node = Node.new_from_path(path)
+      node = Page.new(path)
       node.delete
 
       { :path => node.path }.to_json
@@ -107,9 +116,24 @@ module Rwiki
 
     get '/fuzzy_finder' do
       query = params[:query]
-      matches = Node.fuzzy_finder(query)
+      results = Page.fuzzy_finder(query)
+
+      { :results => results, :count => results.size }.to_json
+    end
 
-      { :results => matches, :count => matches.size }.to_json
+    get '/text_search' do
+      query = params[:query]
+      results = Page.root.findgrep(query)
+
+      { :results => results, :count => results.size }.to_json
+    end
+
+    get '/node/print' do
+      path = params[:path].strip
+      page = Page.new(path)
+      @html_content = page.html_content
+
+      erb :print, :layout => false
     end
   end
 end

data/lib/rwiki/configuration.rb

@@ -1,22 +1,34 @@
 require 'singleton'
-require 'yaml'
 
-class Rwiki::Configuration
-  include Singleton
+module Rwiki
+  class Configuration
+    include Singleton
 
-  CONFIG_FILE_NAME = File.join(ENV['HOME'], '.rwiki', 'config.yml')
+    attr_accessor :rwiki_path
+    attr_accessor :root_page_name
+    attr_accessor :page_file_extension
 
-  attr_reader :config
+    def initialize
+      @rwiki_path = Dir.pwd
+      @root_page_name = 'Home'
+      @page_file_extension = 'txt'
+    end
 
-  def initialize
-    @config = {}
+    def root_page_path
+      '/' + root_page_name
+    end
 
-    if File.exist?(CONFIG_FILE_NAME)
-      @config = YAML.load_file(CONFIG_FILE_NAME) rescue {}
+    def root_page_full_path
+      File.join(rwiki_path, root_page_path)
+    end
+
+    def root_page_full_file_path
+      root_page_full_path + '.' + page_file_extension
+    end
+
+    def version
+      Rwiki::Version::STRING
     end
-  end
 
-  def [](index)
-    @config[index]
   end
 end

data/lib/rwiki/page.rb

@@ -0,0 +1,190 @@
+module Rwiki
+  class Page
+    include Rwiki::Utils
+
+    class Error < StandardError; end
+
+    attr_reader :file_helper
+    attr_reader :textile_helper
+
+    def self.root
+      self.new
+    end
+
+    def initialize(path = Rwiki.configuration.root_page_name)
+      @file_helper = FileHelper.new(path)
+      raise Error.new("Cannot find the #{path} page") unless file_helper.exists?
+    end
+
+    def textile_helper
+      @textile_helper ||= TextileHelper.new(file_content)
+    end
+
+    def is_root?
+      file_helper.path == Rwiki.configuration.root_page_path
+    end
+
+    def path
+      file_helper.path
+    end
+
+    def full_path
+      file_helper.full_path
+    end
+
+    def full_file_path
+      file_helper.full_file_path
+    end
+
+    def title
+      file_helper.basename
+    end
+
+    def parent
+      return if is_root?
+      @parent ||= Page.new(file_helper.full_parent_path)
+    end
+
+    def children
+      @children ||= fetch_children
+    end
+
+    def leaf?
+      children.size == 0
+    end
+
+    def has_children?
+      !leaf?
+    end
+
+    def tree
+      result = []
+
+      children.each do |child|
+        tree_node = child.to_tree_node_hash
+
+        if child.has_children?
+          tree_node[:children] = child.tree
+        end
+
+        result << tree_node
+      end
+
+      result
+    end
+
+    def add_page(name)
+      Page.new(file_helper.add_page(name))
+    end
+
+    def file_content
+      @file_content ||= file_helper.read_file_content
+    end
+
+    def html_content
+      @html_content ||= textile_helper.parsed_content
+    end
+
+    def html_toc
+      @html_toc ||= textile_helper.parsed_toc
+    end
+
+    def update_file_content(file_content)
+      file_helper.update_file_content(file_content)
+      reload!
+    end
+
+    def rename_to(new_name)
+      raise Error.new("Cannot rename the #{Rwiki.configuration.root_page_name} page") if is_root?
+      file_helper.rename_to(new_name)
+    end
+
+    def move_to(node)
+      raise Error.new("Cannot move the #{Rwiki.configuration.root_page_name} page") if is_root?
+      file_helper.move_to(node.path)
+    end
+
+    def delete
+      raise Error.new("Cannot delete the #{Rwiki.configuration.root_page_name} page") if is_root?
+      file_helper.delete
+    end
+
+    def to_tree_node_hash
+      {
+        :text => title,
+        :leaf => false
+      }
+    end
+
+    def to_hash
+      {
+        :path => path,
+        :rawContent => file_content,
+        :htmlContent => html_content,
+        :htmlToc => html_toc
+      }
+    end
+
+    def to_json(extra_attrs = {})
+      to_hash.merge(extra_attrs).to_json
+    end
+
+    # TODO cleanup and write tests
+    def self.fuzzy_finder(query)
+      @finder ||= FuzzyFileFinder.new(Rwiki.configuration.rwiki_path)
+      @finder.rescan!
+
+      matches = @finder.find(query).sort_by { |m| [-m[:score], m[:path]] }
+      matches.each do |m|
+        m[:path] = m[:path].gsub(Rwiki.configuration.rwiki_path, '').gsub(/\.#{Rwiki.configuration.page_file_extension}$/, '')
+        m[:highlighted_path] = m[:highlighted_path].gsub(/\.#{Rwiki.configuration.page_file_extension}$/, '')
+      end
+
+      matches
+    end
+
+    def findgrep(pattern, matches = [])
+      pattern = /#{Regexp.escape(pattern)}/i if pattern.kind_of?(String)
+
+      children.each do |child|
+        child.file_content.lines.grep(pattern) do |line|
+          matches << { :path => child.path, :line => line.strip }
+        end
+
+        if child.has_children?
+          child.findgrep(pattern, matches)
+        end
+      end
+
+      matches
+    end
+
+    protected
+
+    def fetch_children
+      self.class.fetch_children(full_path)
+    end
+
+    def self.fetch_children(full_path)
+      children = []
+
+      if Dir.exists?(full_path)
+        files = Dir.glob("#{full_path}/*.txt").sort
+        files.each do |file|
+          children << Page.new(file)
+        end
+      end
+
+      children
+    end
+
+    def reload!
+      @parent = nil
+      @children = nil
+
+      @file_content = nil
+      @html_content = nil
+    end
+
+  end
+end