tzispa 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3636dd9fdb2d87f20c713f22b24979f7581e90b
-  data.tar.gz: 56a337b9749c02ee44c343e6c4064e18b09207f0
+  metadata.gz: d670509b162e3897342fe1fbf0b0355835fb578c
+  data.tar.gz: e4a8ed5db557b15288bbb4fb2d3689db63571858
 SHA512:
-  metadata.gz: c06aaad81f83e726c4e7bfbaabdb732ed6d17fac90c2e9daa939a7bcc6bccd25fab887ce6068a10bd3ac3ae2d3c09511c2d9874eca61ac2667534eed7e256f24
-  data.tar.gz: 30f16894884f47f20ee479365cd3a00e3d4b5ee92a48a1f4f0157bf62e53946cc5484d1d63c397bd11e4c52e158a29046ee5c58e6441bd9503cd6ba26a9e2fd3
+  metadata.gz: c46d648d7c132be81a90a7da4a685ec58e3c781cc07baa493bdf771e6c33c9861e3e5e0262189e262620fb886d7007dd2045694ec1b5c8fe213094863ea96c27
+  data.tar.gz: 58cfbd8362d96d3883c219637bdd705f6988477b860303976f76f1c85f76c1b4e783c7289fa3ccb3cacba44b75a5ed073c52d85e191045bfed7e44c817e213c3

data/CHANGELOG.md

@@ -2,6 +2,13 @@ Tzispa
 
 General purpose web framework
 
+## v0.5.8
+- add api mapping verb to method in lib/tzispa/api/handler.rb
+- add support for api handler mapping verb to method in lib/tzispa/controller/api.rb
+- improve app routing DSL by forwarding methods from routes lib/tzispa/app.rb
+- renamed rig related routing methods in lib/tzispa/routes.rb
+- add path building methods for rig layouts in lib/tzispa/http/context.rb 
+
 ## v0.5.7
 - add provides DSL method to specify allowe verbs in api handlers
 - handler calling improvements in api the controller

data/lib/tzispa/api/handler.rb

@@ -61,25 +61,30 @@ module Tzispa
         end
       end
 
-      def send(verb, predicate)
+      def call(verb, predicate=nil)
         raise UnknownHandlerVerb.new(verb, self.class.name) unless self.class.provides? verb
-        args = predicate ? predicate.split('__') : nil
-        __send__ verb, *args
+        # allow compound predicates
+        args = predicate ? predicate.split(',') : nil
+        send verb, *args
       end
 
       def self.provides(*args)
-        (@provides ||= Array.new).tap { |prv|
+        (@provides ||= Hash.new).tap { |prv|
           args&.each { |s|
-            prv << s.to_sym
+            prv[s.to_sym] = s
           }
         }
       end
 
-      def self.provides?(value)
-        value = value.to_sym
-        @provides&.include?(value) && public_method_defined?(value)
+      def self.provides?(verb)
+        value = verb.to_sym
+        @provides&.include?(value) && public_method_defined?(@provides[value])
       end
 
+      def self.mapping(source, dest)
+        @provides ||= Hash.new
+        @provides[source] = dest
+      end
 
       private
 

data/lib/tzispa/app.rb

@@ -25,6 +25,7 @@ module Tzispa
 
     def_delegator :@middleware, :use
     def_delegator :@domain, :name
+    def_delegators :@routes, :routing, :route_rig_index, :route_rig_api, :route_rig_signed_api, :route_rig_layout
 
 
     class << self
@@ -54,11 +55,11 @@ module Tzispa
 
     end
 
-    def initialize(domain_name, mount_path: nil, &block)
+    def initialize(domain_name, on: nil, &block)
       @domain = Domain.new(domain_name)
       @config = Config::AppConfig.new(@domain).load!
       @middleware = Middleware.new self
-      @routes ||= Routes.new(self, mount_path)
+      @routes ||= Routes.new(self, on)
       self.class.add(self)
       instance_eval(&block) if block
     end

data/lib/tzispa/controller/api.rb

@@ -46,7 +46,7 @@ module Tzispa
         @verb = context.router_params[:verb]
         @predicate = context.router_params[:predicate]
         @handler = handler_class.new(context)
-        handler.send @verb, @predicate
+        handler.call @verb, @predicate
         context.flash << handler.message
         send handler.response_verb if handler.response_verb
         response.finish

data/lib/tzispa/http/context.rb

@@ -89,6 +89,22 @@ module Tzispa
         app[app_name].config.canonical_url + app_path(app_name, path_id, params)
       end
 
+      def layout_path(layout, params={})
+        app.routes.path layout, params.merge!(layout: layout)
+      end
+
+      def app_layout_path(app_name, layout, params={})
+        app[app_name].routes.path layout, params.merge!(layout: layout)
+      end
+
+      def layout_canonical_url(layout, params={})
+        app.config.canonical_url + layout_path(layout, params)
+      end
+
+      def app_layout_canonical_url(app_name, layout, params={})
+        app[app_name].config.canonical_url + app_layout_path(app_name, layout, params)
+      end
+
       def api(handler, verb, predicate, sufix, app_name)
         unless app_name
           canonical_url :api, handler: handler, verb: verb, predicate: predicate, sufix: sufix

data/lib/tzispa/routes.rb

@@ -25,7 +25,7 @@ module Tzispa
       "#{@map_path}#{@router.path path_id, params}"
     end
 
-    def add(route_id, path, methods, controller)
+    def routing(route_id, path, controller, methods: nil, matching: nil)
       spec_control, callmethod = controller.to_s.split(':')
       mpath = spec_control.split('#')
       req_controller = mpath.pop
@@ -37,27 +37,29 @@ module Tzispa
         controller_module = CONTROLLERS_BASE
         require "tzispa/controller/#{req_controller}"
       end
-      @router.add(path, methods ? {request_method: methods} : nil).tap { |rule|
+      @router.add(path).tap { |rule|
         rule.to TzString.constantize("#{controller_module}::#{controller}").new(@app, callmethod)
         rule.name = route_id
+        rule.add_request_method(methods) if methods
+        rule.add_match_with(matching) if matching
       }
     end
 
 
-    def index(path, methods=nil, controller=nil)
-      add :index, path, methods, controller || 'layout:render!'
+    def route_rig_index(path, controller: nil, methods: nil)
+      routing :index, path, controller || 'layout:render!', methods: methods
     end
 
-    def api(path, methods=nil, controller=nil)
-      add :api, path, methods, controller || 'api:dispatch!'
+    def route_rig_api(path, controller: nil, methods:nil)
+      routing :api, path, controller || 'api:dispatch!', methods: methods
     end
 
-    def signed_api(path, methods=nil, controller=nil)
-      add :sapi, path, methods, controller || 'signed_api:dispatch!'
+    def route_rig_signed_api(path, controller: nil, methods: nil)
+      routing :sapi, path, controller || 'signed_api:dispatch!', methods: methods
     end
 
-    def site(path, methods=nil, controller=nil)
-      add :site, path, methods, controller || 'layout:render!'
+    def route_rig_layout(layout, path, controller: nil, methods: nil)
+      routing layout.to_sym, path, controller || 'layout:render!', methods: methods, matching: {layout: layout.to_s}
     end
 
   end

data/lib/tzispa/version.rb

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

data/tzispa.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'browser',        '~> 2.1'
   s.add_dependency 'tzispa_helpers', '~> 0.1'
   s.add_dependency 'tzispa_utils',   '~> 0.2'
-  s.add_dependency 'tzispa_rig',     '~> 0.4.0'
+  s.add_dependency 'tzispa_rig',     '~> 0.4.2'
   s.add_dependency 'tzispa_data',    '~> 0.2.0'
 
   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.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: tzispa_data
   requirement: !ruby/object:Gem::Requirement