tzispa 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d78240cf37311944ed49b7ddda2d5aa8d51001a
-  data.tar.gz: 104801e65d22dc5d76345003f0111d2a6a1d5a23
+  metadata.gz: 5aaff71883d0b89db28bc7727a27444804d79081
+  data.tar.gz: bf58b21bba595c299eb6148420b01184f3b54a07
 SHA512:
-  metadata.gz: 2856238cca15d665edacf4e0b51a521183dbe3c327c3717b91423bb17fa5c39671b5eae45e3dd00415fdb3ef9f1ff44f9ac4a649dcab6575bcb79c6d09229f29
-  data.tar.gz: 33c353d4fece24681e7280f0d2ae45e42c8262f4fea8ef45cbd99dfa561eaeb2e89b710a35b1634494defd087b5b430aa708d1a990e6377b1e91c3bb94097f22
+  metadata.gz: 4ed1dcd8ef017e2a3ff31655f0ddb110cf37aaf02af048822363a02fe3cbc355bcb3701335348aecbb2d3b23291996343e089140ebae0f4ebaaa92cd72b9be72
+  data.tar.gz: 42447d848724c471e471f0c3ce8a7ef3fc6a3c56b78631585df10ccaa2bf5ece5487c1a9df7e32bb98b3217d95f68ab765f337414d4b9b7552dc9867e6fd5895

data/CHANGELOG.md

@@ -2,6 +2,9 @@ Tzispa
 
 General purpose web framework
 
+## v0.5.3
+- Add basic inter-app operability for api and url calls
+
 ## v0.5.2
 - Api download data[:path] must contain full path to the file
 

data/lib/tzispa/app.rb

@@ -28,18 +28,10 @@ module Tzispa
 
 
     class << self
-      def inherited(base)
-        super
-        base.class_eval do
-          synchronize do
-            applications.add(base)
-          end
-        end
-      end
 
       def applications
         synchronize do
-          @@applications ||= Set.new
+          @@applications ||= Hash.new{ |hash, key| raise UnknownApplication.new("#{key}") }
         end
       end
 
@@ -49,8 +41,13 @@ module Tzispa
         }
       end
 
+      def [](name)
+        applications[name]
+      end
+
       def mount(path, builder)
         self.new.tap { |app|
+          add(app)
           app.routes ||= Routes.new(app, path)
           yield(app.routes) if block_given?
           builder.map path do
@@ -58,6 +55,16 @@ module Tzispa
           end
         }
       end
+
+      private
+
+      def add(app)
+        synchronize do
+          raise DuplicateDomain.new("You have try to add an app with a duplicate domain name #{app.name}") if applications.has_key? app.name
+          applications[app.name] = app
+        end
+      end
+
     end
 
     def initialize(domain_name)
@@ -81,6 +88,10 @@ module Tzispa
       self
     end
 
+    def [](domain)
+      self.class[domain]
+    end
+
     private
 
     def load_locales
@@ -90,5 +101,12 @@ module Tzispa
       end
     end
 
+    public
+
+    class ApplicationError < StandardError; end
+    class UnknownApplication < ApplicationError; end
+    class DuplicateDomain < ApplicationError; end
+
+
   end
 end

data/lib/tzispa/http/context.rb

@@ -77,19 +77,35 @@ module Tzispa
         app.routes.path path_id, params
       end
 
+      def app_path(app_name, path_id, params={})
+        app[app_name].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)
-        canonical_url :api, handler: handler, verb: verb, predicate: predicate, sufix: sufix
+      def app_canonical_url(app_name, path_id, params={})
+        app[app_name].config.canonical_url + app_path(app_name, path_id, params)
       end
 
-      def sapi(handler, verb, predicate, sufix)
-        sign = sign_array [handler, verb, predicate], app.config.salt
-        canonical_url :sapi, sign: sign, handler: handler, verb: verb, predicate: predicate, sufix: sufix
+      def api(handler, verb, predicate, sufix, app_name)
+        unless app_name
+          canonical_url :api, handler: handler, verb: verb, predicate: predicate, sufix: sufix
+        else
+          app_canonical_url app_name, :api, handler: handler, verb: verb, predicate: predicate, sufix: sufix
+        end
       end
 
+      def sapi(handler, verb, predicate, sufix, app_name = nil)
+        unless app_name
+          sign = sign_array [handler, verb, predicate], app.config.salt
+          canonical_url :sapi, sign: sign, handler: handler, verb: verb, predicate: predicate, sufix: sufix
+        else
+          sign = sign_array [handler, verb, predicate], app[:app_name].config.salt
+          app_canonical_url app_name, :sapi, sign: sign, handler: handler, verb: verb, predicate: predicate, sufix: sufix
+        end
+      end
 
     end
 

data/lib/tzispa/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Tzispa
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
   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.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack