roda-component 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 593646329d5c319bc13063df03ac54d68dad4ea9
-  data.tar.gz: a10c68c8fa64cb522d3d4305c548a158101f2271
+  metadata.gz: 8a4f1ee47ccff2680b381dd4e3bda8fd0fab8278
+  data.tar.gz: 32aa60c83320c7e1dfd70da62ed0c09f4804f1bb
 SHA512:
-  metadata.gz: d6b11c2f8010465b3b51fb37c074ae64fb5d2d1237f28b7d070620d82b0268830ca815c829a34dc70bfe1b7ef740ca2a7c688dd65e9f95df69b68509e51181bb
-  data.tar.gz: 891ac724dd26eea83b5e30295f008e56c554bc9138346ec6f11b6aa3a83b114bd447157c41a4017698aca49859a73d10dbfa56b64f1adb1adcc17f008366ee1a
+  metadata.gz: 5f16bfbf9c8c0eb4afc57a156c8bcf37061409f7c10bf19b5f416adb38e6a87ba4c1163ef0fe6abada08e8e5657a7e3f9c24d6102e86eda5ad43d8bed2f4c7c7
+  data.tar.gz: 1ac0e1c0a26e4a48fa19114e7a2e33555b5a0e020cca794bcb020dfc64f3a88a9bd31fbdf58fde6f911df28b6c65e35c37a21ddefc37efb9732f45b2de9b844d

data/.gems

@@ -3,3 +3,6 @@ nokogiri -v 1.6.3.1
 opal -v 0.6.2
 opal-jquery -v 0.2.0
 faye -v 0.8.11
+ohm -v 2.0.1
+ohm-contrib -v 2.0.0.rc2
+ohm-sorted -v 0.4.1

data/.gitignore

@@ -6,12 +6,13 @@
 /doc/
 /pkg/
 /spec/reports/
-/tmp/
+tmp/
 *.bundle
 *.so
 *.o
 *.a
 mkmf.log
+/test/dummy/log/
 .env*
 .gs
 *.gem

data/.ruby-version

@@ -1 +1 @@
-2.1.3
+2.2.0

data/Gemfile

@@ -2,3 +2,16 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in roda-component.gemspec
 gemspec
+
+gem 'roda-bin'
+gem "oga", ">= 0.2.0", require: false
+gem "nokogiri", "~> 1.6.5", require: false
+gem 'awesome_print'
+gem 'tilt'
+gem 'sqlite3'
+gem 'rack_csrf'
+gem 'sass'
+gem 'shield'
+gem 'sequel'
+gem 'binding_of_caller'
+gem 'better_errors'

data/Makefile

@@ -1,35 +1,30 @@
-GEMSPEC=$(shell ls *.gemspec | head -1)
-VERSION=$(shell ruby -rubygems -e 'puts Gem::Specification.load("$(GEMSPEC)").version')
-PROJECT=$(shell ruby -rubygems -e 'puts Gem::Specification.load("$(GEMSPEC)").name')
-GEM=$(PROJECT)-$(VERSION).gem
-
+# GEMSPEC=$(shell ls *.gemspec | head -1)
+# VERSION=$(shell ruby -rubygems -e 'puts Gem::Specification.load("$(GEMSPEC)").version')
+# PROJECT=$(shell ruby -rubygems -e 'puts Gem::Specification.load("$(GEMSPEC)").name')
+# GEM=$(PROJECT)-$(VERSION).gem
+#
 .PHONY: install package publish test server $(GEM)
 
 define install_bs
