inesita 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4f6109fc15e7bd31378ca4936813572ede6fcd7
-  data.tar.gz: 0093982d7f8c2e465766746f71fef462a9e82103
+  metadata.gz: 0a100bdbff9cff050c8c7d021a19b8b88c283ae9
+  data.tar.gz: c78e1c5b340878e330c44a147d1a519f7866b62f
 SHA512:
-  metadata.gz: 3c56b82fd98cec517334f977bda6f7a40bd166b1091c3ad23a21a2dfbedf63c49aa27158a11047f28e598a6a88a48bfdbad77fe55b6a5e82a08a424a8bdb6b8c
-  data.tar.gz: f29604ebbe6ca8963b8be80dbdba463b4e834f02f3b4bfef75202d22faa25042f3fc914c16e68ee5d79faa0168c349a06bc0c33bd86bdbe11a1885799f27b7b8
+  metadata.gz: db700496d73df68d26fd7a1cd540e7dad97846cf08af992fd89d184e0d2244b41a652aef7a2ad9e5cf0c81153d10644ce76cdd484b922a5936f89b268e7fed79
+  data.tar.gz: fae967b5907aefbe7c28832b5658a5a2529ff5914eef9a0d3a8a7ab94392017989948bf42f523d9966f5f2f2abd6ffa1992b89320eeee6b4620d9c2791f89b57

data/README.md

@@ -11,22 +11,24 @@ Install Inesita
 ```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
 
 [More detailed example](https://github.com/fazibear/inesita-example)

data/inesita.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'inesita'
-  s.version     = '0.0.4'
+  s.version     = '0.0.5'
   s.authors     = [ 'Michał Kalbarczyk' ]
   s.email       = 'fazibear@gmail.com'
   s.homepage    = 'http://github.com/fazibear/inesita'
@@ -17,5 +17,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'slim'
   s.add_dependency 'sass'
   s.add_dependency 'thor'
+  s.add_dependency 'rack-rewrite'
   s.add_development_dependency 'rake'
 end

data/lib/inesita/cli/new.rb

@@ -13,18 +13,11 @@ class InesitaCLI < Thor
                 desc: 'force overwrite'
 
   def new(project_dir)
-    empty_directory project_dir, force: options[:force]
-    copy_file       'template/.gitignore', File.join(project_dir, '.gitignore'), force: options[:force]
-    copy_file       'template/config.ru', File.join(project_dir, 'config.ru'), force: options[:force]
-    copy_file       'template/Gemfile', File.join(project_dir, 'Gemfile'), force: options[:force]
-
-    empty_directory File.join(project_dir, 'app'), force: options[:force]
-    copy_file       'template/app/index.html.slim', File.join(project_dir, 'app', 'index.html.slim'), force: options[:force]
-    copy_file       'template/app/application.js.rb', File.join(project_dir, 'app', 'application.js.rb'), force: options[:force]
-    copy_file       'template/app/application.css.sass', File.join(project_dir, 'app', 'application.css.sass'), force: options[:force]
-
-    empty_directory File.join(project_dir, 'app', 'components'), force: options[:force]
-    copy_file       'template/app/components/welcome_component.rb', File.join(project_dir, 'app', 'components', 'welcome_controller.rb'), force: options[:force]
+    Dir.glob("#{File.dirname(__FILE__)}/template/**/*",  File::FNM_DOTMATCH).each do |file|
+      next if File.directory?(file)
+      path = file.split('/')
+      copy_file file, File.join(project_dir, path[path.index('template')+1..-1].join('/')), force: options[:force]
+    end
 
     inside project_dir do
       run 'bundle install'

data/lib/inesita/cli/template/app/application.css.sass

@@ -1 +1,4 @@
 @import "bootstrap"
+
+body
+  margin: 10px 0

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

@@ -3,8 +3,20 @@ require 'opal'
 require 'browser'
 require 'inesita'
 
-require_tree './components'
+require 'components/navbar'
+require 'components/layout'
+require 'components/home'
+require 'components/welcome'
+require 'components/goodbye'
 
 $document.ready do
-  WelcomeComponent.new.mount($document['app'])
+  Inesita::Application.new(
+    routes: {
+      '/' => Home,
+      '/welcome' => Welcome,
+      '/goodbye' => Goodbye
+    },
+    mount: $document.body,
+    layout: Layout
+  ).run
 end

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

@@ -0,0 +1,13 @@
+class Goodbye
+  include Inesita::Component
+  def render
+    div class: 'jumbotron text-center' do
+      h1 do
+        text "Bye, Bye ..."
+      end
+      h4 do
+        text 'This is a sample component'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+class Home
+  include Inesita::Component
+  def render
+    div class: 'jumbotron text-center' do
+      h1 do
+        text "I'm Home !"
+      end
+      h4 do
+        text 'This is a sample component'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+class Layout
+  include Inesita::Layout
+
+  component :navbar, NavBar.new
+
+  def render
+    div do
+      div class: 'container' do
+        component navbar
+        component outlet
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+class NavBar
+  include Inesita::Component
+
+  def render
+    nav class: 'navbar navbar-default' do
+      div class: 'container' do
+        div class: 'navbar-header' do
+          span class: 'navbar-brand' do
+            text 'Inesita'
+          end
+          ul class: 'nav navbar-nav' do
+            li do
+              a href: '/' do
+                text 'Home'
+              end
+            end
+            li do
+              a href: '/welcome' do
+                text 'Welcome'
+              end
+            end
+            li do
+              a href: '/goodbye' do
+                text 'Goodbye'
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/inesita/cli/template/app/components/{welcome_component.rb → welcome.rb}

@@ -1,4 +1,4 @@
-class WelcomeComponent
+class Welcome
   include Inesita::Component
   def render
     div class: 'jumbotron text-center' do

data/lib/inesita/cli/template/app/index.html.slim

@@ -2,17 +2,13 @@ doctype html
 html
   head
     title Inesita
-    link href='application.css' rel='stylesheet' type='text/css'
-    - if $SCRIPT_FILES
+    - if $DEVELOPMENT_MODE
+      link href=asset_path('application.css') rel='stylesheet' type='text/css'
       - $SCRIPT_FILES.each do |file|
-        script src=file
+        script src=asset_path(file)
     - else
+        link href='application.css' rel='stylesheet' type='text/css'
         script src='application.js'
     javascript:
      #{{$LOAD_ASSETS_CODE}}
   body
-    nav.navbar.navbar-inverse
-      .container
-        .navbar-header
-          a.navbar-brand Project Name
-    #app.container

data/lib/inesita/server.rb

@@ -1,6 +1,9 @@
+require 'rack/rewrite'
+
 module Inesita
   module Server
     SOURCE_MAP_PREFIX = '/__OPAL_MAPS__'
+    ASSETS_PREFIX = '/__ASSETS__'
 
     module_function
 
@@ -25,7 +28,7 @@ module Inesita
 
         s.context_class.class_eval do
           def asset_path(path, options = {})
-            "#{path}"
+            $DEVELOPMENT_MODE ? "#{ASSETS_PREFIX}/#{path}" : path
           end
         end
       end
@@ -33,7 +36,7 @@ module Inesita
 
     def set_global_vars(assets, debug = false)
       $LOAD_ASSETS_CODE = Opal::Processor.load_asset_code(assets, 'application.js')
-      if debug
+      if $DEVELOPMENT_MODE
         $SCRIPT_FILES = (assets['application.js'].dependencies + [assets['application.self.js']]).map(&:logical_path)
       end
     end
@@ -43,13 +46,22 @@ module Inesita
       Opal::SourceMapServer.new(sprockets, SOURCE_MAP_PREFIX)
     end
 
+    def development_mode
+      $DEVELOPMENT_MODE = ENV['DEVELOPMENT_MODE'] || true
+    end
+
     def create
+      development_mode
       assets_app = assets
       source_maps_app = source_maps(assets_app)
       set_global_vars(assets_app, true)
 
       Rack::Builder.new do
-        map '/' do
+        use Rack::Rewrite do
+          rewrite %r[^(?!#{ASSETS_PREFIX}|#{SOURCE_MAP_PREFIX}).*], ASSETS_PREFIX
+        end
+
+        map ASSETS_PREFIX do
           run assets_app
         end
 

data/opal/inesita.rb

@@ -1,3 +1,6 @@
 require 'virtual_dom'
 require 'virtual_dom_extension'
 require 'inesita/component'
+require 'inesita/router'
+require 'inesita/application'
+require 'inesita/layout'

data/opal/inesita/application.rb

@@ -0,0 +1,32 @@
+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
+        self.class.component :layout_component, @layout.new(@router)
+      else
+        self.class.component :router_component, @router
+      end
+    end
+
+    def render
+        component layout ? layout_component : router_component
+    end
+
+    def run
+      Application.main = self
+      mount(@mount)
+    end
+  end
+end

data/opal/inesita/layout.rb

@@ -0,0 +1,13 @@
+module Inesita
+  module Layout
+    def self.included(base)
+      base.include(Component)
+    end
+
+    attr_reader :outlet
+
+    def initialize(outlet)
+      @outlet = outlet
+    end
+  end
+end

data/opal/inesita/router.rb

@@ -0,0 +1,39 @@
+module Inesita
+  class Router
+    include Inesita::Component
+    attr_reader :routes
+
+    def initialize(routes)
+      default_component = routes.values.first.new
+      default_component.parent(self)
+
+      @routes = Hash.new(routes['/'].new)
+      routes.map do |route, component|
+        @routes[route] = component.new
+        @routes[route].parent(self)
+      end
+    end
+
+    def render
+      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}})`
+      super
+    end
+
+
+    def self.handle_link(path)
+      `window.history.pushState({}, null, #{path})`
+      Application.main.update
+      false
+    end
+
+  end
+end

data/opal/virtual_dom_extension.rb

@@ -3,5 +3,14 @@ module VirtualDOM
     def component(comp)
       @nodes << NodeFactory.new(comp.method(:render), comp).nodes.first
     end
+
+    def a(params, &block)
+      params = { onclick: -> { Inesita::Router.handle_link(params[:href]) } }.merge(params) if params[:href]
+      @nodes << VirtualNode.new(
+        'a',
+        process_params(params),
+        block ? NodeFactory.new(block, @parent).nodes : []
+      ).vnode
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inesita
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Michał Kalbarczyk
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-rewrite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -116,12 +130,19 @@ files:
 - lib/inesita/cli/template/Gemfile
 - lib/inesita/cli/template/app/application.css.sass
 - lib/inesita/cli/template/app/application.js.rb
-- lib/inesita/cli/template/app/components/welcome_component.rb
+- lib/inesita/cli/template/app/components/goodbye.rb
+- lib/inesita/cli/template/app/components/home.rb
+- lib/inesita/cli/template/app/components/layout.rb
+- lib/inesita/cli/template/app/components/navbar.rb
+- lib/inesita/cli/template/app/components/welcome.rb
 - lib/inesita/cli/template/app/index.html.slim
 - lib/inesita/cli/template/config.ru
 - lib/inesita/server.rb
 - opal/inesita.rb
+- opal/inesita/application.rb
 - opal/inesita/component.rb
+- opal/inesita/layout.rb
+- opal/inesita/router.rb
 - opal/virtual_dom_extension.rb
 homepage: http://github.com/fazibear/inesita
 licenses: []