tzispa 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36b98fcccfc7db5bc2e1851dc330ef71f6d134d6
-  data.tar.gz: 6adbc025f39c5e2a08e61c1490e8833c4a4eb401
+  metadata.gz: cd74c98b9c732e76ab7fa87e760664c4bb1770db
+  data.tar.gz: 0c805105cfede7ef61edced4d066e510db90000a
 SHA512:
-  metadata.gz: 5ba7a3324decfa4aae956546fd1fdd9cd3b191439646ee482b95b9d43518626545cf5c8701f7a9af7a00bb35892ed4cf7aa2d12bf99cc528e6ee16969ea4c506
-  data.tar.gz: 96bffe002e67063a618059da19267120db58adec7a72d3952432f579d034781d7d8e4b5db002e45fcc7f7d37410153a38cbdc6147714a5de5233f54b22d2dc14
+  metadata.gz: 36d1a0becbad7b32e90cce228d2ff4a6c291ba02cc3390af297ec98de4aeb8b75249836425b1a275eb1d9dfa6ae66dc6e8e028c0a73344b3f95a361dce4085d7
+  data.tar.gz: ffa0c807d47a7f36e038d4cc757e1c9f422c0f87a0833f00b454683f4af10d5daa770089e150e85258a3aab6e6a60366b9dd5a390b3b94cd79924d6c7f4851ba

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Tzispa
 
 General purpose web framework
 
+## v0.4.0
+- Added basic cli command engine
+- Added some documentation in README.md
+
 ## v0.3.3
 - Added internationalization support with i18n
 - Created new config folder in each domain to store all configurations

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Juan Antonio Piñero
+
+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,3 +1,52 @@
-Tzispa
+# Tzispa
 
 A sparkling web framework
+
+## Frameworks
+
+Tzispa is composed by these frameworks:
+
+* [**Tzispa::Rig**](https://github.com/japiber/tzispa_rig) - Template engine
+* [**Tzispa::Utils**](https://github.com/japiber/tzispa_utils) - Ruby class utilities
+* [**Tzispa::Helpers**](https://github.com/japiber/tzispa_helpers) - Helper modules
+* [**Tzispa::Data**](https://github.com/japiber/tzispa_data) - Data access layer
+
+
+## Installation
+
+```shell
+% gem install tzispa
+```
+
+## Usage
+
+```shell
+% tzispa generate project myproject
+% cd myproject
+% tzispa generate app mainapp --host=www.mynewsite.com
+% puma start.ru
+```
+
+## Adding more apps
+
+Tzispa support multi-app projects. Each app must have a unique mount path
+
+```shell
+% tzispa generate app adminapp --host=www.mynewsite.com --mount=admin
+```
+
+## Adding templates
+
+There are 3 template types: layout, static and block:
+
+* layout: these are the skeleton entry points of the rig templates
+* static: these are "light" templates that are a included without any processing as plain text
+* block: the true core of the rig templates, each block template file has an associated ruby file with the template binder class
+
+```shell
+% tzispa generate rig lister --type=layout --app=mainapp
+% tzispa generate rig sitefoot --type=static --app=mainapp
+% tzispa generate rig product_detail --type=block --app=mainapp
+```
+
+Work in progress ...

data/bin/tzispa

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require 'tzispa/cli'
+Tzispa::Cli.start

data/lib/tzispa/app.rb

@@ -4,7 +4,7 @@ require 'forwardable'
 require 'logger'
 require 'i18n'
 require 'tzispa/domain'
-require 'tzispa/config/webconfig'
+require 'tzispa/config/appconfig'
 require 'tzispa/config/routes'
 require 'tzispa/middleware'
 require 'tzispa_data'
@@ -46,10 +46,11 @@ module Tzispa
       end
 
       def mount(mount_point, builder)
-        self.routes ||= Tzispa::Config::Routes.new(mount_point)
-        app = self.new
-        yield(routes)
-        app.middleware.map mount_point, builder
+        self.new.tap { |app|
+          self.routes ||= Config::Routes.new(mount_point)
+          yield(routes)
+          app.middleware.map mount_point, builder
+        }
       end
 
       def router
@@ -59,9 +60,10 @@ module Tzispa
     end
 
     def initialize(domain_name)
-      @domain = Domain.new(name: domain_name)
-      @middleware = Tzispa::Middleware.new self
+      @domain = Domain.new(domain_name)
+      @middleware = Middleware.new self
       I18n.load_path = Dir["config/locales/*.yml"]
+      @config = Config::AppConfig.new(@domain).load!
     end
 
     def call(env)
@@ -72,10 +74,9 @@ module Tzispa
     def load!
       unless @loaded
         Mutex.new.synchronize {
-          @config = Tzispa::Config::WebConfig.new(@domain).load!
           @middleware.load!
-          @repository = Tzispa::Data::Repository.new(@config.repository.to_h).load! if @config.respond_to? :repository
-          @engine = Tzispa::Rig::Engine.new self
+          @repository = Data::Repository.new(@config.repository.to_h).load! if @config.respond_to? :repository
+          @engine = Rig::Engine.new self
           @logger = Logger.new("logs/#{@domain.name}.log", 'weekly')
           @logger.level = @config.respond_to?(:developing) && @config.developing ? Logger::DEBUG : Logger::INFO
           I18n.load_path += Dir["#{@domain.path}/config/locales/*.yml"] if @config.respond_to?(:locales) && @config.locales.preload

data/lib/tzispa/bin/tzispa

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require 'tzispa/cli'
+Tzispa::Cli.start

data/lib/tzispa/cli.rb

@@ -0,0 +1,19 @@
+require 'thor'
+
+module Tzispa
+
+  class Cli < Thor
+
+    desc 'version', 'Prints Tzispa version'
+    def version
+      require 'tzispa/version'
+      puts "v#{VERSION}"
+    end
+
+    require 'tzispa/command/cli/generate'
+    register Tzispa::Command::Cli::Generate, 'generate', 'generate [SUBCOMMAND]', 'Generate Tzispa components'
+
+
+  end
+
+end

data/lib/tzispa/command/app.rb

@@ -0,0 +1,86 @@
+require 'json'
+require 'tzispa/domain'
+require 'tzispa/utils/string'
+require 'tzispa/config/appconfig'
+require_relative 'project'
+
+module Tzispa
+  module Command
+
+    class App
+
+      APP_STRUCTURE = [
+        'api',
+        'config',
+        'config/locales',
+        'error',
+        'rig',
+        'rig/block',
+        'rig/layout',
+        'rig/static'
+      ]
+
+      attr_reader :domain, :config
+
+      def initialize(name)
+        @domain = Tzispa::Domain.new(name)
+      end
+
+      def generate(host, mount_path=nil)
+        update_project
+        create_structure
+        create_class mount_path
+        create_appconfig(host)
+        create_home_layout
+      end
+
+      private
+
+      def update_project
+        prj = Project.open
+        raise "Application '#{domain.name}' already exist in this project" if prj.apps.include?(domain.name)
+        prj.apps << domain.name
+        prj.close
+      end
+
+      def create_class(mount_path=nil)
+        appclass = "#{TzString.camelize domain.name}App"
+        mount_path ||= DEFAULT_MOUNT_PATH
+        class_code = TzString.new
+        File.open("#{Project::START_FILE}","a") do |f|
+          f.puts class_code.indenter("\nclass #{appclass} < Tzispa::Application\n\n")
+          f.puts class_code.indenter("def initialize", 2)
+          f.puts class_code.indenter("super(:#{domain.name})", 2)
+          f.puts class_code.unindenter("end\n\n", 2)
+          f.puts class_code.unindenter("end\n\n", 2)
+          f.puts class_code.indenter("#{appclass}.mount '/#{mount_path}', self do |route|")
+          f.puts class_code.indenter("route.index '/', [:get, :head]", 2)
+          f.puts class_code.indenter("route.api   '/__api_:sign/:handler/:verb(~:predicate)(/:sufix)', [:get, :head, :post]")
+          f.puts class_code.indenter("route.site  '/:title(/@:id0)(@:id1)(@~:id2)(@@:id3)(@@~:id4)(@@@:id5)/:layout.:format', [:get, :head]")
+          f.puts class_code.unindenter("end\n\n", 2)
+        end
+      end
+
+      def create_structure
+        unless File.exist? domain.path
+          Dir.mkdir "#{domain.path}"
+          APP_STRUCTURE.each { |appdir|
+            Dir.mkdir "#{domain.path}/#{appdir}"
+          }
+        end
+      end
+
+      def create_appconfig(host)
+        appconfig = Tzispa::Config::AppConfig.new(domain)
+        @config = appconfig.create_default host: host
+      end
+
+      def create_home_layout
+        tpl = Tzispa::Rig::Template.new(name: config&.default_layout || 'index', type: :layout, domain: domain, format: :htm)
+        tpl.create("<html><body><h1>Welcome: Tzispa #{domain.name} application is working!</h1></body></html>")
+      end
+
+    end
+
+  end
+end

data/lib/tzispa/command/cli/generate.rb

@@ -0,0 +1,41 @@
+require 'thor'
+require 'tzispa/command/project'
+require 'tzispa/command/app'
+require 'tzispa/command/rig'
+
+module Tzispa
+  module Command
+    module Cli
+
+      class Generate < Thor
+
+        desc 'project', 'Generate Tzispa project components'
+        def project(name)
+          Tzispa::Command::Project.new(name).generate
+          puts "Project '#{name}' has been created"
+        end
+
+        desc 'app', 'Generate new application into a project'
+        method_option :mount, :aliases => "-m", :desc => "The mount point for this app", :default => ""
+        method_option :host, :aliases => "-h", :desc => "The hostname used for this app ", :required => true
+        def app(name)
+          tzapp = Tzispa::Command::App.new(name)
+          tzapp.generate(options[:host], options[:mount])
+          puts "App '#{name}' has been created"
+        end
+
+
+        desc 'rig', 'Generate new rig template'
+        method_option :app, :aliases => "-a", :desc => "The app where the new template will be created", :required => true
+        method_option :type, :aliases => "-t", :desc => "The template type: block, static or layout ", :required => true
+        def rig(name)
+          tpl = Tzispa::Command::Rig.new(name, options[:app], options[:type])
+          tpl.generate
+          puts "Rig #{options[:type]} template '#{name}' has been created in #{options[:app]}"
+        end
+
+      end
+
+    end
+  end
+end

data/lib/tzispa/command/project.rb

@@ -0,0 +1,257 @@
+require 'json'
+require "base64"
+
+module Tzispa
+  module Command
+
+    class Project
+
+      PROJECT_STRUCTURE = [
+        'apps',
+        'config',
+        'config/locales',
+        'data',
+        'data/session',
+        'logs',
+        'public',
+        'public/css',
+        'public/css/fonts',
+        'public/css/less',
+        'public/img',
+        'public/js',
+        'repository'
+      ]
+
+      PROJECT_FILE       = '.tzispaprj'
+      START_FILE         = 'start.ru'
+      PUMA_CONFIG_FILE   = 'puma.rb'
+
+      DEFAULT_MOUNT_PATH = '/'
+
+      attr_accessor :name, :apps, :created
+
+      def initialize(name)
+        @name = name
+        @apps = Array.new
+      end
+
+
+      def generate
+        if create_structure
+          create_project
+          create_start
+          create_pumaconfig
+          create_i18n 'en'
+        end
+      end
+
+      def self.check?
+        File.exist? "#{PROJECT_FILE}"
+      end
+
+      def self.open
+        raise "This command must be runned in a Tzispa project base dir" unless self.check?
+        hpj = JSON.parse String.new.tap { |ptxt|
+          File.open("#{PROJECT_FILE}","r") do |f|
+            while line = f.gets
+              ptxt << line
+            end
+          end
+        }
+        self.new(hpj['name']).tap { |project|
+          project.apps = hpj['apps']
+          project.created = hpj['created']
+        }
+      end
+
+      def close
+        save to_h
+      end
+
+      def to_h
+        Hash.new.tap { |h|
+          h['name'] = name
+          h['apps'] = apps
+          h['created'] = created
+        }
+      end
+
+      private
+
+      def save(prj, base_dir=nil)
+        base_dir = "#{base_dir}/" if base_dir
+        File.open("#{base_dir}#{PROJECT_FILE}","w") do |f|
+          f.write prj.to_json
+        end
+      end
+
+      def create_structure
+        unless File.exist? name
+          Dir.mkdir "#{name}"
+          PROJECT_STRUCTURE.each { |psdir|
+            Dir.mkdir "#{name}/#{psdir}"
+          }
+        end
+      end
+
+      def create_project
+        save({
+          name: name,
+          created: Time.new,
+          apps: []
+        }, name)
+      end
+
+      def create_start
+        File.open("#{name}/#{START_FILE}","w") do |f|
+          f.puts "require 'rack'\nrequire 'tzispa'"
+        end
+      end
+
+      def create_pumaconfig
+        File.open("#{name}/config/#{PUMA_CONFIG_FILE}", "w") do |f|
+          f.puts PUMA_CONFIG
+        end
+      end
+
+      def create_i18n(lang)
+        File.open("#{name}/config/locales/#{lang}.yml", "w") do |f|
+          f.puts Base64.decode64(I18N_DEFAULTS)
+        end
+      end
+
+      PUMA_CONFIG = <<-PUMACONFIG
+#!/usr/bin/env puma
+
+#daemonize true
+pidfile 'puma.pid'
+state_path 'puma.state'
+
+# stdout_redirect 'logs/puma.stdout', 'logs/puma.stderr'
+# stdout_redirect '/u/apps/lolcat/log/stdout', '/u/apps/lolcat/log/stderr', true
+
+# Disable request logging.
+# quiet
+
+# threads 0, 16
+
+
+bind 'tcp://0.0.0.0:9292'
+workers 0
+
+on_restart do
+require 'fileutils'
+FileUtils.rm_rf(Dir.glob('./data/session/*'))
+end
+
+# on_worker_boot do
+#   puts 'On worker boot...'
+# end
+
+# after_worker_boot do
+#   puts 'On worker boot...'
+# end
+
+# on_worker_shutdown do
+#   puts 'On worker boot...'
+# end
+
+
+tag 'your_app_tag'
+worker_timeout 90
+PUMACONFIG
+
+    I18N_DEFAULTS = <<-I18NDEFAULTSBASE64
+LS0tDQplbjoNCiAgZGF0ZToNCiAgICBhYmJyX2RheV9uYW1lczoNCiAgICAtIFN1bg0KICAgIC0g
+TW9uDQogICAgLSBUdWUNCiAgICAtIFdlZA0KICAgIC0gVGh1DQogICAgLSBGcmkNCiAgICAtIFNh
+dA0KICAgIGFiYnJfbW9udGhfbmFtZXM6DQogICAgLQ0KICAgIC0gSmFuDQogICAgLSBGZWINCiAg
+ICAtIE1hcg0KICAgIC0gQXByDQogICAgLSBNYXkNCiAgICAtIEp1bg0KICAgIC0gSnVsDQogICAg
+LSBBdWcNCiAgICAtIFNlcA0KICAgIC0gT2N0DQogICAgLSBOb3YNCiAgICAtIERlYw0KICAgIGRh
+eV9uYW1lczoNCiAgICAtIFN1bmRheQ0KICAgIC0gTW9uZGF5DQogICAgLSBUdWVzZGF5DQogICAg
+LSBXZWRuZXNkYXkNCiAgICAtIFRodXJzZGF5DQogICAgLSBGcmlkYXkNCiAgICAtIFNhdHVyZGF5
+DQogICAgZm9ybWF0czoNCiAgICAgIGRlZmF1bHQ6ICIlWS0lbS0lZCINCiAgICAgIGxvbmc6ICIl
+QiAlZCwgJVkiDQogICAgICBzaG9ydDogIiViICVkIg0KICAgIG1vbnRoX25hbWVzOg0KICAgIC0N
+CiAgICAtIEphbnVhcnkNCiAgICAtIEZlYnJ1YXJ5DQogICAgLSBNYXJjaA0KICAgIC0gQXByaWwN
+CiAgICAtIE1heQ0KICAgIC0gSnVuZQ0KICAgIC0gSnVseQ0KICAgIC0gQXVndXN0DQogICAgLSBT
+ZXB0ZW1iZXINCiAgICAtIE9jdG9iZXINCiAgICAtIE5vdmVtYmVyDQogICAgLSBEZWNlbWJlcg0K
+ICAgIG9yZGVyOg0KICAgIC0gOnllYXINCiAgICAtIDptb250aA0KICAgIC0gOmRheQ0KICBkYXRl
+dGltZToNCiAgICBkaXN0YW5jZV9pbl93b3JkczoNCiAgICAgIGFib3V0X3hfaG91cnM6DQogICAg
+ICAgIG9uZTogYWJvdXQgMSBob3VyDQogICAgICAgIG90aGVyOiBhYm91dCAle2NvdW50fSBob3Vy
+cw0KICAgICAgYWJvdXRfeF9tb250aHM6DQogICAgICAgIG9uZTogYWJvdXQgMSBtb250aA0KICAg
+ICAgICBvdGhlcjogYWJvdXQgJXtjb3VudH0gbW9udGhzDQogICAgICBhYm91dF94X3llYXJzOg0K
+ICAgICAgICBvbmU6IGFib3V0IDEgeWVhcg0KICAgICAgICBvdGhlcjogYWJvdXQgJXtjb3VudH0g
+eWVhcnMNCiAgICAgIGFsbW9zdF94X3llYXJzOg0KICAgICAgICBvbmU6IGFsbW9zdCAxIHllYXIN
+CiAgICAgICAgb3RoZXI6IGFsbW9zdCAle2NvdW50fSB5ZWFycw0KICAgICAgaGFsZl9hX21pbnV0
+ZTogaGFsZiBhIG1pbnV0ZQ0KICAgICAgbGVzc190aGFuX3hfbWludXRlczoNCiAgICAgICAgb25l
+OiBsZXNzIHRoYW4gYSBtaW51dGUNCiAgICAgICAgb3RoZXI6IGxlc3MgdGhhbiAle2NvdW50fSBt
+aW51dGVzDQogICAgICBsZXNzX3RoYW5feF9zZWNvbmRzOg0KICAgICAgICBvbmU6IGxlc3MgdGhh
+biAxIHNlY29uZA0KICAgICAgICBvdGhlcjogbGVzcyB0aGFuICV7Y291bnR9IHNlY29uZHMNCiAg
+ICAgIG92ZXJfeF95ZWFyczoNCiAgICAgICAgb25lOiBvdmVyIDEgeWVhcg0KICAgICAgICBvdGhl
+cjogb3ZlciAle2NvdW50fSB5ZWFycw0KICAgICAgeF9kYXlzOg0KICAgICAgICBvbmU6IDEgZGF5
+DQogICAgICAgIG90aGVyOiAiJXtjb3VudH0gZGF5cyINCiAgICAgIHhfbWludXRlczoNCiAgICAg
+ICAgb25lOiAxIG1pbnV0ZQ0KICAgICAgICBvdGhlcjogIiV7Y291bnR9IG1pbnV0ZXMiDQogICAg
+ICB4X21vbnRoczoNCiAgICAgICAgb25lOiAxIG1vbnRoDQogICAgICAgIG90aGVyOiAiJXtjb3Vu
+dH0gbW9udGhzIg0KICAgICAgeF9zZWNvbmRzOg0KICAgICAgICBvbmU6IDEgc2Vjb25kDQogICAg
+ICAgIG90aGVyOiAiJXtjb3VudH0gc2Vjb25kcyINCiAgICBwcm9tcHRzOg0KICAgICAgZGF5OiBE
+YXkNCiAgICAgIGhvdXI6IEhvdXINCiAgICAgIG1pbnV0ZTogTWludXRlDQogICAgICBtb250aDog
+TW9udGgNCiAgICAgIHNlY29uZDogU2Vjb25kcw0KICAgICAgeWVhcjogWWVhcg0KICBlcnJvcnM6
+DQogICAgZm9ybWF0OiAiJXthdHRyaWJ1dGV9ICV7bWVzc2FnZX0iDQogICAgbWVzc2FnZXM6DQog
+ICAgICBhY2NlcHRlZDogbXVzdCBiZSBhY2NlcHRlZA0KICAgICAgYmxhbms6IGNhbid0IGJlIGJs
+YW5rDQogICAgICBwcmVzZW50OiBtdXN0IGJlIGJsYW5rDQogICAgICBjb25maXJtYXRpb246IGRv
+ZXNuJ3QgbWF0Y2ggJXthdHRyaWJ1dGV9DQogICAgICBlbXB0eTogY2FuJ3QgYmUgZW1wdHkNCiAg
+ICAgIGVxdWFsX3RvOiBtdXN0IGJlIGVxdWFsIHRvICV7Y291bnR9DQogICAgICBldmVuOiBtdXN0
+IGJlIGV2ZW4NCiAgICAgIGV4Y2x1c2lvbjogaXMgcmVzZXJ2ZWQNCiAgICAgIGdyZWF0ZXJfdGhh
+bjogbXVzdCBiZSBncmVhdGVyIHRoYW4gJXtjb3VudH0NCiAgICAgIGdyZWF0ZXJfdGhhbl9vcl9l
+cXVhbF90bzogbXVzdCBiZSBncmVhdGVyIHRoYW4gb3IgZXF1YWwgdG8gJXtjb3VudH0NCiAgICAg
+IGluY2x1c2lvbjogaXMgbm90IGluY2x1ZGVkIGluIHRoZSBsaXN0DQogICAgICBpbnZhbGlkOiBp
+cyBpbnZhbGlkDQogICAgICBsZXNzX3RoYW46IG11c3QgYmUgbGVzcyB0aGFuICV7Y291bnR9DQog
+ICAgICBsZXNzX3RoYW5fb3JfZXF1YWxfdG86IG11c3QgYmUgbGVzcyB0aGFuIG9yIGVxdWFsIHRv
+ICV7Y291bnR9DQogICAgICBtb2RlbF9pbnZhbGlkOiAiVmFsaWRhdGlvbiBmYWlsZWQ6ICV7ZXJy
+b3JzfSINCiAgICAgIG5vdF9hX251bWJlcjogaXMgbm90IGEgbnVtYmVyDQogICAgICBub3RfYW5f
+aW50ZWdlcjogbXVzdCBiZSBhbiBpbnRlZ2VyDQogICAgICBvZGQ6IG11c3QgYmUgb2RkDQogICAg
+ICByZXF1aXJlZDogbXVzdCBleGlzdA0KICAgICAgdGFrZW46IGhhcyBhbHJlYWR5IGJlZW4gdGFr
+ZW4NCiAgICAgIHRvb19sb25nOg0KICAgICAgICBvbmU6IGlzIHRvbyBsb25nIChtYXhpbXVtIGlz
+IDEgY2hhcmFjdGVyKQ0KICAgICAgICBvdGhlcjogaXMgdG9vIGxvbmcgKG1heGltdW0gaXMgJXtj
+b3VudH0gY2hhcmFjdGVycykNCiAgICAgIHRvb19zaG9ydDoNCiAgICAgICAgb25lOiBpcyB0b28g
+c2hvcnQgKG1pbmltdW0gaXMgMSBjaGFyYWN0ZXIpDQogICAgICAgIG90aGVyOiBpcyB0b28gc2hv
+cnQgKG1pbmltdW0gaXMgJXtjb3VudH0gY2hhcmFjdGVycykNCiAgICAgIHdyb25nX2xlbmd0aDoN
+CiAgICAgICAgb25lOiBpcyB0aGUgd3JvbmcgbGVuZ3RoIChzaG91bGQgYmUgMSBjaGFyYWN0ZXIp
+DQogICAgICAgIG90aGVyOiBpcyB0aGUgd3JvbmcgbGVuZ3RoIChzaG91bGQgYmUgJXtjb3VudH0g
+Y2hhcmFjdGVycykNCiAgICAgIG90aGVyX3RoYW46IG11c3QgYmUgb3RoZXIgdGhhbiAle2NvdW50
+fQ0KICAgIHRlbXBsYXRlOg0KICAgICAgYm9keTogJ1RoZXJlIHdlcmUgcHJvYmxlbXMgd2l0aCB0
+aGUgZm9sbG93aW5nIGZpZWxkczonDQogICAgICBoZWFkZXI6DQogICAgICAgIG9uZTogMSBlcnJv
+ciBwcm9oaWJpdGVkIHRoaXMgJXttb2RlbH0gZnJvbSBiZWluZyBzYXZlZA0KICAgICAgICBvdGhl
+cjogIiV7Y291bnR9IGVycm9ycyBwcm9oaWJpdGVkIHRoaXMgJXttb2RlbH0gZnJvbSBiZWluZyBz
+YXZlZCINCiAgaGVscGVyczoNCiAgICBzZWxlY3Q6DQogICAgICBwcm9tcHQ6IFBsZWFzZSBzZWxl
+Y3QNCiAgICBzdWJtaXQ6DQogICAgICBjcmVhdGU6IENyZWF0ZSAle21vZGVsfQ0KICAgICAgc3Vi
+bWl0OiBTYXZlICV7bW9kZWx9DQogICAgICB1cGRhdGU6IFVwZGF0ZSAle21vZGVsfQ0KICBudW1i
+ZXI6DQogICAgY3VycmVuY3k6DQogICAgICBmb3JtYXQ6DQogICAgICAgIGRlbGltaXRlcjogIiwi
+DQogICAgICAgIGZvcm1hdDogIiV1JW4iDQogICAgICAgIHByZWNpc2lvbjogMg0KICAgICAgICBz
+ZXBhcmF0b3I6ICIuIg0KICAgICAgICBzaWduaWZpY2FudDogZmFsc2UNCiAgICAgICAgc3RyaXBf
+aW5zaWduaWZpY2FudF96ZXJvczogZmFsc2UNCiAgICAgICAgdW5pdDogIiQiDQogICAgZm9ybWF0
+Og0KICAgICAgZGVsaW1pdGVyOiAiLCINCiAgICAgIHByZWNpc2lvbjogMw0KICAgICAgc2VwYXJh
+dG9yOiAiLiINCiAgICAgIHNpZ25pZmljYW50OiBmYWxzZQ0KICAgICAgc3RyaXBfaW5zaWduaWZp
+Y2FudF96ZXJvczogZmFsc2UNCiAgICBodW1hbjoNCiAgICAgIGRlY2ltYWxfdW5pdHM6DQogICAg
+ICAgIGZvcm1hdDogIiVuICV1Ig0KICAgICAgICB1bml0czoNCiAgICAgICAgICBiaWxsaW9uOiBC
+aWxsaW9uDQogICAgICAgICAgbWlsbGlvbjogTWlsbGlvbg0KICAgICAgICAgIHF1YWRyaWxsaW9u
+OiBRdWFkcmlsbGlvbg0KICAgICAgICAgIHRob3VzYW5kOiBUaG91c2FuZA0KICAgICAgICAgIHRy
+aWxsaW9uOiBUcmlsbGlvbg0KICAgICAgICAgIHVuaXQ6ICcnDQogICAgICBmb3JtYXQ6DQogICAg
+ICAgIGRlbGltaXRlcjogJycNCiAgICAgICAgcHJlY2lzaW9uOiAzDQogICAgICAgIHNpZ25pZmlj
+YW50OiB0cnVlDQogICAgICAgIHN0cmlwX2luc2lnbmlmaWNhbnRfemVyb3M6IHRydWUNCiAgICAg
+IHN0b3JhZ2VfdW5pdHM6DQogICAgICAgIGZvcm1hdDogIiVuICV1Ig0KICAgICAgICB1bml0czoN
+CiAgICAgICAgICBieXRlOg0KICAgICAgICAgICAgb25lOiBCeXRlDQogICAgICAgICAgICBvdGhl
+cjogQnl0ZXMNCiAgICAgICAgICBnYjogR0INCiAgICAgICAgICBrYjogS0INCiAgICAgICAgICBt
+YjogTUINCiAgICAgICAgICB0YjogVEINCiAgICBwZXJjZW50YWdlOg0KICAgICAgZm9ybWF0Og0K
+ICAgICAgICBkZWxpbWl0ZXI6ICcnDQogICAgICAgIGZvcm1hdDogIiVuJSINCiAgICBwcmVjaXNp
+b246DQogICAgICBmb3JtYXQ6DQogICAgICAgIGRlbGltaXRlcjogJycNCiAgdGltZToNCiAgICBh
+bTogYW0NCiAgICBmb3JtYXRzOg0KICAgICAgZGVmYXVsdDogIiVhLCAlZCAlYiAlWSAlSDolTTol
+UyAleiINCiAgICAgIGxvbmc6ICIlQiAlZCwgJVkgJUg6JU0iDQogICAgICBzaG9ydDogIiVkICVi
+ICVIOiVNIg0KICAgIHBtOiBwbQ0K
+I18NDEFAULTSBASE64
+
+
+    end
+
+
+  end
+end

data/lib/tzispa/command/rig.rb

@@ -0,0 +1,26 @@
+require 'tzispa/rig/template'
+
+module Tzispa
+  module Command
+
+    class Rig
+
+      attr_reader :name, :domain, :type, :mime_format
+
+      def initialize(name, app, type, mime_format = nil)
+        @prj = Project.open
+        raise "Application '#{app}' does not exists in project file" unless @prj.apps.include?(app)
+        @domain = Tzispa::Domain.new app
+        @type = type.to_sym
+        @name = name
+        @mime_format = mime_format
+      end
+
+      def generate
+        Tzispa::Rig::Template.new(name: name, type: type, domain: domain, format: mime_format).create
+      end
+
+    end
+
+  end
+end

data/lib/tzispa/config/appconfig.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'tzispa/config/yaml'
+require 'tzispa/helpers/security'
+
+module Tzispa
+  module Config
+    class AppConfig
+
+      include Tzispa::Helpers::Security
+
+      CONFIG_FILENAME = :appconfig
+
+      attr_reader :domain, :cfname
+
+      def initialize(domain, configname=nil)
+        @domain = domain
+        @cfname = configname || CONFIG_FILENAME
+        @cftime = nil
+      end
+
+      def filename
+        @filename ||= "#{domain.path}/config/#{cfname}.yml".freeze
+      end
+
+      def load!
+        if @cftime.nil?
+          @cftime = File.ctime(filename)
+        else
+          if @cftime != File.ctime(filename)
+            @config = nil
+            @cftime = File.ctime(filename)
+          end
+        end
+        @config ||= Tzispa::Config::Yaml.load(filename)
+      end
+
+      def create_default(host:, layout: 'index', dev_mode: true, locale: 'en')
+        hcfg = Hash.new.tap { |cfg|
+          cfg['id'] = domain.name
+          cfg['default_layout'] = layout
+          cfg['default_format'] = 'htm'
+          cfg['host_name'] = host
+          cfg['dev_mode'] = dev_mode
+          cfg['default_encoding'] = 'utf-8'
+          cfg['auth_required'] = false
+          cfg['salt'] = secret(24)
+          cfg['locales'] = Hash.new.tap { |loc|
+            loc['preload'] = true
+            loc['default'] = locale
+          }
+          cfg['sessions'] = Hash.new.tap { |ses|
+            ses['enabled'] = true
+            ses['timeout'] = 3600
+            ses['secret'] = secret(32)
+          }
+        }
+        Tzispa::Config::Yaml.save(hcfg, filename)
+        load!
+      end
+
+
+    end
+  end
+end

data/lib/tzispa/config/routes.rb

@@ -21,7 +21,7 @@ module Tzispa
         "#{@map_path}#{@router.path path_id, params}"
       end
 
-      def add(route_id, path, controller)
+      def add(route_id, path, controller, methods)
         spec_control, callmethod = controller.to_s.split(':')
         mpath = spec_control.split('#')
         controller = TzString.camelize(mpath.pop).to_s
@@ -32,22 +32,22 @@ module Tzispa
           controller_module = CONTROLLERS_BASE
           require "tzispa/controller/#{controller.downcase}"
         end
-        @router.add(path).tap { |rule|
+        @router.add(path, {request_method: methods}).tap { |rule|
           rule.to TzString.constantize("#{controller_module}::#{controller}").new(callmethod)
           rule.name = route_id
         }
       end
 
-      def index(path, controller=nil)
-        add :index, path, controller || 'layout:render!'
+      def index(path, methods, controller=nil)
+        add :index, path, controller || 'layout:render!', methods
       end
 
-      def api(path, controller=nil)
-        add :api, path, controller || 'api:dispatch!'
+      def api(path, methods, controller=nil)
+        add :api, path, controller || 'api:dispatch!', methods
       end
 
-      def site(path, controller=nil)
-        add :site, path, controller || 'layout:render!'
+      def site(path, methods, controller=nil)
+        add :site, path, controller || 'layout:render!', methods
       end
 
     end

data/lib/tzispa/config/yaml.rb

@@ -11,6 +11,12 @@ module Tzispa
         self.parametrize params
       end
 
+      def self.save(cfg, filename)
+        File.open(filename, 'w') { |f|
+           f.write cfg.to_yaml
+        }        
+      end
+
 
 
     end

data/lib/tzispa/context.rb

@@ -2,7 +2,7 @@ require 'forwardable'
 
 module Tzispa
 
-  # Thie class defines a environment to hold application state in runtime
+  # This class defines a environment to hold application state in runtime
   class Context
     extend Forwardable
 

data/lib/tzispa/controller/layout.rb

@@ -18,6 +18,7 @@ module Tzispa
                    context.router_params[:layout] || context.config.default_layout
                  end
         layout_format = context.router_params[:format] || context.config.default_format
+        context.layout = layout
         rig = context.app.engine.layout(name: layout, format: layout_format.to_sym)
         response.body << rig.render(context)
         content_type layout_format

data/lib/tzispa/domain.rb

@@ -6,12 +6,12 @@ module Tzispa
     attr_reader :name, :root
 
     DEFAULT_DOMAIN_NAME   = :default
-    DEFAULT_DOMAINS_ROOT  = :domains
+    DEFAULT_DOMAINS_ROOT  = :apps
 
 
-    def initialize(name: DEFAULT_DOMAIN_NAME, root: DEFAULT_DOMAINS_ROOT)
-      @name = name || DEFAULT_DOMAIN_NAME
-      @root = root || DEFAULT_DOMAINS_ROOT
+    def initialize(name=DEFAULT_DOMAIN_NAME, root=DEFAULT_DOMAINS_ROOT)
+      @name = name
+      @root = root
     end
 
     def path

data/lib/tzispa/http/context.rb

@@ -16,6 +16,7 @@ module Tzispa
       include Tzispa::Helpers::Security
 
       attr_reader    :request, :response
+      attr_accessor  :layout
       def_delegators :@request, :session
 
       SESSION_LAST_ACCESS   = :__last_access

data/lib/tzispa/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Tzispa
-  VERSION = '0.3.4'
+  VERSION = '0.4.0'
   FRAMEWORK_NAME = 'Tzispa'
   GEM_NAME = 'tzispa'
 end

data/tzispa.gemspec

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/tzispa/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = Tzispa::FRAMEWORK_NAME.downcase
+  s.version     = Tzispa::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.bindir      = 'bin'
+  s.authors     = ['Juan Antonio Piñero']
+  s.email       = ['japinero@area-integral.com']
+  s.homepage    = 'https://github.com/japiber/tzispa'
+  s.summary     = 'A sparkling web framework'
+  s.description = 'A sparkling web framework based on Rack and inspired by Sinatra and Lotus'
+  s.licenses    = ['MIT']
+
+  s.required_ruby_version     = '~> 2.3'
+
+  s.add_dependency 'rack',           '~> 1.5'
+  s.add_dependency 'puma',           '~> 3.1'
+  s.add_dependency 'i18n',           '~> 0.7'
+  s.add_dependency 'http_router',    '~> 0.11'
+  s.add_dependency 'moneta',         '~> 0.8'
+  s.add_dependency 'tzispa_helpers', '~> 0.1.0'
+  s.add_dependency 'tzispa_utils',   '~> 0.2.1'
+  s.add_dependency 'tzispa_rig',     '~> 0.2.0'
+  s.add_dependency 'tzispa_data',    '~> 0.1'
+
+  s.files         = Dir.glob("{lib,bin}/**/*") + %w(README.md CHANGELOG.md LICENSE tzispa.gemspec)
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.require_paths = ['lib']
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: http_router
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: tzispa_rig
   requirement: !ruby/object:Gem::Requirement
@@ -111,18 +139,27 @@ dependencies:
 description: A sparkling web framework based on Rack and inspired by Sinatra and Lotus
 email:
 - japinero@area-integral.com
-executables: []
+executables:
+- tzispa
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- LICENSE
 - README.md
+- bin/tzispa
 - lib/tzispa.rb
 - lib/tzispa/api/handler.rb
 - lib/tzispa/app.rb
+- lib/tzispa/bin/tzispa
+- lib/tzispa/cli.rb
+- lib/tzispa/command/app.rb
+- lib/tzispa/command/cli/generate.rb
+- lib/tzispa/command/project.rb
+- lib/tzispa/command/rig.rb
+- lib/tzispa/config/appconfig.rb
 - lib/tzispa/config/base.rb
 - lib/tzispa/config/routes.rb
-- lib/tzispa/config/webconfig.rb
 - lib/tzispa/config/yaml.rb
 - lib/tzispa/context.rb
 - lib/tzispa/controller/api.rb
@@ -137,6 +174,7 @@ files:
 - lib/tzispa/http/session_flash_bag.rb
 - lib/tzispa/middleware.rb
 - lib/tzispa/version.rb
+- tzispa.gemspec
 homepage: https://github.com/japiber/tzispa
 licenses:
 - MIT
@@ -157,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A sparkling web framework

data/lib/tzispa/config/webconfig.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require 'tzispa/config/yaml'
-
-module Tzispa
-  module Config
-    class WebConfig
-
-      RPG_WEBCONFIG_FILENAME = :webconfig
-
-
-      def initialize(domain,configname=nil)
-        @domain = domain
-        @cfname = configname || RPG_WEBCONFIG_FILENAME
-        @cftime = nil
-      end
-
-      def filename
-        @filename ||= "#{@domain.path}/config/#{@cfname}.yml".freeze
-      end
-
-      def load!
-        if @cftime.nil?
-          @cftime = File.ctime(filename)
-        else
-          if @cftime != File.ctime(filename)
-            @config = nil
-            @cftime = File.ctime(filename)
-          end
-        end
-        @config ||= Tzispa::Config::Yaml.load(filename)
-      end
-
-
-    end
-  end
-end