webconsole 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e02e38e352341a42a5d9524a80ff626dc71f8d04
-  data.tar.gz: 2239ff3a001e9af4d0e4baeb1153ff84a5e004d2
+  metadata.gz: 4207b87480240b927483e09752b8a2bf2912ec60
+  data.tar.gz: c95f3d9d2b1eccb267495a1bf0a0f57becff2f5a
 SHA512:
-  metadata.gz: a45b3318abdc94bf74fe2469f61c465de8a76ff5f967b5139d36af196b7dc3351aebe756b81569fdd5d1ae248f181feaf07cd9c5d21acfd7da51a8a8c5b1c843
-  data.tar.gz: e351006eb557422f1e7117abc72ac37d3b1f5098363f86dcf863c273d37df4092975aa7342c9d588fe04c3a86a75eeb47b99ae5470ca1f639cad66792b78a0fd
+  metadata.gz: 82ac6794349e1afaa72103f720ccff582f58fe3cc9aec781b9ad6c59cbc2f7dd782c8d2ee09e287ab9ab3343a879f3f2d8297d31497df062c38975712f5c1aff
+  data.tar.gz: d4c60721533c51ee36f02eb0e8a3717f1a6aebab62927d2063fbab475726208e682a6f00be995fcf63419a903054ad08fb819478d069d950fa849c3211ca71d5

data/lib/webconsole/lib/module.rb

@@ -8,7 +8,6 @@ module WebConsole
   EXISTS_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "exists.scpt")
   def self.application_exists
     result = self.run_applescript(EXISTS_SCRIPT)
-    result.chomp!
     if result == "true"
       return true
     else
@@ -25,30 +24,19 @@ module WebConsole
     if arguments
       parameters = parameters + arguments
     end
-    result = self.run_applescript(RUN_PLUGIN_SCRIPT, parameters)
-    result.chomp!
-    return result
+
+    return self.run_applescript(RUN_PLUGIN_SCRIPT, parameters)
   end
   
   RUN_PLUGIN_IN_SPLIT_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "run_plugin_in_split.scpt")
   def self.run_plugin_in_split(name, window_id, split_id)
     parameters = [name, window_id, split_id]
-    result = self.run_applescript(RUN_PLUGIN_IN_SPLIT_SCRIPT, parameters)
-    result.chomp!
-    return result
+    return self.run_applescript(RUN_PLUGIN_IN_SPLIT_SCRIPT, parameters)
   end
 
   WINDOW_ID_FOR_PLUGIN_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "window_id_for_plugin.scpt")
   def self.window_id_for_plugin(name)
-    result = self.run_applescript(WINDOW_ID_FOR_PLUGIN_SCRIPT, [name])
-    result.chomp!
-
-    if result.empty?
-      # TODO: Remove this when doing `run_applescript` refactor
-      return nil
-    end
-
-    return result
+    return self.run_applescript(WINDOW_ID_FOR_PLUGIN_SCRIPT, [name])
   end
 
   SPLIT_ID_IN_WINDOW_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "split_id_in_window.scpt")
@@ -59,39 +47,25 @@ module WebConsole
       arguments.push(pluginName)
     end
 
-    result = self.run_applescript(SPLIT_ID_IN_WINDOW_SCRIPT, arguments)
-    result.chomp!
-
-    if result.empty?
-      # TODO: Remove this when doing `run_applescript` refactor
-      return nil
-    end
-
-    return result
+    return self.run_applescript(SPLIT_ID_IN_WINDOW_SCRIPT, arguments)
   end
 
   SPLIT_ID_IN_WINDOW_LAST_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "split_id_in_window_last.scpt")
   def self.split_id_in_window_last(window_id)
     arguments = [window_id]
-    result = self.run_applescript(SPLIT_ID_IN_WINDOW_LAST_SCRIPT, arguments)
-    result.chomp!
-    return result
+    return self.run_applescript(SPLIT_ID_IN_WINDOW_LAST_SCRIPT, arguments)
   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
+    return self.run_applescript(CREATE_WINDOW_SCRIPT)
   end
 
   # Shared Resources
 
   RESOURCE_PATH_FOR_PLUGIN_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "resource_path_for_plugin.scpt")
   def self.resource_path_for_plugin(name)
-    result = self.run_applescript(RESOURCE_PATH_FOR_PLUGIN_SCRIPT, [name])
-    result.chomp!
-    return result
+    return self.run_applescript(RESOURCE_PATH_FOR_PLUGIN_SCRIPT, [name])
   end
 
   # Shared Resource Path
@@ -116,9 +90,7 @@ module WebConsole
 
   RESOURCE_URL_FOR_PLUGIN_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "resource_url_for_plugin.scpt")
   def self.resource_url_for_plugin(name)
-    result = self.run_applescript(RESOURCE_URL_FOR_PLUGIN_SCRIPT, [name])
-    result.chomp!
-    return result
+    return self.run_applescript(RESOURCE_URL_FOR_PLUGIN_SCRIPT, [name])
   end
   def self.shared_resources_url
     return resource_url_for_plugin(SHARED_RESOURCES_PLUGIN_NAME)
