RubyGems - eucalypt - Versions diffs - 0.5.4 → 0.6.0 - Mend

eucalypt 0.5.4 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (30) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 005bbb19c5ac76105fb268b6e1fe702b9578f6662090cdf00216db6d2cd3c176
-  data.tar.gz: e57af71e2008ead2059f97c9d45486d018fdd270fdd1fdecf498e8b4f49405d3
+  metadata.gz: 63a4230316973e6c72642122be340698338ba605203cac4b45d136b67e470831
+  data.tar.gz: e195e28d876bc4f267b2247928dfb1f2989b2221c698c3b1277533505a52583d
 SHA512:
-  metadata.gz: 21fb4ea75dd4ef56019cbf80cabdce84a16bdc7fafa0577af1ebf85fcf9f061836b8d06e7a8045faef63782e62d66450dcfdec5907c7b219059a4af695bc41a5
-  data.tar.gz: 226b4bd5c05bb8d0305ac0a86a79452543676c9a45fd29eb8bab2a0145aeade7bce7b2642102a6b2d1668f2b2f595483cea4cb92949367a3100dd2cf69ab70d9
+  metadata.gz: 98e8356429004cd6c51bf8772cf7fe73ff91f30a5824f851abb81deebaef4b17c47da94106337e49dca1367f122d6e5bd7f3a078a70c0e2ad0fff05f17c1b9f8
+  data.tar.gz: 460de18916f03b34b1fa63f81bdebb8e33619d9937dce312addbfd9cbd8da4efb9ca61beaef892e8025695f76eff17d913e7a7bee065b07491d6403285695533

data/lib/eucalypt/blog/namespaces/blog/templates/controller/controller_spec.tt CHANGED Viewed

@@ -11,7 +11,7 @@ describe BlogController do
   describe 'blog page' do
     it "should display all posts" do
       get '/'
-      expect(true).to be false
+      expect(true).to be true
     end
   end
@@ -22,20 +22,20 @@ describe BlogController do
       before { get "/#{subpath}/#{post[:urltitle]}" }
       it "should have a timestamp" do
-        expect(true).to be false
+        expect(true).to be true
       end
       it "should have a title" do
-        expect(true).to be false
+        expect(true).to be true
       end
       it "should have a description" do
-        expect(true).to be false
+        expect(true).to be true
       end
       it "should have tags" do
         post[:tags].each do |tag|
-          expect(true).to be false
+          expect(true).to be true
         end
       end
     end

data/lib/eucalypt/blog/namespaces/blog/templates/helper/helper_spec.tt CHANGED Viewed

@@ -3,7 +3,7 @@ require_relative '../spec_helper'
 describe BlogHelper do
   include BlogHelper
-  it "should expect true to be false" do
-    expect(true).to be false
+  it 'works' do
+    expect(true).to be true
   end
 end

data/lib/eucalypt/core/helpers/assets.rb ADDED Viewed

@@ -0,0 +1,12 @@
+class ApplicationController < Sinatra::Base
+  set :assets, Sprockets::Environment.new
+  Eucalypt.glob 'app', 'assets', '*' do |item|
+    assets.append_path item if File.directory? item
+  end
+  MainController.get '/assets/*' do
+    env["PATH_INFO"].sub! '/assets', ''
+    settings.assets.call env
+  end
+end

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

@@ -0,0 +1,62 @@
+class MainController < ApplicationController
+  unless self.routes["GET"].map {|r| r.first.to_s}.include?('/')
+    self.get '/' do
+      <<-HEREDOC
+  <html>
+      <head>
+          <style>
+              @import url('https://fonts.googleapis.com/css?family=Alegreya:400,500|Inconsolata:400,700');
+              body {
+                  margin: 0;
+                  height: 100vh;
+                  width: 100vw;
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+              }
+              #container {
+                  display: flex;
+                  align-items: center;
+              }
+              #container img {
+                  display: inline-block;
+                  height: 200px;
+                  padding: 30px;
+              }
+              #text {
+                  display: inline-block;
+              }
+              #text h1 {
+                  font-family: 'Alegreya', serif;
+                  font-size: 2.5em;
+              }
+              #text p {
+                  font-family: 'Inconsolata', monospace;
+                  font-size: 1.5em;
+              }
+              #text p b {
+                  color: rgb(120,120,120);
+                  font-family: 'Inconsolata', monospace;
+                  font-weight: 700;
+              }
+              #text p span {
+                  color: #4ab37b;
+              }
+          </style>
+          <meta name="viewport" content="width=device-width">
+      </head>
+      <body>
+          <div id="container">
+              <img src="https://raw.githubusercontent.com/eucalypt-framework/eucalypt/master/gfx/eucalypt.png">
+              <div id="text">
+                  <h1>It's alive!</h1>
+                  <p><b>Eucalypt version</b> : <span>#{Eucalypt::VERSION}</span></p>
+                  <p><b>Ruby version</b>     : <span>#{RUBY_VERSION}</span></p>
+              </div>
+          </div>
+      </body>
+  </html>
+      HEREDOC
+    end
+  end
+end

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

@@ -1,22 +1,14 @@
-require 'sinatra'
-require 'securerandom'
 class ApplicationController < Sinatra::Base
-  if settings.methods(false).include?(:maintenance)
-    if settings.maintenance
-      define_singleton_method(:maintenance) do |&block|
-        get '*', &block
-        post '*', &block
-        put '*', &block
-        patch '*', &block
-        delete '*', &block
-        options '*', &block
-        link '*', &block
-        unlink '*', &block
+  def self.maintenance(enabled:, &block)
+    if enabled
+      MainController.get '/maintenance', &block
+      Eucalypt.glob('app', 'controllers', '*.rb') do |file|
+        controller = File.basename(file,'.*').camelize.constantize
+        controller.before '*' do
+          splat = params[:splat].reject {|param| /\/assets\/.*/.match? param}
+          redirect '/maintenance' unless splat.include?('/maintenance') || splat.empty?
+        end
       end
-    else
-      define_singleton_method(:maintenance) {|&block| get 3.times.map{"/#{SecureRandom.hex 8}"}.join(), &block}
     end
-  else
-    define_singleton_method(:maintenance) {|&block| get 3.times.map{"/#{SecureRandom.hex 8}"}.join(), &block}
   end
 end

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

@@ -44,4 +44,13 @@ class ApplicationController < Sinatra::Base
       end
     end
   end
+  helpers do
+    def render_static(file)
+      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
+      send_file location
+    end
+  end
 end

data/lib/eucalypt/core/templates/eucalypt/Procfile CHANGED Viewed

	@@ -1 +1 @@
1	- web: ~~bundle exec~~ eucalypt launch production -p $PORT
1	+ web: eucalypt launch production -p $PORT

data/lib/eucalypt/core/templates/eucalypt/app/controllers/main_controller.rb ADDED Viewed

@@ -0,0 +1,8 @@
+class MainController < ApplicationController
+  helpers MainHelper if defined? MainHelper
+  # Add your main application routes here, like:
+  #
+  # get '/' do
+  #  erb :index
+  # end
+end

data/lib/eucalypt/core/templates/eucalypt/app/helpers/application_helper.rb CHANGED Viewed

@@ -1,3 +1,4 @@
 module ApplicationHelper
   # Add your helper methods here...
+  # NOTE: These methods will be accessible by every controller
 end

data/lib/eucalypt/core/templates/eucalypt/app/helpers/main_helper.rb ADDED Viewed

@@ -0,0 +1,3 @@
+module MainHelper
+  # Add your helper methods here...
+end

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

@@ -20,11 +20,14 @@ class ApplicationController < Sinatra::Base
   # Set default ERB template
   set :erb, layout: :'layouts/main'
-  # Toggle maintenance mode
-  disable :maintenance
   # Set Hanami HTML and asset helpers
   helpers Hanami::Helpers, Hanami::Assets::Helpers
+  # Load controllers and other application files
   require 'eucalypt/load'
+  # Set maintenance route
+  maintenance enabled: false do
+    render_static '/maintenance.html'
+  end
 end

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

@@ -1,15 +1,4 @@
 class ApplicationController < Sinatra::Base
-  set :assets, Sprockets::Environment.new
   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
-  end
 end

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

@@ -5,12 +5,12 @@ class ApplicationController < Sinatra::Base
   end
   configure :development do
-    enable :logging
+    set :logging, Lumberjack::Severity::DEBUG
     disable :log_file
   end
   configure :production do
-    set :logging, Lumberjack::Severity::UNKNOWN
+    enable :logging
     enable :log_file
   end

data/lib/eucalypt/core/templates/eucalypt/config.ru CHANGED Viewed

@@ -2,9 +2,9 @@ require_relative 'app'
 Eucalypt.glob('app', 'controllers', '*.rb').each do |file|
   controller_name = File.basename(file,'.*').camelize
-  next if controller_name == 'ApplicationController'
+  next if controller_name == 'MainController'
   controller = controller_name.constantize
   map(controller.router) { run controller }
 end
-map('/') { run ApplicationController }
+map('/') { run MainController }

data/lib/eucalypt/core/templates/eucalypt/spec/controllers/main_controller_spec.rb ADDED Viewed

@@ -0,0 +1,9 @@
+require_relative '../spec_helper'
+describe MainController do
+  def app() MainController end
+  it 'works' do
+    expect(true).to be true
+  end
+end

data/lib/eucalypt/core/templates/eucalypt/spec/helpers/application_helper_spec.rb CHANGED Viewed

@@ -3,7 +3,7 @@ require_relative '../spec_helper'
 describe ApplicationHelper do
   include ApplicationHelper
-  it "should expect true to be false" do
-    expect(true).to be false
+  it 'works' do
+    expect(true).to be true
   end
 end

data/lib/eucalypt/core/templates/eucalypt/spec/helpers/main_helper_spec.rb ADDED Viewed

@@ -0,0 +1,9 @@
+require_relative '../spec_helper'
+describe MainHelper do
+  include MainHelper
+  it 'works' do
+    expect(true).to be true
+  end
+end

data/lib/eucalypt/destroy/helpers.rb CHANGED Viewed

@@ -13,7 +13,7 @@ module Eucalypt
         directory = File.expand_path('.')
         if Eucalypt.app? directory
           files = Dir[File.join directory, 'app', "#{mvc_file}s", '*.rb']
-          file_names = files.map{|c| File.basename(c).split(?_).first}.reject{|n| n=='application'}
+          file_names = files.map{|c| File.basename(c).split(?_).first}.reject{|n| n == 'main' }
           if files.empty?
             Eucalypt::Error.no_mvc(mvc_file)
@@ -28,13 +28,13 @@ module Eucalypt
             file_name = mvc_file == :model ? "#{name}.rb" : "#{name}_#{mvc_file}.rb"
             spec_file_name = mvc_file == :model ? "#{name}_spec.rb" : "#{name}_#{mvc_file}_spec.rb"
-            unless file_names.include? file_name
+            unless file_names.include? name
               Eucalypt::Error.no_mvc(mvc_file)
               return
             end
           else
             # If name not given
-            files = Dir[File.join directory, 'app', "#{mvc_file}s", "*.rb"].reject{|f| File.basename(f).include? 'application'}
+            files = Dir[File.join directory, 'app', "#{mvc_file}s", "*.rb"].reject{|f| File.basename(f) == 'main_controller.rb' }
             if files.empty?
               Eucalypt::Error.no_mvc(mvc_file)
               return

data/lib/eucalypt/destroy/namespaces/destroy/cli/destroy-scaffold.rb CHANGED Viewed

@@ -17,7 +17,7 @@ module Eucalypt
           File.basename(f).split(?_).first.split(?.).first
         end
-        scaffolds.reject!{|f|f == 'application'}
+        scaffolds.reject!{|f|f == 'main'}
         scaffolds.uniq!
         if scaffolds.empty?

data/lib/eucalypt/generate/namespaces/generate-controller/templates/controller_spec.tt CHANGED Viewed

@@ -3,7 +3,7 @@ require_relative '../spec_helper'
 describe <%= config[:class_name] %> do
   def app() <%= config[:class_name] %> end
-  it "should expect true to be false" do
-    expect(true).to be false
+  it 'works' do
+    expect(true).to be true
   end
 end

data/lib/eucalypt/generate/namespaces/generate-helper/templates/helper_spec.tt CHANGED Viewed

@@ -3,7 +3,7 @@ require_relative '../spec_helper'
 describe <%= config[:class_name] %> do
   include <%= config[:class_name] %>
-  it "should expect true to be false" do
-    expect(true).to be false
+  it 'works' do
+    expect(true).to be true
   end
 end

data/lib/eucalypt/generate/namespaces/generate-model/templates/model_spec.tt CHANGED Viewed

@@ -2,7 +2,7 @@ require_relative '../spec_helper'
 describe <%= config[:class_name] %>, type: :model do
-  it "should expect true to be false" do
-    expect(true).to be false
+  it 'works' do
+    expect(true).to be true
   end
 end

data/lib/eucalypt/load.rb CHANGED Viewed

@@ -1,12 +1,18 @@
+class MainController < ApplicationController; end
+require 'eucalypt/core/helpers/assets'
 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'
+ApplicationController.helpers ApplicationHelper if defined? ApplicationHelper
+Eucalypt.require 'app', 'helpers', '{main_helper.rb}'
+Eucalypt.require 'app', 'controllers', 'main_controller.rb'
 Eucalypt.require 'app', '{models}', '{roles}', '*.rb'
 Eucalypt.require 'app', '{models,policies,helpers,controllers}', '*.rb'
-require 'eucalypt/security/permissions'
+require 'eucalypt/security/permissions'
+require 'eucalypt/core/helpers/default_index'
+require 'eucalypt/core/helpers/maintenance'

data/lib/eucalypt/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Eucalypt
-  VERSION = '0.5.4'
+  VERSION = '0.6.0'
 end

data/lib/eucalypt.rb CHANGED Viewed

@@ -15,5 +15,4 @@ require 'eucalypt/core/helpers/partial'
 Eucalypt::CLI.extend Eucalypt::List
-class ApplicationController < Sinatra::Base; end
 def app() ApplicationController end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eucalypt
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Edwin Onuonga
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -233,6 +233,8 @@ files:
 - lib/eucalypt/core/cli/rake.rb
 - lib/eucalypt/core/cli/test.rb
 - lib/eucalypt/core/cli/version.rb
+- lib/eucalypt/core/helpers/assets.rb
+- lib/eucalypt/core/helpers/default_index.rb
 - lib/eucalypt/core/helpers/logging.rb
 - lib/eucalypt/core/helpers/maintenance.rb
 - lib/eucalypt/core/helpers/manifest.rb
@@ -250,8 +252,9 @@ files:
 - lib/eucalypt/core/templates/eucalypt/app/assets/stylesheets/__partials__.scss
 - lib/eucalypt/core/templates/eucalypt/app/assets/stylesheets/application.scss
 - lib/eucalypt/core/templates/eucalypt/app/assets/stylesheets/partials/_mixins.scss
-- lib/eucalypt/core/templates/eucalypt/app/controllers/application_controller.rb
+- lib/eucalypt/core/templates/eucalypt/app/controllers/main_controller.rb
 - lib/eucalypt/core/templates/eucalypt/app/helpers/application_helper.rb
+- lib/eucalypt/core/templates/eucalypt/app/helpers/main_helper.rb
 - lib/eucalypt/core/templates/eucalypt/app/models/.empty_directory
 - lib/eucalypt/core/templates/eucalypt/app/static/public/maintenance.html
 - lib/eucalypt/core/templates/eucalypt/app/views/index.erb
@@ -263,8 +266,9 @@ files:
 - lib/eucalypt/core/templates/eucalypt/config/initializers/.empty_directory
 - lib/eucalypt/core/templates/eucalypt/config/logging.rb
 - lib/eucalypt/core/templates/eucalypt/logs/.empty_directory
-- lib/eucalypt/core/templates/eucalypt/spec/controllers/application_controller_spec.rb
+- lib/eucalypt/core/templates/eucalypt/spec/controllers/main_controller_spec.rb
 - lib/eucalypt/core/templates/eucalypt/spec/helpers/application_helper_spec.rb
+- lib/eucalypt/core/templates/eucalypt/spec/helpers/main_helper_spec.rb
 - lib/eucalypt/core/templates/eucalypt/spec/models/.empty_directory
 - lib/eucalypt/core/templates/eucalypt/spec/spec_helper.rb
 - lib/eucalypt/destroy/helpers.rb
@@ -291,7 +295,6 @@ 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

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

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

data/lib/eucalypt/core/templates/eucalypt/spec/controllers/application_controller_spec.rb DELETED Viewed

@@ -1,9 +0,0 @@
-require_relative '../spec_helper'
-describe ApplicationController do
-  def app() ApplicationController end
-  it "should expect true to be false" do
-    expect(true).to be false
-  end
-end

data/lib/eucalypt/guard.rb DELETED Viewed

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