tzispa 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce38eca73b4e9cf4021f220361cb880eac3edb9d
-  data.tar.gz: 50885d9e8efe83222542fe3d4f43bf7fa56d8aa1
+  metadata.gz: 30879555b79aeb8632bf06e8be4d195e9f12b0cd
+  data.tar.gz: 8f706c9e46ab36845c37c949442d1d574ba2a457
 SHA512:
-  metadata.gz: 76df8fd7e703f513f37d9ec2af73f5bc467eadb9a6aa5bf5c901c93b5941906111b7e4668e4d6745f81a8d51a8134e345b3b72ae11211724acdad733a625989f
-  data.tar.gz: ea96025a47e02b2a23582f7e6ded42d51249a4536b70a08b60e9d75ba730bf292d845a7ca8a4fd904bda93e816a65d40d62d851b427aa26ff5f74e125cf605ba
+  metadata.gz: 50100c061e878b8e0289badb3d230ce3e4eec7b3e1f8596065655732955f9cc310e424abee4607a2eedd33a9656d59f6b521e48f52bc6c1e9d3e681b21428ca7
+  data.tar.gz: f238512fe61344001901bb6c48687a8c0e0d35264e187444bffd80aa3b91a18e2ede6ba090a722170c72249acfd28cc219af42540bbde8ac62e2a13e5cd31e80

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Tzispa
 
 General purpose web framework
 
+## v0.7.4
+- changed repository load order in app
+- tzispa commands bugs fix
+
 ## v0.7.3
 - bug fix in controllers base prepare_response method
 

data/README.md

@@ -21,25 +21,38 @@ Tzispa is composed by these frameworks:
 ## Usage
 
 ```shell
-% tzispa generate project myproject
-% cd myproject
-% tzispa generate app mainapp --host=www.mynewsite.com
-% puma start.ru
+% tzispa new myproject
 ```
 
-## Adding more apps
+## Adding apps
+
+```shell
+% cd myproject
+% tzispa generate app mainapp
+```
 
 Tzispa support multi-app projects. Each app must have a unique mount path
 
 ```shell
-% tzispa generate app adminapp --host=www.mynewsite.com --mount=admin
+% tzispa generate app adminapp --mount=admin
+```
+
+## Launch
+
+```shell
+% tzispa server
+```
+Starting app server daemonizing
+
+```shell
+% tzispa server --daemonize
 ```
 
 ## Adding templates
 
 There are 3 template types: layout, static and block:
 
-* layout: these are the skeleton entry points of the rig templates
+* layout: these are the skeleton entry points in the rig template engine
 * 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
 

data/lib/tzispa/app.rb

@@ -64,9 +64,9 @@ module Tzispa
         app.class.synchronize do
           logging
           load_locales
+          repository&.load!(domain)
           domain.setup
           routes.setup
-          repository&.load!(domain)
         end
       end
     end

data/lib/tzispa/commands/helpers/project.rb

@@ -11,8 +11,12 @@ module Tzispa
           'public/js', 'repository', 'scripts', 'tmp'
         ].freeze
 
+        GEMFILE = 'Gemfile'
+
         PUMA_CONFIG_FILE = 'puma.rb'
 
+        BOOT_CONFIG_FILE = 'boot.rb'
+
         BOOT_FILE = 'boot.rb'
 
         DEFAULT_MOUNT_PATH = '/'
@@ -25,44 +29,75 @@ module Tzispa
         ].freeze
 
         PUMA_CONFIG = <<-PUMACONFIG
-#!/usr/bin/env puma
-env = Tzispa::Environment.instance
-app_dir = env.root.to_s
-tmp_dir = "\#{app_dir}/tmp"
-logs_dir = "\#{app_dir}/logs"
-environment env.environment
-daemonize env.daemonize?
-pidfile "\#{tmp_dir}/puma.pid"
-state_path "\#{tmp_dir}/puma.state"
-if env.daemonize?
-  stdout_redirect "\#{logs_dir}/puma.stdout", "\#{logs_dir}/puma.stderr"
-end
-workers 0
-# threads 0, 16
-if env.ssl?
-  path_to_key = "\#{app_dir}/\#{env['TZISPA_SSL_KEY']}"
-  path_to_cert = "\#{app_dir}/\#{env['TZISPA_SSL_CERT']}"
-  bind "ssl://\#{env.server_host}:\#{env.server_port}?key=\#{path_to_key}&cert=\#{path_to_cert}"
-else
-  bind "tcp://\#{env.server_host}:\#{env.server_port}"
-end
-tag '%s'
-worker_timeout 90
+  #!/usr/bin/env puma
+  env = Tzispa::Environment.instance
+  app_dir = env.root.to_s
+  tmp_dir = "\#{app_dir}/tmp"
+  logs_dir = "\#{app_dir}/logs"
+  environment env.environment
+  daemonize env.daemonize?
+  pidfile "\#{tmp_dir}/puma.pid"
+  state_path "\#{tmp_dir}/puma.state"
+  if env.daemonize?
+    stdout_redirect "\#{logs_dir}/puma.stdout", "\#{logs_dir}/puma.stderr"
+  end
+  workers 0
+  # threads 0, 16
+  if env.ssl?
+    path_to_key = "\#{app_dir}/\#{env['TZISPA_SSL_KEY']}"
+    path_to_cert = "\#{app_dir}/\#{env['TZISPA_SSL_CERT']}"
+    bind "ssl://\#{env.server_host}:\#{env.server_port}?key=\#{path_to_key}&cert=\#{path_to_cert}"
+  else
+    bind "tcp://\#{env.server_host}:\#{env.server_port}"
+  end
+  tag '%s'
+  worker_timeout 90
+
         PUMACONFIG
 
         ENVC_DEFAULTS = <<-ENVCDEFAULTS
-# Define ENV variables
-WEB_SESSIONS_SECRET="%s"
-WEB_SESSIONS_TIMEOUT=2400
-TZISPA_HOST=localhost
-TZISPA_SERVER_HOST=0.0.0.0
-# TZISPA_PORT = 9412
-# TZISPA_SERVER_PORT = 9412
-TZISPA_SSL=no
-# TZISPA_SSL_KEY=.ssl.key
-# TZISPA_SSL_CERT=.ssl.cer
+  # Define ENV variables
+  WEB_SESSIONS_SECRET="%s"
+  WEB_SESSIONS_TIMEOUT=2400
+  TZISPA_HOST=localhost
+  TZISPA_SERVER_HOST=0.0.0.0
+  # TZISPA_PORT = 9412
+  # TZISPA_SERVER_PORT = 9412
+  TZISPA_SSL=no
+  # TZISPA_SSL_KEY=.ssl.key
+  # TZISPA_SSL_CERT=.ssl.cer
+
         ENVCDEFAULTS
 
+        BOOT_CONFIG = <<-BOOTCONFIG
+  # frozen_string_literal: true
+
+  require 'bundler'
+
+  Bundler.require(*Tzispa::Environment.instance.bundler_groups)
+
+        BOOTCONFIG
+
+        GEMFILE_CONTENT = <<-GEMFILECONTENT
+  # frozen_string_literal: true
+
+  source 'https://rubygems.org'
+
+  gem 'dalli'
+  gem 'i18n'
+  gem 'puma'
+  gem 'redis'
+  gem 'sequel'
+  gem 'tzispa'
+
+  group :development do
+    # Code reloading
+    # See: http://hanamirb.org/guides/projects/code-reloading
+    gem 'shotgun'
+  end
+
+        GEMFILECONTENT
+
       end
     end
   end

data/lib/tzispa/commands/project.rb

@@ -31,9 +31,11 @@ module Tzispa
         generate_projectrc
         generate_environment
         generate_rackup
+        generate_gemfile
         generate_puma_config
+        generate_boot_config
         generate_gitignore
-        generate_i18n(%w(en es))
+        generate_i18n(%w[en es])
         generate_database_config
       end
 
@@ -71,12 +73,24 @@ module Tzispa
         end
       end
 
+      def generate_gemfile
+        File.open("#{name}/#{GEMFILE}", 'w') do |file|
+          file.puts GEMFILE_CONTENT
+        end
+      end
+
       def generate_puma_config
         File.open("#{name}/config/#{PUMA_CONFIG_FILE}", 'w') do |f|
           f.puts PUMA_CONFIG % name
         end
       end
 
+      def generate_boot_config
+        File.open("#{name}/config/#{BOOT_CONFIG_FILE}", 'w') do |f|
+          f.puts BOOT_CONFIG
+        end
+      end
+
       def generate_database_config
         Tzispa::Config::DbConfig.create_default name
       end

data/lib/tzispa/commands/rig.rb

@@ -8,19 +8,18 @@ module Tzispa
     class Rig < Command
       attr_reader :name, :domain, :type, :mime_format
 
-      def initialize(name, app, type, mime_format = nil, options = nil)
+      def initialize(name, app, type, options = nil)
         super(options)
         @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
+                                  content_type: :htm).create
       end
     end
 

data/lib/tzispa/config/app_config.rb

@@ -47,7 +47,7 @@ module Tzispa
             log['enabled'] = true
             log['shift_age'] = 'daily'
           end
-          cfg['sessions'] = {}.tap { |ses| ses['enabled'] = true }
+          cfg['sessions'] = {}.tap { |ses| ses['enabled'] = false }
         end
         Tzispa::Config::Yaml.save(hcfg, filename)
         load!

data/lib/tzispa/config/base.rb

@@ -7,7 +7,7 @@ module Tzispa
 
     class Base < Struct
       def self.parametrize(params)
-        new(*params.keys.map(&:to_sym)).new(*(params.values.map do |v|
+        new(*params&.keys&.map(&:to_sym)).new(*(params&.values&.map do |v|
           v.is_a?(Hash) ? parametrize(v) : v
         end))
       end

data/lib/tzispa/config/db_config.rb

@@ -41,9 +41,9 @@ module Tzispa
 
         def create_default(path)
           hcfg = {}.tap do |cfg|
-            cfg['development'] = {}
-            cfg['deployment'] = {}
-            cfg['test'] = {}
+            cfg['development'] = ''
+            cfg['deployment'] = ''
+            cfg['test'] = ''
           end
           Yaml.save(hcfg, File.join(path, filename))
         end

data/lib/tzispa/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler