sumomo 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da1b5b6612475c1c796f2fc3e25d24b941e6a37f
-  data.tar.gz: b67672d8fb1595aa5c373bf694f675440bbe1839
+  metadata.gz: 7e272e7159b46a624aad9e1fd27d42206ff0089d
+  data.tar.gz: be5daaba9aa97814db24f976f6e0aa7f32496275
 SHA512:
-  metadata.gz: 85a1b46df2f52fb00d462c509094cd1b544f1acc5f3b34f29fd28ceaeaf0d88461fbeaac31af43fe537cf81f51c751b1940597543ed8c9ed7146d42daaaf50f3
-  data.tar.gz: 9a36dbedaa1bbe0a366625255b44a3bb78ad435ded63669294ee5e8401e135ecdae0dfe2fe63e8fd133187c6421849a40ad9a5c170d5fc936f6f465d2c42ae5c
+  metadata.gz: 2b526710d8fb56ca84de1b0f7e7d8979534a82f8b7e8608428a804340d52e80bcf54eb7360488fdf1e33f03125b4ff45f9338319012fed37f5cfd168442387c4
+  data.tar.gz: 8c2e126517ea84d32df7b2ee77b99a7c5eba3f4d9fbfb8ac41b2cdf8e5102d952234357b22f943f7744ff0da2269856a8b0ea989071b0bb8f69a55d0e3067682

data/data/sumomo/api_modules/real_script.js

@@ -80,6 +80,24 @@ function Storage()
 
 var Store = new Storage();
 
+function parseQuery(queryString) {
+    try
+    {
+        var res = JSON.parse(queryString)
+        return res;
+    }
+    catch(e) { }
+    var query = {};
+    var pairs = queryString.split('&');
+    for (var i = 0; i < pairs.length; i++) {
+        var pair = pairs[i].split('=');
+        query[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1] || '');
+    }
+    return query;
+}
+
+{{ SCRIPT }}
+
 function prepare(handler)
 {
     return function(request, callback)

data/data/sumomo/api_modules/test_script.js

@@ -7,28 +7,52 @@ var http         = require('http');
 var url          = require('url');
 var merge        = require('utils-merge');
 var Router       = require('router')
+var fs           = require('fs')
 
 // Simulated store
 function Storage()
 {
 	var store = {}
 
+	try
+	{
+		var store_contents = fs.readFileSync(".store")
+		store = JSON.parse(store_contents)
+	}
+	catch (e)
+	{
+		console.log("Error reading .store; will start with blank store")
+		console.log(e)
+	}
+
 	this.get = function(key, onComplete, onError)
 	{
 		if (store[key] === undefined)
 		{
-			onError({err: "no_such_key"});
+			if (onError)
+			{
+				onError({err: "no_such_key"});
+			}
 		}
 		else
 		{
-			onComplete(store[key]);
+			if (onComplete)
+			{
+				onComplete(store[key]);
+			}
 		}
 	}
 
 	this.set = function(key, value, onComplete, onError)
 	{
 		store[key] = value;
-		onComplete(key);
+		fs.writeFile(".store", JSON.stringify(store), function()
+		{
+			if (onComplete)
+			{
+				onComplete(key);
+			}
+		})
 	}
 
 	return this;
@@ -56,6 +80,24 @@ var server = http.createServer(function(req, res) {
  	});
 });
 
+function parseQuery(queryString) {
+	try
+	{
+		var res = JSON.parse(queryString)
+		return res;
+	}
+	catch(e) { }
+    var query = {};
+    var pairs = (queryString[0] === '?' ? queryString.substr(1) : queryString).split('&');
+    for (var i = 0; i < pairs.length; i++) {
+        var pair = pairs[i].split('=');
+        query[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1] || '');
+    }
+    return query;
+}
+
+{{ SCRIPT }}
+
 // Simulate API Gateway Lambda Proxy Event
 function prepare(handler)
 {

data/lib/sumomo.rb

@@ -183,7 +183,7 @@ module Sumomo
 			instance_eval(&block)
 		end
 
-		def make_api(domain_name, name:, script:nil, dns:nil, cert:nil, &block)
+		def make_api(domain_name, name:, script:nil, dns:nil, cert:nil, with_statements: [], &block)
 			@apis[name] = block
 		end
 
@@ -213,6 +213,7 @@ module Sumomo
 		
 			script = File.read(File.join(Gem.loaded_specs['sumomo'].full_gem_path, "data", "sumomo", "api_modules", "test_script.js"))
         	script.sub!("// {{ ROUTES }}", apigen.generate);
+        	script.gsub!("{{ SCRIPT }}", apigen.init_script);
 
 			File.write(".test.js", script)
 

data/lib/sumomo/api.rb

@@ -3,8 +3,33 @@ module Sumomo
   module Stack
 
     class APIGenerator
+
+      class CorsInfo
+        attr_accessor :allowed_origins, :allowed_headers
+
+        def apply(&block)
+            @allowed_origins = []
+            @allowed_headers = ['origin', 'content-type', 'accept', 'cache-control', 'x-requested-with', 'if-modified-since']
+            instance_eval(&block) if block
+        end
+
+        def AllowOrigin(value)
+            @allowed_origins << value
+        end
+
+        def AllowHeaders(value)
+            @allowed_headers << value
+        end
+      end
+
       def initialize(pretty_print: false, &block)
         @methods = {}
+        @cors = CorsInfo.new
+        @script = ""
+        # defaults
+        @cors.apply do
+            AllowOrigin "*"
+        end
         @pretty_print = pretty_print
         instance_eval(&block)
       end
@@ -23,6 +48,18 @@ module Sumomo
         end
       end
 
+      def CORS(&block)
+        @cors.apply(&block)
+      end
+
+      def SCRIPT(value)
+        @script = value
+      end
+
+      def init_script
+          @script
+      end
+
       def generate
 
         if @pretty_print
@@ -32,7 +69,30 @@ module Sumomo
         end
 
         result = ""
+
+        all_methods = @methods.clone
+
+        # Generate appropriate options methods as well
+
         @methods.each do |path, resource|
+            meths = resource.map{|meth,info| meth}
+
+            # Insert OPTIONS method if there isn't already one
+            if !all_methods[path].has_key?("OPTIONS")
+                all_methods[path]["OPTIONS"] = { script: <<-SCRIPT, params: [] }
+                    var headers = {}
+                    headers["Access-Control-Allow-Origin"] = #{@cors.allowed_origins.join(",").inspect}
+                    headers["Access-Control-Request-Method"] = '*'
+                    headers["Access-Control-Allow-Methods"] = '#{meths.join(', ')}'
+                    headers["Access-Control-Allow-Headers"] = #{@cors.allowed_headers.join(",").inspect}
+
+                    respond_with({methods: #{meths.inspect}}, 200, headers)
+                SCRIPT
+            end
+        end
+
+
+        all_methods.each do |path, resource|
             resource.each do |method, method_info|
 
                 parameter_list = method_info[:params].join(", ")
@@ -44,15 +104,28 @@ module Sumomo
 
       var retval = {};
 
+      var bodyParameters = parseQuery(event.body);
+
       var params = merge(event.queryStringParameters || {}, event.pathParameters || {});
+      params = merge(params, bodyParameters);
 
-      function respond_with(response_object, response_status)
+      function respond_with(response_object, response_status, response_headers)
       {
+        var headers = {}
+        headers["Content-Type"] = "application/json; charset=utf-8"
+        headers["Access-Control-Allow-Origin"] = #{@cors.allowed_origins.join(",").inspect}
+
+        if (response_headers)
+        {
+            for(var key in response_headers)
+            {
+                headers[key] = response_headers[key];
+            }
+        }
+
         var response = {
           statusCode: response_status || 200,
-          headers: {
-              "Content-Type" : "application/json; charset=utf-8"
-          },
+          headers: headers,
           body: JSON.stringify(response_object#{pretty_print})
         };
 
@@ -72,6 +145,7 @@ module Sumomo
       end
     end
 
+
     def make_api(domain_name, name:, script:nil, dns:nil, cert:nil, with_statements:[], &block)
 
         api = make "AWS::ApiGateway::RestApi", name: name do
@@ -82,7 +156,7 @@ module Sumomo
 
         apigen = APIGenerator.new(&block);
         script.sub!("// {{ ROUTES }}", apigen.generate);
-
+        script.gsub!("{{ SCRIPT }}", apigen.init_script);
         script.gsub!("{{ REGION }}", @region);
         script.gsub!("{{ BUCKET }}", @bucket_name);
         script.gsub!("{{ STORE_PREFIX }}", "functions/" + name);

data/lib/sumomo/cdn.rb

@@ -1,7 +1,7 @@
 
 module Sumomo
   module Stack
-    def make_cdn_from_dir(domain:, dns:nil, name:nil, dir:, low_ttl: [])
+    def make_cdn_from_dir(domain:, cert:nil, dns:nil, name:nil, dir:, low_ttl: [])
 
         bucket_name = @bucket_name
 
@@ -32,6 +32,11 @@ module Sumomo
             })
         end
 
+        viewer_policy = "allow-all"
+        if cert
+            viewer_policy = "redirect-to-https"
+        end
+
         cdn = make "AWS::CloudFront::Distribution", name: name do
             DistributionConfig do
                 Origins [{
@@ -51,7 +56,7 @@ module Sumomo
                             Cookies: { Forward: "none" }
                         },
                         TargetOriginId: "originBucket",
-                        ViewerProtocolPolicy: "allow-all",
+                        ViewerProtocolPolicy: viewer_policy,
                         DefaultTTL: 60,
                         MaxTTL: 60,
                         MinTTL: 60
@@ -61,12 +66,20 @@ module Sumomo
                 Enabled "true"
                 DefaultRootObject "index.html"
                 Aliases [ domain ]
-                ViewerCertificate { CloudFrontDefaultCertificate "true" } 
+
+                if cert
+                    ViewerCertificate { 
+                        AcmCertificateArn cert
+                        SslSupportMethod "sni-only"
+                    }
+                else
+                    ViewerCertificate { CloudFrontDefaultCertificate "true" } 
+                end
 
                 DefaultCacheBehavior do
                     AllowedMethods ["GET", "HEAD", "OPTIONS"]
                     TargetOriginId "originBucket"
-                    ViewerProtocolPolicy "allow-all"
+                    ViewerProtocolPolicy viewer_policy
                     ForwardedValues {
                         QueryString "false"
                         Cookies { Forward "none" }

data/lib/sumomo/version.rb

@@ -1,3 +1,3 @@
 module Sumomo
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumomo
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - David Siaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-13 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler