eucalypt 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63a868422a94bde49b8b30b2e6bc5af7b7dd87099452bbb7d0dd4e64eeb4d155
-  data.tar.gz: f3acffad61e46e0664131a530a33294ecaf376d1890c0f7a5f48cf45a163b11a
+  metadata.gz: f37d0ae31182679a375f2f7187055526fe29b64277f3b7f4c618d11a5382989f
+  data.tar.gz: b7ae9fcf4881a3a56fd9e5acaed9152bada8575acd15b7b1e600702f7f211fad
 SHA512:
-  metadata.gz: 67a75c326f188a04327302632f5aaa41a0d1c69d4df04d14c5d849d5711fb3a4226c33dd27f2166f16f95d79cae6dc632936d20fa263693012418110d961a9dc
-  data.tar.gz: 1cb228a0816a3176184804b1466f4b3e3145ace396e55f914e125cb23ed5d275bddb62714a45a07ab4a80d991f7cf123695e53fae34e1344e151b33f73f58809
+  metadata.gz: fd69f7f5cedf737faebcc0e2c54452bf521a6f40847cc83f7620d800396dc1a847d3a8d4cbfb846c70717762438f8da094f85c3cf5461dc765583ca5ede04055
+  data.tar.gz: 406bc23c4389ac1be9cf8097ae8a3f8f412bb3c0006d880720a7e0d76a14f5b4f3ef00cfac62de25d94442c9b5748934d360e4cf36f210305df516f202ba85f6

data/README.md

@@ -32,25 +32,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:
 
-```bash
-$ eucalypt
-
-Commands:
-  eucalypt init [NAME]          ·› Sets up your application
-  eucalypt launch [ENV]         ·› Launches your application
-  eucalypt console              ·› Interactive console with all files loaded
-  eucalypt test                 ·› Run all application tests
-  eucalypt version              ·› Display installed Eucalypt version
-  eucalypt rake                 ·› Run all database migrations
-  eucalypt blog [COMMAND]       ·› Manage static blog environment
-  eucalypt generate [COMMAND]   ·› Generate individual MVC files or scaffolds
-  eucalypt destroy [COMMAND]    ·› Destroy individual MVC files or scaffolds
-  eucalypt security [COMMAND]   ·› Manage authentication and authorization
-  eucalypt migration [COMMAND]  ·› Generate ActiveRecord migrations
-
-For more information about a specific command, use eucalypt -H.
-Example: eucalypt -H generate scaffold
-```
+<p align="center"><img width="70%" src="gfx/cli.png"></p>
 
 ## Documentation
 

data/eucalypt.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
   spec.files         = Dir.glob('lib/**/*', File::FNM_DOTMATCH) + %w[Gemfile LICENSE README.md Rakefile eucalypt.gemspec bin/eucalypt]
   spec.bindir        = "bin"
-  spec.executables   = spec.files.grep(%r{^bin/}) {|f| File.basename(f)}
+  spec.executables   = "eucalypt"
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = "~> 2.5"
@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "string-builder", "~> 2.3"
   spec.add_runtime_dependency "activesupport", "~> 5.2"
   spec.add_runtime_dependency "activerecord", "~> 5.2"
-  spec.add_runtime_dependency "bcrypt", "~> 3.1"
   spec.add_runtime_dependency "front_matter_parser", "0.2.0"
   spec.add_runtime_dependency "thor", "~> 0.20"
   spec.add_runtime_dependency "sinatra", "~> 2.0", ">= 2.0.4"

data/lib/eucalypt/blog/namespaces/blog/cli/blog.rb

@@ -31,18 +31,6 @@ module Eucalypt
         generator.helper
         generator.controller(route: options[:route])
         generator.views
-
-        assets_file = File.join(directory, 'config', 'assets.rb')
-
-        File.open(assets_file) do |f|
-          return if f.read.include? "assets.append_path Eucalypt.path 'app', 'assets', 'blog'"
-        end
-
-        insert_into_file(
-          assets_file,
-          "  assets.append_path Eucalypt.path 'app', 'assets', 'blog'\n",
-          after: "set :assets, Sprockets::Environment.new\n"
-        )
       else
         Eucalypt::Error.wrong_directory
       end

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

@@ -1,5 +1,5 @@
 require 'sinatra'
-require 'bcrypt'
+require 'securerandom'
 class ApplicationController < Sinatra::Base
   if settings.methods(false).include?(:maintenance)
     if settings.maintenance
@@ -14,9 +14,9 @@ class ApplicationController < Sinatra::Base
         unlink '*', &block
       end
     else
-      define_singleton_method(:maintenance) {|&block| get "/#{BCrypt::Password.create(?1)}", &block}
+      define_singleton_method(:maintenance) {|&block| get "/#{SecureRandom.random_bytes 16}", &block}
     end
   else
-    define_singleton_method(:maintenance) {|&block| get "/#{BCrypt::Password.create(?1)}", &block}
+    define_singleton_method(:maintenance) {|&block| get "/#{SecureRandom.random_bytes 16}", &block}
   end
 end

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

@@ -1,15 +1,49 @@
 require 'sinatra'
-class ApplicationController < Sinatra::Base
-  def static(uri, *args)
-    if env['HTTP_VERSION'] == 'HTTP/1.1' and env["REQUEST_METHOD"] != 'GET'
-      status 303
-    else
-      status 302
+module Eucalypt
+  class Static::Router
+    attr_reader :routes
+
+    def initialize(public_folder)
+      @routes = []
+      @public_folder = public_folder
     end
 
-    # According to RFC 2616 section 14.30, "the field value consists of a
-    # single absolute URI"
-    response['Location'] = uri(uri.to_s, settings.absolute_redirects?, settings.prefixed_redirects?)
-    halt(*args)
+    def route(file, aliases: [])
+      raise ArgumentError.new("Invalid argument #{file} for 'file' - Expected string (file path with preceding /)") unless file.is_a?(String) && file.start_with?('/')
+      location = File.join @public_folder, file.sub('/', '')
+      raise ArgumentError.new("Invalid argument #{file} for 'file' - File \"#{location}\" doesn't exist") unless File.file? location
+      raise ArgumentError.new("Invalid keyword argument #{aliases} for 'aliases' - Expected Array of String") unless aliases.is_a?(Array) && aliases.all?{|a| a.is_a? String}
+      raise ArgumentError.new("Invalid keyword argument #{aliases} for 'aliases' - Expected Array of route names (preceded by /)") unless aliases.all?{|a| a.start_with? '/'}
+      @routes << {file: file, aliases: aliases}
+    end
+
+    alias_method :<<, :route
+  end
+end
+
+class ApplicationController < Sinatra::Base
+  set :static_router, ->{ Eucalypt::Static::Router.new settings.public_folder }
+
+  def self.static(file = nil, aliases: [])
+    if settings.static_router.is_a? Eucalypt::Static::Router
+      if block_given?
+        yield settings.static_router
+        settings.static_router.routes.each do |route|
+          route.values.flatten.each do |path|
+            get(path) { send_file File.join(settings.public_folder, route[:file].sub('/','')) }
+          end
+        end
+      else
+        if file && aliases
+          raise ArgumentError.new("Invalid argument #{file} for 'file' - Expected string (file path with preceding /)") unless file.is_a?(String) && file.start_with?('/')
+          location = File.join settings.public_folder, file.sub('/', '')
+          raise ArgumentError.new("Invalid argument #{file} for 'file' - File \"#{location}\" doesn't exist") unless File.file? location
+          raise ArgumentError.new("Invalid keyword argument #{aliases} for 'aliases' - Expected Array of String") unless aliases.is_a?(Array) && aliases.all?{|a| a.is_a? String}
+          raise ArgumentError.new("Invalid keyword argument #{aliases} for 'aliases' - Expected Array of route names (preceded by /)") unless aliases.all?{|a| a.start_with? '/'}
+          routes = [file] + aliases
+          routes.each {|path| get(path){send_file location} }
+        end
+      end
+    end
   end
 end

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

@@ -7,7 +7,7 @@ gem 'rake', '~> 12.3'
 gem 'thin', '~> 1.7'
 
 # Test environment
-group :test, :production do
+group :test do
   gem 'rack-test', '~> 1.0', require: 'rack/test'
   gem 'rspec', '~> 3.7'
   gem 'shoulda-matchers', '~> 3.1'

data/lib/eucalypt/core/templates/eucalypt/app/controllers/application_controller.rb

@@ -1,8 +1,10 @@
 class ApplicationController < Sinatra::Base
   helpers ApplicationHelper if defined? ApplicationHelper
 
+  static '/maintenance.html', aliases: %w[/maintenance]
+
   maintenance do
-    static '/maintenance.html'
+    redirect '/maintenance'
   end
 
   get '/' do

data/lib/eucalypt/core/templates/eucalypt/app.rb

@@ -9,11 +9,10 @@ class ApplicationController < Sinatra::Base
   set :app_file, __FILE__
 
   # Set public folder for static files
-  set :public_folder, Eucalypt.path('app', 'static')
+  set :public_folder, Eucalypt.path('app', 'static', 'public')
 
-  # Allow static files to be served
-  set :static, true
-  ::Static = Eucalypt::Static.new(settings.public_folder, symbolize: true).freeze
+  # Set static data accessor
+  ::Static = Eucalypt::Static.new(Eucalypt.path('app', 'static'), symbolize: true).freeze
 
   # Set views directory
   set :views, Eucalypt.path('app', 'views')
@@ -21,9 +20,6 @@ class ApplicationController < Sinatra::Base
   # Set default ERB template
   set :erb, layout: :'layouts/main'
 
-  # Set IP whitelist
-  set :whitelist, Eucalypt::Whitelist.new(Eucalypt.path 'config', 'whitelist')
-
   # Toggle maintenance mode
   disable :maintenance
 

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

@@ -1,13 +1,13 @@
 class ApplicationController < Sinatra::Base
   set :assets, Sprockets::Environment.new
-  assets.append_path Eucalypt.path 'app', 'assets', 'stylesheets'
-  assets.append_path Eucalypt.path 'app', 'assets', 'scripts'
-  assets.append_path Eucalypt.path 'app', 'assets', 'images'
-  assets.append_path Eucalypt.path 'app', 'assets', 'fonts'
 
   assets.css_compressor = :scss
   assets.js_compressor = :uglify
 
+  Eucalypt.glob 'app', 'assets', '*' do |item|
+    assets.append_path item if File.directory? item
+  end
+
   get '/assets/*' do
     env["PATH_INFO"].sub! '/assets', ''
     settings.assets.call env

data/lib/eucalypt/guard.rb

@@ -0,0 +1,7 @@
+class ApplicationController < Sinatra::Base
+  helpers do
+    def guard
+      settings.guard
+    end
+  end
+end

data/lib/eucalypt/load.rb

@@ -2,6 +2,7 @@ Eucalypt.require 'config', '*.rb'
 Eucalypt.require 'config', 'initializers', '*.rb'
 
 require 'eucalypt/core/helpers/maintenance'
+require 'eucalypt/core/helpers/static'
 
 Eucalypt.require 'app', 'helpers', '{application_helper.rb}'
 Eucalypt.require 'app', 'controllers', 'application_controller.rb'

data/lib/eucalypt/version.rb

@@ -1,3 +1,3 @@
 module Eucalypt
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/lib/eucalypt.rb

@@ -12,8 +12,6 @@ require 'eucalypt/root'
 require 'eucalypt/list'
 require 'eucalypt/core/helpers/manifest'
 require 'eucalypt/core/helpers/partial'
-require 'eucalypt/whitelist'
-require 'eucalypt/core/helpers/static'
 
 Eucalypt::CLI.extend Eucalypt::List
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eucalypt
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Edwin Onuonga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-30 00:00:00.000000000 Z
+date: 2019-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: bcrypt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: front_matter_parser
   requirement: !ruby/object:Gem::Requirement
@@ -267,7 +253,7 @@ files:
 - lib/eucalypt/core/templates/eucalypt/app/controllers/application_controller.rb
 - lib/eucalypt/core/templates/eucalypt/app/helpers/application_helper.rb
 - lib/eucalypt/core/templates/eucalypt/app/models/.empty_directory
-- lib/eucalypt/core/templates/eucalypt/app/static/maintenance.html
+- lib/eucalypt/core/templates/eucalypt/app/static/public/maintenance.html
 - lib/eucalypt/core/templates/eucalypt/app/views/index.erb
 - lib/eucalypt/core/templates/eucalypt/app/views/layouts/main.erb
 - lib/eucalypt/core/templates/eucalypt/app/views/partials/.empty_directory
@@ -288,7 +274,6 @@ files:
 - lib/eucalypt/destroy/namespaces/destroy/cli/destroy-scaffold.rb
 - lib/eucalypt/destroy/namespaces/destroy/cli/destroy.rb
 - lib/eucalypt/errors.rb
-- lib/eucalypt/exceptions.rb
 - lib/eucalypt/generate/.gitkeep
 - lib/eucalypt/generate/namespaces/generate-controller/cli/generate-controller.rb
 - lib/eucalypt/generate/namespaces/generate-controller/generators/controller.rb
@@ -306,6 +291,7 @@ files:
 - lib/eucalypt/generate/namespaces/generate-model/templates/model_spec.tt
 - lib/eucalypt/generate/namespaces/generate/cli/generate-scaffold.rb
 - lib/eucalypt/generate/namespaces/generate/cli/generate.rb
+- lib/eucalypt/guard.rb
 - lib/eucalypt/helpers.rb
 - lib/eucalypt/helpers/colorize.rb
 - lib/eucalypt/helpers/gemfile.rb
@@ -373,7 +359,6 @@ files:
 - lib/eucalypt/security/permissions.rb
 - lib/eucalypt/static.rb
 - lib/eucalypt/version.rb
-- lib/eucalypt/whitelist.rb
 homepage: https://eucalypt.gitbook.io/eucalypt
 licenses:
 - MIT

data/lib/eucalypt/exceptions.rb

@@ -1,12 +0,0 @@
-module Eucalypt
-  class NotWhitelistedError < Exception
-    def initialize(ip)
-      super "IP address #{ip} not whitelisted"
-    end
-  end
-  class InvalidSettingTypeError < Exception
-    def initialize(setting, actual, classes)
-      super "!\nInvalid type for setting :#{setting}, got:\n\t#{actual},\nmust be one of:\n\t#{classes}"
-    end
-  end
-end

data/lib/eucalypt/whitelist.rb

@@ -1,70 +0,0 @@
-require 'sinatra'
-require 'bcrypt'
-require_relative 'exceptions'
-module Eucalypt
-  class Whitelist
-    def initialize(file)
-      @file = file
-      File.new(file, "a").close
-      add '::1', '127.0.0.1', '0.0.0.0'
-    end
-
-    def add(*to_add)
-      to_add.flatten.each do |ip|
-        next if include? ip
-        File.open(@file, 'a+') do |f|
-          lines = File.readlines(@file)
-          if lines.empty? || lines.all? {|line| line == "\n"}
-            File.open(@file, 'w') do |f1|
-              f1.write "#{BCrypt::Password.create(ip)}\n"
-            end
-          else
-            prefix = f.read.last == "\n" ? '' : "\n"
-            f.puts prefix + BCrypt::Password.create(ip)
-          end
-        end
-      end
-    end
-
-    def remove(*to_remove)
-      whitelist = []
-      hashed = File.readlines(@file).select{|ip| /\$.*/.match ip}.map(&:strip)
-
-      hashed.each do |ip|
-        if to_remove.flatten.any? {|request| BCrypt::Password.new(ip) == request}
-          next
-        else
-          whitelist << ip unless whitelist.include?(ip)
-        end
-      end
-
-      File.open(@file, 'w') {|f| f.write whitelist*("\n")<<"\n"}
-    end
-
-    def ips()
-      File.readlines(@file).map(&:strip).
-        select{|ip| /\$.*/.match ip}.
-        map {|ip| BCrypt::Password.new ip}
-    end
-
-    def include?(ip)
-      ips.any? {|whitelisted| whitelisted == ip}
-    end
-  end
-end
-
-class ApplicationController < Sinatra::Base
-  helpers do
-    def whitelisted?
-      case settings.whitelist
-      when Eucalypt::Whitelist then settings.whitelist.include?(request.ip)
-      when FalseClass          then true
-      else raise Eucalypt::InvalidSettingTypeError.new(:whitelist, settings.whitelist.class, %w[FalseClass Eucalypt::Whitelist])
-      end
-    end
-
-    def ip_check()
-      raise Eucalypt::NotWhitelistedError.new(request.ip) unless whitelisted?
-    end
-  end
-end