eucalypt 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 419ec8d7308501fc42963e6cd81b193bdf527246286a85c0611b2a1bcd7bc6a3
-  data.tar.gz: f1a6de0bbd6d6df1083a686ac9c641d37723fd1f59620ae40b0e327c89742849
+  metadata.gz: 54fd8995c7242de470b93565d009d8cb1d060c803f028a4ee31002189bd09dbe
+  data.tar.gz: 20caf73b8bef6a241689ccc6b17a4a575cebe8d98d3f29f03d33d441d03c5bf1
 SHA512:
-  metadata.gz: f25b0fba832f8f1afc6c19ad21ba140acb08ba419f0e78c238b89dab606885184a9f26ff486d35fa8009eeedadaf87f34ec681fbadcb2964228d2d1d754dc3ae
-  data.tar.gz: 3e0ba7c329b06870f210520d389d878b86c8d34f82554cc2ee73a32719638af3a2ad58e93da09642ee91dce96c80664cd26197852c120c6c565548935185a305
+  metadata.gz: a84f7047d5a21dab87c48f69d32bb9b162b732b84006b35ad4ccb25f7a63587d2a96ebd4c03186641890985dee9dc067f16e72b1d9b469f992599bd6ba8e9f74
+  data.tar.gz: 36ce133a9c5535c3ff90352de8167846c731d79c5e4c03afd03c9b1629f5ed3cdf4d3e67904a0cf24fb3850ce061dcaee28524bca5f4c9bf4cc9bbe667f4d5b2

data/eucalypt.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activerecord", "~> 5.2"
   spec.add_runtime_dependency "front_matter_parser", "0.2.0"
   spec.add_runtime_dependency "thor", "~> 0.20"
-  spec.add_runtime_dependency "sinatra", "~> 2.0"
+  spec.add_runtime_dependency "sinatra", "~> 2.0", ">= 2.0.4"
   spec.add_runtime_dependency "rerun", "~> 0.13"
 
   spec.metadata = {

data/lib/eucalypt/blog/namespaces/blog/generators/views.rb

@@ -4,7 +4,7 @@ module Eucalypt
   module Generators
     class Blog < Thor::Group
       def views
-        config = {erb: ["<%= application :css, :js %>","<%= yield %>"]}
+        config = {erb: ["<%= manifest :stylesheet, :script %>","<%= yield %>"]}
         template File.join('views','article_layout.erb'), File.join('app','views','layouts','blog','article.erb'), config
         template File.join('views','articles_layout.erb'), File.join('app','views','layouts','blog','articles.erb'), config
 

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

@@ -3,4 +3,5 @@ require_relative 'launch'
 require_relative 'console'
 require_relative 'test'
 require_relative 'version'
-require_relative 'help'
+require_relative 'help'
+require_relative 'rake'

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

@@ -0,0 +1,15 @@
+require_relative '__base__'
+module Eucalypt
+  class CLI < Thor
+    using Colorize
+    desc "rake", "Run all database migrations".colorize(:grey)
+    def rake
+      directory = File.expand_path('.')
+      if Eucalypt.app? directory
+        exec "bundle exec rake db:migrate"
+      else
+        Eucalypt::Error.wrong_directory
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+require 'sinatra'
+class ApplicationController < Sinatra::Base
+  # Application manifest file accessor method
+  helpers do
+    def manifest(*args)
+      html = String.new
+      args.map(&:to_sym).each do |arg|
+        html << %{<link href="/assets/application.css" type="text/css" rel="stylesheet">} if arg == :stylesheet
+        html << %{<script src="/assets/application.js" type="text/javascript"></script>} if arg == :script
+      end
+      html
+    rescue
+      raise ArgumentError.new "Expected arguments to be any of: [stylesheet, script]"
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+require 'sinatra'
+class ApplicationController < Sinatra::Base
+  helpers do
+    def partial(template, **locals)
+      erb template.to_sym, layout: false, locals: locals
+    end
+  end
+end

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

@@ -1,14 +1,9 @@
 source 'https://rubygems.org'
 
-# Bundler
 gem 'bundler', '~> 1.16'
-# Sinatra DSL
-gem 'sinatra', '~> 2.0', require: 'sinatra/base'
-# Eucalypt CLI
+gem 'sinatra', '~> 2.0', '>= 2.0.4', require: 'sinatra/base'
 gem 'eucalypt', '<%= config[:version] %>'
-# Rake
 gem 'rake', '~> 12.3'
-# Server
 gem 'thin', '~> 1.7'
 
 # Test environment

data/lib/eucalypt/core/templates/eucalypt/app/assets/scripts/application.js

@@ -3,8 +3,8 @@
  * All of these Javascript files will be compiled into a single Javascript file.                *
  * To use this combined file, include the following in the head section of your views:          *
  *                                                                                              *
- * <%= application :js %>            If including only application.js                           *
- * <%= application :css, :js %>      If including application.css as well                       *
+ * <%= manifest :script %>                   If including only application.js                   *
+ * <%= manifest :stylesheet, :script %>      If including application.css as well               *
  *                                                                                              *
  * By default, every file in the /assets/scripts directory is required by `require_tree .`      *
  * However, you may remove the `require_tree .` directive and instead specify individual files. *

data/lib/eucalypt/core/templates/eucalypt/app/assets/stylesheets/application.scss

@@ -3,8 +3,8 @@
  * All of these stylesheet files will be compiled into a single stylesheet.                     *
  * To use this combined stylesheet, include the following in the head section of your views:    *
  *                                                                                              *
- * <%= application :css %>           If including only application.css                          *
- * <%= application :css, :js %>      If including application.js as well                        *
+ * <%= manifest :stylesheet %>               If including only application.css                  *
+ * <%= manifest :stylesheet, :script %>      If including application.js as well                *
  *                                                                                              *
  * By default, every file in the /assets/stylesheets directory is required by `require_tree .`  *
  * However, you may remove the `require_tree .` directive and instead specify individual files. *

data/lib/eucalypt/core/templates/eucalypt/app/views/layouts/main.erb

@@ -1,7 +1,7 @@
 <html>
     <head>
         <title></title>
-        <%= application :css, :js %>
+        <%= manifest :stylesheet, :script %>
     </head>
     <body>
         <%= yield %>

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

@@ -1,5 +1,7 @@
 require 'bundler'
-Bundler.require :default
+require 'active_support/core_ext/hash'
+require 'sinatra'
+Bundler.require :default, settings.environment
 Eucalypt.set_root __dir__
 
 Static = Eucalypt::Static.new(Eucalypt.path('app', 'static'), symbolize: true).freeze

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

@@ -1,7 +1,9 @@
+require 'fileutils'
 class ApplicationController < Sinatra::Base
   set :logger, Lumberjack::Logger.new
+  helpers { def logger() settings.logger end }
 
-  require 'fileutils'
+  #= General logging =#
   %i[production test].each do |e|
     configure e do
       use Rack::CommonLogger, $stdout
@@ -9,19 +11,14 @@ class ApplicationController < Sinatra::Base
       log_path = Eucalypt.path 'log', Time.now.strftime("%Y-%m-%dT%H-%M-%S_%z").sub(/_\+/, ?p).sub(/_\-/, ?m)
       FileUtils.mkdir_p log_path
 
-      # STDERR logger
       $stderr.reopen File.new(File.join(log_path, "#{e}.stderr.log"), 'a+')
       $stderr.sync = true
-
-      # STDOUT logger
       $stdout.reopen File.new(File.join(log_path, "#{e}.stdout.log"), 'a+')
       $stdout.sync = true
     end
   end
 
-  helpers do
-    def logger
-      settings.logger
-    end
-  end
+  #= ActiveRecord logging =#
+  ActiveRecord::Base.logger = Logger.new STDOUT
+  ActiveRecord::Migration.verbose = true # Set to false for quieter logging
 end

data/lib/eucalypt/security/namespaces/security-pundit/cli/security-pundit.rb

@@ -64,7 +64,7 @@ module Eucalypt
           inject_into_file(user_model_file, insert, before: /^end/) unless contents.include? insert
         end
 
-        Out.info "Ensure you run `#{'rake db:migrate'.colorize(:bold)}` to create the necessary tables for Pundit."
+        Out.info "Ensure you run `#{'eucalypt rake'.colorize(:bold)}` to create the necessary tables for Pundit."
       else
         Eucalypt::Error.wrong_directory
       end

data/lib/eucalypt/security/namespaces/security-warden/cli/security-warden.rb

@@ -64,7 +64,7 @@ module Eucalypt
           auth_controller.generate
         end
 
-        Out.info "Ensure you run `#{'rake db:migrate'.colorize(:bold)}` to create the necessary tables for Warden."
+        Out.info "Ensure you run `#{'eucalypt rake'.colorize(:bold)}` to create the necessary tables for Warden."
       else
         Eucalypt::Error.wrong_directory
       end

data/lib/eucalypt/version.rb

@@ -1,3 +1,3 @@
 module Eucalypt
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/lib/eucalypt.rb

@@ -10,5 +10,7 @@ require 'eucalypt/controller'
 require 'eucalypt/app'
 require 'eucalypt/root'
 require 'eucalypt/list'
+require 'eucalypt/core/helpers/manifest'
+require 'eucalypt/core/helpers/partial'
 
 Eucalypt::CLI.extend Eucalypt::List

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eucalypt
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Edwin Onuonga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,6 +157,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -164,6 +167,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: rerun
   requirement: !ruby/object:Gem::Requirement
@@ -224,8 +230,11 @@ files:
 - lib/eucalypt/core/cli/help.rb
 - lib/eucalypt/core/cli/init.rb
 - lib/eucalypt/core/cli/launch.rb
+- lib/eucalypt/core/cli/rake.rb
 - lib/eucalypt/core/cli/test.rb
 - lib/eucalypt/core/cli/version.rb
+- lib/eucalypt/core/helpers/manifest.rb
+- lib/eucalypt/core/helpers/partial.rb
 - lib/eucalypt/core/templates/Gemfile.tt
 - lib/eucalypt/core/templates/eucalypt/.gitignore
 - lib/eucalypt/core/templates/eucalypt/.travis.yml
@@ -246,12 +255,10 @@ files:
 - lib/eucalypt/core/templates/eucalypt/app/views/layouts/main.erb
 - lib/eucalypt/core/templates/eucalypt/app/views/partials/.empty_directory
 - lib/eucalypt/core/templates/eucalypt/config.ru
-- lib/eucalypt/core/templates/eucalypt/config/active_record.rb
 - lib/eucalypt/core/templates/eucalypt/config/asset_pipeline.rb
 - lib/eucalypt/core/templates/eucalypt/config/database.yml
 - lib/eucalypt/core/templates/eucalypt/config/initializers/.empty_directory
 - lib/eucalypt/core/templates/eucalypt/config/logging.rb
-- lib/eucalypt/core/templates/eucalypt/config/manifest.rb
 - lib/eucalypt/core/templates/eucalypt/log/.empty_directory
 - lib/eucalypt/core/templates/eucalypt/spec/controllers/application_controller_spec.rb
 - lib/eucalypt/core/templates/eucalypt/spec/helpers/application_helper_spec.rb
@@ -367,7 +374,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Micro-framework and CLI wrapped around the Sinatra DSL.

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

@@ -1,5 +0,0 @@
-class ApplicationController < Sinatra::Base
-  # Comment or remove the below lines for no logging
-  ActiveRecord::Base.logger = Logger.new STDOUT
-  ActiveRecord::Migration.verbose = true
-end

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

@@ -1,15 +0,0 @@
-class ApplicationController < Sinatra::Base
-  # Application manifest file accessor method
-  helpers do
-    def application(*args)
-      html = String.new
-      args.map(&:to_sym).each do |arg|
-        html << stylesheet('application') if %i[css stylesheet].include? arg
-        html << javascript('application') if %i[js javascript].include? arg
-      end
-      html
-    rescue
-      raise ArgumentError.new "Expected arguments to be any of: #{css+js}"
-    end
-  end
-end