eucalypt 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75b2cf3eff60c7fbf7f6f07d7a773b85378a69ea193ef6d599ff366499b5805c
-  data.tar.gz: 728eee98d207ff017b6ab2bda8721e6c8f429decf4f089260db8031c72e1b278
+  metadata.gz: 771a431c14d309ed211df539c99b3e25ab84e915ca74701daea4e14fcf5adf47
+  data.tar.gz: 333f258faf7446501ed5700009f34300cb7226160dda5722ebde2bb12b164767
 SHA512:
-  metadata.gz: 6f68bf1fada82d622031f0cdc7bde08d9137713861020ea29a04dac0057932f20f70970c1cfb2270eece8b7a61ffa051f4b1e91991e91e0012b11a3969d72883
-  data.tar.gz: 5c3f34122457ce97b157ccb65eb015b70588b527cac2745400b5986ea00242bbe1e8bac41c69293cbb19100290085911bf10ce69210f1105a48e7d7ae626ef2c
+  metadata.gz: 3c1a78bcaf7f2804dc6a3557930e3c74f9bc4aafa4be272ecd0c224a7d9b6f4b610d27cdfa5c2897e19f88e9bdda088b88bff93caaf63fa15604317b55d370dc
+  data.tar.gz: 054f855e42dd04196f5d3fbb9fc4e1400f98479bb72d44202a358690a5fa67a280f1e785d27ef34b21fcb841fc453183d0076ff25edda5fc136b5e079d0194c3

data/Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-gemspec
+gemspec

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Edwin Onuonga
+Copyright (c) 2018-2020 Edwin Onuonga
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,8 +1,8 @@
-<p align="center"><img width="75px" src="gfx/eucalypt.png"></p>
+<p align="center"><img width="75px" src="https://i.ibb.co/BKb7SxT/eucalypt.png"></p>
 
 [![Ruby Version](https://img.shields.io/badge/ruby-~%3E%202.5-red.svg)](https://github.com/eucalypt-framework/eucalypt/blob/0c509a4e22fd97ec52b6f638af21de783f3aafc8/eucalypt.gemspec#L19)
 [![Gem](https://img.shields.io/gem/v/eucalypt.svg)](https://rubygems.org/gems/eucalypt)
-[![Build Status](https://travis-ci.org/eucalypt-framework/eucalypt.svg?branch=master)](https://travis-ci.org/eucalypt-framework/eucalypt)
+[![Build Status](https://travis-ci.com/eucalypt-framework/eucalypt.svg?branch=master)](https://travis-ci.com/eucalypt-framework/eucalypt)
 [![License](https://img.shields.io/github/license/eucalypt-framework/eucalypt.svg)](https://github.com/eucalypt-framework/eucalypt/blob/master/LICENSE)
 [![Documentation](https://img.shields.io/badge/docs-gitbook-blue.svg)](https://eucalypt.gitbook.io/eucalypt)
 
@@ -22,7 +22,7 @@ $ gem install eucalypt
 
 Running the top-level `eucalypt` command displays information about initializing a new application:
 
-<p align="center"><img width="70%" src="gfx/cli-1.png"></p>
+<p align="center"><img width="70%" src="https://i.ibb.co/4ZkqjS5/cli-1.png"></p>
 
 Initialize a new application with:
 
@@ -36,7 +36,7 @@ $ eucalypt init my-new-app
 
 Move into your new application's directory and run the top-level `eucalypt` command to display a list of all available commands:
 
-<p align="center"><img width="70%" src="gfx/cli-2.png"></p>
+<p align="center"><img width="70%" src="https://i.ibb.co/JsQkH8j/cli-2.png"></p>
 
 ## Documentation
 

data/Rakefile

@@ -1,6 +1 @@
-require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
-task :default => [:spec]
-
-desc "Run the specs"
-RSpec::Core::RakeTask.new(:spec)
+require "bundler/gem_tasks"

data/lib/eucalypt/app.rb

@@ -1,6 +1,13 @@
 module Eucalypt
   APP_FILE = 'Gumfile'.freeze
+
   def self.app?(directory)
     File.exist? File.join(directory, APP_FILE)
   end
+
+  # @note Does not check for boolean variables.
+  #   Instead checks for presence.
+  def self.console?
+    !!ENV['CONSOLE']
+  end
 end

data/lib/eucalypt/core/cli/console.rb

@@ -2,14 +2,35 @@ require_relative '__base__'
 module Eucalypt
   class CLI < Thor
     using Colorize
-    desc "console", "Interactive console with all files loaded".colorize(:grey)
-    def console
+    desc "console [ENV]", "Interactive console with all files loaded".colorize(:grey)
+    def console(env = ENV['APP_ENV']||'development')
       directory = File.expand_path('.')
       if Eucalypt.app? directory
-        exec 'bundle exec irb -r ./app.rb'
+        unless %w[p production d development t test].include? env
+          Out.error "Invalid Rack environment #{env.colorize(:bold)}"
+          return
+        end
+
+        env = map_env env
+        cmd = "CONSOLE=true bundle exec irb -r ./app.rb"
+
+        puts "Running command: #{cmd.colorize(:bold)}"
+        puts "Rack environment: #{env.colorize(:bold)}"
+        exec "env APP_ENV=#{env} #{cmd}"
       else
         Eucalypt::Error.wrong_directory
       end
     end
+
+    no_tasks do
+      def map_env(env)
+        case env
+        when ?p then 'production'
+        when ?d then 'development'
+        when ?t then 'test'
+        else env
+        end
+      end
+    end
   end
 end

data/lib/eucalypt/core/helpers/default_index.rb

@@ -47,7 +47,7 @@ class MainController < ApplicationController
       </head>
       <body>
           <div id="container">
-              <img src="https://raw.githubusercontent.com/eucalypt-framework/eucalypt/master/gfx/eucalypt.png">
+              <img src="https://i.ibb.co/BKb7SxT/eucalypt.png">
               <div id="text">
                   <h1>It's running!</h1>
                   <p><b>Eucalypt version</b> : <span>#{Eucalypt::VERSION}</span></p>

data/lib/eucalypt/core/templates/Gemfile.tt

@@ -1,15 +1,11 @@
 source 'https://rubygems.org'
 
+gem 'irb', require: false
 gem 'sinatra', '~> 2.0', '>= 2.0.4', require: 'sinatra/base'
 gem 'eucalypt', '<%= config[:version] %>'
 gem 'rake', '~> 12.3'
 gem 'thin', '~> 1.7'
 
-# IRB is not bundled in Ruby >= 2.6
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6')
-  gem 'irb', require: false
-end
-
 # Test environment
 group :test do
   gem 'rack-test', '~> 1.0', require: 'rack/test'

data/lib/eucalypt/core/templates/eucalypt/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 before_install: gem update --system
-script: bundle exec rake
+script: bundle exec rspec spec
 rvm: 2.5
 services:
   - postgresql

data/lib/eucalypt/core/templates/eucalypt/Rakefile

@@ -1,7 +1,2 @@
 require './app'
-require 'rspec/core/rake_task'
-
-task :default => [:spec]
-
-desc "Run the specs"
-RSpec::Core::RakeTask.new :spec
+# Add your Rake tasks here!

data/lib/eucalypt/core/templates/eucalypt/config/logging.rb

@@ -11,7 +11,8 @@ class ApplicationController < Sinatra::Base
 
   configure :production do
     enable :logging
-    enable :log_file
+    # Output to log file except when running console
+    set :log_file, !Eucalypt.console?
   end
 
   set :log_directory_format, "%Y-%m-%d_%H-%M-%S"

data/lib/eucalypt/generate/namespaces/generate-controller/templates/controller/policy_rest_controller.tt

@@ -10,35 +10,53 @@ class <%= config[:class_name] %> < Eucalypt::Controller(route: '<%= config[:rout
   # - e.g. Showing a form for editing <%= config[:resources] %>
   <% if config[:headless] %>
   # Authorization helpers are used in the following way (if using headless policies):
+  # - `authorized?(:<%= config[:resource] %>, :read?)`
   # - `authorized?(:<%= config[:resource] %>, :add?)`
   # - `authorized?(:<%= config[:resource] %>, :edit?)`
   # - `authorized?(:<%= config[:resource] %>, :delete?)`
   <% else %>
   # Authorization helpers are used in the following way:
+  # - `authorized?(<%= config[:constant] %>, :read?)`
   # - `authorized?(<%= config[:constant] %>, :add?)`
   # - `authorized?(<%= config[:constant] %>, :edit?)`
   # - `authorized?(<%= config[:constant] %>, :delete?)`
   <% end %>
   # GET - Browse
   get '/' do
+    # NOTE: To skip browse permission checks, comment out the `authenticate` and `authorize` lines.
+    authenticate
+    authorize <%= config[:constant] %>, :read?
     @<%= config[:resources] %> = <%= config[:constant] %>.all
-    # Render a view here for displaying all <%= config[:resources] %>
+    # Render the <%= config[:resources] %> as JSON, or create a view
+    content_type :json
+    @<%= config[:resources] %>.to_json
+  rescue Pundit::NotAuthorizedError
+    status 401 # Unauthorized
+    redirect '/'
   end
 
   # GET - Read
   get '/:id' do |id|
+    # NOTE: To skip read permission checks, comment out the `authenticate` and `authorize` lines.
+    authenticate
     @<%= config[:resource] %> = <%= config[:constant] %>.find id
-    # Render a view here for displaying a single <%= config[:resource] %>
+    authorize @<%= config[:resource] %>, :read?
+    # Render the <%= config[:resource] %> as JSON, or create a view
+    content_type :json
+    @<%= config[:resource] %>.to_json
   rescue ActiveRecord::RecordNotFound
     status 404 # Resource not found
     redirect to '/'
+  rescue Pundit::NotAuthorizedError
+    status 401 # Unauthorized
+    redirect to '/'
   end
 
   # POST - Edit
   post '/:id/edit' do |id|
     authenticate
     <%= config[:resource] %> = <%= config[:constant] %>.find id
-    authorize <%= config[:resource]%>, :edit?
+    authorize <%= config[:resource] %>, :edit?
     <%= config[:resource] %>.update! params['<%= config[:resource] %>']
     redirect to "/#{id}"
   rescue ActiveRecord::RecordNotFound
@@ -65,7 +83,7 @@ class <%= config[:class_name] %> < Eucalypt::Controller(route: '<%= config[:rout
   post '/:id/delete' do |id|
     authenticate
     <%= config[:resource] %> = <%= config[:constant] %>.find id
-    authorize <%= config[:resource]%>, :delete?
+    authorize <%= config[:resource] %>, :delete?
     <%= config[:resource] %>.destroy!
     redirect to '/'
   rescue ActiveRecord::RecordNotFound

data/lib/eucalypt/generate/namespaces/generate/cli/generate-scaffold.rb

@@ -54,7 +54,7 @@ module Eucalypt
         if options[:policy]
           args = ['security', 'policy', 'generate', name]
           args << '--headless' if options[:headless]
-          args << %w[-p add edit delete] if options[:rest]
+          args << %w[-p read add edit delete] if options[:rest]
           args.flatten!
           Eucalypt::CLI.start(args)
         end

data/lib/eucalypt/security/permissions.rb

@@ -10,10 +10,18 @@ Eucalypt.glob('app', '{policies}', '*.rb') do |file|
   role_constant      = role_constant_name.constantize
 
   if ActiveRecord::Base.connection.table_exists? roles_name
-    role_constant.pluck(:permission).each do |permission|
-      policy_constant.define_method "#{permission}?" do
-        role_constant.find_by(permission: permission).send(user.role.send resource_name)
+    level = ActiveRecord::Base.logger.level
+    begin
+      ActiveRecord::Base.logger.level = :unknown
+      role_constant.pluck(:permission).each do |permission|
+        policy_constant.define_method "#{permission}?" do
+          role_constant.find_by(permission: permission).send(user.role.send resource_name)
+        end
       end
+    rescue => exception
+      throw exception
+    ensure
+      ActiveRecord::Base.logger.level = level
     end
   end
 end

data/lib/eucalypt/version.rb

@@ -1,8 +1,8 @@
 module Eucalypt
   VERSION = {
     major: 0,
-    minor: 7,
-    patch: 2,
+    minor: 8,
+    patch: 0,
     meta: nil
   }.compact.values.join('.').freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eucalypt
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Edwin Onuonga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-11 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake