inesita 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64d2e0eb42676d12536c5751ef8896a2b60ed123
-  data.tar.gz: dc4a4619b78c7405d54a0a80383996c6df724433
+  metadata.gz: d28277c2df0f1066c1ac4e90e1fa635818a6ac34
+  data.tar.gz: 3af7d67dd0c861446803d4456f953e9ff7314149
 SHA512:
-  metadata.gz: 1e008afb399d387e09fce2aaf3ca81503fd5618e4d9bb0949a3aa81993b930f43515acc12d5b0451030c1252c361703b22d4d1aaf2b3a3989dde70a66378addb
-  data.tar.gz: 98301a71c7490a38f673ed625152379071b5cf31c4309b1051e1723ad7e416852798bec825faf9bf286c76d481d344ebae24a7abdda130110fe0fdb2d518f24e
+  metadata.gz: 5020e2a1ff4ccfd32450a8a8c44fce5fc7f18f08afa413764ef3c24e1a81ffb643cc6835b5f5234ee91ee25f90ef1fa38966b14232d00151a09cd759ec8bbea1
+  data.tar.gz: 4828053c40152c0068e5420c19954190d3a7366419445fa99d7f97d4878267b6588c643092788f8fa73844439de0914bb578cac380cd6dd969dde738814a2dec

data/Gemfile

@@ -1,5 +1,3 @@
 source "https://rubygems.org"
 
-gem "opal", github: "opal/opal"
-
 gemspec

data/README.md

@@ -1,35 +1,12 @@
-!!! WORK IN PROGRESS !!!
+# Inesita [![Gem Version](https://badge.fury.io/rb/inesita.svg)](http://badge.fury.io/rb/inesita) [![Code Climate](https://codeclimate.com/github/inesita-rb/inesita/badges/gpa.svg)](https://codeclimate.com/github/inesita-rb/inesita) [![Gem Dependencies](https://gemnasium.com/inesita-rb/inesita.png)](https://gemnasium.com/inesita-rb/inesita)
 
-# Inesita [![Gem Version](https://badge.fury.io/rb/inesita.svg)](http://badge.fury.io/rb/inesita) [![Code Climate](https://codeclimate.com/github/inesita-rb/inesita/badges/gpa.svg)](https://codeclimate.com/github/inesita-rb/inesita)
+Inesita is a web frontend framework for fast building browser application using Ruby. It uses Virtual DOM for page render.
 
-Frontend web framework for Opal
+## Description
 
-## usage
+More detailed description [here](https://inesita-rb.github.io).
 
-Install Inesita
+## Examples
 
-```sh
-$ gem install inesita
-```
-Generate Inesita new app
-
-```sh
-$ inesita new my_app
-```
-Launch Inesita server
-
-```sh
-$ cd my_app
-$ bundle exec inesita server
-```
-Go to [http://localhost:9292/](http://localhost:9292/)
-
-To build your application to `public` dir
-
-```sh
-$ bundle exec inesita build
-```
-## examples
-
- - [My own playground](https://github.com/inesita-rb/playground)
- - [TodoMVC example](https://github.com/inesita-rb/todomvc)
+ - [Example application](https://github.com/inesita-rb/playground)
+ - [TodoMVC application](https://github.com/inesita-rb/todomvc)

data/TODO.md

@@ -4,3 +4,5 @@
 
  - [ ] `router.current_url?` should supports also path
  - [ ] helper for dom class
+ - [ ] add comments to new application template
+ - [x] remove `dom` block from render

data/inesita.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'inesita'
-  s.version     = '0.1.0'
+  s.version     = '0.2.1'
   s.authors     = [ 'Michał Kalbarczyk' ]
   s.email       = 'fazibear@gmail.com'
   s.homepage    = 'http://github.com/inesita-rb/inesita'
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'opal', '~> 0.8'
-  s.add_dependency 'opal-virtual-dom', '~> 0.0.5'
+  s.add_dependency 'opal-virtual-dom', '~> 0.1.0'
   s.add_dependency 'slim', '~> 3.0'
   s.add_dependency 'sass', '~> 3.4'
   s.add_dependency 'thor', '~> 0.19'

data/lib/inesita/cli/template/app/components/description.rb.tt

@@ -2,16 +2,14 @@ class Description
   include Inesita::Component
 
   def render
-    dom do
-      div class: 'jumbotron text-center' do
-        p do
-          text %{
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-            Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-            Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-            Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-          }
-        end
+    div class: 'jumbotron text-center' do
+      p do
+        text %{
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+          Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+          Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+          Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+        }
       end
     end
   end

data/lib/inesita/cli/template/app/components/home.rb.tt

@@ -2,15 +2,13 @@ class Home
   include Inesita::Component
 
   def render
-    dom do
-      div class: 'jumbotron text-center' do
-        img src: 'http://avatars.githubusercontent.com/inesita-rb'
-        h1 do
-          text "Hello I'm Inesita"
-        end
-        h4 do
-          text 'This is a sample component'
-        end
+    div class: 'jumbotron text-center' do
+      img src: 'http://avatars.githubusercontent.com/inesita-rb'
+      h1 do
+        text "Hello I'm Inesita"
+      end
+      h4 do
+        text 'This is a sample component'
       end
     end
   end

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

@@ -2,11 +2,9 @@ class Layout
   include Inesita::Layout
 
   def render
-    dom do
-      div class: 'container' do
-        component NavBar
-        component outlet
-      end
+    div class: 'container' do
+      component NavBar
+      component outlet
     end
   end
 end

data/lib/inesita/cli/template/app/components/navbar.rb.tt

@@ -2,23 +2,21 @@ class NavBar
   include Inesita::Component
 
   def render
-    dom do
-      nav class: 'navbar navbar-default' do
-        div class: 'container' do
-          div class: 'navbar-header' do
-            span class: 'navbar-brand' do
-              text '<%= config[:project_name] %>'
-            end
-            ul class: 'nav navbar-nav' do
-              li class: "#{"active" if router.current_url?(:home)}" do
-                a href: router.url_for(:home) do
-                  text 'Home'
-                end
+    nav class: 'navbar navbar-default' do
+      div class: 'container' do
+        div class: 'navbar-header' do
+          span class: 'navbar-brand' do
+            text '<%= config[:project_name] %>'
+          end
+          ul class: 'nav navbar-nav' do
+            li class: "#{"active" if router.current_url?(:home)}" do
+              a href: router.url_for(:home) do
+                text 'Home'
               end
-              li class: "#{"active" if router.current_url?(:description)}" do
-                a href: router.url_for(:description) do
-                  text 'Description'
-                end
+            end
+            li class: "#{"active" if router.current_url?(:description)}" do
+              a href: router.url_for(:description) do
+                text 'Description'
               end
             end
           end

data/opal/inesita.rb

@@ -1,5 +1,4 @@
 require 'virtual_dom'
-require 'virtual_dom_extension'
 require 'inesita/js_helpers'
 require 'inesita/component_withs'
 require 'inesita/component'

data/opal/inesita/application.rb

@@ -22,9 +22,7 @@ module Inesita
     end
 
     def render
-      dom do
-        component root
-      end
+      component root
     end
   end
 end

data/opal/inesita/component.rb

@@ -1,34 +1,34 @@
 module Inesita
   module Component
-    include VirtualDOM
+    include VirtualDOM::DOM
     include ComponentWiths
 
-    def dom(&block)
-      nodes = NodeFactory.new(block, self).nodes
-      @cache_component_counter = nil
-      if nodes.length == 1
-        nodes.first
-      else
-        VirtualNode.new('div', {}, nodes).vnode
-      end
-    end
-
     def mount_to(element)
       @root_component = self
-      @virtual_dom = render
+      @virtual_dom = render_virtual_dom
       @root_node = VirtualDOM.create(@virtual_dom)
       element.inner_dom = @root_node
     end
 
     def render_if_root
       if @virtual_dom && @root_node
-        new_virtual_dom = render
+        new_virtual_dom = render_virtual_dom
         diff = VirtualDOM.diff(@virtual_dom, new_virtual_dom)
         VirtualDOM.patch(@root_node, diff)
         @virtual_dom = new_virtual_dom
       end
     end
 
+    def render_virtual_dom
+      @__virtual_nodes__ = []
+      render
+      if @__virtual_nodes__.length == 0
+        @__virtual_nodes__.first
+      else
+        VirtualDOM::VirtualNode.new('div', {}, @__virtual_nodes__).vnode
+      end
+    end
+
     def update_dom
       @root_component.render_if_root
     end
@@ -39,5 +39,32 @@ module Inesita
       @cache_component_counter += 1
       @cache_component["#{component}-#{@cache_component_counter}"] || @cache_component["#{component}-#{@cache_component_counter}"] = block.call
     end
+
+    def a(params, &block)
+      params = { onclick: -> { @router.handle_link(params[:href]) } }.merge(params) if params[:href] && @router
+      @__virtual_nodes__ ||= []
+      if block
+        current = @__virtual_nodes__
+        @__virtual_nodes__ = []
+        result = block.call
+        vnode = VirtualDOM::VirtualNode.new('a', process_params(params), @__virtual_nodes__.count == 0 ? result : @__virtual_nodes__).vnode
+        @__virtual_nodes__ = current
+      else
+        vnode = VirtualDOM::VirtualNode.new('a', process_params(params), []).vnode
+      end
+      @__virtual_nodes__ << vnode
+      vnode
+    end
+
+    def component(comp, opts = {})
+      fail "Component is nil in #{self.class} class" if comp.nil?
+      @__virtual_nodes__ ||= []
+      @__virtual_nodes__ << cache_component(comp) do
+        (comp.is_a?(Class) ? comp.new : comp)
+          .with_root_component(@root_component)
+          .with_router(@router)
+          .with_store(@store)
+      end.with_props(opts[:props] || {}).render_virtual_dom
+    end
   end
 end

data/opal/inesita/router.rb

@@ -31,9 +31,7 @@ module Inesita
     end
 
     def render
-      dom do
-        component find_component, props: @component_props
-      end
+      component find_component, props: @component_props
     end
 
     def handle_link(path)

data/test.rb

@@ -0,0 +1,27 @@
+module A
+  ['test','cos'].each do |name|
+    define_method name do
+      puts name
+    end
+  end
+end
+
+module B
+  include A
+end
+
+module C
+  include B
+end
+
+class X
+  include C
+  def initialize
+    test
+  end
+end
+
+X.new
+
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inesita
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Michał Kalbarczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +149,7 @@ files:
 - opal/inesita/router.rb
 - opal/inesita/routes.rb
 - opal/inesita/store.rb
-- opal/virtual_dom_extension.rb
+- test.rb
 homepage: http://github.com/inesita-rb/inesita
 licenses: []
 metadata: {}

data/opal/virtual_dom_extension.rb

@@ -1,22 +0,0 @@
-module VirtualDOM
-  class NodeFactory
-    def component(comp, opts = {})
-      fail "Component is nil in #{@parent.class} class" if comp.nil?
-      @nodes << @parent.cache_component(comp) do
-        (comp.is_a?(Class) ? comp.new : comp)
-          .with_root_component(@parent.root_component)
-          .with_router(@parent.router)
-          .with_store(@parent.store)
-      end.with_props(opts[:props] || {}).render
-    end
-
-    def a(params, &block)
-      params = { onclick: -> { @parent.router.handle_link(params[:href]) } }.merge(params) if params[:href] && @parent.router
-      @nodes << VirtualNode.new(
-        'a',
-        process_params(params),
-        block ? NodeFactory.new(block, @parent).nodes : []
-      ).vnode
-    end
-  end
-end