xaases 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3684fb4858709d60739e6cac8bcd89d268c2ca9f14dc8d764b4c48bc24ff3416
-  data.tar.gz: 55e17d9d5c5f8ebd3585b073834407426dc923d77d3f6b047ba944dbc83b1517
+  metadata.gz: 20c01b0ec0fd646988062e2c636f5f87e9b4d336c6e3a0a5803059c3b7dd0c72
+  data.tar.gz: 1f4e2ab166e2e29accc17f637830ae9869837f3d57faa7623af95255d8d1655a
 SHA512:
-  metadata.gz: e32dbdd2c7536960700215d6981f4f95c83e14c7107665129e3a5c759f14d277e3faa8942d72191c4072d9fe42ff059def75aeac7d8066ddbc4bc4f020bd461a
-  data.tar.gz: 0edc73e54643a28aad13f456afb28027a653d3b6ab62a60d812fb5639a76a0445125253985ed6934f9d32ec853f26f99c8e30bc884c2bd6be0e95be2bd970e26
+  metadata.gz: ba9b23891348962ca8247bba003f0495f8888bc6b6e4de67f1860ba67cf7eb10c388e88c53b66db1006d2b9b57c76a8d3e604697319933606bbd312b161fbd39
+  data.tar.gz: 72b3ee56ac48a105e837176eb280276d63ea3ab3be2eaa7579731530408464e682b81745b5fd5a7da55ec20f69f392f8d32cb0c6fd89f0ad05c129a432622e94

data/.gitignore

@@ -8,3 +8,4 @@ serverless.yml
 xaases.yml
 .serverless
 *.gem
+*.js

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xaases (0.1.1)
+    xaases (0.2.0)
       highline (~> 2.0, >= 2.0.0)
 
 GEM

data/README.md

@@ -22,15 +22,17 @@ $ xaases init
 
 is create `xaases.yml`.
 
-### Add resource
+### Add table
 
 ```
-$ xaases add <tablename> <columns...>
+$ xaases table <name> <columns...>
 ```
 
+**Memo:** DynamoDB table support columns max of count is 2.
+
 ### Deploy to AWS
 
-Edit `serverless.yml`
+Need edit `serverless.yml` with
 
 ```
 provider:
@@ -38,7 +40,25 @@ provider:
   region: <region>
 ```
 
-and run `sls deploy`
+And run `sls deploy` command.
+
+### Add API
+
+```
+$ xaases api GET /
+```
+
+Created API `GET /`, add to `serverless.yml` and generate `handler.js`
+
+Generated `handler.js` content is
+
+```js
+module.exports.root = (event, context, callback) => {
+  callback(null, { statusCode: 200, body: "OK." });
+};
+```
+
+You can edit anything of it.
 
 ## Development
 

data/lib/xaases/api.rb

@@ -0,0 +1,14 @@
+module Xaases
+  class Api
+    def initialize(method, path)
+      @method = method.upcase
+      @path = path
+    end
+
+    def name
+      s = path.sub(/\A\//, '').sub(/\//, '_')
+      s = 'root' if method == 'GET' && s == ''
+      s
+    end
+  end
+end

data/lib/xaases/aws/lambda_js.rb

@@ -2,10 +2,13 @@ require 'xaases/js'
 module Xaases
   module Aws
     class LambdaJs
-      def initialize
-        @js = Xaases::Js.new
-        @js.strict!
-        @js.const(aws: "require('aws-sdk')")
+      attr_reader :minify
+
+      def initialize(minify: true)
+        @minify = minify
+        @js = Xaases::Js.new(minify: minify)
+        #@js.strict!
+        #@js.const(aws: "require('aws-sdk')")
       end
 
       def use_dynamo!
@@ -13,27 +16,29 @@ module Xaases
       end
 
       def export(name, content)
-        f = Xaases::Js::Function.new(:eve, :ctx, :cb)
+        #f = Xaases::Js::Function.new(:eve, :ctx, :cb)
+        f = Xaases::Js::Function.new(:event, :context, :callback)
+        f.content = content
         @js.export(name, f)
       end
 
       def res(status, content)
         #err = err ? err : 'null'
-        body = Xaases::Js.new.hash('statusCode' => status, 'body' => content)
+        body = Xaases::Js.new(minify: minify).hash('statusCode' => status, 'body' => content)
         @js.call :callback, 'null', body
       end
 
-      def put(table, data, handler)
+      def dynamo_put(table, data, handler)
         params = {
           'TableName' => "'#{table}'",
-          'Item' => Xaases::Js.new.hash(data)
+          'Item' => Xaases::Js.new(minify: minify).hash(data)
         }
-        params_js = Xaases::Js.new.hash(params)
-        @js.call :put, params_js, handler
+        params_js = Xaases::Js.new(minify: minify).hash(params)
+        @js.call 'dyn.put', params_js, handler
       end
 
       def render
-        @js
+        @js.render
       end
     end
   end

data/lib/xaases/cli/help.rb

@@ -1,5 +1,6 @@
 puts <<-EOS
 usage: #{Xaases::NAME} <command> [options]
   init
-  add <name> <columns...>
+  table <name> <columns...>
+  api <method> <path>
 EOS

data/lib/xaases/cli.rb

@@ -1,30 +1,41 @@
 require 'xaases/cli/color'
+require 'xaases/error'
 require 'xaases/conf'
 require 'xaases/serverless'
-require 'xaases/aws/dynamodb'
 
 cmd = ARGV.first
 options = ARGV.slice(1..-1)
 
 begin
   case cmd
-  when 'add'
-    Xaases.add *options
+  when 'table'
+    require 'xaases/aws/dynamodb'
+    Xaases.table *options
     sls = Xaases::Serverless::Yaml.new('serverless.yml', 'xaases')
-    name = options.first + 'DynamoDbTable'
-    sls.add_resource name, Xaases::Aws::Dynamodb.new(*options).to_hash
+    key = options.first + 'DynamoDbTable'
+    sls.add_resource key, Xaases::Aws::Dynamodb.new(*options).to_hash
     sls.write
-    #`sls deploy`
-  when 'func'
+
+  when 'api'
+    require 'xaases/aws/lambda_js'
+    Xaases.api *options
     sls = Xaases::Serverless::Yaml.new('serverless.yml', 'xaases')
-    sls.add_function *options
+    name = sls.add_function *options
     sls.write
-    #`sls deploy`
+
+    res = Xaases::Aws::LambdaJs.new(minify: false)
+    res.res(200, '"OK."')
+
+    js = Xaases::Aws::LambdaJs.new(minify: false)
+    js.export name, res.render
+    f = File.open 'handler.js', 'a'
+    f.write js.render
+
   when 'init', 'touch'
-    require 'xaases/cli/init'
+    Xaases.init
   else
     require 'xaases/cli/help'
   end
-rescue => e
+rescue Xaases::Error => e
   Xaases::Color.failure e.message
 end

data/lib/xaases/conf.rb

@@ -3,11 +3,16 @@ require 'yaml'
 module Xaases
   CONF_NAME = NAME + '.yml'
 
+  def self.init
+    YAML.dump({ 'Tables' => {}, 'APIs' => {} }, File.open(CONF_NAME, 'w'))
+    Color.warn "Created #{CONF_NAME}"
+  end
+
   def self.load
     begin
       @@config = YAML.load_file(CONF_NAME) || {}
     rescue Errno::ENOENT
-      raise "Require '#{CONF_NAME}' file, you need run at 'xaases init' command."
+      raise Error.new("Require '#{CONF_NAME}' file, you need run at 'xaases init' command.")
     end
   end
 
@@ -21,10 +26,17 @@ module Xaases
     dump
   end
 
-  def self.add name, *columns
-    edit do |c|
-      puts Color.yellow "Add #{name}"
-      c[name] = columns
+  def self.table name, *columns
+    edit do |config|
+      puts Color.yellow "Add table #{name}"
+      config['Tables'][name] = columns
+    end
+  end
+
+  def self.api verb, path
+    edit do |config|
+      puts Color.yellow "Add API: #{verb} #{path}"
+      config['APIs'][verb + ' ' + path] = []
     end
   end
 end

data/lib/xaases/error.rb

@@ -0,0 +1,3 @@
+module Xaases
+  class Error < StandardError; end
+end

data/lib/xaases/js/function.rb

@@ -8,6 +8,10 @@ module Xaases
         @s = ''
       end
 
+      def content=(s)
+        @s = s
+      end
+
       def render
         @s
       end

data/lib/xaases/js.rb

@@ -1,7 +1,10 @@
 require 'xaases/js/function'
 module Xaases
   class Js
-    def initialize
+    attr_reader :minify
+
+    def initialize(minify: true)
+      @minify = minify
       @s = ''
     end
 
@@ -16,13 +19,23 @@ module Xaases
     end
 
     def call(name, *params)
-      @s += "#{name}(#{params.join(',')});"
+      if minify
+        @s += "#{name}(#{params.join(',')});"
+      else
+        @s += "#{name}(#{params.join(', ')});"
+      end
     end
 
     def hash(data)
-      @s += '{' + data.map do |key, value|
-        key.to_s + ':' + value.to_s
-      end.join(',') + '}'
+      if minify
+        @s += '{' + data.map do |key, value|
+          key.to_s + ':' + value.to_s
+        end.join(',') + '}'
+      else
+        @s += '{ ' + data.map do |key, value|
+          key.to_s + ': ' + value.to_s
+        end.join(', ') + ' }'
+      end
     end
 
     def if(*conditions)
@@ -40,7 +53,12 @@ module Xaases
     end
 
     def export(name, f)
-      @s += "module.exports.#{name}=(#{f.params.join(',')})=>{#{f.render}};"
+      if minify
+        @s += "module.exports.#{name}=(#{f.params.join(',')})=>{#{f.render}};"
+      else
+        content = f.render.split("\n").join("\n  ")
+        @s += "module.exports.#{name} = (#{f.params.join(', ')}) => {\n  #{content}\n};\n"
+      end
     end
 
     def render

data/lib/xaases/serverless/yaml.rb

@@ -27,11 +27,22 @@ module Xaases
         @data['resources']['Resources'][name] = rs
       end
 
-      def add_function(file, name, path, method, fn)
-        @data['functions'][file] = {
-          'handler' => "#{file}.#{name}",
+      def add_function(method, path)
+        method = method.downcase
+        file = 'index'
+        name = path.sub(/\A\//, '').sub(/\//, '_')
+        name = nil if name == ''
+
+        name = ['create', name].compact.join('_') if method == 'post'
+        name = ['update', name].compact.join('_') if method == 'put'
+        name = ['delete', name].compact.join('_') if method == 'delete'
+
+        name = 'root' if method == 'get' && !name
+        @data['functions'][name] = {
+          'handler' => "handler.#{name}",
           'events' => [{ 'http' => { 'path' => path, 'method' => method }}]
         }
+        name
       end
 
       def write

data/lib/xaases/version.rb

@@ -1,3 +1,3 @@
 module Xaases
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xaases
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - myun2
@@ -76,15 +76,15 @@ files:
 - bin/setup
 - exe/xaases
 - lib/xaases.rb
+- lib/xaases/api.rb
 - lib/xaases/aws.rb
 - lib/xaases/aws/dynamodb.rb
 - lib/xaases/aws/lambda_js.rb
 - lib/xaases/cli.rb
 - lib/xaases/cli/color.rb
 - lib/xaases/cli/help.rb
-- lib/xaases/cli/init.rb
 - lib/xaases/conf.rb
-- lib/xaases/function.rb
+- lib/xaases/error.rb
 - lib/xaases/js.rb
 - lib/xaases/js/function.rb
 - lib/xaases/name.rb

data/lib/xaases/cli/init.rb

@@ -1,5 +0,0 @@
-require 'fileutils'
-TMPL_NAME = Xaases::NAME + '.yml'
-FileUtils.touch(TMPL_NAME)
-
-attempt "Created #{TMPL_NAME}"

data/lib/xaases/function.rb

@@ -1,4 +0,0 @@
-module Xaases
-  class Function
-  end
-end