inesita 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c0a64bb895728681f357fb737fedc3131c966ad
-  data.tar.gz: 2c8b318940f34a93001956c590a90f05da36b882
+  metadata.gz: 128cb0e2fdec618eadbb291fe314c09e213a549a
+  data.tar.gz: c72d4643eb7034aa29802104c8aac1a250f5174a
 SHA512:
-  metadata.gz: c655ef4d2cab0cc422c0dfc5d9e6a77d238c5634c2e047c064860614d8d2381c9c0bf8f7e88b9634b5c3f692c5761827f95c820c60284af53708d159473a40ac
-  data.tar.gz: d1c65668cfe5e1112668a70b771f5279cd09f2decc67197fc45ba91313b1b5cd52d988dfa3b7fe095a2c476ce9ef49cd7f7df5a9fba5d6dd3c3aeb9a4c7e175d
+  metadata.gz: dd9a32e62454e2685c5772c7bb071351001447e951a99f9c01b77991f473804313051108a578c3a32c8a83266d66fab0174747fc7ee30922a7ee459bed839216
+  data.tar.gz: 266c547fef5472b0b867ef14aad998c7b6f66cee8d01e03559d94dca6fd69bb62eba2bc1b29481c6ad9918f8591d2aadcb7a6c4a64f9a9882d8fe0e9308bcb20

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 0.3.1 (edge)
+## 0.3.2 (05.03.2016)
+* add `app_dist` and `app_dev` directory support
+* add `redirect_to` to route option
+
+## 0.3.1 (05.01.2016)
 * add params hash to `router.url_for`
 * fix `router.current_url?`
 * add `class_names` helper

data/Gemfile

@@ -2,8 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'bundler', '~> 1.3'
+gem 'bundler', '~> 1.0'
 gem 'rspec', '~> 3.0'
 gem 'opal-rspec', '~> 0.5.0'
-gem 'rake', '~> 10.4'
+gem 'rake', '~> 10.0'
 gem 'opal-browser', '~> 0.2'

data/inesita.gemspec

@@ -1,11 +1,12 @@
 Gem::Specification.new do |s|
   s.name        = 'inesita'
-  s.version     = '0.3.1'
+  s.version     = '0.3.2'
   s.authors     = ['Michał Kalbarczyk']
   s.email       = 'fazibear@gmail.com'
   s.homepage    = 'http://github.com/inesita-rb/inesita'
   s.summary     = 'Frontend web framework for Opal'
   s.description = 'Frontent web framework for Opal'
+  s.license     = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }

data/lib/inesita.rb

@@ -18,12 +18,16 @@ require 'inesita/server'
 module Inesita
   module_function
 
-  def env
-    @env || :development
+  def dist!
+    @env = :dist
   end
 
-  def env=(env)
-    @env = env
+  def dev?
+    (@env || :dev) == :dev
+  end
+
+  def dist?
+    @env == :dist
   end
 
   def assets_code

data/lib/inesita/cli.rb

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

data/lib/inesita/cli/build.rb

@@ -14,11 +14,11 @@ class InesitaCLI < Thor
 
   method_option :destination,
                 aliases: ['-d', '-dir'],
-                default: 'public',
+                default: Inesita::Config::BUILD_DIR,
                 desc: 'build destination directory'
 
   def build
-    Inesita.env = :production
+    Inesita.dist!
     assets = Inesita::Server.new.assets_app
 
     build_dir = options[:destination]

data/lib/inesita/cli/new.rb

@@ -13,7 +13,7 @@ class InesitaCLI < Thor
                 desc: 'force overwrite'
 
   def new(project_dir)
-    directory('template', project_dir, project_name: project_dir)
+    directory('template', project_dir, project_name: project_dir, build_dir: Inesita::Config::BUILD_DIR)
 
     inside project_dir do
       run 'bundle install'

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

@@ -0,0 +1 @@
+/<%= config[:build_dir] %>

data/lib/inesita/config.rb

@@ -2,7 +2,10 @@ module Inesita
   module Config
     SOURCE_MAP_PREFIX = '/__OPAL_MAPS__'
     ASSETS_PREFIX = '/__ASSETS__'
-    APP_DIR = 'app'
     STATIC_DIR = '/static'
+    BUILD_DIR = 'dist'
+    APP_DIR = 'app'
+    APP_DEV_DIR = 'app_dev'
+    APP_DIST_DIR = 'app_dist'
   end
 end

data/lib/inesita/server.rb

@@ -18,10 +18,10 @@ module Inesita
     end
 
     def assets_code
-      assets_prefix = Inesita.env == :development ? Config::ASSETS_PREFIX : nil
+      assets_prefix = Inesita.dev? ? Config::ASSETS_PREFIX : nil
       %(
         <link rel="stylesheet" type="text/css" href="#{assets_prefix}/stylesheet.css">
-        #{Opal::Sprockets.javascript_include_tag('application', sprockets: @assets_app, prefix: assets_prefix, debug: Inesita.env == :development)}
+        #{Opal::Sprockets.javascript_include_tag('application', sprockets: @assets_app, prefix: assets_prefix, debug: Inesita.dev?)}
        )
     end
 
@@ -49,6 +49,8 @@ module Inesita
     def create_assets_app
       Opal::Server.new do |s|
         s.append_path Config::APP_DIR
+        s.append_path Config::APP_DIST_DIR if Inesita.dist?
+        s.append_path Config::APP_DEV_DIR if Inesita.dev?
 
         Opal.paths.each do |p|
           s.append_path p

data/opal/inesita/router.rb

@@ -22,19 +22,26 @@ module Inesita
       @routes.route(*params, &block)
     end
 
-    def find_component
+    def find_route
       @routes.routes.each do |route|
-        params = path.match(route[:regex])
-        next unless params
-        @params = @url_params.merge(Hash[route[:params].zip(params[1..-1])])
-        @component_props = route[:component_props]
-        return route[:component]
+        next unless path.match(route[:regex])
+        return handle_link(url_for(route[:redirect_to])) if route[:redirect_to]
+        return route
       end
       fail Error, "Can't find route for url"
     end
 
+    def find_component(route)
+      params = path.match(route[:regex])
+      @params = @url_params.merge(Hash[route[:params].zip(params[1..-1])])
+      @component_props = route[:component_props]
+      route[:component]
+    end
+
     def render
-      component find_component, props: @component_props
+      if route = find_route
+        component find_component(route), props: @component_props
+      end
     end
 
     def handle_link(path)
@@ -57,7 +64,7 @@ module Inesita
       route = @routes.routes.find do |r|
         case name
         when String
-          r[:name] == name
+          r[:name] == name || r[:path] == name
         when Object
           r[:component] == name
         else

data/opal/inesita/routes.rb

@@ -10,13 +10,14 @@ module Inesita
     def route(*params, &block)
       path = params.first.delete('/')
       path = @parent ? "#{@parent}/#{path}" : "/#{path}"
-      component = params.last[:to]
-      name = params.last[:as]
-      component_props = params.last[:props]
 
       add_subroutes(path, &block) if block_given?
-      validate_component(component)
-      add_route(name, path, component, component_props)
+
+      if params.last[:redirect_to]
+        add_redirect(path, params.last[:redirect_to])
+      else
+        add_route(params.last[:as], path, params.last[:to], params.last[:props])
+      end
     end
 
     def validate_component(component)
@@ -24,7 +25,15 @@ module Inesita
       fail Error, "Invalid #{component} class, should mixin Inesita::Component" unless component.include?(Inesita::Component)
     end
 
+    def add_redirect(path, redirect_to)
+      @routes << {
+        path: path,
+        redirect_to: redirect_to
+      }.merge(params_and_regex(path))
+    end
+
     def add_route(name, path, component, component_props)
+      validate_component(component)
       @routes << {
         path: path,
         component: component,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inesita
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Michał Kalbarczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -158,6 +158,7 @@ files:
 - lib/inesita/cli/build.rb
 - lib/inesita/cli/new.rb
 - lib/inesita/cli/server.rb
+- lib/inesita/cli/template/.gitignore.tt
 - lib/inesita/cli/template/Gemfile.tt
 - lib/inesita/cli/template/README.md.tt
 - lib/inesita/cli/template/app/application.js.rb.tt
@@ -197,7 +198,8 @@ files:
 - spec/opal/spec_helper.rb
 - spec/opal/store_spec.rb
 homepage: http://github.com/inesita-rb/inesita
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []