jets 1.4.10 → 1.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0732e4d712b717146a73dd2422817525ed0a45d1aa6b1a91f0230688a7a66412
-  data.tar.gz: e1ea0a9ede83b5efee168cf85dcb0edfc3ca364a4937cfad0e9ba6fb0dfe8c2a
+  metadata.gz: 24d179a8d9f5977280a81d8897cdbb13670a365823e94388f1ccb494aa47507d
+  data.tar.gz: 10ce7863fa659965ff45964ce4fbdb040f104a145dd57a5fdd6b18610afbff5f
 SHA512:
-  metadata.gz: 9faf4666841f6c94bbc5c18e718768e289d0b068a5ff75f85fe8c60faf7664970467a6a0c5721468f2244d90b84a6babd381c496a31009d424ead14d0ec8f9a9
-  data.tar.gz: 688d165e578e7db64e361f0e33e852f1b75006193f04a9b0194a7d60b2be96f0b9f8cf94d93089580ee6a0d87ee2b60442dbf62e74a896a1325a3612059fc2e3
+  metadata.gz: 0f01c123b0318172492ba05bb8c86acc9664b303662fb3ba8ef46b841783cc138c316516afa54468506697b4f899308d624de60b728fa6848feb03f6260b76b6
+  data.tar.gz: 3db800311acd08768ddb4a5747c58c1dee6667c59d09e1fe2750253c57805bd3dba6f830df83f5bd580f0356f71f40f2bc842c878ca7039bfd33f58289a82d21

data/.gitmodules

@@ -1,6 +1,3 @@
-[submodule "vendor/dynomite"]
-	path = vendor/dynomite
-	url = https://github.com/tongueroo/dynomite.git
 [submodule "vendor/jets-gems"]
 	path = vendor/jets-gems
 	url = https://github.com/tongueroo/jets-gems

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [1.4.11]
+- #133 from tongueroo/custom-layer add custom lambda layer support
+- #134 from tongueroo/remove-dynomite-vendor remove vendor/dynomite
+
 ## [1.4.10]
 - update vendor/dynomite: fix index creation dsl
 

data/Gemfile

@@ -8,6 +8,7 @@ gemspec
 # Need both because of jets/application.rb and jets/webpacker/middleware_setup.rb
 group :development, :test do
   gem "mysql2", "~> 0.5.2"
+  gem "dynomite"
   gem "webpacker", git: "https://github.com/tongueroo/webpacker.git", branch: "jets"
   gem "rspec_junit_formatter"
 end

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.4.10)
+    jets (1.4.11)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)
@@ -67,7 +67,7 @@ GEM
       tzinfo (~> 1.1)
     arel (9.0.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.129.0)
+    aws-partitions (1.130.0)
     aws-sdk-apigateway (1.23.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
@@ -109,6 +109,9 @@ GEM
     crass (1.0.4)
     diff-lcs (1.3)
     dotenv (2.6.0)
+    dynomite (1.1.0)
+      activesupport
+      aws-sdk-dynamodb
     erubi (1.8.0)
     gems (1.1.1)
       json
@@ -174,6 +177,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   byebug
+  dynomite
   jets!
   mysql2 (~> 0.5.2)
   rake

data/lib/jets/application.rb

@@ -85,6 +85,10 @@ class Jets::Application
       # Useful to disable this when user wants to manage the route themself like pointing
       # it to CloudFront for blue-green deployments instead.
 
+    # Custom user lambda layers
+    config.lambda = ActiveSupport::OrderedOptions.new
+    config.lambda.layers = []
+
     config
   end
 

data/lib/jets/commands/templates/skeleton/Gemfile.tt

@@ -13,6 +13,7 @@ gem "pg", "~> 1.1.3"
 # Include mysql2 gem if you are using ActiveRecord, remove if you are not
 gem "mysql2", "~> 0.5.2"
 <% end %>
+gem "dynomite"
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

data/lib/jets/db.rb

@@ -1,9 +1,15 @@
 module Jets::Db ; end
 
 # Thanks: https://makandracards.com/makandra/42521-detecting-if-a-ruby-gem-is-loaded
-return unless File.exist?("#{Jets.root}config/database.yml")
+if File.exist?("#{Jets.root}config/database.yml")
+  require "active_record"
+  specs = Gem.loaded_specs
+  require "mysql2" if specs.key?('mysql2')
+  require "pg" if specs.key?('pg')
+end
 
-require "active_record"
-specs = Gem.loaded_specs
-require "mysql2" if specs.key?('mysql2')
-require "pg" if specs.key?('pg')
+if File.exist?("#{Jets.root}config/dynamodb.yml")
+  specs = Gem.loaded_specs
+  specs.key?('dynomite')
+  require "dynomite" if specs.key?('dynomite')
+end

data/lib/jets/resource/lambda/function.rb

@@ -129,10 +129,16 @@ module Jets::Resource::Lambda
         handler: handler,
         runtime: runtime,
       }
-      managed[:layers] = ["!Ref GemLayer"] if runtime =~ /^ruby/
+      layers = get_layers(runtime)
+      managed[:layers] = layers if layers
       props.merge!(managed)
     end
 
+    def get_layers(runtime)
+      return nil unless runtime =~ /^ruby/
+      ["!Ref GemLayer"] + Jets.config.lambda.layers
+    end
+
     def get_runtime(props)
       props[:runtime] || default_runtime
     end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.4.10"
+  VERSION = "1.4.11"
 end

data/lib/jets.rb

@@ -61,11 +61,4 @@ require "jets/core_ext/kernel"
 $:.unshift(File.expand_path("../../vendor/jets-gems/lib", __FILE__))
 require "jets-gems"
 
-# lazy loaded dependencies: depends what project. Mainly determined by Gemfile
-# and config files.
-if File.exist?("#{Jets.root}config/dynamodb.yml")
-  $:.unshift(File.expand_path("../../vendor/dynomite/lib", __FILE__))
-  require "dynomite"
-end
-
 Jets::Db # trigger autoload

data/vendor/jets-gems/lib/jets/gems/check.rb

@@ -72,9 +72,9 @@ Your current lambdagems sources:
 
 Jets is unable to build a deployment package that will work on AWS Lambda without the required pre-compiled gems. To remedy this, you can:
 
-* Build the gem yourself and add it to your own custom lambdagems sources. Refer to the Lambda Gems Docs: http://rubyonjets.com/docs/lambdagems
 * Use another gem that does not require compilation.
-* Wait until it added to lambdagems.com.
+* Create your own custom layer with the gem: http://rubyonjets.com/docs/custom-lambda-layers/
+* Build the gem yourself and add it to your own custom lambdagems sources. Refer to the Lambda Gems Docs: http://rubyonjets.com/docs/lambdagems
 <% if agree.yes? -%>
 * No need to report this to us, as we've already been notified.
 <% elsif agree.no? -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.4.10
+  version: 1.4.11
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -798,45 +798,6 @@ files:
 - lib/jets/version.rb
 - readme/prerelease.md
 - readme/testing.md
-- vendor/dynomite/CHANGELOG.md
-- vendor/dynomite/Gemfile
-- vendor/dynomite/Gemfile.lock
-- vendor/dynomite/README.md
-- vendor/dynomite/Rakefile
-- vendor/dynomite/bin/console
-- vendor/dynomite/bin/setup
-- vendor/dynomite/docs/migrations/long-example.rb
-- vendor/dynomite/docs/migrations/short-example.rb
-- vendor/dynomite/dynomite.gemspec
-- vendor/dynomite/lib/dynomite.rb
-- vendor/dynomite/lib/dynomite/core.rb
-- vendor/dynomite/lib/dynomite/db_config.rb
-- vendor/dynomite/lib/dynomite/erb.rb
-- vendor/dynomite/lib/dynomite/item.rb
-- vendor/dynomite/lib/dynomite/log.rb
-- vendor/dynomite/lib/dynomite/migration.rb
-- vendor/dynomite/lib/dynomite/migration/common.rb
-- vendor/dynomite/lib/dynomite/migration/dsl.rb
-- vendor/dynomite/lib/dynomite/migration/dsl/base_secondary_index.rb
-- vendor/dynomite/lib/dynomite/migration/dsl/global_secondary_index.rb
-- vendor/dynomite/lib/dynomite/migration/dsl/local_secondary_index.rb
-- vendor/dynomite/lib/dynomite/migration/executor.rb
-- vendor/dynomite/lib/dynomite/migration/generator.rb
-- vendor/dynomite/lib/dynomite/migration/templates/create_table.rb
-- vendor/dynomite/lib/dynomite/migration/templates/update_table.rb
-- vendor/dynomite/lib/dynomite/version.rb
-- vendor/dynomite/pkg/dynomite-1.0.8.gem
-- vendor/dynomite/pkg/dynomite-1.0.9.gem
-- vendor/dynomite/pkg/dynomite-1.1.0.gem
-- vendor/dynomite/spec/fixtures/app_root/config/dynamodb.yml
-- vendor/dynomite/spec/fixtures/dynamodb/migrate/20190108061826-comments_migration.rb
-- vendor/dynomite/spec/lib/dynomite/item_spec.rb
-- vendor/dynomite/spec/lib/dynomite/migration/dsl/global_secondary_index_spec.rb
-- vendor/dynomite/spec/lib/dynomite/migration/dsl/local_secondary_index_spec.rb
-- vendor/dynomite/spec/lib/dynomite/migration/dsl_spec.rb
-- vendor/dynomite/spec/lib/dynomite/migration/generator_spec.rb
-- vendor/dynomite/spec/lib/dynomite/migration_spec.rb
-- vendor/dynomite/spec/spec_helper.rb
 - vendor/jets-gems/Gemfile
 - vendor/jets-gems/Gemfile.lock
 - vendor/jets-gems/LICENSE.txt

data/vendor/dynomite/CHANGELOG.md

@@ -1,45 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
-
-## [1.1.0]
-- Merge pull request #5 from tongueroo/fix-index-creation
-- fix index creation dsl among other things
-
-## [1.0.9]
-- allow item.replace(hash) to work
-- Merge pull request #3 from mveer99/patch-1 Update comments: Fixed typo in project_name
-
-## [1.0.8]
-- scope endpoint option to dynamodb client only vs the entire Aws.config
-
-## [1.0.7]
-- update DYNOMITE_ENV var
-
-## [1.0.6]
-- rename to dynomite
-
-## [1.0.5]
-- fix jets dynamodb:migrate tip
-
-## [1.0.4]
-- Add and use log method instead of puts to write to stderr by default
-
-## [1.0.3]
-- rename APP_ROOT to JETS_ROOT
-
-## [1.0.2]
-- to_json for json rendering
-
-## [1.0.1]
-- Check dynamodb local is running when configured
-
-## [1.0.0]
-- LSI support
-- automatically infer table_name
-- automatically infer create_table and update_table migrations types
-
-## [0.3.0]
-- DSL methods now available: create_table, update_table
-- Also can add GSI indexes within update_table with: i.gsi

data/vendor/dynomite/Gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in dynomite.gemspec
-gemspec

data/vendor/dynomite/Gemfile.lock

@@ -1,61 +0,0 @@
-PATH
-  remote: .
-  specs:
-    dynomite (1.1.0)
-      activesupport
-      aws-sdk-dynamodb
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.2.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    aws-eventstream (1.0.1)
-    aws-partitions (1.129.0)
-    aws-sdk-core (3.44.2)
-      aws-eventstream (~> 1.0)
-      aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.0)
-      jmespath (~> 1.0)
-    aws-sdk-dynamodb (1.19.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
-      aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.3)
-    concurrent-ruby (1.1.4)
-    diff-lcs (1.3)
-    i18n (1.5.1)
-      concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
-    minitest (5.11.3)
-    rake (12.3.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  dynomite!
-  rake
-  rspec
-
-BUNDLED WITH
-   1.17.2

data/vendor/dynomite/README.md

@@ -1,141 +0,0 @@
-# Dynomite
-
-A simple wrapper library to make DynamoDB usage a little more friendly.  The modeling is ActiveRecord-ish but not exactly because DynamoDB is a different type of database.  Examples below explain it best:
-
-## Examples
-
-First define a class:
-
-```ruby
-class Post < Dynomite::Item
-  # partition_key "id" # optional, defaults to id
-end
-```
-
-### Create
-
-```ruby
-post = Post.new
-post = post.replace(title: "test title")
-post.attrs # {"id" => "generated-id", title" => "my title"}
-```
-
-`post.attrs[:id]` now contain a generated unique partition_key id.  Usually the partition_key is 'id'. You can set your own unique id also by specifying id.
-
-```ruby
-post = Post.new(id: "myid", title: "my title")
-post.replace
-post.attrs # {"id" => "myid", title" => "my title"}
-```
-
-Note that the replace method replaces the entire item, so you need to merge the attributes if you want to keep the other attributes.  Know this is weird, but this is how DynamoDB works.
-
-### Find
-
-```ruby
-post = Post.find("myid")
-post.attrs = post.attrs.deep_merge("desc": "my desc") # keeps title field
-post.replace
-post.attrs # {"id" => "myid", title" => "my title", desc: "my desc"}
-```
-
-The convenience `attrs` method performs a deep_merge:
-
-```ruby
-post = Post.find("myid")
-post.attrs("desc": "my desc 2") # <= does a deep_merge
-post.replace
-post.attrs # {"id" => "myid", title" => "my title", desc: "my desc 2"}
-```
-
-Note, a race condition edge case can exist when several concurrent replace
-calls are happening.  This is why the interface is called replace to
-emphasize that possibility.
-
-### Delete
-
-```ruby
-resp = Post.delete("myid")  # dynamodb client resp
-# or
-post = Post.find("myid")
-resp = post.delete  # dynamodb client resp
-```
-
-### Scan
-
-```ruby
-options = {}
-posts = Post.scan(options)
-posts # Array of Post items.  [Post.new, Post.new, ...]
-```
-
-### Query
-
-```ruby
-posts = Post.query(
-  index_name: 'category-index',
-  expression_attribute_names: { "#category_name" => "category" },
-  expression_attribute_values: { ":category_value" => "Entertainment" },
-  key_condition_expression: "#category_name = :category_value",
-)
-posts # Array of Post items.  [Post.new, Post.new, ...]
-```
-
-### Where
-
-The where could be prettied up. Appreciate any pull requests.
-
-```ruby
-Post.where({category: "Drama"}, {index_name: "category-index"})
-```
-
-Examples are also in [item_spec.rb](spec/lib/dynomite/item_spec.rb).
-
-## Migration Support
-
-Dynomite supports ActiveRecord-like migrations.  Here's a short example:
-
-```ruby
-class CreateCommentsMigration < Dynomite::Migration
-  def up
-    create_table :comments do |t|
-      t.partition_key "post_id:string" # required
-      t.sort_key  "created_at:string" # optional
-      t.provisioned_throughput(5) # sets both read and write, defaults to 5 when not set
-    end
-  end
-end
-```
-
-More examples are in the [docs/migrations](docs/migrations) folder.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'dynomite'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install dynomite
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/tongueroo/dynomite.
-
-### TODO
-
-* improve Post.where.  Something like `Post.index_name("user_id").where(category_name: "Entertainment")` would be nice.
-* implement `post.update` with `db.update_item` in a Ruby-ish way

data/vendor/dynomite/Rakefile

@@ -1,2 +0,0 @@
-require "bundler/gem_tasks"
-task :default => :spec

data/vendor/dynomite/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "dynomite"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/vendor/dynomite/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/vendor/dynomite/docs/migrations/long-example.rb

@@ -1,123 +0,0 @@
-# Note: table name created will be namespaced based on
-# Dynomite::Migration.table_namespace.  This can be set in
-# config/dynamodb.yml
-#
-# development:
-#   table_namespace: "mynamespace"
-#
-# This results in:
-#   create_table "posts"
-# Produces:
-#   table name: "mynamespace-posts"
-#
-# When you're in a in Jets project you can set the namespace based on
-# Jets.config.table_namespace, which is based on the project name and
-# a short version of the environment.  Example:
-#
-# `config/dynamodb.yml`:
-# development:
-#   table_namespace: <%= Jets.config.table_namespace %>
-#
-# If your project_name is demo and environment is production:
-#   create_table "posts" => table name: "demo-prod-posts"
-#
-# If your project_name is demo and environment is staging:
-#   create_table "posts" => table name: "demo-stag-posts"
-#
-# If your project_name is demo and environment is development:
-#   create_table "posts" => table name: "demo-dev-posts"
-#
-# If the table_namespace is set to a blank string or nil, then a namespace
-# will not be prepended at all.
-
-class CreateCommentsMigration < Dynomite::Migration
-  def up
-    create_table :comments do |t|
-      t.partition_key "post_id:string" # required
-      t.sort_key  "created_at:string" # optional
-      t.provisioned_throughput(5) # sets both read and write, defaults to 5 when not set
-
-      # Instead of using partition_key and sort_key you can set the
-      # key schema directly also
-      # t.key_schema([
-      #     {attribute_name: "id", :key_type=>"HASH"},
-      #     {attribute_name: "created_at", :key_type=>"RANGE"}
-      #   ])
-      # t.attribute_definitions([
-      #   {attribute_name: "id", attribute_type: "N"},
-      #   {attribute_name: "created_at", attribute_type: "S"}
-      # ])
-
-      # other ways to set provisioned_throughput
-      # t.provisioned_throughput(:read, 10)
-      # t.provisioned_throughput(:write, 10)
-      # t.provisioned_throughput(
-      #   read_capacity_units: 5,
-      #   write_capacity_units: 5
-      # )
-    end
-  end
-end
-
-class UpdateCommentsMigration < Dynomite::Migration
-  def up
-    update_table :comments do |t|
-
-      # t.global_secondary_index do
-      # t.gsi(METHOD, INDEX_NAME) do
-
-      # You normally create an index like so:
-      #
-      #  t.gsi(:create) do |i|
-      #    i.partition_key = "post_id:string" # partition_key is required
-      #    i.sort_key = "updated_at:string" # sort_key is optional
-      #  end
-      #
-      # The index name will be inferred from the partition_key and sort_key when
-      # not explicitly set.  Examples:
-      #
-      #   index_name = "#{partition_key}-#{sort_key}-index"
-      #   index_name = "post_id-index" # no sort key
-      #   index_name = "post_id-updated_at-index" # has sort key
-      #
-      # The inference allows you to not have to worry about the index
-      # naming scheme. You can still set the index_name explicitly like so:
-      #
-      #  t.gsi(:create, "post_id-updated_at-index") do |i|
-      #    i.partition_key = "post_id:string" # partition_key is required
-      #    i.sort_key = "updated_at:string" # sort_key is optional
-      #  end
-      #
-      t.gsi(:create) do |i|
-        i.partition_key "post_id:string"
-        i.sort_key "updated_at:string" # optional
-
-        # translates to
-        # i.key_schema({...})
-        # also makes sure that the schema_keys are added to the attributes_definitions
-
-        # t.projected_attributes(:all) # default if not called
-        # t.projected_attributes(:keys_only) # other ways to call
-        # t.projected_attributes([:id, :body, :tags, :updated_at])
-        # translates to:
-        # Valid Values: ALL | KEYS_ONLY | INCLUDE
-        # t.projection(
-        #   projection_type: :all, # defaults to all
-        # )
-        # t.projection(
-        #   projection_type: :include, # defaults to all
-        #   non_key_attributes: [:id, :body, :tags, :updated_at], # defaults to all
-        # )
-
-        i.provisioned_throughput(10)
-      end
-
-      t.gsi(:update, "category-index") do |i|
-        i.provisioned_throughput(10)
-      end
-
-      t.gsi(:delete, "category-index")
-    end
-  end
-end
-