phaedra 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1bdff92530752ce6f23f3b1e5e5763ac60ea46f0ff941147949790133a8d54e
-  data.tar.gz: 940607642ec362c3eeb5a88629cfd5f42125990f0d0437fd160e7e27ce0f66e2
+  metadata.gz: 00d5ba6f3bc10860baef3bf63867665db4ef610b7cf14a8281495cf929339bc3
+  data.tar.gz: 5d1c500a8cbe79a89182497e7881fdeba3d129e5e2f2ddcce19012f9ae713171
 SHA512:
-  metadata.gz: e151d4bf1a2471acf06e5331dde65dc97988403a873916062f08f46b37c6bfbc54a780e448bda0bada253cefe74747abd3811e3071ec7a8474e1346aa53cb863
-  data.tar.gz: 16343524b69c5d67c228f4b69154faf816a996e9b6a15b66b01d10dbaf7510a3c1e747296e1c5d8b42100e7ca01c3e7e8492f4e2b5844946967a28bc1dd20799
+  metadata.gz: 3f3a8145df4a02f5362dfffb66f1de44ccd650425504007f2f49fa666c68bd9d228d0e8ade98daa2d318c57b220013009bd2c9b37d10d375a7cecca2cee0c4ac
+  data.tar.gz: f0effbf926248e56c67da411bd688cc3f6783d7710bdedf141029d523b4e55667df18b1e509cb68aa55795a01b74369ac8e007a91754ac9b3c6046741d166258

data/README.md

@@ -118,7 +118,13 @@ All you have to do is create a static site repo ([Bridgetown](https://www.bridge
 
 We recommend using OpenFaaS' dockerfile template so you can define your own `Dockerfile` to book Rack + Phaedra using the Puma web server. This also allows you to customize the Docker image configuration to install and configure other tools as necessary.
 
-First, make sure you've pulled down the template:
+First make sure you've added Puma to your Gemfile:
+
+```
+gem "puma"
+```
+
+Then make sure you've pulled down the OpenFaaS template:
 
 ```sh
 faas-cli template store pull dockerfile
@@ -174,7 +180,7 @@ Next add the `config.ru` file to boot Rack:
 ```ruby
 # testphaedra/config.ru
 
-require "phaedra"
+require "phaedra/rack_app"
 
 run Phaedra::RackApp.new
 ```
@@ -210,7 +216,7 @@ In case you're wondering: yes, with Phaedra you can write multiple Ruby function
 Booting Phaedra up as Rack app is very simple. All you need to do is add a `config.ru` file alongside your `api` folder:
 
 ```ruby
-require "phaedra"
+require "phaedra/rack_app"
 
 run Phaedra::RackApp.new
 ```

data/example/Dockerfile

@@ -0,0 +1,46 @@
+FROM ruby:2.6-alpine3.11 as builder
+
+RUN apk add --no-cache --virtual \\
+    #
+    # required
+    bash tzdata build-base libffi-dev \\
+    #
+    # nice to haves
+    curl git
+
+FROM builder as phaedra-app
+
+# This is to fix an issue on Linux with permissions issues
+ARG USER_ID=${USER_ID:-1000}
+ARG GROUP_ID=${GROUP_ID:-1000}
+ARG DOCKER_USER=${DOCKER_USER:-user}
+ARG APP_DIR=${APP_DIR:-/home/user/phaedra-app}
+
+# Change with --build-arg PHAEDRA_ENV=production
+ARG PHAEDRA_ENV=staging
+ENV PHAEDRA_ENV=$PHAEDRA_ENV
+
+# Create a non-root user
+RUN addgroup -g $GROUP_ID -S $GROUP_ID
+RUN adduser --disabled-password -G $GROUP_ID --uid $USER_ID -S $DOCKER_USER
+
+# Create and then own the directory to fix permissions issues
+RUN mkdir -p $APP_DIR
+RUN chown -R $USER_ID:$GROUP_ID $APP_DIR
+
+# Define the user running the container
+USER $USER_ID:$GROUP_ID
+
+# . now == $APP_DIR
+WORKDIR $APP_DIR
+
+# COPY is run as a root user, not as the USER defined above, so we must chown it
+COPY --chown=$USER_ID:$GROUP_ID Gemfile* ./
+RUN gem install bundler
+RUN bundle install
+
+COPY --chown=$USER_ID:$GROUP_ID . .
+
+EXPOSE 8080
+
+CMD ["bundle", "exec", "rackup", "-p", "8080", "-o", "0.0.0.0"]

data/example/api/simple.rb

@@ -3,7 +3,7 @@ require_relative "../phaedra/initializers"
 class PhaedraFunction < Phaedra::Base
   def get(params)
     response["Content-Type"] = "text/html; charset=utf-8"
-    "<p>This is Interesting. 😁 #{Phaedra.the_time}</p>"
+    "<p>😁 #{Phaedra.the_time} - #{ENV["PHAEDRA_ENV"]} - #{Time.new}</p>"
   end
 end
 

data/example/api/the-time.rb

@@ -1,10 +1,10 @@
-require "phaedra"
+require_relative "../phaedra/initializers"
 
 class PhaedraFunction < Phaedra::Base
   before_action :earlier_stuff
 
   def get(params)
-    "The Current Time is: #{Time.new} and Search Param is #{params[:search]}."
+    "The ?search param is #{params[:search]}"
   end
 
   def post(params)

data/example/docker-compose.yml

@@ -0,0 +1,8 @@
+version: '3'
+services:
+  web:
+    build: .
+    ports:
+      - "8080:8080"
+    environment:
+      - PHAEDRA_ENV

data/lib/phaedra.rb

@@ -1,4 +1,5 @@
 require "phaedra/version"
 require "webrick"
 require "phaedra/initializers_module"
+require "phaedra/startup_initializers"
 require "phaedra/base"

data/lib/phaedra/startup_initializers.rb

@@ -0,0 +1,9 @@
+module Phaedra
+  Initializers.register self, priority: :high do
+    environment
+  end
+
+  def self.environment
+    @environment ||= ENV.fetch("PHAEDRA_ENV", :development).to_sym
+  end
+end

data/lib/phaedra/version.rb

@@ -1,3 +1,3 @@
 module Phaedra
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phaedra
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Jared White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,10 +80,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- example/Dockerfile
 - example/Gemfile
 - example/api/simple.rb
 - example/api/the-time.rb
 - example/config.ru
+- example/docker-compose.yml
 - example/phaedra/initializers.rb
 - lib/phaedra.rb
 - lib/phaedra/base.rb
@@ -93,6 +95,7 @@ files:
 - lib/phaedra/rack_middleware.rb
 - lib/phaedra/rack_middleware/not_found.rb
 - lib/phaedra/rack_middleware/static.rb
+- lib/phaedra/startup_initializers.rb
 - lib/phaedra/version.rb
 - phaedra.gemspec
 homepage: https://github.com/whitefusionhq/phaedra
@@ -114,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Write serverless Ruby functions via a REST-like microframework compatible