sumomo 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50c766004cfe7ab6506c86fd593da0ad14ce4d32
-  data.tar.gz: d4c1e97e89b10d383c5bb0738ab7dec19036ce30
+  metadata.gz: 33a1ba0180e0332decba1ba24db31155e9be19df
+  data.tar.gz: 225e02aca2d17a355f845eea32f70016deb50ce1
 SHA512:
-  metadata.gz: 0f2fac8ee478c2afd773edc2aaeee457934ae63fcdaeae65db95449933da981c5b7fa74fa720aeb812f7f27e3ab6281b05a0546eee7108f4874ad5b30dee1b88
-  data.tar.gz: f04eb3b716f1ebe9e04afc1226b4766542a0b805dcc661c3639148246483e3f5d7aaaa076f23bfbc697242eff5f191c7b0a81482e1535a40670879f5d9705ce4
+  metadata.gz: bfab4dcab755411ad37d1341f925bca4f84cef9b629300ecc1de7371cf7257fc55ae81881500a08cced1a515d1f8b4e4a7091e597798cdb36384a063dd7ac267
+  data.tar.gz: d8adb92b5e2d9d51ea5d85d5f3a873f64008ee530d510086adbf99464adc6b83bab443879b05e942b230be7bd747731898201b2f2469eaa8cf06ba0f2f75f61f

data/README.md

@@ -71,6 +71,34 @@ end
 Sumomo::wait_for_stack(name: "mystack", region: "ap-northeast-1")
 ```
 
+## Features
+
+You can make apis with this now
+
+```ruby
+
+api = make_api "test2.shinonome.astrobunny.net",
+    name: "TestGenAPI",
+    cert: certificate,
+    dns: cloudflare_dns(key: key, email: email) do
+
+    GET "/page/:pageid", :pageid, <<-SCRIPT
+        respond_with ({message: pageid, params: params});
+    SCRIPT
+
+    GET "/best_girl", <<-SCRIPT
+        respond_with ({best_girl_is: "Ruby"});
+    SCRIPT
+
+    GET "/*", <<-SCRIPT
+        respond_with ({message: "Hello!"});
+    SCRIPT
+
+end
+
+output "APIURL", api
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/sumomo/api.rb

@@ -1,235 +1,239 @@
 
 module Sumomo
-	module Stack
-
-		
-		class APIGenerator
-		  def initialize(&block)
-		    @methods = {}
-		    instance_eval(&block)
-		  end
-
-		  def method_missing(name, *args, &block)
-		    "#{name}".split("_").each do |meth|
-		      valid_methods = ["GET", "PUT", "POST", "PATCH", "DELETE", "HEAD", "OPTIONS"]
-		      if valid_methods.include?("#{meth}")
-		        path = args[0]
-		        @methods[path] = {} if !@methods.has_key?(path)
-		        
-		        @methods[path][meth] = { script: args.last, params: args.select{|arg| arg.is_a?(Symbol) && /\A[a-zA-Z\-0-9_]+\Z/.match("#{arg}") } }
-		      else
-		        super
-		      end
-		    end
-		  end
-
-		  def generate
-		    result = ""
-		    @methods.each do |path, resource|
-		        resource.each do |method, method_info|
-
-		            parameter_list = method_info[:params].join(", ")
-		            parameter_call_list = method_info[:params].map{|parm| "params['#{parm}']"}.join(", ")
-
-		            result += <<-SCRIPT
-
-		router.#{method.downcase}('#{path}', prepare(function (event, callback) {
-
-		  var retval = {};
-
-		  var params = merge(event.queryStringParameters || {}, event.pathParameters || {});
-
-		  retval = function (#{parameter_list}) {
-		    #{method_info[:script]}
-		  }( #{ parameter_call_list } );
-
-		  var response = {
-		    statusCode: 200,
-		    headers: {
-		        "Content-Type" : "application/json; charset=utf-8"
-		    },
-		    body: JSON.stringify(retval, null, 2)
-		  };
-
-		  callback(null, response);
-		}))
-
-		          SCRIPT
-		        end
-		      end
-		    result
-		  end
-		end
-
-		def make_api(domain_name, name:, script:nil, dns:nil, cert:nil, &block)
-
-		    api = make "AWS::ApiGateway::RestApi", name: name do
-		        Name name
-		    end
-
-		    script ||= <<-SCRIPT
-
-		'use strict';
-		console.log('Loading API');
-
-		var os                  = require('os');
-		var http                = require('http');
-		var url                 = require('url');
-		var merge               = require('utils-merge');
-		var Router              = require('router')
-
-		var router = Router();
-
-		function prepare(handler)
-		{
-		    return function(request, callback)
-		    {
-		        try 
-		        {
-		            request._native_req.pathParameters = request.params
-		            handler(request._native_req, callback);
-		        }
-		        catch (e)
-		        {
-		            console.log(e);
-		            callback(e, {
-		                statusCode: 500, 
-		                body: JSON.stringify({message: "Internal Server Error"}, null, 2)
-		            });
-		        }
-		    }
-		}
-
-		// {{ ROUTES }}
-
-		exports.handler = function(event, context, callback) {
-
-		    var request = {
-		        _native_req: event,
-		        url: "https://something" + event.path,
-		        method: event.httpMethod,
-		        params: {}
-		    }
-
-		    console.log(request);
-
-		    router(request, callback, function(err) {
-		        callback(null, {
-		            statusCode: 404, 
-		            body: JSON.stringify({message: "File not found"}, null, 2)
-		        })
-		    });
-		};
-		SCRIPT
-
-		    apigen = APIGenerator.new(&block);
-		    script.sub!("// {{ ROUTES }}", apigen.generate);
-
-		    module_dir = File.join(Gem.datadir("sumomo"), "api_modules")
-
-		    files = Dir[File.join(module_dir, "**/*")].select{|x| File.file?(x)}.map do |x| 
-		        { name: x.sub(/^#{module_dir}\//, ""), code: File.read(x) } 
-		    end
-
-		    files += [ {name:"index.js", code:script} ]
-
-		    fun = make_lambda(name: "#{name}Lambda#{@version_number}", files:files)
-
-		    resource = make "AWS::ApiGateway::Resource", name: "#{name}Resource" do
-		        ParentId api.RootResourceId
-		        PathPart "{proxy+}"
-		        RestApiId api
-		    end
-
-		    meth = make "AWS::ApiGateway::Method", name: "#{name}MethodOther" do
-		        RestApiId api
-		        ResourceId resource
-		        HttpMethod "ANY"
-		        AuthorizationType "NONE"
-		        Integration ({
-		            Type: "AWS_PROXY",
-		            IntegrationHttpMethod: "POST",
-		            Uri: call("Fn::Join", "", ["arn:aws:apigateway:" ,ref("AWS::Region") ,":lambda:path", "/2015-03-31/functions/", fun.Arn, "/invocations"])
-		        })
-		    end
-
-		    meth2 = make "AWS::ApiGateway::Method", name: "#{name}MethodRoot" do
-		        RestApiId api
-		        ResourceId api.RootResourceId
-		        HttpMethod "ANY"
-		        AuthorizationType "NONE"
-		        Integration ({
-		            Type: "AWS_PROXY",
-		            IntegrationHttpMethod: "POST",
-		            Uri: call("Fn::Join", "", ["arn:aws:apigateway:" ,ref("AWS::Region") ,":lambda:path", "/2015-03-31/functions/", fun.Arn, "/invocations"])
-		        })
-		    end
-
-		    make "AWS::Lambda::Permission", name: "#{name}LambdaPermission" do
-		        FunctionName fun.Arn
-		        Action "lambda:InvokeFunction"
-		        Principal "apigateway.amazonaws.com"
-		    end
-
-		    deployment = make "AWS::ApiGateway::Deployment", name: "#{name}Deployment#{@version_number}" do
-		        depends_on meth
-		        depends_on meth2
-		        RestApiId api
-		    end
-
-		    stage = make "AWS::ApiGateway::Stage", name: "#{name}Stage" do
-		        RestApiId api
-		        DeploymentId deployment
-		        StageName "test"
-		    end
-
-		    root_name = /(?<root_name>[^.]+\.[^.]+)$/.match(domain_name)[:root_name]
-
-		    cert ||= make "Custom::USEastCertificate", name: "#{name}Certificate" do
-		        DomainName domain_name
-		    end
-
-		    domain = make "Custom::APIDomainName", name: "#{name}DomainName" do
-		        DomainName domain_name
-		        CertificateArn cert
-		    end
-
-		    make "AWS::ApiGateway::BasePathMapping", name: "#{name}BasePathMapping" do
-		        BasePath "(none)"
-		        DomainName domain
-		        RestApiId api
-		        Stage stage
-		    end
-
-		    if dns[:type] == :cloudflare
-		        make "Custom::CloudflareDNSEntry", name: "#{name}CloudFlareEntry" do
-		            Key dns[:key]
-		            Email dns[:email]
-		            Domain root_name
-		            Entry domain_name.sub(/#{root_name}$/, "").chomp(".")
-		            CNAME call("Fn::Join", "", [api, ".execute-api.", ref("AWS::Region"), ".amazonaws.com"])
-		        end
-		        domain_name
-		    elsif dns[:type] == :route53
-		        make "AWS::Route53::RecordSet", name: "#{name}Route53Entry" do
-		            HostedZoneId dns[:hosted_zone]
-		            Name domain_name
-		            Type "CNAME"
-		        end
-		        domain_name
-		    else
-		        call("Fn::Join", "", [api, ".execute-api.", ref("AWS::Region"), ".amazonaws.com"])
-		    end
-		    
-		end
-
-		def cloudflare_dns(key:, email:)
-		    {type: :cloudflare, key: key, email: email}
-		end
-
-		def route53_dns(hosted_zone:)
-		    {type: :route53, hosted_zone: hosted_zone}
-		end
-
-	end
+  module Stack
+
+
+    class APIGenerator
+      def initialize(&block)
+        @methods = {}
+        instance_eval(&block)
+      end
+
+      def method_missing(name, *args, &block)
+        "#{name}".split("_").each do |meth|
+          valid_methods = ["GET", "PUT", "POST", "PATCH", "DELETE", "HEAD", "OPTIONS"]
+          if valid_methods.include?("#{meth}")
+            path = args[0]
+            @methods[path] = {} if !@methods.has_key?(path)
+            
+            @methods[path][meth] = { script: args.last, params: args.select{|arg| arg.is_a?(Symbol) && /\A[a-zA-Z\-0-9_]+\Z/.match("#{arg}") } }
+          else
+            super
+          end
+        end
+      end
+
+      def generate
+        result = ""
+        @methods.each do |path, resource|
+            resource.each do |method, method_info|
+
+                parameter_list = method_info[:params].join(", ")
+                parameter_call_list = method_info[:params].map{|parm| "params['#{parm}']"}.join(", ")
+
+                result += <<-SCRIPT
+
+    router.#{method.downcase}('#{path}', prepare(function (event, callback) {
+
+      var retval = {};
+
+      var params = merge(event.queryStringParameters || {}, event.pathParameters || {});
+
+      function respond_with(response_object, response_status)
+      {
+        var response = {
+          statusCode: response_status || 200,
+          headers: {
+              "Content-Type" : "application/json; charset=utf-8"
+          },
+          body: JSON.stringify(response_object)
+        };
+
+        callback(null, response);
+      }
+
+      var retval = function (#{parameter_list}) {
+        #{method_info[:script]}
+      }( #{ parameter_call_list } );
+
+    }));
+
+              SCRIPT
+            end
+          end
+        result
+      end
+    end
+
+    def make_api(domain_name, name:, script:nil, dns:nil, cert:nil, &block)
+
+        api = make "AWS::ApiGateway::RestApi", name: name do
+            Name name
+        end
+
+        script ||= <<-SCRIPT
+
+    'use strict';
+    console.log('Loading API');
+
+    var os                  = require('os');
+    var http                = require('http');
+    var url                 = require('url');
+    var merge               = require('utils-merge');
+    var Router              = require('router')
+
+    var router = Router();
+
+    function prepare(handler)
+    {
+        return function(request, callback)
+        {
+            try 
+            {
+                request._native_req.pathParameters = request.params
+                handler(request._native_req, callback);
+            }
+            catch (e)
+            {
+                console.log(e);
+                callback(e, {
+                    statusCode: 500, 
+                    body: JSON.stringify({message: "Internal Server Error"}, null, 2)
+                });
+            }
+        }
+    }
+
+    // {{ ROUTES }}
+
+    exports.handler = function(event, context, callback) {
+
+        var request = {
+            _native_req: event,
+            url: "https://something" + event.path,
+            method: event.httpMethod,
+            params: {}
+        }
+
+        console.log(request);
+
+        router(request, callback, function(err) {
+            callback(null, {
+                statusCode: 404, 
+                body: JSON.stringify({message: "File not found"}, null, 2)
+            })
+        });
+    };
+    SCRIPT
+
+        apigen = APIGenerator.new(&block);
+        script.sub!("// {{ ROUTES }}", apigen.generate);
+
+        module_dir = File.join(Gem.datadir("sumomo"), "api_modules")
+
+        files = Dir[File.join(module_dir, "**/*")].select{|x| File.file?(x)}.map do |x| 
+            { name: x.sub(/^#{module_dir}\//, ""), code: File.read(x) } 
+        end
+
+        files += [ {name:"index.js", code:script} ]
+
+        fun = make_lambda(name: "#{name}Lambda#{@version_number}", files:files)
+
+        resource = make "AWS::ApiGateway::Resource", name: "#{name}Resource" do
+            ParentId api.RootResourceId
+            PathPart "{proxy+}"
+            RestApiId api
+        end
+
+        meth = make "AWS::ApiGateway::Method", name: "#{name}MethodOther" do
+            RestApiId api
+            ResourceId resource
+            HttpMethod "ANY"
+            AuthorizationType "NONE"
+            Integration ({
+                Type: "AWS_PROXY",
+                IntegrationHttpMethod: "POST",
+                Uri: call("Fn::Join", "", ["arn:aws:apigateway:" ,ref("AWS::Region") ,":lambda:path", "/2015-03-31/functions/", fun.Arn, "/invocations"])
+            })
+        end
+
+        meth2 = make "AWS::ApiGateway::Method", name: "#{name}MethodRoot" do
+            RestApiId api
+            ResourceId api.RootResourceId
+            HttpMethod "ANY"
+            AuthorizationType "NONE"
+            Integration ({
+                Type: "AWS_PROXY",
+                IntegrationHttpMethod: "POST",
+                Uri: call("Fn::Join", "", ["arn:aws:apigateway:" ,ref("AWS::Region") ,":lambda:path", "/2015-03-31/functions/", fun.Arn, "/invocations"])
+            })
+        end
+
+        make "AWS::Lambda::Permission", name: "#{name}LambdaPermission" do
+            FunctionName fun.Arn
+            Action "lambda:InvokeFunction"
+            Principal "apigateway.amazonaws.com"
+        end
+
+        deployment = make "AWS::ApiGateway::Deployment", name: "#{name}Deployment#{@version_number}" do
+            depends_on meth
+            depends_on meth2
+            RestApiId api
+        end
+
+        stage = make "AWS::ApiGateway::Stage", name: "#{name}Stage" do
+            RestApiId api
+            DeploymentId deployment
+            StageName "test"
+        end
+
+        root_name = /(?<root_name>[^.]+\.[^.]+)$/.match(domain_name)[:root_name]
+
+        cert ||= make "Custom::USEastCertificate", name: "#{name}Certificate" do
+            DomainName domain_name
+        end
+
+        domain = make "Custom::APIDomainName", name: "#{name}DomainName" do
+            DomainName domain_name
+            CertificateArn cert
+        end
+
+        make "AWS::ApiGateway::BasePathMapping", name: "#{name}BasePathMapping" do
+            BasePath "(none)"
+            DomainName domain
+            RestApiId api
+            Stage stage
+        end
+
+        if dns[:type] == :cloudflare
+            make "Custom::CloudflareDNSEntry", name: "#{name}CloudFlareEntry" do
+                Key dns[:key]
+                Email dns[:email]
+                Domain root_name
+                Entry domain_name.sub(/#{root_name}$/, "").chomp(".")
+                CNAME call("Fn::Join", "", [api, ".execute-api.", ref("AWS::Region"), ".amazonaws.com"])
+            end
+            domain_name
+        elsif dns[:type] == :route53
+            make "AWS::Route53::RecordSet", name: "#{name}Route53Entry" do
+                HostedZoneId dns[:hosted_zone]
+                Name domain_name
+                Type "CNAME"
+            end
+            domain_name
+        else
+            call("Fn::Join", "", [api, ".execute-api.", ref("AWS::Region"), ".amazonaws.com"])
+        end
+        
+    end
+
+    def cloudflare_dns(key:, email:)
+        {type: :cloudflare, key: key, email: email}
+    end
+
+    def route53_dns(hosted_zone:)
+        {type: :route53, hosted_zone: hosted_zone}
+    end
+
+  end
 end

data/lib/sumomo/version.rb

@@ -1,3 +1,3 @@
 module Sumomo
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumomo
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - David Siaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-09 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler