webconsole 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 555c27b5c21ea562b658de794fa4ec746b9a0925
-  data.tar.gz: f326923751b001f49193726d6a0c3ec7ba7ba3b2
+  metadata.gz: 3fcc746a3b332008cbc7f7767e5c7879b968b639
+  data.tar.gz: d2debc54d64a67a3555db9164e012f2e2d59a883
 SHA512:
-  metadata.gz: 886011882fdcf7a7b133396e95fa704b5cac1c7d44118bc8d461d09d5a06db54ee2a42c95e752ed05a440266ae046df90c681e9a1340051011bfa7777c679167
-  data.tar.gz: 9ab339784218399113bfd0fc381b83492c39548225851e1b67d405abc264fb56630a37713455016f50fb68ca93bff9074f70e51f53b1e57c5a36ebc63cdb6c6a
+  metadata.gz: 2e195df3b04bdff44650930f4e1e00ea1cb4839dde2e771d1ce1e482b5c6a0f31e9917cfcc9395bcdfdf97148be98310534b21fc8c65fe4ca2ee622106d4b5b6
+  data.tar.gz: c18edf9c671929b543e95171fc6b683eea64a19990a7bab4afd74b2b5d61b441d779099bcd003fad7e720c3b8c2e582bfc66acb9a49f2c8fdbc9bb33c3ea6ccb

data/lib/webconsole/lib/constants.rb

@@ -1,6 +1,7 @@
 module WebConsole
   # Keys
   PLUGIN_NAME_KEY = 'WC_PLUGIN_NAME'
+  SPLIT_ID_KEY = 'WC_SPLIT_ID'
   WINDOW_ID_KEY = 'WC_WINDOW_ID'
   SHARED_RESOURCES_PATH_KEY = 'WC_SHARED_RESOURCES_PATH'
   SHARED_RESOURCES_URL_KEY = 'WC_SHARED_RESOURCES_URL'

data/lib/webconsole/lib/module.rb

@@ -48,6 +48,13 @@ module WebConsole
     return result
   end
 
+  CREATE_WINDOW_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "create_window.scpt")
+  def self.create_window
+    result = self.run_applescript(CREATE_WINDOW_SCRIPT)
+    result.chomp!
+    return result
+  end
+
   # Shared Resources
 
   RESOURCE_PATH_FOR_PLUGIN_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "resource_path_for_plugin.scpt")

data/lib/webconsole/lib/view.rb

@@ -1,33 +1,32 @@
+require_relative "window"
 require_relative "view/javascript"
 require_relative "view/erb"
 require_relative "view/resources"
 
 module WebConsole
-  class View
-
-    attr_reader :window
-    def initialize
-      @window = WebConsole::Window.new
-    end
-
-    def base_url=(value)
-      @window.base_url = value
-    end
-
-    def base_url_path=(value)
-      @window.base_url_path = value
-    end
-
-    def load_html(html)
-      @window.load_html(html)
+  class View < Window
+
+    # Properties
+
+    def view_id
+      if !@view_id
+        if ENV.has_key?(SPLIT_ID_KEY)
+          @view_id = ENV[SPLIT_ID_KEY]
+        else
+          @view_id = split_id
+        end
+      end
+      return @view_id
     end
 
-    def do_javascript(javascript)
-      return @window.do_javascript(javascript)
-    end
+    private
+    
+    # Web
 
-    def close
-      @window.close
+    def arguments_with_target(arguments)
+      arguments = super(arguments)
+      arguments.push(view_id)
+      return arguments
     end
 
   end

data/lib/webconsole/lib/view/erb.rb

@@ -1,5 +1,5 @@
 module WebConsole
-  class View
+  class View < Window
 
     require 'erb'
 

data/lib/webconsole/lib/view/javascript.rb

@@ -1,5 +1,5 @@
 module WebConsole
-  class View
+  class View < Window
 
     def do_javascript_function(function, arguments = nil)
       javascript = self.class.javascript_function(function, arguments)

data/lib/webconsole/lib/view/resources.rb

@@ -1,5 +1,5 @@
 module WebConsole
