inesita 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcd66252288b01b5288ce873b305ea83b45a13eb
-  data.tar.gz: 609b032f8021f62302a18cb0f09d12d5384b7627
+  metadata.gz: 586b44f53758981d474a33605fdca12c01fbb1ab
+  data.tar.gz: a7e71cd60cdbb4741b08ce77aac599dc14f996f9
 SHA512:
-  metadata.gz: 700729fe540f023f63894d452ed28ced8e9912dacb7c2c910bebc052de386a7f6e8b8149ce971993d4cb8b3cdc4a02a5ea1ff177a8ed05f1c862575497702e55
-  data.tar.gz: 36b8e82c1c306d42c90f2790b88b782b36e1c4b836f1d329282ff9f60ec0e34181b649b931769b9fadd02307c41f18a1e6f5e03f42b55276f56cea06c5794770
+  metadata.gz: c514f42391b811439ef6144c1f9a46096d57208a4802f0e98d30e0d58d2763da443c1f28d218a19ec602737dd1676ed0791449ee9045d7ad5ff498dce2214ef4
+  data.tar.gz: e41e94a6d8c82f9601e6cead98b5f406396e8af47f6238027cd742eb9071ff146abbdb2aa54af1d86e99364d20aa433adbc0416d679aaab91ff5349fac78fab2

data/inesita.gemspec

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

data/lib/inesita/cli/template/app/application.js.rb

@@ -16,7 +16,6 @@ $document.ready do
       '/welcome' => Welcome,
       '/goodbye' => Goodbye
     },
-    mount: $document.body,
     layout: Layout
-  ).run
+  ).mount($document.body)
 end

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

@@ -9,21 +9,26 @@ class NavBar
             text 'Inesita'
           end
           ul class: 'nav navbar-nav' do
-            li do
+            li class: "#{"active" if url == '/'}" do
               a href: '/' do
                 text 'Home'
               end
             end
-            li do
+            li class: "#{"active" if url == '/welcome'}" do
               a href: '/welcome' do
                 text 'Welcome'
               end
             end
-            li do
+            li class: "#{"active" if url == '/goodbye'}" do
               a href: '/goodbye' do
                 text 'Goodbye'
               end
             end
+            li class: "#{"active" if url == '/counter'}" do
+              a href: '/counter' do
+                text 'Counter'
+              end
+            end
           end
         end
       end

data/lib/inesita/server.rb

@@ -24,7 +24,7 @@ module Inesita
         # add paths from rails-assets
         RailsAssets.load_paths.each do |p|
           s.append_path p
-        end
+        end if defined?(RailsAssets)
 
         s.context_class.class_eval do
           def asset_path(path, options = {})

data/opal/inesita/application.rb

@@ -1,16 +1,13 @@
 module Inesita
   class Application
     include Inesita::Component
-    class << self; attr_accessor :main; end
 
     attr_reader :layout
 
     def initialize(options)
-      raise 'Mount point missing' unless options[:mount]
       raise 'Routes missing' unless options[:routes]
 
       @router = Router.new(options[:routes])
-      @mount = options[:mount]
       @layout = options[:layout]
 
       if @layout
@@ -21,12 +18,7 @@ module Inesita
     end
 
     def render
-        component layout ? layout_component : router_component
-    end
-
-    def run
-      Application.main = self
-      mount(@mount)
+      component layout ? layout_component : router_component
     end
   end
 end

data/opal/inesita/component.rb

@@ -23,6 +23,10 @@ module Inesita
       end
     end
 
+    def url
+      `document.location.pathname`
+    end
+
     def self.included(base)
       base.extend(ClassMethods)
     end

data/opal/inesita/router.rb

@@ -7,7 +7,7 @@ module Inesita
       default_component = routes.values.first.new
       default_component.parent(self)
 
-      @routes = Hash.new(routes['/'].new)
+      @routes = Hash.new(default_component)
       routes.map do |route, component|
         @routes[route] = component.new
         @routes[route].parent(self)
@@ -18,20 +18,15 @@ module Inesita
       component routes[url]
     end
 
-    def url
-      `document.location.pathname`
-    end
-
     def mount
-      `window.onpopstate = function(){#{self.handle_link}}`
-      `window.addEventListener("hashchange", function(){#{self.handle_link}})`
+      `window.onpopstate = function(){#{handle_link}}`
+      `window.addEventListener("hashchange", function(){#{handle_link}})`
       super
     end
 
-
-    def self.handle_link(path)
+    def self.handle_link(path, component)
       `window.history.pushState({}, null, #{path})`
-      Application.main.update
+      component.update
       false
     end
 

data/opal/virtual_dom_extension.rb

@@ -5,7 +5,8 @@ module VirtualDOM
     end
 
     def a(params, &block)
-      params = { onclick: -> { Inesita::Router.handle_link(params[:href]) } }.merge(params) if params[:href]
+      #TODO: Only if router is configured
+      params = { onclick: -> { Inesita::Router.handle_link(params[:href], @parent) } }.merge(params) if params[:href]
       @nodes << VirtualNode.new(
         'a',
         process_params(params),

metadata

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