RubyGems - redcar - Versions diffs - 0.8.1 → 0.9.0 - Mend

redcar 0.8.1 → 0.9.0

Files changed (210) hide show

data/plugins/{view_shortcuts → help}/views/redcar_small_icon.png RENAMED

File without changes

data/plugins/html_view/features/browser_bar.feature ADDED

@@ -0,0 +1,47 @@
+Feature: Navigating web content in HtmlTabs using the browser bar
+  Background:
+    When I will choose "plugins/html_view/features/fixtures" from the "open_directory" dialog
+    And I open a directory
+    And I open the browser bar
+    And I type "sample.html" into the "New URL:" field in the speedbar
+    And I press "Go!" in the speedbar
+  Scenario: Refresh a tab
+    Given I will choose "plugins/html_view/features/fixtures/sample.html" from the "open_file" dialog
+    When I open a file
+    And I replace the contents with "<html>I see you!</html>"
+    And I save the tab
+    And I close the focussed tab
+    And I open the browser bar
+    And I press "Refresh" in the speedbar
+    Then the HTML tab should say "I see you!"
+  Scenario: Go to a new URL in a HtmlTab
+    When I type "other.html" into the "New URL:" field in the speedbar
+    And I press "Go!" in the speedbar
+    Then the HTML tab should say "Is today Tuesday?"
+  Scenario: Move back and forward in the browser history
+    When I type "other.html" into the "New URL:" field in the speedbar
+    And I press "Go!" in the speedbar
+    And I press "<" in the speedbar
+    Then the HTML tab should say "Hello!!"
+    When I press ">" in the speedbar
+    Then the HTML tab should say "Is today Tuesday?"
+  Scenario: View page source from the browser bar
+    When I press "Source" in the speedbar
+    Then I should see "<html><b>Hello!!</b></html>" in the edit tab
+  Scenario: Add a new bookmark to a project
+    When I type "other.html" into the "New URL:" field in the speedbar
+    Given I would type "Other" in an input box
+    And I would type "" in an input box
+    When I press "+" in the speedbar
+    And I open the web bookmarks tree
+    Then I should see "Other" in the tree
+  Scenario: When a HTML tab loses focus, the browser bar is hidden
+    When I open a new edit tab
+    Then there should not be an open speedbar

data/plugins/html_view/features/fixtures/other.html ADDED

	@@ -0,0 +1 @@
1	+ <html><b>Is today Tuesday?</b></html>

data/plugins/html_view/features/fixtures/sample.html ADDED

	@@ -0,0 +1 @@
1	+ <html><b>Hello!!</b></html>

data/plugins/html_view/features/step_definitions/html_view_steps.rb CHANGED

@@ -1,8 +1,8 @@
-Then /^the HTML tab (should say|says) "([^"]*)"$/ do |_, needle|
+Then /^the HTML tab (should (not )?say|says) "([^"]*)"$/ do |_, negation, needle|
   limit = 5
   contents = nil
   started = false
   thread = Thread.new do
     started = true
     start = Time.now
@@ -10,15 +10,55 @@ Then /^the HTML tab (should say|says) "([^"]*)"$/ do |_, needle|
     while !contents or (contents and !contents.match(needle)) && Time.now - start < limit
       contents = get_browser_contents
       sleep 0.1
-    end
+    end
   end
   Redcar.gui.yield_until { started && !thread.alive? }
   # For now, just skip on XUL platforms on which we can't get browser exec results
   # (current version of SWT and XulRunner). More info at:
   # https://bugs.eclipse.org/bugs/show_bug.cgi?id=259687
   unless (contents.nil? or contents.empty?) and [:windows, :linux].include? Redcar.platform
-    contents.should match needle
+    negation ? (contents.should_not match needle) : (contents.should match needle)
   end
 end
+When /^I click "([^\"]+)" in the HTML tab$/ do |link|
+  html_view = focussed_tab.html_view
+  # The JQuery way doesn't seem to work - I'm getting errors with this:
+  # => html_view.controller.execute(%{ $("a:contains(#{link.gsub('"', '\"')})").click(); })
+  # So, click the link the old-fashioned way.
+  js = <<-JAVASCRIPT
+    var link, evt, links, cancelled, i;
+    links = document.getElementsByTagName("a");
+    for (i = 0; i < links.length; i++) {
+      if (links[i].innerHTML.search(#{link.inspect}) > -1) {
+        link = links[i];
+        break;
+      }
+    }
+    if (typeof(link) !== "undefined") {
+      if (document.createEvent) {
+        evt = document.createEvent("MouseEvents");
+        evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+        cancelled = !link.dispatchEvent(evt);
+      } else if (link.fireEvent) {
+        cancelled = !link.fireEvent("onclick");
+      }
+      if (!cancelled) {
+        window.location = link.href;
+      }
+    }
+  JAVASCRIPT
+  html_view.controller.execute(js)
+end
+When /^I open the browser bar$/ do
+  Redcar::HtmlView::ToggleBrowserBar.new.run
+end
+When /^I open a web preview$/ do
+  Redcar::HtmlView::FileWebPreview.new.run
+end

data/plugins/html_view/features/support/env.rb CHANGED

@@ -0,0 +1,26 @@
+def htmlview_fixtures_path
+  File.expand_path(File.dirname(__FILE__) + "/../fixtures")
+end
+def htmlview_fixtures_redcar
+  File.join(htmlview_fixtures_path,".redcar")
+end
+def reset_htmlview_fixtures
+  FileUtils.rm_rf(htmlview_fixtures_redcar) if File.exists?(htmlview_fixtures_redcar)
+  File.open(htmlview_fixtures_path + "/sample.html", "w") do |f|
+    f.print "<html><b>Hello!!</b></html>"
+  end
+  File.open(htmlview_fixtures_path + "/other.html", "w") do |f|
+    f.print "<html><b>Is today Tuesday?</b></html>"
+  end
+end
+Before do
+  reset_htmlview_fixtures
+end
+After do
+  reset_htmlview_fixtures
+end

data/plugins/html_view/features/web_preview.feature ADDED

@@ -0,0 +1,21 @@
+Feature: Previewing how a file will appear in a browser
+  Scenario: Previewing an untitled tab
+    When I open a new edit tab
+    And I replace the contents with "<html>test 1-2-3</html>"
+    And I open a web preview
+    Then my active tab should be "Preview"
+    And the HTML tab should say "test 1-2-3"
+  Scenario: Previewing a saved file
+    Given I will choose "plugins/html_view/features/fixtures/sample.html" from the "open_file" dialog
+    When I open a file
+    And I replace the contents with "<html>test 1-2-3</html>"
+    And I open a web preview
+    Then my active tab should be "Preview: sample.html"
+    And the HTML tab should say "Hello!!"
+    When I close the focussed tab
+    And I save the tab
+    And I open a web preview
+    Then my active tab should be "Preview: sample.html"
+    And the HTML tab should say "test 1-2-3"

data/plugins/html_view/lib/html_controller.rb CHANGED

@@ -2,23 +2,23 @@
 module Redcar
   module HtmlController
     include Redcar::Observable
     # Reload the index page
     def reload_index
       notify_listeners(:reload_index)
     end
     # Override this to return a message if the user should be prompted
     # before closing the tab.
     def ask_before_closing
       nil
     end
     # Override this to run code right before the tab is closed.
     def close
       nil
     end
     # Call execute with a string of javascript to execute the script
     # in the context of the browser widget.
     def execute(script)
@@ -47,4 +47,4 @@ module Redcar
       JS
     end
   end
-end
+end

data/plugins/html_view/lib/html_view.rb CHANGED

@@ -1,6 +1,9 @@
+require 'html_view/commands'
+require 'html_view/browser_bar'
 require 'html_view/html_tab'
 require 'html_controller'
+require 'html_view/default_controller'
 require 'json'
 module Redcar
@@ -8,18 +11,67 @@ module Redcar
     def self.default_css_path
       File.expand_path(File.join(Redcar.root, %w(plugins html_view assets redcar.css)))
     end
     def self.jquery_path
       File.expand_path(File.join(Redcar.root, %w(plugins html_view assets jquery-1.4.min.js)))
     end
+    def self.keymaps
+      map = Redcar::Keymap.build("main", [:osx, :linux, :windows]) do
+        link "Alt+Shift+B", ToggleBrowserBar
+      end
+      [map]
+    end
+    def self.menus
+      Redcar::Menu::Builder.build do
+        sub_menu "File" do
+          item "Web Preview", :command => FileWebPreview, :priority => 8
+        end
+        sub_menu "View" do
+          item "Toggle Browser Bar", :command => ToggleBrowserBar, :priority => 11
+        end
+      end
+    end
+    def self.storage
+      @storage ||= begin
+         storage = Plugin::Storage.new('html_view')
+         storage.set_default('use_external_browser_for_urls', false)
+         storage
+      end
+    end
+    def self.show_browser_bar?
+      if win = Redcar.app.focussed_window and
+        win.speedbar and win.speedbar.is_a?(BrowserBar)
+        return true
+      end
+      false
+    end
+    def self.tidy_url(url)
+      unless url.include?("://")
+        if File.exists?(url)
+          url = "file://#{url}"
+        elsif project = Redcar::Project::Manager.focussed_project and
+          relpath = File.join(project.path,url) and
+          File.exists?(relpath)
+          url = "file://#{relpath}"
+        else
+          url = "http://#{url}"
+        end
+      end
+      url
+    end
     attr_reader :controller
     def initialize(html_tab)
       @html_tab = html_tab
       @html_tab.add_listener(:controller_action, &method(:controller_action))
     end
     def controller=(new_controller)
       @controller = new_controller
       @html_tab.title = controller.title
@@ -28,7 +80,7 @@ module Redcar
       controller_action("index")
       attach_controller_listeners
     end
     def attach_controller_listeners
       @controller.add_listener(:reload_index) { controller_action("index") }
@@ -53,7 +105,7 @@ module Redcar
         result
       end
     end
     def controller_action(action_name, params=nil)
       text = nil
       begin
@@ -78,13 +130,13 @@ module Redcar
         end
       end
     end
     def contents=(source)
       @html_tab.controller.browser.set_text(source)
     end
     private
     class RubyFunc < Swt::Browser::BrowserFunction
       def function(args)
         begin
@@ -101,7 +153,7 @@ module Redcar
           puts e.backtrace
         end
       end
       attr_accessor :controller
     end

data/plugins/{web_bookmarks/lib/web_bookmarks → html_view/lib/html_view}/browser_bar.rb RENAMED

@@ -1,8 +1,15 @@
 module Redcar
-  class WebBookmarks
+  class HtmlView
     class BrowserBar < Redcar::Speedbar
+      def tab_changed(tab)
+        unless tab.is_a?(HtmlTab)
+          win = Redcar.app.focussed_window
+          win.close_speedbar
+        end
+      end
       def html_tab
         tab = Redcar.app.focussed_window.focussed_notebook_tab
         tab if tab.is_a?(Redcar::HtmlTab)
@@ -31,25 +38,26 @@ module Redcar
       end
       button :source, "Source", nil do
-        tab  = Redcar.app.focussed_window.new_tab(Redcar::EditTab)
-        url = html_tab.controller.browser.url.to_s
-        if url =~ /^file:\/\//
-          file_path = url[7,url.length]
-          mirror = Project::FileMirror.new(file_path)
-          tab.edit_view.document.mirror = mirror
-        else
-          tab.edit_view.document.text = html_tab.controller.browser.text
-          tab.title = "Page Source"
+        if html = html_tab and url = html.controller.browser.url.to_s
+          tab  = Redcar.app.focussed_window.new_tab(Redcar::EditTab)
+          if url =~ /^file:\/\//
+            file_path = url[7,url.length]
+            mirror = Redcar::Project::FileMirror.new(file_path)
+            tab.edit_view.document.mirror = mirror
+          else
+            tab.edit_view.document.text = html_tab.controller.browser.text
+            tab.title = "Page Source"
+          end
+          tab.edit_view.grammar = "HTML"
+          tab.edit_view.reset_undo
+          tab.focus
         end
-        tab.edit_view.grammar = "HTML"
-        tab.edit_view.reset_undo
-        tab.focus
       end
       button :add, "+", nil do
         if tab = html_tab and
           url = tab.controller.browser.url.to_s
-          WebBookmarks::AddBookmark.new(url).run
+          Redcar::WebBookmarks::AddBookmark.new(url).run
         end
       end
@@ -57,14 +65,18 @@ module Redcar
       textbox :new_url
       button :go_to_url, "Go!", "Return" do
-        @tab = html_tab
-        if @tab
-          unless new_url.value == ""
-            @tab.title=new_url.value
-            @tab.controller.go_to_location(new_url.value)
+        unless new_url.value == ""
+          url = new_url.value
+          if tab = html_tab
+            tab.title = url
+            tab.controller.go_to_location(HtmlView.tidy_url(url))
+            icon = HtmlTab.web_content_icon
+            tab.icon = icon unless tab.icon == icon
+          else
+            Redcar::HtmlView::DisplayWebContent.new(url,url).run
           end
         end
       end
     end
   end
-end
+end

data/plugins/html_view/lib/html_view/commands.rb ADDED

@@ -0,0 +1,64 @@
+require 'java'
+module Redcar
+  class HtmlView
+    # Open a HtmlTab for displaying web content
+    class DisplayWebContent < Redcar::Command
+      def initialize(name,url,display_bar=true,tab_class=HtmlTab)
+        @name        = name
+        @url         = url
+        @display_bar = display_bar
+        @tab         = tab_class
+      end
+      def execute
+        use_external = HtmlView.storage['use_external_browser_for_urls']
+        if use_external and OpenDefaultBrowserCommand.supported?
+          OpenDefaultBrowserCommand.new(@url).run
+        else
+          win = Redcar.app.focussed_window
+          controller = DefaultController.new(@name,@url)
+          tab = win.new_tab(@tab)
+          tab.html_view.controller = controller
+          tab.icon = HtmlTab.web_content_icon if tab.is_a?(HtmlTab)
+          tab.focus
+          if @display_bar and not HtmlView.show_browser_bar?
+            HtmlView::ToggleBrowserBar.new.run
+          end
+        end
+      end
+    end
+    class FileWebPreview < Redcar::EditTabCommand
+      def execute
+        mirror  = doc.mirror
+        if mirror and path = mirror.path and File.exists?(path)
+          name = "Preview: " +File.basename(path)
+        else
+          name    = "Preview"
+          preview = java.io.File.createTempFile("preview","html")
+          preview.deleteOnExit
+          path    = preview.getAbsolutePath
+          File.open(path,'w') {|f| f.puts(doc.get_all_text)}
+        end
+        url = File.expand_path(path)
+        DisplayWebContent.new(name,url).run
+      end
+    end
+    class ToggleBrowserBar < Redcar::Command
+      sensitize :open_htmltab
+      def execute
+        if win = Redcar.app.focussed_window
+          if HtmlView.show_browser_bar?
+            win.close_speedbar
+          else
+            speedbar = Redcar::HtmlView::BrowserBar.new
+            win.open_speedbar(speedbar)
+          end
+        end
+      end
+    end
+  end
+end