-  class View
+  class View < Window
     require 'open-uri'
 
     require_relative "../constants"

data/lib/webconsole/lib/window.rb

@@ -8,9 +8,24 @@ module WebConsole
       @window_id = window_id
     end
 
+    # Properties
+
     def base_url_path=(value)
       @base_url = "file://" + value
     end
+    
+    def window_id
+      if !@window_id
+        if ENV.has_key?(WINDOW_ID_KEY)
+          @window_id = ENV[WINDOW_ID_KEY]
+        else
+          @window_id = WebConsole::create_window
+        end
+      end
+      return @window_id
+    end
+    
+    # Web
 
     LOADHTML_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "load_html.scpt")
     LOADHTMLWITHBASEURL_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "load_html_with_base_url.scpt")
@@ -24,44 +39,51 @@ module WebConsole
         arguments.push(@base_url)
       end
 
-      if window_id
-        arguments.push(window_id)
-      end
-
-      result = WebConsole::run_applescript(script, arguments)
-      if !window_id
-        # This allows a window manager created without a window_id and then be assigned the window_id when load_html is called.
-        @window_id = self.class.window_id_from_result(result)        
-      end
+      return run_script(script, arguments)
     end
 
     DOJAVASCRIPT_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "do_javascript.scpt")
     def do_javascript(javascript)
-      WebConsole::run_applescript(DOJAVASCRIPT_SCRIPT, [javascript, window_id])
+      return run_script(DOJAVASCRIPT_SCRIPT, [javascript])
     end
 
     READ_FROM_STANDARD_INPUT_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "read_from_standard_input.scpt")
     def read_from_standard_input(text)
-      WebConsole::run_applescript(READ_FROM_STANDARD_INPUT_SCRIPT, [text, window_id])
+      run_script(READ_FROM_STANDARD_INPUT_SCRIPT, [text])
     end
 
+    # Window
+
     CLOSEWINDOW_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "close_window.scpt")
     def close
       WebConsole::run_applescript(CLOSEWINDOW_SCRIPT, [window_id])
     end
-    
-    def window_id
-      if !@window_id && ENV.has_key?(WINDOW_ID_KEY)
-        @window_id = ENV[WINDOW_ID_KEY]
+
+    SPLIT_ID_IN_WINDOW_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "split_id_in_window.scpt")
+    def split_id(pluginName = nil)
+      arguments = [window_id]
+
+      if pluginName
+        arguments.push(pluginName)
       end
-      return @window_id
+
+      result = WebConsole::run_applescript(SPLIT_ID_IN_WINDOW_SCRIPT, arguments)
+      result.chomp!
+      return result
     end
 
     private
-    
-    def self.window_id_from_result(result)
-      return result.split.last.to_i
+
+    def run_script(script, arguments = [])
+      arguments = arguments_with_target(arguments)
+      return WebConsole::run_applescript(script, arguments)
     end
 
+    def arguments_with_target(arguments)
+      arguments.push(window_id)
+      return arguments
+    end
+
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webconsole
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Roben Kleene
@@ -17,13 +17,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/applescript/close_window.scpt
+- lib/applescript/create_window.scpt
 - lib/applescript/do_javascript.scpt
-- lib/applescript/do_javascript_in_split.scpt
 - lib/applescript/exists.scpt
 - lib/applescript/load_html.scpt
-- lib/applescript/load_html_in_split.scpt
 - lib/applescript/load_html_with_base_url.scpt
-- lib/applescript/load_html_with_base_url_in_split.scpt
 - lib/applescript/load_plugin.scpt
 - lib/applescript/plugin_has_windows.scpt
 - lib/applescript/read_from_standard_input.scpt
@@ -31,7 +29,7 @@ files:
 - lib/applescript/resource_url_for_plugin.scpt
 - lib/applescript/run_plugin.scpt
 - lib/applescript/run_plugin_in_split.scpt
-- lib/applescript/split_id_for_plugin_in_window.scpt
+- lib/applescript/split_id_in_window.scpt
 - lib/applescript/window_id_for_plugin.scpt
 - lib/webconsole.rb
 - lib/webconsole/dependencies.rb