-	which bs || (wget https://raw.githubusercontent.com/educabilia/bs/master/bin/bs && chmod +x bs && sudo mv bs /usr/local/bin)
-
-	@if [ -s .gs ]; then \
-		true; \
-	else \
-		mkdir .gs; \
-		touch .env; \
-		echo 'GEM_HOME=$(PWD)/.gs' >> .env; \
-		echo 'GEM_PATH=$(PWD)/.gs' >> .env; \
-		echo 'PATH=$(PWD)/.gs/bin:$$PATH' >> .env; \
-		echo 'RACK_ENV=test' >> .env.test; \
-	fi;
-
-	bs gem list dep-cj -i || bs gem install dep-cj
-	gem list cutest-cj -i || gem install cutest-cj
+	gem list bundler -i || gem install bundler
+endef
+
+define gem_paths
+	gem list bundler -i || gem install bundler
 endef
 
 install:
 	$(call install_bs)
-	bs dep install
-	bs gem cleanup
+	bundle config --local path .bundle
+	gem update roda-bin
+	bundle
+
+server:
+	bundle
+	cd test/dummy && touch dummy.db && rm dummy.db && bundle exec thin start -p 8080
 
 test:
-	bs env $$(cat .env.test) cutest test/**/*_test.rb
+	bundle exec pry-test --async
 
 package: $(GEM)
 

data/Rakefile

@@ -1,2 +1 @@
 require "bundler/gem_tasks"
-

data/lib/roda/component.rb

@@ -3,7 +3,10 @@ require 'opal-jquery'
 
 unless RUBY_ENGINE == 'opal'
   require 'tilt'
-  require 'awesome_print'
+
+  if defined? Oga
+    require 'roda/component/oga'
+  end
 end
 
 require "base64"
@@ -13,23 +16,47 @@ require 'roda/component/dom'
 require 'roda/component/events'
 
 if RUBY_ENGINE == 'opal'
+  class Element
+    alias_native :val
+    alias_native :serialize_array, :serializeArray
+  end
+
   $component_opts ||= {
     events: {},
     comp: {},
-    cache: {}
+    cache: {},
+    tmpl: {}
   }
 end
 
 class Roda
   class Component
-    attr_accessor :scope
+    attr_accessor :scope, :cache
 
     def initialize(scope = false)
-      @scope = scope
+      @scope   = scope
 
       if client?
         $faye.subscribe "/components/#{self.class._name}" do |msg|
-          `window.console.log(#{msg})`
+          msg = Native(msg)
+
+          trigger :"#{msg[:type]}", msg unless $faye.public_id == msg[:public_id]
+        end
+
+        $faye.on 'transport:up' do
+          $faye.online = true
+
+          if $faye.disconnected
+            trigger :reconnect
+          else
+            trigger :connect
+          end
+        end
+
+        $faye.on 'transport:down' do
+          $faye.disconnected = true
+          $faye.online       = false
+          trigger :disconnect
         end
       end
     end
@@ -54,20 +81,37 @@ class Roda
           m.public_instance_methods(false).each do |meth|
             define_method "#{meth}" do |*args, &blk|
               name     = self.class._name
-              event_id = "comp-event-#{$faye.generate_id}"
-
-              Element['body'].on event_id do |event, local, data|
-                blk.call local, event, data
+              # event_id = "comp-event-#{$faye.generate_id}"
+
+              HTTP.post("/components/#{name}/call/#{meth}",
+                headers: {
+                  'X-CSRF-TOKEN' => Element.find('meta[name=_csrf]').attr('content'),
+                  'X-RODA-COMPONENT-ON-SERVER' => true
+                },
+                payload: args.first) do |response|
+
+                  # We set the new csrf token
+                  xhr  = Native(response.xhr)
+                  csrf = xhr.getResponseHeader('NEW-CSRF')
+                  Element.find('meta[name=_csrf]').attr 'content', csrf
+                  ###########################
+
+                  blk.call Native(response.body), response
               end
 
-              $faye.publish("/components/outgoing/#{$faye.private_id}/#{$faye.public_id}", {
-                name: name,
-                type: 'event',
-                event_type: 'call',
-                event_method: meth,
-                event_id: event_id,
-                local: args.first || nil
-              })
+              # Element['body'].on event_id do |event, local, data|
+              #   blk.call local, event, data
+              # end
+              #
+              # $faye.publish("/components/outgoing/#{$faye.private_id}/#{$faye.public_id}", {
+              #   name: name,
+              #   type: 'event',
+              #   event_type: 'call',
+              #   event_method: meth,
+              #   event_id: event_id,
+              #   local: args.first || nil
+              # })
+
 
               true
             end
@@ -78,7 +122,10 @@ class Roda
       end
 
       # The name of the component
-      def name _name
+      alias_method :name_original, :name
+      def comp_name(_name = nil)
+        return name_original unless _name
+
         @_name = _name.to_s
 
         if server?
@@ -87,30 +134,47 @@ class Roda
       end
 
       # The html source
-      def html _html, &block
+      def comp_html _html, &block
         if server?
           if _html.is_a? String
-            cache[:html] = File.read _html
+            if _html[%r{\A./}]
+              cache[:html] = File.read _html
+            else
+              cache[:html] = File.read "#{component_opts[:path]}/#{_html}"
+            end
           else
             cache[:html] = yield
           end
 
-          cache[:dom] = Nokogiri::HTML cache[:html]
+          cache[:dom] = DOM.new(cache[:html])
+        end
+      end
+
+      def HTML raw_html
+        if defined? Oga
+          Oga.parse_html(raw_html)
+        elsif defined? Nokogiri
+          Nokogiri::HTML(raw_html)
+        else
+          warn 'No HTML parsing lib loaded.  Please require Nokogiri or Oga'
         end
       end
 
       # setup your dom
-      def setup &block
+      def comp_setup &block
         block.call cache[:dom] if server?
       end
-      alias :clean :setup
 
       def events
         @_events ||= Events.new self, component_opts, false
       end
 
       def on *args, &block
-        events.on(*args, &block)
+        if args.first.to_s != 'server'
+          events.on(*args, &block)
+        else
+          on_server &block
+        end
       end
 
       # cache for class
@@ -134,13 +198,11 @@ class Roda
         @_app ||= {}
       end
 
-      # We need to save the nokogiri dom and the raw html.
+      # We need to save the oga dom and the raw html.
       # the reason we ave the raw html is so that we can use it client side.
       def tmpl name, dom, remove = true
-        cache[:tmpl][name] = {
-          dom: remove ? dom.remove : dom
-        }
-        cache[:tmpl][name][:html] = cache[:tmpl][name][:dom].to_html
+        cache[:tmpl][name] = { dom: remove ? dom.remove : dom }
+        cache[:tmpl][name][:html] = cache[:tmpl][name][:dom].to_xml
         cache[:tmpl][name]
       end
       alias :add_tmpl :tmpl
@@ -178,33 +240,25 @@ class Roda
       @_cache ||= self.class.cache.dup
     end
 
-    def cache= new_cache
-      @_cache = new_cache
-    end
-
     def events
       @_events ||= Events.new self.class, component_opts, scope
     end
 
     def dom
       if server?
-        @_dom ||= DOM.new cache[:dom].dup || begin
-          Nokogiri::HTML cache[:html]
-        end
+        # TODO: duplicate cache[:dom] so we don't need to parse all the html again
+        @_dom ||= DOM.new(cache[:dom].dom.to_s)
       else
         @_dom ||= DOM.new(Element)
       end
     end
+    alias_method :element, :dom
 
     # Grab the template from the cache, use the nokogiri dom or create a
     # jquery element for server side
     def tmpl name
       if t = cache[:tmpl][name]
-        if server?
-          DOM.new t[:dom].dup
-        else
-          DOM.new Element[t[:html].dup]
-        end
+        DOM.new t[:html]
       else
         false
       end
@@ -231,12 +285,12 @@ class Roda
     def server?
       RUBY_ENGINE == 'ruby'
     end
-    alias :server :server?
+    alias_method :server, :server?
 
     def client?
-      RUBY_ENGINE == 'opal'
+      !server?
     end
-    alias :client :client?
+    alias_method :client, :client?
   end
 
   # This is just here to make things more cross compatible

data/lib/roda/component/dom.rb

@@ -1,14 +1,16 @@
-unless RUBY_ENGINE == 'opal'
-  require 'nokogiri'
-end
-
 class Roda
   class Component
     class DOM
-      attr_accessor :dom
+      attr_accessor :dom, :raw_html
+
+      def initialize html
+        @raw_html = html
 
-      def initialize dom
-        @dom = dom
+        if server?
+          @dom = Component::HTML(html.dup)
+        else
+          @dom = html.is_a?(String) ? Element[html.dup] : html
+        end
       end
 
       def find string, &block
@@ -20,43 +22,51 @@ class Roda
 
         if block
           if server?
-            @node.each do |node|
-              block.call node
+            node.each do |n|
+              block.call n
             end
           else
-            block.call @node
+            block.call node
           end
         else
           if server?
-            @node = @node.first
+            @node = node.first
           end
         end
 
-        self
+        if server?
+          self
+        else
+          node
+        end
       end
 
       def html= content
         if server?
-          @node.inner_html = content
+          node.inner_html = content
         else
-          @node.html content
+          node.html content
         end
 
-        @node
+        node
       end
 
       def html content = false
         if !content
           if server?
-            @node ? @node.to_html : dom.to_html
+            node.inner_html
           else
-            @node ? @node.html : dom.html
+            node ? node.html : dom.html
           end
         else
           self.html = content
         end
       end
 
+      def node
+        @node || dom
+      end
+
       # This allows you to use all the nokogiri or opal jquery methods if a
       # global one isn't set
       def method_missing method, *args, &block

data/lib/roda/component/events.rb

@@ -1,33 +1,72 @@
 class Roda
   class Component
-    class Events < Struct.new(:klass, :component_opts, :scope)
+    class Events < Struct.new(:klass, :component_opts, :scope, :request)
       def on name, options = {}, &block
-        limit_if = options.delete(:if) || []
-        limit_if = [limit_if] unless limit_if.is_a? Array
+        if client? && options.is_a?(String)
+          class_name   = klass._name
+          class_events = (events[class_name] ||= {})
+          event        = (class_events[:_jquery_events] ||= [])
+          event        << [block, class_name, options, name]
+        elsif options.is_a?(Hash)
+          limit_if = options.delete(:if) || []
+          limit_if = [limit_if] unless limit_if.is_a? Array
 
-        class_name   = options.delete(:for) || klass._name
-        class_events = (events[class_name] ||= {})
-        event        = (class_events[name.to_s] ||= [])
+          class_name   = options.delete(:for) || klass._name
+          class_events = (events[class_name] ||= {})
+          event        = (class_events[name.to_s] ||= [])
 
-        # remove the type, if we have an on if and it isn't in the engine_type
-        if limit_if.any? && !limit_if.include?(engine_type.to_sym)
-          block = Proc.new {}
+          # remove the type, if we have an on if and it isn't in the engine_type
+          if limit_if.any? && !limit_if.include?(engine_type.to_sym)
+            block = Proc.new {}
+          end
+
+          event << [block, klass._name, options]
+        end
+      end
+
+      def trigger_jquery_events
+        return unless e = events[klass._name]
+
+        (e[:_jquery_events] || []).each do |event|
+          block, comp, selector, name = event
+
+          name = name.to_s
+
+          if name != 'ready'
+            Document.on name, selector do |evt|
+              Component::Instance.new(component(comp), scope).instance_exec evt.current_target, evt, &block
+            end
+          else
+            Component::Instance.new(component(comp), scope).instance_exec Document.find(selector), nil, &block
+          end
         end
-        event << [block, klass._name, options]
       end
 
       def trigger name, options = {}
         content = ''
+        e = events[klass._name]
+
+        return unless e
 
-        events[klass._name][name.to_s].each do |event|
-          block, comp, _ = event
+        (e[name.to_s] || []).each do |event|
+          block, comp, opts = event
 
-          response = Component::Instance.new(component(comp), scope).instance_exec options, &block
+          if !opts[:socket]
+            response = Component::Instance.new(component(comp), scope).instance_exec options, &block
 
-          if response.is_a? Roda::Component::DOM
-            content = response.to_html
-          elsif response.is_a? String
-            content = response
+            if response.is_a? Roda::Component::DOM
+              content = response.to_xml
+            else
+              content = response
+            end
+          else
+            $faye.publish("/components/#{klass._name}", {
+              name: klass._name,
+              type: 'event',
+              event_type: 'call',
+              event_method: name.to_s,
+              data: options
+            })
           end
         end
 
@@ -53,12 +92,12 @@ class Roda
       end
 
       def server?
-        RUBY_ENGINE == 'ruby' ? 'server' : false
+        RUBY_ENGINE == 'ruby' ? true : false
       end
       alias :server :server?
 
       def client?
-        RUBY_ENGINE == 'opal' ? 'client' : false
+        !server?
       end
       alias :client :client?
     end