repla 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88517cd81d52290765c991921da1b15292749835
-  data.tar.gz: ffd0dd0a75fc9607d02e27f882b4750e9028ed15
+  metadata.gz: addea698961d0d433594235b23367754bb856791
+  data.tar.gz: cc9b8dec45d41a68dc98e3399b0426a87c662897
 SHA512:
-  metadata.gz: c1220e7a74ce376147c3e83dced2f0c6484fd952fb2267c3633b8cbda482a090f8b224bfc0ce8258b36b80da4055b77ff056dc3e96eb5c7b9c14b9a22767ea68
-  data.tar.gz: 48d05054e557edfd52b2e4444fe977539851a43e23019cd624935dac8951e7f3bf5761530ff700e1117ff58e512beeed5d824b87bcdf64bfcf35d36ffe6da7ea
+  metadata.gz: a309d37ca6e26474f40abaac84be6fd3ebd566d527c9d2fe8fb145e76fa2430c7c75c6c7ea8644fd5c5762b9e46848a1e04eabffd6b67d9ee96ea3c6befccc3e
+  data.tar.gz: 457a79f04227251a93fa0d0e8411eacc990dbdd0eea41904b639364b06f6069b20cd7aa59d13bbd9dc4d5c61db32c45ce28975553ac516900fe9d028c185f751

data/lib/repla/lib/window.rb

@@ -34,6 +34,13 @@ module Repla
       run_script(script, arguments)
     end
 
+    LOAD_URL_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, 'load_url.scpt')
+    def load_url(file)
+      arguments = [file]
+      script = LOAD_URL_SCRIPT
+      run_script(script, arguments)
+    end
+
     DOJAVASCRIPT_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, 'do_javascript.scpt')
     def do_javascript(javascript)
       run_script(DOJAVASCRIPT_SCRIPT, [javascript])

data/lib/repla/logger/test/Rakefile

@@ -13,6 +13,5 @@ namespace :logger do
   end
 
   task clean_up: [:test_logger] do
-    Repla::Test::Helper.quit
   end
 end

data/lib/repla/logger/test/lib/{test_view_helper.rb → test_log_helper.rb}

@@ -1,7 +1,7 @@
 require_relative 'test_setup'
 
 # Helper for testing view class
-class TestViewHelper
+class LogHelper
   def initialize(window_id, view_id)
     @view = Repla::View.new(window_id, view_id)
     javascript = File.read(TEST_JAVASCRIPT_FILE)

data/lib/repla/logger/test/tc_logger.rb

@@ -1,43 +1,44 @@
 #!/System/Library/Frameworks/Ruby.framework/Versions/2.3/usr/bin/ruby
 
-require 'test/unit'
+require 'minitest/autorun'
 
 require_relative 'lib/test_setup'
 
-require_relative 'lib/test_view_helper'
+require_relative 'lib/test_log_helper'
 require_relative '../../logger'
 
 # Test constants
-class TestConstants < Test::Unit::TestCase
+class TestConstants < Minitest::Test
   def test_constants
     message_prefix = Repla::Logger::MESSAGE_PREFIX
-    assert_not_nil(message_prefix)
+    refute_nil(message_prefix)
     error_prefix = Repla::Logger::ERROR_PREFIX
-    assert_not_nil(error_prefix)
+    refute_nil(error_prefix)
   end
 end
 
 # Test unitialized logger
-class TestUnintializedLogger < Test::Unit::TestCase
+class TestUnintializedLogger < Minitest::Test
+  def setup
+    @logger = Repla::Logger.new
+  end
+
   def teardown
-    Repla::Test::Helper.quit
-    assert(!Repla::Test::Helper.app_running?,
-           'The application should not be running.')
+    window = Repla::Window.new(@logger.window_id)
+    window.close
   end
 
   def test_uninitialized_logger
-    logger = Repla::Logger.new
-
     # Test Message
     message = 'Testing log message'
-    logger.info(message)
+    @logger.info(message)
     sleep Repla::Test::TEST_PAUSE_TIME # Pause for output to be processed
 
     # Make sure the log messages before accessing the logger's `view_id` and
     # `window_id` because those run the logger. This test should test logging a
     # message and running the logger itself simultaneously. This is why the
-    # `TestViewHelper` is intialized after logging the message.
-    test_view_helper = TestViewHelper.new(logger.window_id, logger.view_id)
+    # `LogHelper` is intialized after logging the message.
+    test_view_helper = LogHelper.new(@logger.window_id, @logger.view_id)
 
     test_message = test_view_helper.last_log_message
     assert_equal(message, test_message, 'The messages should match')
@@ -47,16 +48,16 @@ class TestUnintializedLogger < Test::Unit::TestCase
 end
 
 # Test logger
-class TestLogger < Test::Unit::TestCase
+class TestLogger < Minitest::Test
   def setup
     @logger = Repla::Logger.new
     @logger.show
-    @test_view_helper = TestViewHelper.new(@logger.window_id, @logger.view_id)
+    @test_view_helper = LogHelper.new(@logger.window_id, @logger.view_id)
   end
 
   def teardown
-    Repla::Test::Helper.quit
-    assert(!Repla::Test::Helper.app_running?)
+    window = Repla::Window.new(@logger.window_id)
+    window.close
   end
 
   def test_logger

data/lib/repla/test/bundles/TestEnvironment.replabundle/Contents/Resources/test_environment.rb

@@ -1,13 +1,13 @@
 #!/System/Library/Frameworks/Ruby.framework/Versions/2.3/usr/bin/ruby
 
-require 'test/unit'
+require 'minitest/autorun'
 
 require_relative '../../../../../../repla'
 require_relative 'constants'
 require_relative '../../../../../lib/escape'
 
 # Test environment
-class TestEnviroment < Test::Unit::TestCase
+class TestEnviroment < Minitest::Test
   using Escape
   def test_plugin_name_key
     assert(ENV.key?(Repla::PLUGIN_NAME_KEY))

data/lib/repla/test/bundles/TestServer.replabundle/Contents/Info.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>WCName</key>
+	<string>TestServer</string>
+	<key>WCCommand</key>
+	<string>server.sh</string>
+	<key>WCUUID</key>
+	<string>43D9A5AC-78CF-4F67-9093-E3F1CB11932B</string>
+	<key>WCEditable</key>
+	<integer>0</integer>
+</dict>
+</plist>

data/lib/repla/test/bundles/TestServer.replabundle/Contents/Resources/server.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -e
+
+ruby -run -e httpd -- -p 5000 .
+

data/lib/repla/test/lib/view_helper.rb

@@ -0,0 +1,48 @@
+require_relative '../../test'
+require 'minitest/autorun'
+
+module Repla
+  module Test
+    # View helper
+    module ViewHelper
+      def self.make_windows(filename)
+        file_view = make_file_view(filename, Window)
+        url_view = make_url_view(filename, Window)
+        raise unless file_view.class == Window
+
+        raise unless url_view.class == Window
+
+        [file_view, url_view]
+      end
+
+      def self.make_views(filename)
+        file_view = make_file_view(filename)
+        url_view = make_url_view(filename)
+        raise if file_view.class != View
+
+        raise if url_view.class != View
+
+        [file_view, url_view]
+      end
+
+      def self.make_file_view(filename, view_class = View)
+        file = Repla::Test.html_file(filename)
+        view = view_class.new
+        view.load_file(file)
+        view
+      end
+
+      def self.make_url_view(filename, view_class = View.new)
+        Repla.load_plugin(Repla::Test::TEST_SERVER_PLUGIN_FILE)
+        window_id = Repla.run_plugin(Repla::Test::TEST_SERVER_PLUGIN_NAME,
+                                     Repla::Test::TEST_HTML_DIRECTORY)
+        raise if window_id.nil?
+
+        url = Repla::Test.html_server_url(filename)
+        view = view_class.new(window_id)
+        view.load_url(url)
+        view
+      end
+    end
+  end
+end

data/lib/repla/test.rb

@@ -1,4 +1,5 @@
 module Repla
+  # Test
   module Test
     # General
     TEST_PAUSE_TIME = 2.00
@@ -8,14 +9,43 @@ module Repla
     TEST_DIRECTORY = File.join(File.dirname(__FILE__), 'test')
     LIB_DIRECTORY = File.join(TEST_DIRECTORY, 'lib')
     HELPER_FILE = File.join(LIB_DIRECTORY, 'helper')
+    VIEW_HELPER_FILE = File.join(LIB_DIRECTORY, 'view_helper')
 
     # Test Assets
+    def self.html_file(filename)
+      File.join(TEST_HTML_DIRECTORY, filename)
+    end
 