@@ -139,11 +111,43 @@ module WebConsole
 
     result = `#{command}`
 
-    # TODO: Figure out a better way to do this when doing `run_applescript` refactor
-    # if result.chomp.empty?
-    #   return nil
-    # end
+    result.chomp!
+
+    if result.empty?
+      return nil
+    end
+
+    if result.is_integer?
+      return result.to_i
+    end
+
+    if result.is_float?
+      return result.to_f
+    end
 
     return result
   end
+
+  class ::String
+    def is_float?
+      !!Float(self) rescue false
+    end
+
+    def is_integer?
+      self.to_i.to_s == self
+    end
+  end
+
+  class ::Float
+    def javascript_argument
+      return self.to_s
+    end
+  end
+
+  class ::Integer
+    def javascript_argument
+      return self.to_s
+    end
+  end
+
 end

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

@@ -3,18 +3,7 @@ module WebConsole
 
     def do_javascript_function(function, arguments = nil)
       javascript = self.class.javascript_function(function, arguments)
-      result = do_javascript(javascript)
-      result.chomp!
-
-      if result.is_integer?
-        return result.to_i
-      end
-
-      if result.is_float?
-        return result.to_f
-      end
-
-      return result
+      return do_javascript(javascript)
     end
 
     def self.javascript_function(function, arguments = nil)
@@ -52,26 +41,6 @@ module WebConsole
       def javascript_escape!
         replace(self.javascript_escape)
       end
-
-      def is_float?
-        !!Float(self) rescue false
-      end
-
-      def is_integer?
-        self.to_i.to_s == self
-      end
-    end
-
-    class ::Float
-      def javascript_argument
-        return self.to_s
-      end
-    end
-
-    class ::Integer
-      def javascript_argument
-        return self.to_s
-      end
     end
 
   end

data/lib/webconsole/lib/window.rb

@@ -76,6 +76,5 @@ module WebConsole
       return arguments
     end
 
-
   end
 end

data/lib/webconsole/logger/test/lib/test_view_helper.rb

@@ -13,16 +13,15 @@ class TestViewHelper
     end
 
     def number_of_log_messages
-      # TODO: Do JavaScript should coerce types
-      return @view.do_javascript(TEST_MESSAGE_COUNT_JAVASCRIPT).chomp.to_i
+      return @view.do_javascript(TEST_MESSAGE_COUNT_JAVASCRIPT)
     end
 
     def last_log_message
-      return @view.do_javascript(TEST_MESSAGE_JAVASCRIPT).chomp
+      return @view.do_javascript(TEST_MESSAGE_JAVASCRIPT)
     end
   
     def last_log_class
-      return @view.do_javascript(TEST_CLASS_JAVASCRIPT).chomp
+      return @view.do_javascript(TEST_CLASS_JAVASCRIPT)
     end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webconsole
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Roben Kleene
@@ -34,6 +34,8 @@ files:
 - lib/applescript/split_id_in_window_last.scpt
 - lib/applescript/toggle_log.scpt
 - lib/applescript/window_id_for_plugin.scpt
+- lib/webconsole.rb
+- lib/webconsole/dependencies.rb
 - lib/webconsole/dependencies/css/style.css
 - lib/webconsole/dependencies/js/wcdependencies.js
 - lib/webconsole/dependencies/lib/controller.rb
@@ -41,31 +43,29 @@ files:
 - lib/webconsole/dependencies/lib/tester.rb
 - lib/webconsole/dependencies/lib/view.rb
 - lib/webconsole/dependencies/views/view.html.erb
-- lib/webconsole/dependencies.rb
 - lib/webconsole/extension_constants.rb
 - lib/webconsole/lib/constants.rb
 - lib/webconsole/lib/controller.rb
 - lib/webconsole/lib/module.rb
+- lib/webconsole/lib/view.rb
 - lib/webconsole/lib/view/erb.rb
 - lib/webconsole/lib/view/javascript.rb
 - lib/webconsole/lib/view/resources.rb
-- lib/webconsole/lib/view.rb
 - lib/webconsole/lib/window.rb
+- lib/webconsole/logger.rb
+- lib/webconsole/logger/test/Rakefile
 - lib/webconsole/logger/test/js/test_view_helper.js
 - lib/webconsole/logger/test/lib/test_constants.rb
 - lib/webconsole/logger/test/lib/test_view_helper.rb
-- lib/webconsole/logger/test/Rakefile
 - lib/webconsole/logger/test/run_tests.sh
 - lib/webconsole/logger/test/tc_logger.rb
-- lib/webconsole/logger.rb
+- lib/webconsole/repl.rb
 - lib/webconsole/repl/css/style.css
 - lib/webconsole/repl/js/wcrepl.js
 - lib/webconsole/repl/lib/input_controller.rb
 - lib/webconsole/repl/lib/output_controller.rb
 - lib/webconsole/repl/lib/view.rb
 - lib/webconsole/repl/view/view.html.erb
-- lib/webconsole/repl.rb
-- lib/webconsole.rb
 homepage: 
 licenses: []
 metadata: {}
@@ -75,17 +75,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Web Console helper gem