opal-browser 0.2.0 → 0.3.3

data/opal/browser/canvas.rb

@@ -1,5 +1,3 @@
-require 'promise'
-
 require 'browser/canvas/style'
 require 'browser/canvas/text'
 require 'browser/canvas/data'
@@ -8,7 +6,7 @@ require 'browser/canvas/gradient'
 module Browser
 
 class Canvas
-  include Native
+  include Native::Wrapper
 
   attr_reader :element, :style, :text
 
@@ -59,6 +57,14 @@ class Canvas
     @element[:height].to_i
   end
 
+  def width=(new_width)
+    @element[:width] = new_width.to_i
+  end
+
+  def height=(new_height)
+    @element[:height] = new_height.to_i
+  end
+
   def append_to(parent)
     @element.append_to(parent)
   end
@@ -312,6 +318,14 @@ class Canvas
   def to_data(type = undefined)
     `#{@element.to_n}.toDataUrl(type)`
   end
+
+  def to_dom(*)
+    @element
+  end
+
+  def on(*args, &block); @element.on(*args, &block); end
+  def one(*args, &block); @element.one(*args, &block); end
+  def off(*args, &block); @element.off(*args, &block); end
 end
 
 Browser::DOM::Builder.for Canvas do |b, item|

data/opal/browser/console.rb

@@ -1,10 +1,12 @@
+warn "`console' has been moved to Opal's stdlib, please `require 'console'` instead." if RUBY_ENGINE_VERSION.to_f >= 0.9
+
 module Browser
 
 # Manipulate the browser console.
 #
 # @see https://developer.mozilla.org/en-US/docs/Web/API/console
 class Console
-  include Native
+  include Browser::NativeCachedWrapper
 
   # Clear the console.
   def clear

data/opal/browser/cookies.rb

@@ -1,14 +1,28 @@
-require 'stringio'
-
 module Browser
 
 # Allows manipulation of browser cookies.
 #
 # @see https://developer.mozilla.org/en-US/docs/Web/API/document.cookie
+#
+# Usage:
+#
+#   cookies = $document.cookies
+#   cookies["my-cookie"] = "monster"
+#   cookies.delete("my-cookie")
+#
+# By default, cookies are stored JSON-encoded. You can supply a `raw:` option
+# whenever you need to access/write the cookies in a raw way, eg.
+#
+#   cookies["my-other-cookie", raw: true] = 123
+#
+# You can also set this option while referencing $document.cookies, eg.
+#
+#   cookies = $document.cookies(raw: true)
+#   cookies["my-other-cookie"] = 123
 class Cookies
   # Default cookie options.
   DEFAULT = {
-    expires: Time.now + 1.day,
+    expires: Time.now + 60 * 60 * 24,
     secure:  false
   }
 
@@ -19,24 +33,34 @@ class Cookies
   # Create a new {Cookies} wrapper.
   #
   # @param document [native] the native document object
-  def initialize(document)
+  # @param options [Hash] the default cookie options
+  def initialize(document, options = {})
     @document = document
-    @options  = DEFAULT.dup
+    @options  = DEFAULT.merge(options)
   end
 
   # Access the cookie with the given name.
   #
   # @param name [String] the name of the cookie
+  # @param options [Hash] the options for the cookie
+  #
+  # @option options [Boolean] :raw     get a raw cookie value, don't encode it with JSON
   #
   # @return [Object]
-  def [](name)
-    matches = `#@document.cookie`.scan(/#{Regexp.escape(name.encode_uri_component)}=([^;]*)/)
+  def [](name, options = {})
+    options = @options.merge(options)
+
+    matches = `#@document.cookie`.scan(/#{Regexp.escape(FormData.encode(name))}=([^;]*)/)
 
     return if matches.empty?
 
-    result = matches.map {|cookie|
-      JSON.parse(cookie.match(/^.*?=(.*)$/)[1].decode_uri_component)
-    }
+    result = matches.flatten.map do |value|
+      if options[:raw]
+        FormData.decode(value)
+      else
+        JSON.parse(FormData.decode(value))
+      end
+    end
 
     result.length == 1 ? result.first : result
   end
@@ -47,36 +71,45 @@ class Cookies
   # @param value [Object] the data to set
   # @param options [Hash] the options for the cookie
   #
+  # @option options [Boolean] :raw     don't encode a value with JSON
   # @option options [Integer] :max_age the max age of the cookie in seconds
   # @option options [Time]    :expires the expire date
   # @option options [String]  :path    the path the cookie is valid on
   # @option options [String]  :domain  the domain the cookie is valid on
   # @option options [Boolean] :secure  whether the cookie is secure or not
-  def []=(name, value, options = {})
-    `#@document.cookie = #{encode name, value.is_a?(String) ? value : JSON.dump(value), @options.merge(options)}`
+  def []=(name, options = {}, value)
+    options = @options.merge(options)
+    if options[:raw]
+      string = value.to_s
+    else
+      string = JSON.dump(value)
+    end
+    encoded_value = encode(name, string, options)
+    `#@document.cookie = #{encoded_value}`
   end
 
   # Delete a cookie.
   #
   # @param name [String] the name of the cookie
-  def delete(name)
+  def delete(name, _options = {})
     `#@document.cookie = #{encode name, '', expires: Time.now}`
   end
 
   # @!attribute [r] keys
   # @return [Array<String>] all the cookie names
-  def keys
-    Array(`#@document.cookie.split(/; /)`).map {|cookie|
+  def keys(_options = {})
+    Array(`#@document.cookie.split(/; /)`).map do |cookie|
       cookie.split(/\s*=\s*/).first
-    }
+    end
   end
 
   # @!attribute [r] values
   # @return [Array] all the cookie values
-  def values
-    keys.map {|key|
-      self[key]
-    }
+  def values(options = {})
+    options = @options.merge(options)
+    keys.map do |key|
+      self[key, options]
+    end
   end
 
   # Enumerate the cookies.
@@ -84,13 +117,18 @@ class Cookies
   # @yieldparam key [String] the name of the cookie
   # @yieldparam value [String] the value of the cookie
   #
+  # @param options [Hash] the options for the cookie
+  #
+  # @option options [Boolean] :raw     don't encode a value with JSON
+  #
   # @return [self]
-  def each(&block)
-    return enum_for :each unless block
+  def each(options = {}, &block)
+    return enum_for :each, options unless block
+    options = @options.merge(options)
 
-    keys.each {|key|
-      yield key, self[key]
-    }
+    keys.each do |key|
+      yield key, self[key, options]
+    end
 
     self
   end
@@ -98,35 +136,35 @@ class Cookies
   # Delete all the cookies
   #
   # @return [self]
-  def clear
-    keys.each {|key|
+  def clear(_options = {})
+    keys.each do |key|
       delete key
-    }
+    end
 
     self
   end
 
 protected
   def encode(key, value, options = {})
-    io = StringIO.new
+    io = []
 
-    io << key.encode_uri_component << ?= << value.encode_uri_component << '; '
+    io << FormData.encode(key) << ?= << FormData.encode(value) << '; '
 
     io << 'max-age=' << options[:max_age] << '; '        if options[:max_age]
-    io << 'expires=' << options[:expires].to_utc << '; ' if options[:expires]
+    io << 'expires=' << options[:expires].utc << '; '    if options[:expires]
     io << 'path='    << options[:path] << '; '           if options[:path]
     io << 'domain='  << options[:domain] << '; '         if options[:domain]
     io << 'secure'                                       if options[:secure]
 
-    io.string
+    io.join
   end
 end
 
 class DOM::Document < DOM::Element
   # @!attribute [r] cookies
   # @return [Cookies] the cookies for the document
-  def cookies
-    Cookies.new(@native) if defined?(`#@native.cookie`)
+  def cookies(options = {})
+    Cookies.new(@native, options) if defined?(`#@native.cookie`)
   end
 end
 

data/opal/browser/crypto.rb

@@ -0,0 +1,79 @@
+module Browser
+
+# Implements (parts of) the web crypto interface
+#
+# https://developer.mozilla.org/en-US/docs/Web/API/Web_Crypto_API
+class Crypto
+  include NativeCachedWrapper
+
+  class Digest
+    def initialize(buf)
+      @buffer = Buffer.new(buf)
+    end
+
+    attr_reader :buffer
+
+    # Convert a digest to a hexadecimal string
+    def to_hex
+      buffer.to_a.map { |i| "%02x" % i }.join
+    end
+
+    # Convert a digest to a binary string
+    def to_s
+      buffer.to_a.map { |i| "%c" % i }.join
+    end
+
+    # Convert a digest to a Base64-encoded string
+    #
+    # You will need to `require "base64"`
+    def to_b64
+      Base64.strict_encode64(to_s)
+    end
+
+    # Convert a digest to a urlsafe Base64-encoded string
+    #
+    # You will need to `require "base64"`
+    def to_u64(padding: false)
+      Base64.urlsafe_encode64(to_s, padding: padding)
+    end
+  end
+
+  # Compute a cryptographic digest of data (a Buffer). If block is given,
+  # it will call a block, otherwise it will return a Promise that will
+  # return once a digest is computed.
+  #
+  # Allowed values for algo: SHA-1, SHA-256 (default), SHA-368, SHA-512.
+  #
+  # The block/promise will be given an argument of type {Digest} which can
+  # be used to format a digest.
+  #
+  # Example:
+  # ```
+  # Browser::Blob.new(['test']).buffer.then { |b|
+  #   $window.crypto.digest(b)
+  # }.then { |d|
+  #   puts d.to_hex
+  # }
+  # ```
+  def digest data, algo = 'SHA-256', &block
+    promise = nil
+    unless block_given?
+      promise = Promise.new
+      block = proc { |i| promise.resolve(i) }
+    end
+    resblock = proc { |i| block.call(Digest.new(i)) }
+
+    `#@native.subtle.digest(algo, #{Native.convert(data)}).then(#{resblock.to_n})`
+    promise
+  end
+end
+
+class Window
+  # @!attribute [r] crypto
+  # @return [Crypto] the crypto interface of this window
+  def crypto
+    @crypto ||= Crypto.new(`#@native.crypto`)
+  end
+end
+
+end

data/opal/browser/css/declaration.rb

@@ -1,7 +1,7 @@
 module Browser; module CSS
 
 class Declaration
-  include Native
+  include Browser::NativeCachedWrapper
   include Enumerable
 
   def rule

data/opal/browser/css/rule.rb

@@ -1,7 +1,7 @@
 module Browser; module CSS
 
 class Rule
-  include Native
+  include Browser::NativeCachedWrapper
 
   STYLE_RULE               = 1
   CHARSET_RULE             = 2

data/opal/browser/css/style_sheet.rb

@@ -1,10 +1,10 @@
 module Browser; module CSS
 
 class StyleSheet
-  include Native
+  include Browser::NativeCachedWrapper
 
   def initialize(what)
-    if what.is_a? DOM::Element
+    if DOM::Element === what
       super(`#{what.to_n}.sheet`)
     else
       super(what)

data/opal/browser/css.rb

@@ -4,19 +4,35 @@ require 'browser/css/rule'
 require 'browser/css/rule/style'
 
 module Kernel
-  # Create a <style> element from a string or a block using the
-  # {Browser::CSS::Builder} DSL.
+  # @overload CSS(document = $document, &block)
   #
-  # @param text [String] the CSS text
-  # @return [Browser::DOM::Element] the create <style> element
-  def CSS(text = nil, &block)
-    style = $document.create_element(:style)
+  #   Create a `<style>` element from a {Paggio::CSS} DSL.
+  #
+  #   @param document [Browser::DOM::Document] the document instance
+  #     we intend to use
+  #
+  #   @return [Browser::DOM::Element] the created `<style>` element
+  #
+  # @overload CSS(string, document = $document)
+  #
+  #   Create a `<style>` element from a string.
+  #
+  #   @param document [Browser::DOM::Document] the document instance
+  #     we intend to use
+  #
+  #   @return [Browser::DOM::Element] the created `<style>` element
+  def CSS(*args, &block)
+    document = if args.length > 1 || block_given?
+      args.pop
+    end || $document
+
+    style = document.create_element(:style)
     style[:type] = 'text/css'
 
     if block
       style.inner_text = Paggio.css(&block)
     else
-      style.inner_text = text
+      style.inner_text = args.join("")
     end
 
     style

data/opal/browser/database/sql.rb

@@ -1,4 +1,3 @@
-require 'promise'
 require 'ostruct'
 
 module Browser; module Database
@@ -27,7 +26,7 @@ class SQL
     Timeout    = Class.new(self)
   end
 
-  include Native
+  include Native::Wrapper
 
   # @return [String] the name of the database
   attr_reader :name
@@ -73,7 +72,7 @@ class SQL
     return `#@native.version` unless block
 
     `#@native.changeVersion(#{from}, #{to},
-      #{-> t { block.call(Transaction.new(self, t)) }})`
+      #{->(t) { block.call(Transaction.new(self, t)) }})`
   end
 
   # Start a transaction on the database.
@@ -82,12 +81,12 @@ class SQL
   def transaction(&block)
     raise ArgumentError, 'no block given' unless block
 
-    `#@native.transaction(#{-> t { block.call(Transaction.new(self, t)) }})`
+    `#@native.transaction(#{->(t) { block.call(Transaction.new(self, t)) }})`
   end
 
   # Allows you to make changes to the database or read data from it.
   class Transaction
-    include Native
+    include Native::Wrapper
 
     # @return [Database] the database the transaction has been created from
     attr_reader :database
@@ -109,8 +108,8 @@ class SQL
       promise = Promise.new
 
       `#@native.executeSql(#{query}, #{parameters},
-        #{-> _, r { promise.resolve(Result.new(self, r)) }},
-        #{-> _, e { promise.reject(Error.new(e)) }})`
+        #{->(_, r) { promise.resolve(Result.new(self, r)) }},
+        #{->(_, e) { promise.reject(Error.new(e)) }})`
 
       promise
     end
@@ -129,7 +128,7 @@ class SQL
   end
 
   class Result
-    include Native
+    include Native::Wrapper
 
     # @return [Transaction] the transaction the result came from
     attr_reader :transaction

data/opal/browser/delay.rb

@@ -49,6 +49,17 @@ class Window
   def after!(time, &block)
     Delay.new(@native, time, &block)
   end
+
+  # Returns a promise that will resolve after the given seconds.
+  #
+  # @param time [Float] the seconds after it gets called
+  #
+  # @return [Promise] the promise that will resolve after timeout happens
+  def resolve_after(time)
+    promise = Promise.new
+    Delay.new(@native, time) { promise.resolve }.start
+    promise
+  end
 end
 
 end
@@ -63,6 +74,11 @@ module Kernel
   def after!(time, &block)
     $window.after!(time, &block)
   end
+
+  # (see Browser::Window#resolve_after)
+  def resolve_after(time)
+    $window.resolve_after(time)
+  end
 end
 
 class Proc

data/opal/browser/dom/attribute.rb

@@ -2,7 +2,7 @@ module Browser; module DOM
 
 # Encapsulates an {Element} attribute.
 class Attribute
-  include Native
+  include Browser::NativeCachedWrapper
 
   # @!attribute [r] name
   # @return [String] the name of the attribute

data/opal/browser/dom/builder.rb

@@ -38,10 +38,32 @@ class Builder
 
   attr_reader :document, :element
 
-  def initialize(document, &block)
+  NEW_PAGGIO = (Paggio::HTML.instance_method(:build!) rescue false)
+
+  def initialize(document, builder=nil, &block)
     @document = document
-    @builder  = Paggio::HTML.new(&block)
-    @roots    = @builder.each.map { |e| Builder.build(self, e) }
+
+    # Compatibility issue due to an unreleased Paggio gem.
+    # Let's try to support both versions. When Paggio is released,
+    # we may remove it.
+
+    if NEW_PAGGIO
+      @builder = Paggio::HTML.new(defer: true, &block)
+
+      build = proc do
+        @builder.build!(force_call: !!builder)
+        @roots = @builder.each.map { |e| Builder.build(self, e) }
+      end
+
+      if builder
+        builder.extend!(@builder, &build)
+      else
+        build.()
+      end
+    else
+      @builder = Paggio::HTML.new(&block)
+      @roots = @builder.each.map { |e| Builder.build(self, e) }
+    end
   end
 
   def to_a
@@ -54,15 +76,12 @@ Builder.for String do |b, item|
 end
 
 Builder.for Paggio::HTML::Element do |b, item|
-  dom = b.document.create_element(`item.name`)
+  options = {}
 
-  if Hash === `item.attributes`
-    dom.attributes.merge!(`item.attributes`)
-  end
+  options[:attrs] = `item.attributes` if Hash === `item.attributes`
+  options[:classes] = `item.class_names`
 
-  `item.class_names`.each {|value|
-    dom.add_class value
-  }
+  dom = b.document.create_element(`item.name`, **options)
 
   if on = `item.on || nil`
     on.each {|args, block|