+    def self.html_server_url(filename)
+      'http://127.0.0.1:5000/' + filename
+    end
+
+    # HTML
+    TEST_HTML_DIRECTORY = File.join(TEST_DIRECTORY, 'html')
+    INDEX_HTML_FILENAME = 'index.html'.freeze
+    INDEXJQUERY_HTML_FILENAME = 'indexjquery.html'.freeze
+    INDEX_HTML_FILE = html_file(INDEX_HTML_FILENAME)
+    INDEXJQUERY_HTML_FILE = html_file(INDEXJQUERY_HTML_FILENAME)
+    INDEX_HTML_TITLE = 'Index'.freeze
+    INDEXJQUERY_HTML_TITLE = 'Index JQuery'.freeze
+
+    # JavaScript
+    TEST_ASSETS_JAVASCRIPT_DIRECTORY = File.join(TEST_DIRECTORY, 'js')
+    TITLE_JAVASCRIPT_FILE = File.join(TEST_ASSETS_JAVASCRIPT_DIRECTORY,
+                                      'title.js')
     # Plugins
     TEST_PLUGIN_DIRECTORY = File.join(TEST_DIRECTORY, 'bundles')
     HELLOWORLD_PLUGIN_FILE = File.join(TEST_PLUGIN_DIRECTORY,
                                        'HelloWorld.replabundle')
     HELLOWORLD_PLUGIN_NAME = 'HelloWorld'.freeze
+    TEST_SERVER_PLUGIN_NAME = 'TestServer'.freeze
+    TEST_SERVER_PLUGIN_FILE = File.join(TEST_PLUGIN_DIRECTORY,
+                                        'TestServer.replabundle')
+    INDEX_HTML_URL = html_server_url(INDEX_HTML_FILENAME)
+    INDEXJQUERY_HTML_URL = html_server_url(
+      INDEXJQUERY_HTML_FILENAME
+    )
+    NO_SERVER_URL = 'NoServer'.freeze
     PRINT_PLUGIN_FILE = File.join(TEST_PLUGIN_DIRECTORY, 'Print.replabundle')
     PRINT_PLUGIN_NAME = 'Print'.freeze
     TESTLOG_PLUGIN_FILE = File.join(TEST_PLUGIN_DIRECTORY,
@@ -25,18 +55,6 @@ module Repla
                                     'Invalid.replabundle')
     INVALID_PLUGIN_NAME = 'Invalid'.freeze
 
-    # HTML
-    TEST_HTML_DIRECTORY = File.join(TEST_DIRECTORY, 'html')
-    INDEX_HTML_FILE = File.join(TEST_HTML_DIRECTORY, 'index.html')
-    INDEXJQUERY_HTML_FILE = File.join(TEST_HTML_DIRECTORY, 'indexjquery.html')
-    INDEX_HTML_TITLE = 'Index'.freeze
-    INDEXJQUERY_HTML_TITLE = 'Index JQuery'.freeze
-
-    # JavaScript
-    TEST_ASSETS_JAVASCRIPT_DIRECTORY = File.join(TEST_DIRECTORY, 'js')
-    TITLE_JAVASCRIPT_FILE = File.join(TEST_ASSETS_JAVASCRIPT_DIRECTORY,
-                                      'title.js')
-
     # Local Asssets
 
     # JavaScript

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repla
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Roben Kleene
@@ -23,6 +23,7 @@ files:
 - lib/applescript/hide_log.scpt
 - lib/applescript/load.scpt
 - lib/applescript/load_plugin.scpt
+- lib/applescript/load_url.scpt
 - lib/applescript/load_with_root_access_directory.scpt
 - lib/applescript/read_from_standard_input.scpt
 - lib/applescript/resource_path_for_plugin.scpt
@@ -54,8 +55,8 @@ files:
 - lib/repla/logger.rb
 - lib/repla/logger/test/Rakefile
 - lib/repla/logger/test/js/test_view_helper.js
+- lib/repla/logger/test/lib/test_log_helper.rb
 - lib/repla/logger/test/lib/test_setup.rb
-- lib/repla/logger/test/lib/test_view_helper.rb
 - lib/repla/logger/test/run_tests.sh
 - lib/repla/logger/test/tc_logger.rb
 - lib/repla/repl.rb
@@ -125,6 +126,8 @@ files:
 - lib/repla/test/bundles/TestEnvironment.replabundle/Contents/Resources/test_environment.rb
 - lib/repla/test/bundles/TestLog.replabundle/Contents/Info.plist
 - lib/repla/test/bundles/TestLog.replabundle/Contents/Resources/test_log.rb
+- lib/repla/test/bundles/TestServer.replabundle/Contents/Info.plist
+- lib/repla/test/bundles/TestServer.replabundle/Contents/Resources/server.sh
 - lib/repla/test/html/index.html
 - lib/repla/test/html/indexjquery.html
 - lib/repla/test/html/js/zepto.js
@@ -135,6 +138,7 @@ files:
 - lib/repla/test/js/textjquery.js
 - lib/repla/test/js/title.js
 - lib/repla/test/lib/helper.rb
+- lib/repla/test/lib/view_helper.rb
 homepage: 
 licenses: []
 metadata: {}