tzispa 0.6.1 → 0.7.0

data/lib/tzispa/route_set.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+require 'yaml'
+require 'http_router'
+require 'tzispa/utils/string'
+require 'tzispa/controller/http_error'
+
+module Tzispa
+
+  class RouteSet
+    using Tzispa::Utils::TzString
+
+    CONTROLLERS_BASE = 'Tzispa::Controller'
+
+    attr_reader :router, :map_path, :app
+
+    def initialize(app, root = nil)
+      @router = HttpRouter.new
+      @app = app
+      @router.default Controller::HttpError.new(app, :error_404)
+      @map_path = root unless root == '/'
+    end
+
+    def setup
+      draw do
+        contents = File.read(routes_definitions)
+        instance_eval(contents, File.basename(routes_definitions), 0)
+      end
+    end
+
+    def routes_definitions
+      @routes_definitions ||= "config/routes/#{app.name}.rb"
+    end
+
+    def path(path_id, params = {})
+      "#{@map_path}#{@router.path path_id, params}"
+    end
+
+    def call(env)
+      @router.call env
+    end
+
+    def add(route_id, path, controller, methods: nil, matching: nil)
+      add_route(route_id, path, to: build_controller(controller),
+                                methods: methods,
+                                matching: matching)
+    end
+
+    def draw
+      yield if block_given?
+    end
+
+    def index(path, controller: nil, methods: nil)
+      add :index, path, controller || 'layout:render!', methods: methods
+    end
+
+    def api(path, controller: nil, methods: nil)
+      add :api, path, controller || 'api:dispatch!', methods: methods
+    end
+
+    def signed_api(path, controller: nil, methods: nil)
+      add :sapi, path, controller || 'api:dispatch!', methods: methods
+    end
+
+    def layout(layout, path, controller: nil, methods: nil)
+      add layout, path, controller || 'layout:render!', methods: methods,
+                                                        matching: { layout: layout.to_s }
+    end
+
+    private
+
+    def add_route(route_id, path, to:, methods: nil, matching: nil)
+      @router.add(path).tap do |rule|
+        rule.name = route_id
+        rule.to to
+        rule.add_request_method(methods) if methods
+        rule.add_match_with(matching) if matching
+      end
+    end
+
+    def build_controller(controller)
+      spec_control, callmethod = controller.to_s.split(':')
+      mpath = spec_control.split('#')
+      controller_class(mpath).new(app, callmethod)
+    end
+
+    def controller_class(mpath)
+      req_controller = mpath.pop
+      cmodule = if mpath.count > 1
+                  require "#{app.path}/controller/#{req_controller}"
+                  mpath.collect!(&:capitalize).join('::')
+                else
+                  require "tzispa/controller/#{req_controller}"
+                  CONTROLLERS_BASE
+                end
+      "#{cmodule}::#{req_controller.camelize}".constantize
+    end
+  end
+
+end

data/lib/tzispa/server.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'rack'
+require 'tzispa/environment'
+
+module Tzispa
+  # provides rack-based web server interface
+  class Server < ::Rack::Server
+    attr_reader :options
+
+    def initialize
+      @options = _extract_options
+      setup
+    end
+
+    def start
+      preload
+      super
+    end
+
+    private
+
+    def setup
+      instance_eval 'load "./config/boot.rb"'
+      @app = if code_reloading?
+               Shotgun::Loader.new(rackup_file)
+             else
+               config = "Rack::Builder.new {( #{::File.read(rackup_file)}\n )}.to_app"
+               instance_eval config, rackup_file
+             end
+    end
+
+    def env
+      @env ||= Tzispa::Environment.instance
+    end
+
+    def code_reloading?
+      env.code_reloading?
+    end
+
+    def preload
+      return unless code_reloading?
+      Shotgun.enable_copy_on_write
+      Shotgun.preload
+    end
+
+    def rackup_file
+      env.rackup.to_s
+    end
+
+    def _extract_options
+      {
+        environment: env.environment,
+        config:      rackup_file,
+        Host:        env.server_host,
+        Port:        env.server_port,
+        AccessLog:   []
+      }
+    end
+  end
+end

data/lib/tzispa/tzisparc.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+require 'pathname'
+require 'tzispa/utils/hash'
+
+module Tzispa
+
+  class Tzisparc
+    using Tzispa::Utils::TzHash
+
+    FILE_NAME = '.tzisparc'
+
+    DEFAULT_ARCHITECTURE = 'domains'
+
+    APP_ARCHITECTURE = 'app'
+
+    ARCHITECTURE_KEY = 'architecture'
+
+    PROJECT_NAME = 'project'
+
+    DEFAULT_TEST_SUITE = 'minitest'
+
+    TEST_KEY = 'test'
+
+    DEFAULT_TEMPLATE = 'rig'
+
+    TEMPLATE_KEY = 'template'
+
+    SEPARATOR = '='
+
+    def initialize(root)
+      @root = root
+    end
+
+    def options
+      @options ||= default_options.merge(file_options).symbolize!
+    end
+
+    def default_options
+      @default_options ||= { ARCHITECTURE_KEY => DEFAULT_ARCHITECTURE,
+                             PROJECT_NAME     => project_name,
+                             TEST_KEY         => DEFAULT_TEST_SUITE,
+                             TEMPLATE_KEY     => DEFAULT_TEMPLATE }
+    end
+
+    def exists?
+      path_file.exist?
+    end
+
+    def generate
+      File.open(path_file, 'w') do |file|
+        default_options.each { |k, v| file.puts("#{k}#{SEPARATOR}#{v}") }
+      end
+    end
+
+    private
+
+    def file_options
+      exists? ? parse_file(path_file) : {}
+    end
+
+    def parse_file(path)
+      {}.tap do |hash|
+        File.readlines(path).each do |line|
+          key, value = line.split(SEPARATOR)
+          hash[key] = value.strip
+        end
+      end
+    end
+
+    def path_file
+      @root.join FILE_NAME
+    end
+
+    def project_name
+      ::File.basename(@root)
+    end
+  end
+
+end

data/lib/tzispa/version.rb

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

data/lib/tzispa.rb

@@ -1,6 +1,8 @@
 module Tzispa
 
   require 'tzispa/version'
+  require 'tzispa/environment'
+  require 'tzispa/server'
   require 'tzispa/app'
-  
+
 end

data/tzispa.gemspec

@@ -1,4 +1,6 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+# frozen_string_literal: true
+
 require File.expand_path('../lib/tzispa/version', __FILE__)
 
 Gem::Specification.new do |s|
@@ -10,21 +12,25 @@ Gem::Specification.new do |s|
   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.description = 'A sparkling web framework Rack based'
   s.licenses    = ['MIT']
 
-  s.required_ruby_version     = '~> 2.3'
+  s.required_ruby_version = '~> 2.3'
 
+  s.add_dependency 'bundler',        '~> 1.14'
   s.add_dependency 'rack',           '~> 2.0',    '>= 2.0.1'
   s.add_dependency 'i18n',           '~> 0.8.0'
   s.add_dependency 'thor',           '~> 0.19.0'
   s.add_dependency 'http_router',    '~> 0.11.2'
-  s.add_dependency 'tzispa_helpers', '~> 0.2.2'
+  s.add_dependency 'tzispa_helpers', '~> 0.3'
   s.add_dependency 'tzispa_utils',   '~> 0.3'
   s.add_dependency 'tzispa_rig',     '~> 0.5'
-  s.add_dependency 'tzispa_data',    '~> 0.3'
+  s.add_dependency 'tzispa_data',    '~> 0.4'
+  s.add_dependency 'dotenv',         '~> 2.2'
+
+  s.add_development_dependency 'shotgun'
 
-  s.files         = Dir.glob("{lib,bin}/**/*") + %w(README.md CHANGELOG.md LICENSE tzispa.gemspec)
+  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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tzispa
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: tzispa_utils
   requirement: !ruby/object:Gem::Requirement
@@ -120,15 +134,43 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-description: A sparkling web framework based on Rack and inspired by Sinatra and Lotus
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: shotgun
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A sparkling web framework Rack based
 email:
 - japinero@area-integral.com
 executables:
@@ -145,13 +187,21 @@ files:
 - lib/tzispa/app.rb
 - lib/tzispa/bin/tzispa
 - lib/tzispa/cli.rb
-- lib/tzispa/command/api.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/commands/api.rb
+- lib/tzispa/commands/app.rb
+- lib/tzispa/commands/cli/generate.rb
+- lib/tzispa/commands/command.rb
+- lib/tzispa/commands/console.rb
+- lib/tzispa/commands/helpers/i18n.rb
+- lib/tzispa/commands/helpers/project.rb
+- lib/tzispa/commands/helpers/repository.rb
+- lib/tzispa/commands/project.rb
+- lib/tzispa/commands/repository.rb
+- lib/tzispa/commands/rig.rb
+- lib/tzispa/commands/server.rb
+- lib/tzispa/config/app_config.rb
 - lib/tzispa/config/base.rb
+- lib/tzispa/config/db_config.rb
 - lib/tzispa/config/yaml.rb
 - lib/tzispa/context.rb
 - lib/tzispa/controller/api.rb
@@ -160,14 +210,15 @@ files:
 - lib/tzispa/controller/exceptions.rb
 - lib/tzispa/controller/http_error.rb
 - lib/tzispa/controller/layout.rb
-- lib/tzispa/controller/signed_api.rb
 - lib/tzispa/domain.rb
+- lib/tzispa/env.rb
+- lib/tzispa/environment.rb
 - lib/tzispa/http/context.rb
 - lib/tzispa/http/request.rb
 - lib/tzispa/http/response.rb
-- lib/tzispa/http/session_flash_bag.rb
-- lib/tzispa/middleware.rb
-- lib/tzispa/routes.rb
+- lib/tzispa/route_set.rb
+- lib/tzispa/server.rb
+- lib/tzispa/tzisparc.rb
 - lib/tzispa/version.rb
 - tzispa.gemspec
 homepage: https://github.com/japiber/tzispa

data/lib/tzispa/command/api.rb

@@ -1,24 +0,0 @@
-require 'tzispa/controller/api'
-
-module Tzispa
-  module Command
-
-    class Api
-
-      attr_reader :name, :domain
-
-      def initialize(name, app)
-        @prj = Project.open
-        raise "Application '#{app}' does not exists in project file" unless @prj.apps.include?(app)
-        @domain = Tzispa::Domain.new app
-        @name = name
-      end
-
-      def generate
-        Tzispa::Controller::Api.new.generate_handler(domain, name)
-      end
-
-    end
-
-  end
-end

data/lib/tzispa/command/app.rb

@@ -1,95 +0,0 @@
-require 'json'
-require 'tzispa/domain'
-require 'tzispa/utils/string'
-require 'tzispa/utils/indenter'
-require 'tzispa/config/appconfig'
-require_relative 'project'
-
-module Tzispa
-  module Command
-
-    class App
-
-      using Tzispa::Utils
-
-      APP_STRUCTURE = [
-        'api',
-        'locales',
-        'error',
-        'helpers',
-        'middleware',
-        'rig',
-        'rig/block',
-        'rig/layout',
-        'rig/static',
-        'services'
-      ]
-
-      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 app_class_name
-        @app_class_name ||= "#{domain.name.camelize}App"
-      end
-
-      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)
-        mount_path ||= DEFAULT_MOUNT_PATH
-        File.open("#{Project::START_FILE}","a") do |f|
-          f.puts write_app_code(mount_path)
-        end
-      end
-
-      def write_app_code(mount_path)
-        mount_path = "/#{mount_path}" unless mount_path.start_with? '/'
-        Tzispa::Utils::Indenter.new(2).tap { |code|
-          code << "(Class.new Tzispa::Application).run :#{domain.name}, builder: self#{", on: \'"+mount_path+"\'" if mount_path && mount_path.length > 0}  do\n\n"
-          code.indent << "route_rig_signed_api  '/api_:sign/:handler/:verb(~:predicate)(/:sufix)'\n"
-          code        << "route_rig_api         '/api/:handler/:verb(~:predicate)(/:sufix)'\n"
-          code        << "route_rig_index       '/'\n\n"
-          code.unindent << "end\n\n"
-        }.to_s
-      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

@@ -1,51 +0,0 @@
-require 'thor'
-
-
-module Tzispa
-  module Command
-    module Cli
-
-      class Generate < Thor
-
-        require 'tzispa/command/project'
-        desc 'project', 'Generate Tzispa project components'
-        def project(name)
-          Tzispa::Command::Project.new(name).generate
-          puts "Project '#{name}' has been created"
-        end
-
-        require 'tzispa/command/app'
-        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
-
-        require 'tzispa/command/rig'
-        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
-
-        require 'tzispa/command/api'
-        desc 'api', 'Generate new api handler'
-        method_option :app, :aliases => "-a", :desc => "The app where the api handler will be created", :required => true
-        def api(name)
-          hnd = Tzispa::Command::Api.new(name, options[:app])
-          hnd.generate
-          puts "Api handler '#{name}' has been created in #{options[:app]}"
-        end
-
-
-      end
-
-    end
-  end
-end