beryl 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 024bc3d265686b410dc6f3fc59b3768f68387a6acea8c47e1871b037a4e81b19
-  data.tar.gz: 7a5fad376ffce81ecba38189a661d0eaf1c82224b3667f99ba98c9d1886c9ca3
+  metadata.gz: '0359afa9fc5dcf6e6116594b9ba70c06425e9c889069e60c5398c1be9b39d100'
+  data.tar.gz: 505f33152ec6db4b9ddfd2dcbd30351357a3dacc5434493a67e271104cde0c40
 SHA512:
-  metadata.gz: 1b035c97f8e44c4dcd69b092df5d2b83019b9f7e33c2eb728877c264ccab9ee15b2e05c5cf3f279b70bf96d2eb98a95d67ca593eb21e7256c091d1b5711f2e6c
-  data.tar.gz: 4ca220ec4b41fcf09122d3fdd926095124f4b74c66a7d22b42b97153f09aa091cdc7551500708fcfa4db1d53ff6d23a1e2f949d3f988771584f598730dfe1947
+  metadata.gz: bce4b5249650d957206888567d29ca76d21038a11f228466da07dd1824ac2a0a76161bbc84cbf89f61e32bea48f3322302e0dd75294c1dd5f69c67a8c77f8135
+  data.tar.gz: 68bc437aa950783b2c37ed46410140067202e30103d35c901273f4eaa4cbd8e47da4390c607d9268a05cd5256c78c9d2225869a6ce9467c404dc511bf1b68a54

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    beryl (0.2.4)
+    beryl (0.2.5)
       bowser
       capybara
       opal

data/app/initial_state.rb

@@ -1,5 +1,4 @@
 {
   content: 'here we will load something',
   counter: 0,
-  route: nil
 }

data/app/routes.rb

@@ -0,0 +1,5 @@
+route '/', :homepage
+
+route '/page-x', :page_x
+
+route 'dupa/:id', :dupa_page

data/app/view.rb

@@ -1,8 +1,17 @@
 require 'beryl/view'
-require 'something'
+require 'widgets/homepage'
+require 'widgets/page_x'
+require 'widgets/not_found'
 
 class View < Beryl::View
   def render
-    Something.new.render(state)
+    case state[:route]
+    when :homepage
+      Homepage.new.render(state)
+    when  :page_x
+      PageX.new.render(state)
+    else
+      NotFound.new.render(state)
+    end
   end
 end

data/app/{something.rb → widgets/homepage.rb}

@@ -1,6 +1,6 @@
 require 'beryl/widget'
 
-class Something < Beryl::Widget
+class Homepage < Beryl::Widget
   def render(state)
     column :fill_width, :fill_height do
       row :fill_width do
@@ -38,12 +38,4 @@ class Something < Beryl::Widget
       end
     end
   end
-end
-
-
-# column :fill_width, :fill_height do
-#   text 'Bart', height: 100, width: 300
-#   text 'Abc', proportional_height: 2
-#   text 'Karol', :fill_height
-#   text 'Xyz', proportional_height: 3
-# end
+end

data/app/widgets/not_found.rb

@@ -0,0 +1,7 @@
+require 'beryl/widget'
+
+class NotFound < Beryl::Widget
+  def render(state)
+    text "Not found..."
+  end
+end

data/app/widgets/page_x.rb

@@ -0,0 +1,7 @@
+require 'beryl/widget'
+
+class PageX < Beryl::Widget
+  def render(state)
+    text "Other route: #{state[:route]}"
+  end
+end

data/config.ru

@@ -1,5 +1,9 @@
+app_path = File.expand_path('../app', __FILE__)
+$LOAD_PATH.unshift(app_path) unless $LOAD_PATH.include?(app_path)
+
 require 'beryl/backend'
 require 'rack'
+require 'view'
 
 use Rack::Static, :urls => ['/build']
-run Beryl::Backend.new
+run Beryl::Backend.new(View.new)

data/lib/beryl/backend.rb

@@ -1,16 +1,31 @@
 require 'command_handler'
 require 'json'
 require 'serializer'
+require 'beryl/routing/router'
+require 'beryl/html_renderer'
+require 'beryl/backend_runtime'
 
 module Beryl
   class Backend
+    def initialize(view)
+      @view = view
+      initial_state = eval(File.read('app/initial_state.rb'))
+      @state = initial_state.clone
+    end
+
     def call(env)
       req = Rack::Request.new(env)
       case req.path_info
       when '/command'
         [200, { 'Content-Type' => 'application/json; charset=utf-8' }, [handle_command(req)]]
       else
-        [200, { 'Content-Type' => 'text/html; charset=utf-8' }, [response]]
+        router = Beryl::Routing::Router.new
+        route = router.match(req.path_info)
+        @state[:route] = route[0]
+        @state[:params] = route[1]
+        puts "STATE = #{@state}"
+        code = (route[0] != :not_found ? 200 : 404)
+        [code, { 'Content-Type' => 'text/html; charset=utf-8' }, [response]]
       end
     end
 
@@ -23,7 +38,15 @@ module Beryl
     end
 
     def hydrate_state
-      Serializer.serialize(eval(File.read('app/initial_state.rb'))).gsub('"', '"')
+      Serializer.serialize(@state).gsub('"', '"')
+    end
+
+    def render
+      runtime = Beryl::BackendRuntime.new(@state, @view)
+      runtime.process_all_messages
+      @view.state = runtime.state
+      virtual_dom = VirtualDOM.new(@view.render)
+      HTMLRenderer.new.render(virtual_dom.dom.first)
     end
 
     def response
@@ -35,7 +58,7 @@ module Beryl
           <link rel="stylesheet" type="text/css" href="build/style.css">
         </head>
         <body>
-          <div id="beryl" data-beryl="#{hydrate_state}" class="bg-color-255-255-255-255 font-color-0-0-0-255 font-size-20 font-open-sanshelveticaverdanasans-serif s e ui s e"></div>
+          <div id="beryl" data-beryl="#{hydrate_state}" class="bg-color-255-255-255-255 font-color-0-0-0-255 font-size-20 font-open-sanshelveticaverdanasans-serif s e ui s e">#{render}</div>
         </body>
       </html>
       HEREDOC

data/lib/beryl/backend_runtime.rb

@@ -0,0 +1,54 @@
+module Beryl
+  class BackendRuntime
+    attr_reader :state
+
+    def initialize(state, view)
+      @messages = []
+      @state = state
+      @view = view
+      @commands = []
+    end
+
+    def push(message)
+      @messages << message
+    end
+
+    def process_all_messages
+      while @messages.any?
+        message = @messages.shift
+        result = transition(message.first, message.last)
+        @state = result.is_a?(Array) ? result.first : result
+        command = result.is_a?(Array) ? result[1] : nil
+        run_command(result[1], result[2]) if command
+        if @commands.any?
+          while @commands.any? do end # TODO: refactor
+          process_all_messages
+        end
+      end
+    end
+
+    def run
+      process
+      render
+    end
+
+    def run_command(type, payload)
+      puts 'running command'
+    end
+
+    def transition(type, payload)
+      case type
+
+      when :IncrementClicked
+        @state.merge(counter: @state[:counter] + 1)
+
+      when :LoadClicked
+        [@state, :FetchData, key_1: 1, key_2: 2]
+
+      when :LoadSuccess
+        @state.merge(content: payload[:data])
+
+      end
+    end
+  end
+end

data/lib/beryl/deserializer.rb

@@ -15,6 +15,8 @@ module Beryl
         item['value'].to_i
       when 'String'
         item['value']
+      when 'Symbol'
+        item['value'].to_sym
       end
     end
   end

data/lib/beryl/frontend.rb

@@ -1,7 +1,7 @@
 require 'opal'
 require 'native'
 require 'beryl/deserializer'
-require 'beryl/runtime'
+require 'beryl/frontend_runtime'
 
 module Beryl
   class Frontend
@@ -19,7 +19,8 @@ module Beryl
         root = document.getElementById('beryl')
         serialized_state = root.getAttribute('data-beryl').gsub('"', '"')
         state = Beryl::Deserializer.deserialize(serialized_state)
-        Beryl::Runtime.new(root, state, @view).run
+        puts "STATE = #{state.inspect}"
+        Beryl::FrontendRuntime.new(root, state, @view).run
       end
     end
   end

data/lib/beryl/{runtime.rb → frontend_runtime.rb}

@@ -4,12 +4,15 @@ require 'bowser/http'
 require 'serializer'
 
 module Beryl
-  class Runtime
+  class FrontendRuntime
+    attr_reader :state
+
     def initialize(root, state, view)
       @messages = []
       @root = root
       @state = state
       @view = view
+      @commands = []
     end
 
     def push(message)
@@ -33,17 +36,33 @@ module Beryl
       end
     end
 
+    def process_all_messages
+      while @messages.any?
+        message = @messages.shift
+        result = transition(message.first, message.last)
+        @state = result.is_a?(Array) ? result.first : result
+        command = result.is_a?(Array) ? result[1] : nil
+        run_command(result[1], result[2]) if command
+        if @commands.any?
+          while @commands.any? do end # TODO: refactor
+          process_all_messages
+        end
+      end
+    end
+
     def run
       process
       render
     end
 
     def run_command(type, payload)
+      uuid = SecureRandom.uuid
+      @commands << uuid
       Task.new do
         Bowser::HTTP.fetch('/command', method: :post, data: { type: type, payload: Serializer.serialize(payload) })
           .then(&:json) # JSONify the response
-          .then { |response| puts response }
-          .catch { |exception| warn exception.message }
+          .then { |response| puts response; @commands.delete(uuid) }
+          .catch { |exception| warn exception.message; @commands.delete(uuid)  }
       end
     end
 

data/lib/beryl/html_renderer.rb

@@ -0,0 +1,30 @@
+module Beryl
+  class HTMLRenderer
+    def render(element)
+      return element[:props][:nodeValue] if element[:type] == 'text'
+      "#{open_tag(element)}#{children(element)}#{close_tag(element)}"
+    end
+
+    private
+
+    def children(element)
+      element[:children].each_with_object('') do |child, html|
+        html << render(child)
+      end
+    end
+
+    def close_tag(element)
+      "</#{element[:type]}>"
+    end
+
+    def open_tag(element)
+      "<#{element[:type]}#{props(element[:props])}>"
+    end
+
+    def props(props)
+      props.each_with_object('') do |(key, value), html|
+        html << " #{key}=\"#{value}\""
+      end
+    end
+  end
+end

data/lib/beryl/routing/matcher.rb

@@ -0,0 +1,29 @@
+module Beryl
+  module Routing
+    module Matcher
+      extend self
+
+      DEFAULT_CONSTRAINT = '.*'
+
+      def match(route, path)
+        params = params(route)
+        r = params.each_with_object("#{route.clone}") do |param, result|
+          result.sub!(":#{param}", "(#{DEFAULT_CONSTRAINT})")
+        end
+        regex = /\A#{r}\z/
+        matched = regex.match(path)
+        return false unless matched
+        params(route).each_with_object({}).with_index do |(param, result), index|
+          result[param] = matched[index + 1]
+        end
+
+      end
+
+      private
+
+      def params(route)
+        route.scan(/:[[:lower:]_]+[[:lower:][:digit:]_]*/).map { |param| param[1..-1].to_sym }
+      end
+    end
+  end
+end

data/lib/beryl/routing/router.rb

@@ -0,0 +1,32 @@
+require 'beryl/routing/matcher'
+
+module Beryl
+  module Routing
+    class Router
+      attr_reader :routes
+
+      def initialize
+        @routes = []
+        draw
+      end
+
+      def match(path)
+        @routes.each do |route|
+          matched = Beryl::Routing::Matcher.match(route[0], path)
+          return [route[1], matched] if matched
+        end
+        [:not_found]
+      end
+
+      private
+
+      def draw
+        eval(File.open(File.expand_path('./app/routes.rb')).read)
+      end
+
+      def route(path, route)
+        @routes << [path, route]
+      end
+    end
+  end
+end

data/lib/beryl/version.rb

@@ -1,3 +1,3 @@
 module Beryl
-  VERSION = '0.2.5'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beryl
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Bart Blast
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-28 00:00:00.000000000 Z
+date: 2018-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,8 +139,11 @@ files:
 - Rakefile-template
 - app/frontend.rb
 - app/initial_state.rb
-- app/something.rb
+- app/routes.rb
 - app/view.rb
+- app/widgets/homepage.rb
+- app/widgets/not_found.rb
+- app/widgets/page_x.rb
 - beryl.gemspec
 - bin/console
 - bin/setup
@@ -148,9 +151,13 @@ files:
 - lib/beryl.rb
 - lib/beryl/Rakefile
 - lib/beryl/backend.rb
+- lib/beryl/backend_runtime.rb
 - lib/beryl/deserializer.rb
 - lib/beryl/frontend.rb
-- lib/beryl/runtime.rb
+- lib/beryl/frontend_runtime.rb
+- lib/beryl/html_renderer.rb
+- lib/beryl/routing/matcher.rb
+- lib/beryl/routing/router.rb
 - lib/beryl/style.css
 - lib/beryl/utils.rb
 - lib/beryl/version.rb