inesita 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 458b9936036113bd22c7281e5540805eaf750859
-  data.tar.gz: 7863484c3dc1751231b3e0f3e2dee9b72e777a63
+  metadata.gz: 1e1ab35a96ca0e0be0d5e6b5f673c0d4d4d41aa2
+  data.tar.gz: e6631eb22bf44f14f912cd424deb9bea2b6b1db0
 SHA512:
-  metadata.gz: 0da6474d7bd3f30e9c4e66c5d71614c29bd788c7e23cc0393b1a081c44a6a3816685452c52515aa6d5c6ce7017a04664e7846c0054a5f21652adb2451462f275
-  data.tar.gz: da1834d65e9c268644463ec5a86e4121249f9159989e98e47212be7b76814eba7a179a76a8b0c893d8d38c32c0e5286e868f2cc702b404287b1d79b5893bf73c
+  metadata.gz: 012401b46fcb01f87440465e4ee08ae6de69d4fb4a481a467b1373b9d5a2b7344d4c25c0cf1dc2c3a620f612e05bd7d2531a17a399f78447e2297478035591d5
+  data.tar.gz: 542547268bc1bf4eca309993a3c60fd01bc0ce95e0c9e8891bb5027b4dc1d23adac1aaeefb4af5607369b5a88e435b006ba7ff936114bc18cf5698113ade6db3

data/inesita.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'inesita'
-  s.version     = '0.0.10'
+  s.version     = '0.0.11'
   s.authors     = [ 'Michał Kalbarczyk' ]
   s.email       = 'fazibear@gmail.com'
   s.homepage    = 'http://github.com/fazibear/inesita'

data/lib/inesita/cli/template/app/components/layout.rb

@@ -1,8 +1,10 @@
 class Layout
   include Inesita::Layout
 
+  components :navbar
+
   def initialize
-    component :navbar, NavBar.new
+    @navbar ||= NavBar.new
   end
 
   def render

data/lib/inesita/cli/template/app/components/welcome.rb

@@ -1,5 +1,6 @@
 class Welcome
   include Inesita::Component
+
   def render
     div class: 'jumbotron text-center' do
       h1 do

data/opal/inesita/application.rb

@@ -2,7 +2,7 @@ module Inesita
   class Application
     include Inesita::Component
 
-    attr_reader :layout
+    components :parent
 
     def initialize(options)
       raise 'Routes missing' unless options[:routes]
@@ -10,11 +10,13 @@ module Inesita
       @router = Router.new(options[:routes])
       @layout = options[:layout]
 
-      component :parent, @layout ? @layout.create(@router) : @router
+      @parent = @layout ? @layout.create(@router) : @router
     end
 
     def render
-      component parent
+      dom do
+        component parent
+      end
     end
   end
 end

data/opal/inesita/component.rb

@@ -2,19 +2,24 @@ module Inesita
   module Component
     include VirtualDOM
 
-    def parent(component)
+    def with_parent(component)
       @parent = component
+      self
+    end
+
+    def dom(&block)
+      NodeFactory.new(block, self).nodes.first
     end
 
     def mount(element)
-      @virtual_dom = NodeFactory.new(method(:render), self).nodes.first
+      @virtual_dom = render
       @mount_point = VirtualDOM.create(@virtual_dom)
       element.inner_dom = @mount_point
     end
 
     def update
       if @virtual_dom && @mount_point
-        new_virtual_dom =  NodeFactory.new(method(:render), self).nodes.first
+        new_virtual_dom = render
         diff = VirtualDOM.diff(@virtual_dom, new_virtual_dom)
         VirtualDOM.patch(@mount_point, diff)
         @virtual_dom = new_virtual_dom
@@ -27,13 +32,20 @@ module Inesita
       `document.location.pathname`
     end
 
-    def component(name, instance)
-      self.class.define_method name do
-        unless instance_variable_get(:"@#{name}")
-          instance_variable_set(:"@#{name}", instance)
-          instance_variable_get(:"@#{name}").parent(self)
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def components(*attrs)
+        attrs.flatten.each do |component|
+          if VirtualDOM::NodeFactory::HTML_TAGS.include?(component)
+            fail "Forbidden component name '#{component}' in #{self} component"
+          else
+            attr_reader component
+          end
         end
-        instance_variable_get(:"@#{name}")
+        attr_reader *attrs.flatten
       end
     end
   end

data/opal/inesita/layout.rb

@@ -3,13 +3,17 @@ module Inesita
     def self.included(base)
       base.include(Component)
       base.extend(ClassMethods)
+      base.components :outlet
+    end
+
+    def with_outlet(outlet)
+      @outlet = outlet
+      self
     end
 
     module ClassMethods
       def create(outlet)
-        new.tap do |l|
-          l.component :outlet, outlet
-        end
+        new.with_outlet(outlet)
       end
     end
   end

data/opal/inesita/router.rb

@@ -2,23 +2,24 @@ module Inesita
   class Router
     include Inesita::Component
     class << self; attr_accessor :handle_browser_history; end
-    attr_reader :routes
+
+    components :routes
 
     def initialize(routes)
       default_component = routes.values.first.new
-      default_component.parent(self)
 
       @routes = Hash.new(default_component)
       routes.map do |route, component|
         @routes[route] = component.new
-        @routes[route].parent(self)
       end
 
       handle_browser_history
     end
 
     def render
-      component routes[url]
+      dom do
+        component routes[url]
+      end
     end
 
     def handle_browser_history

data/opal/virtual_dom_extension.rb

@@ -1,7 +1,8 @@
 module VirtualDOM
   class NodeFactory
     def component(comp)
-      @nodes << NodeFactory.new(comp.method(:render), comp).nodes.first
+      fail "Component is nil in #{@parent.class} class" if comp.nil?
+      @nodes << comp.with_parent(@parent).render
     end
 
     def a(params, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inesita
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Michał Kalbarczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal