bowser 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95e9589b4b3a1ad43cbf589ee1d13093c0e6ea44
-  data.tar.gz: d7f0e1233bd6e89fc2759233a12ca0bcd9b07e4c
+  metadata.gz: 30eccdfa1a9fdd25efe66a4e7b69f9ef0dff07d4
+  data.tar.gz: d4e62c0377fbd2f1d690d010d93eef4aa2c13de1
 SHA512:
-  metadata.gz: 2b77f3dda657fafe47a7b79cac128012aedb38ac3266edb6d7d28118e7fe45472dd904c696e2bb080e5c1aaa978dfd881aba5518ac9fa14ade0b38c2fd879d56
-  data.tar.gz: cba81e8918c17a2d785c058314cd40a240e859cc61cbe48cf76f60fa4f4f87e4dcebdc7778ff66f287e3a85d58daae4e61ee592a5c92dc7a67f670c193d28cb6
+  metadata.gz: 8f353bd279771bf383e9233b15211ed4f780f7082287ccb3e49920f7bdae95f205163ba6746526b5c63406a51c9f56fefb23709e180308852cc9935e9ea571ba
+  data.tar.gz: 626063d6efea1c1fd45b4d642192d56f40d0c1a7029ce782aae41c12084d45ba152576833841e126a8b23b0c813a7852d49ece7bb552df0c8717ad43e8e8be8d

data/lib/bowser/version.rb

@@ -1,3 +1,3 @@
 module Bowser
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/opal/bowser/element.rb

@@ -48,6 +48,11 @@ module Bowser
       `#@native.value`
     end
 
+    # Convenience for when you only need a single file
+    def file
+      files.first
+    end
+
     def files
       FileList.new(`#@native.files`)
     end

data/opal/bowser/file_list.rb

@@ -1,3 +1,4 @@
+require 'bowser/event_target'
 require 'promise'
 
 module Bowser
@@ -6,12 +7,13 @@ module Bowser
 
     def initialize native
       @native = `#{native} || []`
+      @files = length.times.each_with_object([]) { |index, array|
+        array[index] = File.new(`#@native[index]`)
+      }
     end
 
     def [] index
-      if index < length && index >= 0
-        File.new(`#@native[index]`)
-      end
+      @files[index]
     end
 
     def length
@@ -20,19 +22,26 @@ module Bowser
     alias size length
 
     def each &block
-      length.times.each do |i|
-        block.call self[i]
+      @files.each do |file|
+        block.call file
       end
     end
 
     def to_a
-      map { |file| file }
+      @files.dup # Don't return a value that can mutate our internal state
     end
     alias to_ary to_a
 
+    def to_s
+      @files.to_s
+    end
+
     class File
+      attr_reader :data
+
       def initialize native
         @native = native
+        @data = nil
       end
 
       def name
@@ -53,17 +62,38 @@ module Bowser
 
       def read
         promise = Promise.new
-        reader = Native(`new FileReader()`)
-        reader[:onload] = proc do
-          promise.resolve reader.result
+        reader = FileReader.new
+        reader.on :load do
+          result = reader.result
+
+          @data = result
+          promise.resolve result
         end
-        reader[:onerror] = proc do
+
+        reader.on :error do
           promise.reject reader.result
         end
-        reader.readAsBinaryString(`#@native`)
+
+        reader.read_as_binary_string self
 
         promise
       end
+
+      class FileReader
+        include EventTarget
+
+        def initialize
+          @native = `new FileReader()`
+        end
+
+        def result
+          `#@native.result`
+        end
+
+        def read_as_binary_string file
+          `#@native.readAsBinaryString(file.native)`
+        end
+      end
     end
   end
 end

data/opal/bowser/http.rb

@@ -2,6 +2,7 @@ require 'native'
 require 'promise'
 
 require 'bowser/http/request'
+require 'bowser/http/form_data'
 
 module Bowser
   module HTTP
@@ -11,12 +12,8 @@ module Bowser
       promise = Promise.new
       request = Request.new(:get, url)
 
-      request.on :success do
-        promise.resolve request.response
-      end
-      request.on :error do |event|
-        promise.reject Native(event)
-      end
+      connect_events_to_promise request, promise
+
       request.send
 
       promise
@@ -26,15 +23,40 @@ module Bowser
       promise = Promise.new
       request = Request.new(:post, url)
 
+      connect_events_to_promise request, promise
+
+      request.send(data: data, headers: { 'Content-Type' => content_type })
+
+      promise
+    end
+
+    def upload_files(url, files, key: 'files', key_suffix: '[]')
+      promise = Promise.new
+      request = Request.new(:post, url)
+
+      connect_events_to_promise request, promise
+
+      form = FormData.new
+      files.each do |file|
+        form.append "#{key}#{key_suffix}", file
+      end
+
+      request.send(data: form)
+
+      promise
+    end
+
+    def upload_file(url, file, key: 'file')
+      upload_files(url, [file], key: key, key_suffix: nil)
+    end
+
+    def connect_events_to_promise(request, promise)
       request.on :success do
         promise.resolve request.response
       end
       request.on :error do |event|
         promise.reject Native(event)
       end
-      request.send(data: data, headers: { 'Content-Type' => content_type })
-
-      promise
     end
   end
 end

data/opal/bowser/http/form_data.rb

@@ -0,0 +1,19 @@
+module Bowser
+  module HTTP
+    class FormData
+      def initialize
+        @native = `new FormData()`
+      end
+
+      def append key, value
+        data = if `!!value.native`
+                 `value.native`
+               else
+                 value
+               end
+
+        `#@native.append(key, data)`
+      end
+    end
+  end
+end

data/opal/bowser/http/request.rb

@@ -4,6 +4,8 @@ require 'bowser/http/event'
 module Bowser
   module HTTP
     class Request
+      include EventTarget
+
       attr_reader :method, :url, :data, :headers, :promise
       attr_accessor :response
 
@@ -17,52 +19,32 @@ module Bowser
         @native = native
         @method = method
         @url = url
-
-        @ready_state_callbacks = []
-        %x{
-          #@native.onreadystatechange = #{
-            proc do |event|
-              @ready_state_callbacks.each do |callback|
-                callback.call event
-              end
-            end
-          }
-        }
-
         @response = Response.new(@native)
       end
 
-      def on event_name, &block
-        handler = proc { |event| block.call(Event.new(event)) }
-        case event_name
-        when :readystatechange
-          @ready_state_callbacks << handler
-        when :success
-          @ready_state_callbacks << proc { |event|
-            block.call Event.new(event) if done? && response.success?
-          }
+      def send(data: {}, headers: {})
+        `#@native.open(#{method}, #{url})`
+        @data = data
+        self.headers = headers
+
+        if method == :get || method == :delete
+          `#@native.send()`
+        elsif Hash === data
+          `#@native.send(#{JSON.generate data})`
+        elsif `!!data.native`
+          `#@native.send(data.native)`
         else
-          object = post? ? `#@native.upload` : @native
-          `object.addEventListener(event_name, handler)`
+          `#@native.send(data)`
         end
 
         self
       end
 
-      def send(data: {}, headers: {})
-        `#@native.open(#{method}, #{url})`
-        @data = data
+      def headers= headers
         @headers = headers
         headers.each do |attr, value|
           `#@native.setRequestHeader(attr, value)`
         end
-        if method == :get || method == :delete
-          `#@native.send()`
-        else
-          `#@native.send(#{JSON.generate data})`
-        end
-
-        self
       end
 
       def post?

data/opal/bowser/window.rb

@@ -15,7 +15,7 @@ module Bowser
       end
     else
       def animation_frame &block
-        delay(0.16, &block)
+        delay(1.0 / 60, &block)
         self
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bowser
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -100,6 +100,7 @@ files:
 - opal/bowser/file_list.rb
 - opal/bowser/http.rb
 - opal/bowser/http/event.rb
+- opal/bowser/http/form_data.rb
 - opal/bowser/http/request.rb
 - opal/bowser/http/response.rb
 - opal/bowser/websocket.rb