inesita 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ebd0043943e1e408e1ac4421368b5303d765a4b8
-  data.tar.gz: 8e92b4325f614c34fd84ec8d2f15ec3bc7968ad2
+SHA256:
+  metadata.gz: 593839c5dcafc20d97673e15a3cbb50e55d6fe65a6175265a5189783823fa6cd
+  data.tar.gz: 970ff04862576b05a37e4d0d74ae19e8188c667f709a1b23809ef892ff99a8c8
 SHA512:
-  metadata.gz: cd2a9a5c8c580d815b1219aaf2f0b1c09a3af223a064d4560ca134ae0623bb8d235e2ed248badfebe8fce3bb08e6689b0e762672e82f4572b0306f98a4eea1e5
-  data.tar.gz: cd8f058f70369030df6cfb9e8aebc26e759a7ac13776dbc5d07a07dc38cf06b301d5509dec9d9e83c6a7dc6a0b783496fe736941b593a800154648694db302ff
+  metadata.gz: 1297ed999cb39b0dd188507d1b8f94ad9345aa8116ad44a03f4a18386418efc149cd5a7bc9e5fcc39176d9f74535439d62701a5cb75a2088e3e905851ca7bc90
+  data.tar.gz: 5081aebace29915edf37c7ee4f06c3cd5b638b6f8bb03bcc91278508e25316c88db05010d582deb6653d07f4474aa7b371e3ab3f5bcbc1ce8cad0d630388f4b0

data/CHANGELOG.md

@@ -1,4 +1,19 @@
-## [Unreleased]
+## [0.7.0] -
+
+### Fixes
+- `thor` warrnings
+- 'sprockets' warrnings
+
+### Changed
+- Update `opal` to `0.11`
+- Move templates configuration to `config.ru`
+
+### Removed
+- remove `slim` dependency
+- remove `sass` dependency
+
+
+## [0.6.1] - 2016.11.07
 
 ### Added
 - `inject` class method for `Component`
@@ -106,7 +121,8 @@
 - rename `update_dom` to `render!`
 - use `opal-browser` instead of pure javascript
 
-[Unreleased]: https://github.com/inesita-rb/inesita/compare/v0.5.1...HEAD
+[Unreleased]: https://github.com/inesita-rb/inesita/compare/v0.6.1...HEAD
+[0.6.1]: https://github.com/inesita-rb/inesita/compare/v0.5.1...v0.6.1
 [0.5.1]: https://github.com/inesita-rb/inesita/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/inesita-rb/inesita/compare/v0.4.1...v0.5.0
 [0.4.4]: https://github.com/inesita-rb/inesita/compare/v0.4.1...v0.4.4

data/inesita.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'inesita'
-  s.version     = '0.6.1'
+  s.version     = '0.7.0'
   s.authors     = ['Michał Kalbarczyk']
   s.email       = 'fazibear@gmail.com'
   s.homepage    = 'http://github.com/inesita-rb/inesita'
@@ -15,16 +15,15 @@ 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.9', '< 0.11'
-  s.add_dependency 'opal-virtual-dom', '~> 0.5.0'
-  s.add_dependency 'slim', '~> 3.0'
-  s.add_dependency 'sass', '~> 3.4'
+  s.add_dependency 'opal', '>= 0.10.4', '< 0.12'
+  s.add_dependency 'opal-sprockets', '~> 0'
+  s.add_dependency 'opal-virtual-dom', '~> 0.6.0'
   s.add_dependency 'thor', '~> 0.19'
   s.add_dependency 'rack-rewrite', '~> 1.5'
   s.add_dependency 'listen', '~> 3.0'
 
   s.add_development_dependency 'bundler', '~> 1.0'
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'opal-rspec', '~> 0.6.0.beta'
-  s.add_development_dependency 'rake', '~> 11.0'
+  s.add_development_dependency 'opal-rspec', '~> 0.6.0'
+  s.add_development_dependency 'rake', '~> 12.0'
 end

data/lib/inesita.rb

@@ -1,9 +1,7 @@
-require 'opal'
+require 'opal-sprockets'
 Opal.append_path File.expand_path('../../opal', __FILE__)
 
 require 'opal-virtual-dom'
-require 'slim'
-require 'sass'
 
 require 'listen'
 

data/lib/inesita/cli.rb

@@ -5,8 +5,6 @@ begin
   Bundler.require
 rescue Bundler::GemfileNotFound
   require 'opal-virtual-dom'
-  require 'slim'
-  require 'sass'
   require 'inesita/server'
 end
 

data/lib/inesita/cli/build.rb

@@ -10,26 +10,31 @@ module Inesita
 
     method_option :force,
                   aliases: :f,
+                  type: :boolean,
                   default: false,
                   desc: 'force overwrite'
 
     method_option :destination_dir,
                   aliases: :d,
+                  type: :string,
                   default: Inesita::Config::BUILD_DIR,
                   desc: 'destination directory'
 
     method_option :source_dir,
                   aliases: :s,
+                  type: :string,
                   default: Inesita::Config::APP_DIR,
                   desc: 'source (app) dir'
 
     method_option :static_dir,
                   aliases: :t,
+                  type: :string,
                   default: Inesita::Config::STATIC_DIR,
                   desc: 'static dir'
 
     method_option :dist_source_dir,
                   aliases: :b,
+                  type: :string,
                   default: Inesita::Config::APP_DIST_DIR,
                   desc: 'source (app) dir for dist build'
 

data/lib/inesita/cli/new.rb

@@ -10,6 +10,7 @@ module Inesita
 
     method_option :force,
                   aliases: :f,
+                  type: :boolean,
                   default: false,
                   desc: 'force overwrite'
 

data/lib/inesita/cli/server.rb

@@ -7,11 +7,13 @@ module Inesita
     desc 'server [OPTIONS]', 'Starts Inesita server'
     method_option :port,
                   aliases: :p,
+                  type: :numeric,
                   default: 9292,
                   desc: 'The port Inesita will listen on'
 
     method_option :host,
                   aliases: :h,
+                  type: :string,
                   default: '127.0.0.1',
                   desc: 'The host address Inesita will bind to'
 

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

@@ -1,17 +1,20 @@
 source "https://rubygems.org"
 
-# inesita gem
-gem 'inesita', '~> 0.6.0'
+# inesita gems
+gem 'inesita', '~> 0.7.0'
 gem 'inesita-livereload', '~> 0.1.0'
-gem 'inesita-router', '~> 0.1.0'
+gem 'inesita-router', '~> 0.2.0'
 
-# add this gems to minify files on build
-#
+# templates gems
+gem 'slim'
+gem 'sass'
+
+# minification gems
 # gem 'uglifier'
 # gem 'htmlcompressor'
 
 # bootsrap assets
-gem 'bootstrap-sass'
+gem 'bootstrap'
 
 # rails-assets are also supported
 # source 'https://rails-assets.org' do

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

@@ -18,7 +18,7 @@ class Application
   inject Store
 
   def render
-    div class: 'container' do
+    div.container do
       component NavBar
       component router
     end

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

@@ -15,15 +15,15 @@ class Counter
     h4 do
       text props[:header]
     end
-    div class: 'input-group' do
-      span class: 'input-group-btn' do
-        button class: 'btn btn-default', onclick: method(:dec) do
+    div.input_group do
+      span.input_group_btn do
+        button.btn.btn_default onclick: method(:dec) do
           text '-'
         end
       end
-      input type: "text", class: "form-control", value: store.counter, disabled: true
-      span class: 'input-group-btn' do
-        button class: 'btn btn-default', onclick: -> { inc } do
+      input.form_control type: "text", value: store.counter, disabled: true
+      span.input_group_btn do
+        button.btn.btn_default onclick: method(:inc) do
           text '+'
         end
       end

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

@@ -2,7 +2,7 @@ class Description
   include Inesita::Component
 
   def render
-    div class: 'jumbotron text-center' do
+    div.jumbotron.text_center.bg_light do
       p do
         text %{
           Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

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

@@ -2,7 +2,7 @@ class Home
   include Inesita::Component
 
   def render
-    div.jumbotron class: 'text-center' do
+    div.jumbotron.text_center.bg_light do
       img src: '/static/inesita-rb.png'
       h1 do
         text "Hello I'm Inesita"

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

@@ -2,22 +2,20 @@ 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 '<%= 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.navbar.navbar_expand_lg.navbar_light.bg_light do
+      span.navbar_brand do
+        text '<%= config[:project_name] %>'
+      end
+      div.collapse.navbar_collapse do
+        ul.nav.navbar_nav.mr_auto do
+          li.nav_item class: class_names(active: router.current_url?(:home)) do
+            a.nav_link 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.nav_item class: class_names(active: router.current_url?(:description)) do
+            a.nav_link href: router.url_for(:description) do
+              text 'Description'
             end
           end
         end

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

@@ -2,8 +2,17 @@
 require 'bundler'
 Bundler.require
 
+# setup slim templates
+def setup(sprockets)
+  sprockets.register_engine(
+    '.slim',
+    Slim::Template,
+    silence_deprecation: true
+  )
+end
+
 # you can comment this line to disable live-reload
 use Inesita::LiveReload
 
 # run inesita server
-run Inesita::Server.new
+run Inesita::Server.new(setup_sprockets: method(:setup))

data/lib/inesita/cli/watch.rb

@@ -10,26 +10,31 @@ module Inesita
 
     method_option :force,
                   aliases: :f,
+                  type: :boolean,
                   default: true,
                   desc: 'force overwrite'
 
     method_option :destination_dir,
                   aliases: :d,
+                  type: :string,
                   default: Inesita::Config::BUILD_DIR,
                   desc: 'destination directory'
 
     method_option :source_dir,
                   aliases: :s,
+                  type: :string,
                   default: Inesita::Config::APP_DIR,
                   desc: 'source (app) dir'
 
     method_option :static_dir,
                   aliases: :t,
+                  type: :string,
                   default: Inesita::Config::STATIC_DIR,
                   desc: 'static dir'
 
     method_option :dist_source_dir,
                   aliases: :b,
+                  type: :string,
                   default: Inesita::Config::APP_DIST_DIR,
                   desc: 'source (app) dir for dist build'
 

data/lib/inesita/server.rb

@@ -7,16 +7,11 @@ module Inesita
     end
   end
 
-	class SlimTransformer
-		def self.call(input)
-			Slim::Template.new(input[:name]) { input[:data] }.render(nil)
-		end
-	end
-
-	class Server
+  class Server
     attr_reader :assets_app
 
     def initialize(opts = {})
+      @setup_sprockets = opts.delete(:setup_sprockets)
       setup_dirs(opts)
       setup_env(opts)
       @assets_app = create_assets_app
@@ -67,7 +62,7 @@ module Inesita
     end
 
     def create_assets_app
-      Opal::Server.new do |s|
+      Opal::Sprockets::Server.new do |s|
         s.append_path @app_dir
         if @dist
           s.append_path @app_dist_dir
@@ -83,21 +78,12 @@ module Inesita
           s.append_path p
         end if defined?(RailsAssets)
 
-        configure_sprockets(s.sprockets)
-      end.sprockets
-    end
-
-		def configure_sprockets(sprockets)
-			if sprockets.respond_to?(:register_transformer)
-				sprockets.register_mime_type 'text/html', extensions: ['.slim', '.html.slim', '.slim.html']
-				sprockets.register_preprocessor 'text/html', SlimTransformer
-			elsif sprockets.respond_to?(:register_engine)
-				sprockets.register_engine '.slim', Slim::Template
-			end
+        s.sprockets.context_class.class_eval do
+          include SprocketsContext
+        end
 
-      sprockets.context_class.class_eval do
-        include SprocketsContext
-      end
+        @setup_sprockets.call(s.sprockets) if @setup_sprockets
+      end.sprockets
     end
 
     def create_source_maps_app

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inesita
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Michał Kalbarczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -16,62 +16,48 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.10.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.10.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
-  name: opal-virtual-dom
+  name: opal-sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: slim
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: sass
+  name: opal-virtual-dom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -148,28 +134,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0.beta
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0.beta
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
 description: Frontent web framework for Opal
 email: fazibear@gmail.com
 executables:
@@ -220,10 +206,7 @@ files:
 - opal/inesita/injection.rb
 - spec/lib/nil_spec.rb
 - spec/lib/spec_helper.rb
-- spec/opal/application_spec.rb
 - spec/opal/component_spec.rb
-- spec/opal/injecion_spec.rb
-- spec/opal/layout_spec.rb
 - spec/opal/spec_helper.rb
 homepage: http://github.com/inesita-rb/inesita
 licenses:
@@ -246,15 +229,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Frontend web framework for Opal
 test_files:
 - spec/lib/nil_spec.rb
 - spec/lib/spec_helper.rb
-- spec/opal/application_spec.rb
 - spec/opal/component_spec.rb
-- spec/opal/injecion_spec.rb
-- spec/opal/layout_spec.rb
 - spec/opal/spec_helper.rb

data/spec/opal/application_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe Inesita::Application do
-  let(:application) { Inesita::Application }
-  let(:layout) { Class.new { include Inesita::Layout } }
-  let(:injection) { Class.new { include Inesita::Injection } }
-
-  it 'should respond to #render' do
-    expect(application.new(layout: layout)).to respond_to(:render)
-  end
-
-  it 'should fail with wrong :layout class' do
-    expect { application.new(layout: Class) }.to raise_error Inesita::Error
-  end
-
-  it 'should not fail with :layout class' do
-    expect { application.new(layout: layout) }.not_to raise_error
-  end
-
-  it 'should not fail with any class for injection' do
-    expect { application.new(layout: layout, test: injection) }.not_to raise_error
-  end
-end

data/spec/opal/injecion_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe Inesita::Injection do
-  let(:application) { Inesita::Application }
-  let(:injection) { Class.new { include Inesita::Injection } }
-  let(:layout) { Class.new { include Inesita::Layout } }
-
-  it 'should respond to #render!' do
-    expect(injection.new).to respond_to(:render!)
-  end
-
-  it 'should respond to #root_component' do
-    expect(injection.new).to respond_to(:root_component)
-  end
-
-  it 'should respond to injection name method' do
-    expect(application.new(layout: layout, test: injection)).to respond_to(:test)
-  end
-end

data/spec/opal/layout_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe Inesita::Layout do
-  let(:layout) { Class.new { include Inesita::Layout } }
-
-  it 'should respond to #outlet' do
-    expect(layout.new).to respond_to(:outlet)
-  end
-end