inesita 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83190d831f12858fb0b8c2e4c2a5575dc3863c49
-  data.tar.gz: b5a6b50b689ace6fbaf726a64ea5c4dd2979a53d
+  metadata.gz: e75bb45e13cde077690f59ac0196e2b630f9d40f
+  data.tar.gz: 16e95d9a8c923eff86a7d6f84800807cbc2dd0d7
 SHA512:
-  metadata.gz: c4018bda515c29a290b83166a73a4405e60db9e58136a78fe7ea7c8c7e20600540da7d1823acad5470d41d28f1d46fcc6ef8264f1869a45e183d997df4abbbdd
-  data.tar.gz: d6bcc46517b00b20712df8874821bfba1b3fe8be77fe2662461413663483da2d6011b81a19bef856bdd27b85bdbe1fbe4eb2ad47b7d1a297f26aa611b8709cff
+  metadata.gz: 935deea53673ada2f81a43202c1e75bfa86242f501ec9ee7241713b49a60479017a7dcf30eea5806a3d1b3fdf1255bc6bc58a18d3d56a4ccb0a6ae5323c8dc68
+  data.tar.gz: ab86e398eaa70c544249753da02e07ddaaabce585879343f163d7cb04b8119ab655c0974aa45a56b8a7dfc282e348bae70297e37897446a59610035883c2e228

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+sudo: false
+cache:
+  bundler: true
+rvm:
+  - 2.2.3
+notifications:
+  webhooks:
+    urls: https://webhooks.gitter.im/e/04c689326f7cd8e4d499

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+## 0.3.0 (edge)
+
+* live-reload
+* rename `update_dom` to `render!`
+* include `opal-browser`
+* `after_render` component method - executes after component is rendered
+* add minification support
+* specs added
+* add static support - for serving images

data/Gemfile

@@ -1,3 +1,9 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
+
+gem 'bundler', '~> 1.3'
+gem 'rspec', '~> 3.0'
+gem 'opal-rspec', '~> 0.5.0'
+gem 'rake', '~> 10.4'
+gem 'opal-browser', '~> 0.2'

data/LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Michał Kalbarczyk
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,4 +1,4 @@
-# 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) [![Dependency Status](https://gemnasium.com/inesita-rb/inesita.svg)](https://gemnasium.com/inesita-rb/inesita) [![Build Status](https://travis-ci.org/inesita-rb/inesita.svg?branch=master)](https://travis-ci.org/inesita-rb/inesita) [![Join the chat at https://gitter.im/inesita-rb/inesita](https://img.shields.io/badge/%E2%8A%AA%20GITTER%20-JOIN%20CHAT%20%E2%86%92-brightgreen.svg)](https://gitter.im/inesita-rb/inesita?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Inesita is a web frontend framework for fast building browser application using Ruby. It uses Virtual DOM for page render.
 
@@ -8,5 +8,7 @@ More detailed description [here](https://inesita-rb.github.io).
 
 ## Examples
 
- - [Example application](https://github.com/inesita-rb/playground)
- - [TodoMVC application](https://github.com/inesita-rb/todomvc)
+ - [[DEMO](http://inesita-playground.netlify.com/)] [Example application source](https://github.com/inesita-rb/playground)
+ - [[DEMO](http://inesita-todomvc.netlify.com/)] [TodoMVC application source](https://github.com/inesita-rb/todomvc)
+ - [[DEMO](http://inesita-dbmonster.netlify.com/)] [DBMonster application source](https://github.com/inesita-rb/dbmonster)
+ - [[DEMO](https://inesita-asciify-me.netlify.com/)] [Asciify Me application source](https://github.com/inesita-rb/asciify-me)

data/Rakefile

@@ -1,3 +1,20 @@
 require 'bundler'
 Bundler.require
 Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+require 'opal/rspec/rake_task'
+require 'opal/browser'
+
+ENV['SPEC_OPTS'] = '--color'
+
+RSpec::Core::RakeTask.new(:spec_lib) do |task|
+  task.pattern = 'spec/lib/**/*_spec.rb'
+end
+
+Opal::RSpec::RakeTask.new(:spec_opal) do |_server, task|
+  task.pattern = 'spec/opal/**/*_spec.rb'
+  task.default_path = 'spec/opal'
+end
+
+task default: [:spec_lib, :spec_opal]

data/inesita.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'inesita'
-  s.version     = '0.2.3'
-  s.authors     = [ 'Michał Kalbarczyk' ]
+  s.version     = '0.3.0'
+  s.authors     = ['Michał Kalbarczyk']
   s.email       = 'fazibear@gmail.com'
   s.homepage    = 'http://github.com/inesita-rb/inesita'
   s.summary     = 'Frontend web framework for Opal'
@@ -12,11 +12,13 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_dependency 'opal', '~> 0.8'
-  s.add_dependency 'opal-virtual-dom', '~> 0.1.0'
+  s.add_dependency 'opal', '~> 0.9'
+  s.add_dependency 'opal-browser', '~> 0.2'
+  s.add_dependency 'opal-virtual-dom', '~> 0.3.0'
   s.add_dependency 'slim', '~> 3.0'
   s.add_dependency 'sass', '~> 3.4'
   s.add_dependency 'thor', '~> 0.19'
   s.add_dependency 'rack-rewrite', '~> 1.5'
-  s.add_development_dependency 'rake', '~> 10.4'
+  s.add_dependency 'listen', '~> 3.0'
+  s.add_dependency 'websocket', '~> 1.0'
 end

data/lib/inesita.rb

@@ -1,9 +1,36 @@
 require 'opal'
 Opal.append_path File.expand_path('../../opal', __FILE__)
-Opal.use_gem 'opal-virtual-dom'
 
 require 'opal-virtual-dom'
+require 'opal-browser'
 require 'slim'
 require 'sass'
 
+require 'singleton'
+require 'listen'
+require 'rubame'
+
+require 'inesita/config'
+require 'inesita/app_files_listener'
+require 'inesita/live_reload'
 require 'inesita/server'
+
+module Inesita
+  module_function
+
+  def env
+    @env || :development
+  end
+
+  def env=(env)
+    @env = env
+  end
+
+  def assets_code
+    @assets_code
+  end
+
+  def assets_code=(code)
+    @assets_code = code
+  end
+end

data/lib/inesita/app_files_listener.rb

@@ -0,0 +1,42 @@
+module Inesita
+  class AppFilesListener
+    include Singleton
+    CURRENT_DIR = Dir.pwd
+
+    def initialize
+      @websockets = []
+      listener = Listen.to(Config::APP_DIR) do |modified, added, _removed|
+        (modified + added).each do |file|
+          @websockets.each do |ws|
+            ws.send transform_filename(file)
+          end
+        end
+      end
+      listener.start
+    end
+
+    def add_ws(ws)
+      @websockets << ws
+    end
+
+    def rm_ws(ws)
+      @websockets.delete(ws)
+    end
+
+    def transform_filename(filename)
+      filename.sub!(CURRENT_DIR, '')
+      path = filename.split('/')
+      path.delete('')
+      path.delete(Config::APP_DIR)
+      path = path.join('/').split('.')
+
+      prefix = Config::ASSETS_PREFIX
+      name = path.first
+      if path.include?('rb') || path.include?('js')
+        "#{prefix}|#{name}|js"
+      elsif path.include?('sass') || path.include?('css')
+        "#{prefix}|stylesheet|css"
+      end
+    end
+  end
+end

data/lib/inesita/cli.rb

@@ -11,6 +11,7 @@ rescue Bundler::GemfileNotFound
 end
 
 require 'rack'
+require 'inesita/minify'
 require 'inesita/cli/build'
 require 'inesita/cli/server'
 require 'inesita/cli/new'

data/lib/inesita/cli/build.rb

@@ -5,7 +5,7 @@ class InesitaCLI < Thor
 
   namespace :build
 
-  desc "build [OPTIONS]", "Build Inesita app"
+  desc 'build [OPTIONS]', 'Build Inesita app'
 
   method_option :force,
                 aliases: ['-f'],
@@ -18,18 +18,41 @@ class InesitaCLI < Thor
                 desc: 'build destination directory'
 
   def build
+    Inesita.env = :production
+    assets = Inesita::Server.new.assets_app
+
     build_dir = options[:destination]
+    force = options[:force]
 
-    assets = Inesita::Server.assets
-    Inesita::Server.set_global_vars(assets, false)
+    empty_directory build_dir, force: force
 
-    index = assets['index.html']
-    javascript = assets['application.js']
-    stylesheet = assets['stylesheet.css']
+    copy_static(build_dir, force)
+    create_index(build_dir, assets['index.html'].source, force)
+    create_js(build_dir, assets['application.js'].source, force)
+    create_css(build_dir, assets['stylesheet.css'].source, force)
+  end
 
-    empty_directory build_dir, force: options[:force]
-    create_file File.join(build_dir, 'index.html'),      index.source,      force: options[:force]
-    create_file File.join(build_dir, 'application.js'),  javascript.source, force: options[:force]
-    create_file File.join(build_dir, 'stylesheet.css'), stylesheet.source, force: options[:force]
+  no_commands do
+    def copy_static(build_dir, force)
+      Dir.glob('./static/**/*').each do |file|
+        if File.directory?(file)
+          empty_directory File.join(build_dir, file), force: force
+        else
+          copy_file File.absolute_path(file), File.join(build_dir, file), force: force
+        end
+      end
+    end
+
+    def create_index(build_dir, html, force)
+      create_file File.join(build_dir, 'index.html'), Inesita::Minify.html(html), force: force
+    end
+
+    def create_js(build_dir, javascript, force)
+      create_file File.join(build_dir, 'application.js'), Inesita::Minify.js(javascript),  force: force
+    end
+
+    def create_css(build_dir, stylesheet, force)
+      create_file File.join(build_dir, 'stylesheet.css'), Inesita::Minify.css(stylesheet), force: force
+    end
   end
 end

data/lib/inesita/cli/new.rb

@@ -5,7 +5,7 @@ class InesitaCLI < Thor
 
   namespace :new
 
-  desc "new PROJECT_NAME", "Create Inesita app"
+  desc 'new PROJECT_NAME', 'Create Inesita app'
 
   method_option :force,
                 aliases: ['-f'],
@@ -13,10 +13,7 @@ class InesitaCLI < Thor
                 desc: 'force overwrite'
 
   def new(project_dir)
-    puts 'x'
-    directory('template', project_dir, {
-      project_name: project_dir
-    })
+    directory('template', project_dir, project_name: project_dir)
 
     inside project_dir do
       run 'bundle install'

data/lib/inesita/cli/server.rb

@@ -1,10 +1,9 @@
 class InesitaCLI < Thor
-
   check_unknown_options!
 
   namespace :server
 
-  desc "server [OPTIONS]", "Starts Inesita server"
+  desc 'server [OPTIONS]', 'Starts Inesita server'
   method_option :port,
                 aliases: '-p',
                 default: 9292,

data/lib/inesita/cli/template/Gemfile.tt

@@ -1,9 +1,12 @@
 source "https://rubygems.org"
 
-gem 'opal-browser', '~> 0.2'
-gem 'inesita', '~> 0.2.0'
+# inesita gem
+gem 'inesita', '~> 0.3.0'
 
-source 'https://rails-assets.org' do
-  gem 'rails-assets-bootstrap'
-  gem 'rails-assets-virtual-dom'
-end
+# add this gems to minify files on build
+#
+# gem 'uglifier'
+# gem 'htmlcompressor'
+
+# bootsrap assets
+gem 'bootstrap-sass'

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

@@ -1,11 +1,9 @@
-require 'virtual-dom'
-require 'opal'
-require 'browser'
-require 'browser/interval'
 require 'inesita'
 
 require 'router'
 require 'store'
+require 'layout'
+
 require_tree './components'
 
 $document.ready do

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

@@ -3,7 +3,7 @@ class Home
 
   def render
     div class: 'jumbotron text-center' do
-      img src: 'http://avatars.githubusercontent.com/inesita-rb'
+      img src: '/static/inesita-rb.jpg'
       h1 do
         text "Hello I'm Inesita"
       end

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

@@ -2,13 +2,5 @@ doctype html
 html
   head
     title <%= config[:project_name] %>
-    - if $DEVELOPMENT_MODE
-      link href=asset_path('stylesheet.css') rel='stylesheet' type='text/css'
-      - $SCRIPT_FILES.each do |file|
-        script src=asset_path(file)
-    - else
-        link href='stylesheet.css' rel='stylesheet' type='text/css'
-        script src='application.js'
-    javascript:
-     #{{$LOAD_ASSETS_CODE}}
+    == Inesita.assets_code
   body

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

@@ -4,7 +4,7 @@ class Layout
   def render
     div class: 'container' do
       component NavBar
-      component outlet
+      component router
     end
   end
 end

data/lib/inesita/cli/template/config.ru.tt

@@ -1,4 +1,9 @@
+# initialize bundler
 require 'bundler'
 Bundler.require
 
-run Inesita::Server.create
+# you can comment this line to disable live-reload
+use Inesita::LiveReload
+
+# run inesita server
+run Inesita::Server.new

data/lib/inesita/config.rb

@@ -0,0 +1,8 @@
+module Inesita
+  module Config
+    SOURCE_MAP_PREFIX = '/__OPAL_MAPS__'
+    ASSETS_PREFIX = '/__ASSETS__'
+    APP_DIR = 'app'
+    STATIC_DIR = '/static'
+  end
+end

data/lib/inesita/live_reload.rb

@@ -0,0 +1,47 @@
+require 'rubame'
+
+module Inesita
+  class LiveReload
+    INJECT_CODE = Opal.compile(File.read(File.expand_path('../../../opal/inesita/live_reload.rb', __FILE__)))
+
+    def initialize(app, _options = {})
+      @app = app
+      Thread.new do
+        begin
+          init_live_reload
+        rescue => e
+          puts e
+        end
+      end
+    end
+
+    def call(env)
+      status, headers, body = @app.call(env)
+      if status == 200
+        new_body = inject_script(body)
+        headers['Content-Length'] = new_body.bytesize.to_s
+        [status, headers, [new_body]]
+      else
+        [status, headers, body]
+      end
+    end
+
+    def inject_script(body)
+      new_body = ''
+      body.each { |line| new_body += line.to_s }
+      new_body.gsub('{ Opal.loaded', "{ #{INJECT_CODE} Opal.loaded")
+    end
+
+    def init_live_reload
+      AppFilesListener.instance
+      server = Rubame::Server.new('0.0.0.0', 23654)
+      loop do
+        server.run do |ws|
+          ws.onopen    { AppFilesListener.instance.add_ws(ws) }
+          ws.onclose   { AppFilesListener.instance.rm_ws(ws) }
+          ws.onmessage { |msg| ws.send 'pong' if msg == 'ping' }
+        end
+      end
+    end
+  end
+end