Merge pull request #92 from opal/staging

10th composite staging pull request
opal · Nov 17, 2021 · c601ea7 · c601ea7
2 parents a9a1592 + c5662c9
commit c601ea7
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,19 +19,19 @@ jobs:
             browser: chrome
             os: ubuntu-latest
             opal: master
-          - name: Chromium/Linux/Opal-master/PromiseV2
+          - name: Chromium/Linux/Opal-1.3/PromiseV2
             browser: chrome
             os: ubuntu-latest
-            opal: master
+            opal: 1.3
             promise: v2
-          - name: Chromium/Linux/Opal-1.2
+          - name: Chromium/Linux/Opal-1.3
             browser: chrome
             os: ubuntu-latest
-            opal: 1.2
-          - name: Chromium/Linux/Opal-1.1
+            opal: 1.3
+          - name: Chromium/Linux/Opal-1.2
             browser: chrome
             os: ubuntu-latest
-            opal: 1.1
+            opal: 1.2
           - name: Chromium/Linux/Opal-1.0
             browser: chrome
             os: ubuntu-latest
@@ -72,7 +72,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: set environment variables
         run: |
-          echo "OPAL_VERSION=${{ matrix.combo.opal || '1.2' }}" >> $GITHUB_ENV
+          echo "OPAL_VERSION=${{ matrix.combo.opal || '1.3' }}" >> $GITHUB_ENV
           echo "OPAL_BROWSER_PROMISE=${{ matrix.combo.promise || 'v1' }}" >> $GITHUB_ENV
       - uses: ruby/setup-ruby@v1
         with:

diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ gem 'rack'
 gem 'sinatra'
 gem 'sinatra-websocket'
 # For opal-rspec, a release is needed
-gem 'opal-rspec', github: 'opal/opal-rspec', submodules: true # '>= 0.8.0.alpha1'
+gem 'opal-rspec', github: 'hmdne/opal-rspec', branch: 'opal-1.3', submodules: true # '>= 0.8.0.alpha1'
 gem 'opal-sprockets'
 # Force build of eventmachine on Windows
 gem 'eventmachine', github: 'eventmachine/eventmachine' if RUBY_PLATFORM =~ /mingw/
@@ -16,7 +16,7 @@ gem 'eventmachine', github: 'eventmachine/eventmachine' if RUBY_PLATFORM =~ /min
 # runner
 gem 'selenium-webdriver', require: false
 gem 'rest-client', require: false
-gem 'webdrivers', github: 'hmdne/webdrivers', require: false
+gem 'webdrivers', require: false
 gem 'rexml', require: false
 
 # browser
@@ -27,6 +27,4 @@ when /\./
 else
   gem 'opal', github: 'opal/opal', ref: ENV['OPAL_VERSION']
 end
-# At this time, we need to use a branch. Please see:
-# https://github.com/meh/paggio/issues/7
-gem 'paggio', github: 'hmdne/paggio'
+
diff --git a/README.md b/README.md
@@ -21,7 +21,6 @@ _Gemfile_
 ```ruby
 source 'https://rubygems.org/'
 
-gem 'paggio', github: 'hmdne/paggio'
 gem 'opal-browser'
 ```
 

diff --git a/Rakefile b/Rakefile
@@ -1,5 +1,6 @@
 require 'bundler'
 Bundler.require
+require 'bundler/gem_tasks'
 
 require 'webdrivers'
 load 'webdrivers/Rakefile'

diff --git a/examples/component/app/application.rb b/examples/component/app/application.rb
@@ -1,5 +1,6 @@
 require "opal"
 require "console"
+require "promise"
 require "browser/setup/full"
 
 # Let's test some element before we have been initialized.
@@ -15,7 +16,7 @@ class MyCounter < Browser::DOM::Element::Custom
 
   self.observed_attributes = %w[value]
 
-  def initialize
+  def initialize(node)
     super
   end
 

diff --git a/index.html.erb b/index.html.erb
@@ -2,7 +2,8 @@
 <html>
 <head>
   <title>Opal Browser - RSpec Runner</title>
-
+</head>
+<body>
   <script>
     window.onerror = function(msg, url, line) {
       var error = document.createElement("div");
@@ -18,8 +19,6 @@
   <script src="spec/wgxpath.install.js"></script>
 
   <%= javascript_include_tag @server.main %>
-</head>
-<body>
 </body>
 </html>
 
diff --git a/opal-browser.gemspec b/opal-browser.gemspec
@@ -17,5 +17,5 @@ Gem::Specification.new {|s|
   s.require_paths = ['lib']
 
   s.add_dependency 'opal', ['>= 1.0', '< 2.0']
-  s.add_dependency 'paggio'
+  s.add_dependency 'paggio', '>= 0.3.0'
 }
diff --git a/opal/browser/dom/node.rb b/opal/browser/dom/node.rb
@@ -38,6 +38,11 @@ def self.new(value)
     end
   end
 
+  def initialize(node)
+    raise ArgumentError, "Please ensure that #initialize of #{self.class} accepts one argument" unless node
+    super
+  end
+
   # Return true of the other element is the same underlying DOM node.
   #
   # @return [Boolean]

diff --git a/opal/browser/socket.rb b/opal/browser/socket.rb
@@ -4,13 +4,13 @@ module Browser
 # connection.
 #
 # @see https://developer.mozilla.org/en-US/docs/Web/API/WebSocket
-class Socket
+class Socket < IO
   def self.supported?
     Browser.supports? :WebSocket
   end
 
   include Native::Wrapper
-  include IO::Writable
+  include IO::Writable if defined? IO::Writable
   include Event::Target
 
   target {|value|

diff --git a/opal/browser/version.rb b/opal/browser/version.rb
@@ -1,3 +1,3 @@
 module Browser
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end
diff --git a/spec/dom/element/custom_spec.rb b/spec/dom/element/custom_spec.rb
@@ -8,7 +8,7 @@
 
   def create_custom_class(name, observed_attrs = [])
     Class.new(Browser::DOM::Element::Custom) do
-      def initialize
+      def initialize(node)
         super
         $scratchpad[:initialized] = true
       end
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,6 @@ _Gemfile_ @@
     ```ruby
     source 'https://rubygems.org/'
-    gem 'paggio', github: 'hmdne/paggio'
     gem 'opal-browser'
     ```
@@ Expand Down @@