tzispa 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd74c98b9c732e76ab7fa87e760664c4bb1770db
-  data.tar.gz: 0c805105cfede7ef61edced4d066e510db90000a
+  metadata.gz: 5c4be6874602d23587c2ba452f1989d6fa49d358
+  data.tar.gz: a62b6ab378ef9cf8d4c33e5c34e5924d1ac882c4
 SHA512:
-  metadata.gz: 36d1a0becbad7b32e90cce228d2ff4a6c291ba02cc3390af297ec98de4aeb8b75249836425b1a275eb1d9dfa6ae66dc6e8e028c0a73344b3f95a361dce4085d7
-  data.tar.gz: ffa0c807d47a7f36e038d4cc757e1c9f422c0f87a0833f00b454683f4af10d5daa770089e150e85258a3aab6e6a60366b9dd5a390b3b94cd79924d6c7f4851ba
+  metadata.gz: eb163a5d484d121d42f7b9c3994453c9118df7d430a5bee41c748551a647e80786c1d7a0e7da29587c295e425605a83fae5a4e88dc3553fb2c1cde5ba97fc342
+  data.tar.gz: 4c4fb446ea60989923a78f49040b8389cc049ec9e4a4d2c6f60efc97778db4e051fb953d2e4b7f9010cb506ce9445f56e6a529c656a9fe4e02bce2ce54be006d

data/CHANGELOG.md

@@ -2,6 +2,9 @@ Tzispa
 
 General purpose web framework
 
+## v0.4.1
+- Add support to generate canonical urls 
+
 ## v0.4.0
 - Added basic cli command engine
 - Added some documentation in README.md

data/lib/tzispa/app.rb

@@ -76,7 +76,7 @@ module Tzispa
         Mutex.new.synchronize {
           @middleware.load!
           @repository = Data::Repository.new(@config.repository.to_h).load! if @config.respond_to? :repository
-          @engine = Rig::Engine.new self
+          @engine = Rig::Engine.new(self, true, 32)
           @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/cli.rb

@@ -13,7 +13,6 @@ module Tzispa
     require 'tzispa/command/cli/generate'
     register Tzispa::Command::Cli::Generate, 'generate', 'generate [SUBCOMMAND]', 'Generate Tzispa components'
 
-
   end
 
 end

data/lib/tzispa/command/api.rb

@@ -0,0 +1,24 @@
+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,6 +1,7 @@
 require 'json'
 require 'tzispa/domain'
 require 'tzispa/utils/string'
+require 'tzispa/utils/indenter'
 require 'tzispa/config/appconfig'
 require_relative 'project'
 
@@ -44,23 +45,29 @@ module Tzispa
       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)
+          f.puts new_app_code(mount_path)
         end
       end
 
+      def new_app_code(mount_path)
+        appclass = "#{TzString.camelize domain.name}App"
+        Tzispa::Utils::Indenter.new(2).tap { |code|
+          code << "\nclass #{appclass} < Tzispa::Application\n\n"
+          code.indent << "def initialize\n"
+          code.indent << "super(:#{domain.name})\n"
+          code.unindent << "end\n\n"
+          code.unindent << "end\n\n"
+          code << "#{appclass}.mount '/#{mount_path}', self do |route|\n"
+          code.indent << "route.index '/', [:get, :head]\n"
+          code << "route.api   '/__api_:sign/:handler/:verb(~:predicate)(/:sufix)', [:get, :head, :post]\n"
+          code << "route.site  '/:title(/@:id0)(@:id1)(@~:id2)(@@:id3)(@@~:id4)(@@@:id5)/:layout.:format', [:get, :head]\n"
+          code.unindent << "end\n\n"
+        }.to_s
+      end
+
+
       def create_structure
         unless File.exist? domain.path
           Dir.mkdir "#{domain.path}"

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

@@ -1,7 +1,5 @@
 require 'thor'
-require 'tzispa/command/project'
-require 'tzispa/command/app'
-require 'tzispa/command/rig'
+
 
 module Tzispa
   module Command
@@ -9,12 +7,14 @@ module Tzispa
 
       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
@@ -24,7 +24,7 @@ module Tzispa
           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
@@ -34,6 +34,15 @@ module Tzispa
           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

data/lib/tzispa/config/appconfig.rb

@@ -41,6 +41,7 @@ module Tzispa
           cfg['default_layout'] = layout
           cfg['default_format'] = 'htm'
           cfg['host_name'] = host
+          cfg['canonical_url'] = "http://#{host}"
           cfg['dev_mode'] = dev_mode
           cfg['default_encoding'] = 'utf-8'
           cfg['auth_required'] = false

data/lib/tzispa/controller/api.rb

@@ -64,6 +64,44 @@ module Tzispa
         send_file path, data
       end
 
+      def generate_handler(domain, name)
+        @domain = domain
+        @handler = name
+        raise "The handler '#{name}' already exist" if File.exist?(handler_class_file)
+        File.open(handler_class_file, "w") { |f|
+          hnd_code = TzString.new
+          f.puts hnd_code.indenter("require 'tzispa/api/handler'\n\n")
+          level = 0
+          handler_namespace.split('::').each { |ns|
+            f.puts hnd_code.indenter("module #{ns}\n", level > 0 ? 2 : 0).to_s
+            level += 1
+          }
+          f.puts hnd_code.indenter("\nclass #{handler_class_name} < Tzispa::Api::Handler\n\n", 2)
+          f.puts hnd_code.indenter("end\n\n")
+          handler_namespace.split('::').each { |ns|
+            f.puts hnd_code.unindenter("end\n", 2)
+          }
+        }
+      end
+
+      def handler_class_name
+        "#{TzString.camelize @handler}Handler"
+      end
+
+      def handler_class_file
+        "#{@domain.path}/api/#{@handler}.rb"
+      end
+
+      def handler_namespace
+        "#{TzString.camelize @domain.name }::Api"
+      end
+
+      def handler_class
+        @domain.require "api/#{@handler}"
+        TzString.constantize "#{handler_namespace}::#{handler_class_name}"
+      end
+
+
       private
 
       attr_reader :hnd
@@ -82,15 +120,6 @@ module Tzispa
           context.app.config.salt)
       end
 
-      def handler_class_name
-        "#{TzString.camelize @domain.name }::Api::#{TzString.camelize @handler }Handler"
-      end
-
-      def handler_class
-        @domain.require "api/#{@handler.downcase}"
-        TzString.constantize handler_class_name
-      end
-
     end
   end
 end

data/lib/tzispa/controller/base.rb

@@ -16,13 +16,13 @@ module Tzispa
       attr_reader :context
       def_delegators :@context, :request, :response, :config
 
-      def initialize(callmethod)
+      def initialize(callmethod=nil)
         @callmethod = callmethod
       end
 
       def call(environment)
         @context = Tzispa::Http::Context.new(environment)
-        invoke @callmethod
+        invoke @callmethod if @callmethod
         response.finish
       end
 

data/lib/tzispa/http/context.rb

@@ -66,6 +66,10 @@ module Tzispa
         @app.class.routes.path path_id, params
       end
 
+      def canonical_url(path_id, params={})
+        @app.config.canonical_url + path(path_id, params)
+      end
+
       def api(handler, verb, predicate, sufix)
         raise ArgumentError.new('missing parameter in api call') unless handler && verb
         sign = sign_array [handler, verb, predicate], @app.config.salt

data/lib/tzispa/version.rb

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

data/tzispa.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   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_rig',     '~> 0.2.7'
   s.add_dependency 'tzispa_data',    '~> 0.1'
 
   s.files         = Dir.glob("{lib,bin}/**/*") + %w(README.md CHANGELOG.md LICENSE tzispa.gemspec)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: tzispa_data
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +153,7 @@ 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