browserio 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65263f95668ebcadb417c1a5ed22eca4cb8e0abc
-  data.tar.gz: 1ed66b53e9bf24c26e5bfe60750814cd4825f3a1
+  metadata.gz: 3d9e44c21fd854715d112d473a87d24a62062bb5
+  data.tar.gz: da0ab3ae5d7ed26d39d9d8533bea9161470b58d4
 SHA512:
-  metadata.gz: 1946bc54bc94b2ec67d44b4191d1a48ae9cd145eb0fb18749ac43efb80bb555aa291582661efb7f346647657b07874f4c47af598c380c8f0533f0493c6421af9
-  data.tar.gz: 1900e69f3e53d2363c31dd0f94986b56ffb38c1864aa414b5a6d3b5e9cf6e7504466b192fcfb9a97edd5f236c5ee3f17c757f688f59d679059bba79faedb0d09
+  metadata.gz: ccceca5f70fb051ceee6ecdd0491f9b2be081ee0a8033b03f456b889673a0dbe32a1e5abd766ea5da577ad72c1bfac0b407b20f1a62d4899ab2575e074bfee27
+  data.tar.gz: 057efd0d548410512b455250dabe6a3f0403efc6b2d04dda14fc139f8302acf2c10e5ccaeb72285efd9cbac86582401999dd56280dd4877ef65a20535e396ef6

data/browserio.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "opal", "~> 0.7.1"
-  spec.add_runtime_dependency "opal-jquery", "~> 0.3.0"
+  spec.add_runtime_dependency "opal"
+  spec.add_runtime_dependency "opal-jquery"
   spec.add_runtime_dependency "nokogiri", '~> 1.6.6.2'
 
   spec.add_development_dependency "pry"

data/lib/browserio.rb

@@ -6,8 +6,12 @@ require 'browserio/utilis/blank'
 require 'browserio/utilis/methods'
 require 'browserio/utilis/try'
 require 'browserio/utilis/titleize'
+require 'browserio/utilis/element'
 require 'base64'
-require 'nokogiri' unless RUBY_ENGINE == 'opal'
+unless RUBY_ENGINE == 'opal'
+  require 'nokogiri'
+  require 'browserio/utilis/nokogiri'
+end
 require 'browserio/html'
 require 'browserio/dom'
 require 'browserio/config'

data/lib/browserio/component.rb

@@ -2,11 +2,9 @@ module BrowserIO
   class Component
     include Methods
 
-    REJECTED_CLIENT_OPTS = %i(scope file_path methods_wrapped events klass on added_class_events)
+    REJECTED_CLIENT_OPTS = %i(scope file_path methods_wrapped events klass on on_server_methods added_class_events)
 
     class << self
-      alias_method :__new__, :new
-
       # Override the default new behaviour
       def new(*args, &block)
         obj = allocate
@@ -15,7 +13,7 @@ module BrowserIO
         obj.bio_opts.init = args.delete(:init)
 
         # Merge other args into opts
-        args.each { |a| a.each {|k, v| obj.bio_opts[k] = v } }
+        args.each { |a| a.each {|k, v| obj.bio_opts[k] = v } } if args.any?
 
         # Set all the requires
         unless RUBY_ENGINE == 'opal'
@@ -30,8 +28,12 @@ module BrowserIO
         end
         bio_opts.added_class_events = true
 
-        if obj.bio_opts.init && obj.method(:initialize).parameters.length > 0
-          obj.send :initialize, *obj.bio_opts.init, &block
+        if obj.bio_opts.init
+          if obj.bio_opts.init.is_a? Array
+            obj.send :initialize, *obj.bio_opts.init, &block
+          else
+            obj.send :initialize, obj.bio_opts.init, &block
+          end
         else
           obj.send :initialize, &block
         end
@@ -41,7 +43,7 @@ module BrowserIO
 
           public_instance_methods(false).each do |meth|
             alias_method :"bio_original_#{meth}", :"#{meth}"
-            define_method "#{meth}" do |*d_args, &block|
+            define_method "#{meth}" do |*d_args, &blk|
               if bio_opts.js
                 bio_opts.method_called = meth
                 bio_opts.method_args   = *d_args
@@ -50,9 +52,9 @@ module BrowserIO
               o_name = "bio_original_#{meth}"
 
               if client? || method(o_name).parameters.length > 0
-                result = send(o_name, *d_args, &block)
+                result = send(o_name, *d_args, &blk)
               else
-                result = send(o_name, &block)
+                result = send(o_name, &blk)
               end
 
               # Append the initialize javscript
@@ -88,7 +90,7 @@ module BrowserIO
       # @example
       #   tmpl :some_name, dom.find('#some-div')
       # @return dom [DOM]
-      def bio_tmpl(name, dom = false, remove = false)
+      def bio_tmpl(name, dom = false, remove = true)
         if dom
           dom = remove ? dom.remove : dom
           bio_opts.tmpl[name] = {
@@ -130,7 +132,7 @@ module BrowserIO
         @bio_config ||= begin
           args = BrowserIO.config.opts_dup.merge(klass: self, object_events: {})
 
-          if RUBY_ENGINE == 'ruby'
+          if server?
             args[:file_path] = caller.first.gsub(/(?<=\.rb):.*/, '')
             args[:path_name] = args[:file_path]
               .gsub(%r{(#{Dir.pwd}/|.*(?=browserio))}, '')
@@ -153,12 +155,17 @@ module BrowserIO
       end
       alias_method :config, :bio_config
 
-      def on(*args, &block)
-        bio_opts.on << [args, block]
+      def bio_on(*args, &block)
+        if args.first.to_s != 'server'
+          bio_opts.on << [args, block]
+        else
+          bio_on_server(&block)
+        end
       end
+      alias_method :on, :bio_on
 
       def method_missing(method, *args, &block)
-        if server? && bio_opts.scope.respond_to?(method, true)
+        if bio_opts.scope.respond_to?(method, true)
           bio_opts.scope.send method, *args, &block
         else
           super
@@ -168,6 +175,50 @@ module BrowserIO
       def client_bio_opts
         bio_config.opts_dup.reject {|k, v| REJECTED_CLIENT_OPTS.include? k }
       end
+
+      def bio_on_server(&block)
+        if server?
+          yield
+        else
+          m = Module.new(&block)
+
+          m.public_instance_methods(false).each do |meth|
+            bio_opts.on_server_methods << meth.to_s
+
+            define_method "#{meth}" do |*args, &blk|
+              path_name = bio_opts.path_name
+              # event_id = "comp-event-#{$faye.generate_id}"
+
+              payload = client_bio_opts.reject do |k, _|
+                %w(html tmpl requires plugins object_events).include? k
+              end
+              payload[:method_called] = meth
+              payload[:method_args]   = args
+
+              HTTP.post("/#{bio_opts.assets_url}/#{path_name}.call",
+                headers: {
+                  'X-CSRF-TOKEN' => Element.find('meta[name=_csrf]').attr('content')
+                },
+                payload: payload) do |response|
+
+                  # We set the new csrf token
+                  xhr  = Native(response.xhr)
+                  csrf = xhr.getResponseHeader('BIO-CSRF-TOKEN')
+                  Element.find('meta[name=_csrf]').attr 'content', csrf
+                  ###########################
+
+                  res = JSON.from_object(`response`)
+
+                  blk.call res[:body], res
+              end
+
+              true
+            end
+          end
+
+          include m
+        end
+      end
     end
 
     # Duplicate of class condig [Config]
@@ -253,13 +304,19 @@ module BrowserIO
     end
     alias_method :client_opts, :client_bio_opts
 
-    def bio_trigger *args
-      bio_opts.events.trigger *args
+    def bio_trigger(*args)
+      bio_opts.events.trigger(*args)
     end
     alias_method :trigger, :bio_trigger
 
+    if RUBY_ENGINE == 'opal'
+      def bio(*args)
+        BrowserIO[*args]
+      end
+    end
+
     def method_missing(method, *args, &block)
-      if server? && bio_opts.scope.respond_to?(method, true)
+      if bio_opts.scope.respond_to?(method, true)
         bio_opts.scope.send method, *args, &block
       else
         super

data/lib/browserio/config.rb

@@ -20,7 +20,9 @@ module BrowserIO
         loaded: false,
         requires: [],
         on: [],
+        on_server_methods: [],
         object_events: {},
+        is_plugin: false,
         plugins: []
       }.merge opts
 
@@ -32,10 +34,15 @@ module BrowserIO
     # @param name [<String, Symbol>, #to_sym]
     def name(name)
       opts.name = name.to_sym
+      opts.is_plugin = true if name.to_s =~ /_plugin$/
       BrowserIO.components ||= {}
       BrowserIO.components[opts.name] = opts
     end
 
+    def is_plugin?
+      opts.is_plugin
+    end
+
     %w(scope assets_url).each do |m|
       define_method m do |v|
         opts[m] = v

data/lib/browserio/utilis/element.rb

@@ -0,0 +1,23 @@
+if RUBY_ENGINE == 'opal'
+  class Element
+    alias_native :val
+    alias_native :prepend
+    alias_native :serialize_array, :serializeArray
+    alias_native :has_class, :hasClass
+    alias_native :click
+
+    def get_script url, &block
+      %x{
+        $.getScript(url, function(){
+          #{block.call if block_given?}
+        });
+      }
+    end
+  end
+
+  class String
+    def is_i?
+      self.to_i.to_s == self
+    end
+  end
+end

data/lib/browserio/utilis/nokogiri.rb

@@ -0,0 +1,44 @@
+module Nokogiri
+  module XML
+    class NodeSet
+      # fix: this is really shity
+      # alias_method :original_to_html, :to_html
+      # def to_html *args
+      #   original_to_html(*args).gsub('%7B', "{").gsub('%7D', "}")
+      # end
+    end
+    class Node
+      # fix: this is really shity
+      # alias_method :original_to_html, :to_html
+      # def to_html *args
+      #   original_to_html(*args).gsub('%7B', "{").gsub('%7D', "}")
+      # end
+
+      private
+
+      def coerce data # :nodoc:
+        if data.class.to_s == 'BrowserIO::DOM'
+          data = data.dom
+        end
+
+        case data
+        when XML::NodeSet
+          return data
+        when XML::DocumentFragment
+          return data.children
+        when String
+          return fragment(data).children
+        when Document, XML::Attr
+          # unacceptable
+        when XML::Node
+          return data
+        end
+
+        raise ArgumentError, <<-EOERR
+Requires a Node, NodeSet or String argument, and cannot accept a #{data.class}.
+(You probably want to select a node from the Document with at() or search(), or create a new Node via Node.new().)
+        EOERR
+      end
+    end
+  end
+end

data/lib/browserio/version.rb

@@ -1,3 +1,3 @@
 module BrowserIO
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/roda/plugins/browserio.rb

@@ -48,6 +48,33 @@ class Roda
               else
                 File.read("#{ROOT_PATH}/#{component}.rb")
               end
+            when 'call'
+              body = scope.request.body.read
+              data = scope.request.params
+
+              begin
+                data.merge!(body ? JSON.parse(body) : {})
+              rescue
+                # can't be parsed by json
+              end
+
+              data          = data.indifferent
+              name          = data.delete(:name)
+              method_called = data.delete(:method_called)
+              method_args   = data.delete(:method_args)
+
+              res = scope.bio(name, data).send(method_called, *method_args)
+
+              scope.response.headers["BIO-CSRF-TOKEN"] = scope.csrf_token if scope.methods.include? :csrf_token
+
+              if res.is_a? Hash
+                scope.response.headers["Content-Type"] = 'application/json; charset=UTF-8'
+                res = res.to_json
+              else
+                res = res.to_s
+              end
+
+              res
             else
               "#{::BrowserIO.javascript(component)}\n//# sourceMappingURL=/assets/bio/#{component}.map"
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browserio
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - cj
@@ -14,30 +14,30 @@ dependencies:
   name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: opal-jquery
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -176,9 +176,11 @@ files:
 - lib/browserio/plugins/pjax.rb
 - lib/browserio/plugins/validations.rb
 - lib/browserio/utilis/blank.rb
+- lib/browserio/utilis/element.rb
 - lib/browserio/utilis/hash.rb
 - lib/browserio/utilis/indifferent_hash.rb
 - lib/browserio/utilis/methods.rb
+- lib/browserio/utilis/nokogiri.rb
 - lib/browserio/utilis/titleize.rb
 - lib/browserio/utilis/try.rb
 - lib/browserio/version.rb