lotusrb 0.5.0 → 0.6.0

data/lib/lotus/frameworks.rb

@@ -5,6 +5,7 @@ require 'lotus/action/glue'
 require 'lotus/action/csrf_protection'
 require 'lotus/mailer'
 require 'lotus/mailer/glue'
+require 'lotus/assets'
 
 Lotus::Controller.configure do
   prepare do

data/lib/lotus/generators/action/action_spec.minitest.tt

@@ -5,7 +5,7 @@ describe <%= config[:app] %>::Controllers::<%= config[:controller] %>::<%= confi
   let(:action) { <%= config[:app] %>::Controllers::<%= config[:controller] %>::<%= config[:action] %>.new }
   let(:params) { Hash[] }
 
-  it "is successful" do
+  it 'is successful' do
     response = action.call(params)
     response[0].must_equal 200
   end

data/lib/lotus/generators/action/action_spec.rspec.tt

@@ -1,6 +1,6 @@
 require_relative '<%= config[:relative_action_path] %>'
 
-describe <%= config[:app] %>::Controllers::<%= config[:controller] %>::<%= config[:action] %> do
+RSpec.describe <%= config[:app] %>::Controllers::<%= config[:controller] %>::<%= config[:action] %> do
   let(:action) { described_class.new }
   let(:params) { Hash[] }
 

data/lib/lotus/generators/action/view_spec.minitest.tt

@@ -7,7 +7,7 @@ describe <%= config[:app] %>::Views::<%= config[:controller] %>::<%= config[:act
   let(:view)      { <%= config[:app] %>::Views::<%= config[:controller] %>::<%= config[:action] %>.new(template, exposures) }
   let(:rendered)  { view.render }
 
-  it "exposes #foo" do
+  it 'exposes #foo' do
     view.foo.must_equal exposures.fetch(:foo)
   end
 end

data/lib/lotus/generators/action/view_spec.rspec.tt

@@ -1,6 +1,6 @@
 require_relative '<%= config[:relative_view_path] %>'
 
-describe <%= config[:app] %>::Views::<%= config[:controller] %>::<%= config[:action] %> do
+RSpec.describe <%= config[:app] %>::Views::<%= config[:controller] %>::<%= config[:action] %> do
   let(:exposures) { Hash[foo: 'bar'] }
   let(:template)  { Lotus::View::Template.new('<%= config[:template_path] %>') }
   let(:view)      { described_class.new(template, exposures) }

data/lib/lotus/generators/{slice → app}/application.rb.tt

@@ -1,6 +1,7 @@
 require 'lotus/helpers'
+require 'lotus/assets'
 
-module <%= config[:classified_slice_name] %>
+module <%= config[:classified_app_name] %>
   class Application < Lotus::Application
     configure do
       ##
@@ -73,7 +74,7 @@ module <%= config[:classified_slice_name] %>
       #
       # See: http://www.rubydoc.info/gems/rack/Rack/Session/Cookie
       #
-      # sessions :cookie, secret: ENV['<%= config[:upcase_slice_name] %>_SESSIONS_SECRET']
+      # sessions :cookie, secret: ENV['<%= config[:upcase_app_name] %>_SESSIONS_SECRET']
 
       # Configure Rack middleware for this application
       #
@@ -107,7 +108,7 @@ module <%= config[:classified_slice_name] %>
 
       # The layout to be used by all views
       #
-      layout :application # It will load <%= config[:classified_slice_name] %>::Views::ApplicationLayout
+      layout :application # It will load <%= config[:classified_app_name] %>::Views::ApplicationLayout
 
       # The relative path to templates
       #
@@ -116,18 +117,40 @@ module <%= config[:classified_slice_name] %>
       ##
       # ASSETS
       #
-
-      # Specify sources for assets
-      # The directory `public/` is added by default
-      #
-      # assets << [
-      #   'vendor/javascripts'
-      # ]
-
-      # Enabling serving assets
-      # Defaults to false
-      #
-      # serve_assets false
+      assets do
+        # JavaScript compressor
+        #
+        # Supported engines:
+        #
+        #   * :builtin
+        #   * :uglifier
+        #   * :yui
+        #   * :closure
+        #
+        # See: http://lotusrb.org/guides/assets/compressors
+        #
+        # In order to skip JavaScript compression comment the following line
+        javascript_compressor :builtin
+
+        # Stylesheet compressor
+        #
+        # Supported engines:
+        #
+        #   * :builtin
+        #   * :yui
+        #   * :sass
+        #
+        # See: http://lotusrb.org/guides/assets/compressors
+        #
+        # In order to skip stylesheet compression comment the following line
+        stylesheet_compressor :builtin
+
+        # Specify sources for assets
+        #
+        sources << [
+          'assets'
+        ]
+      end
 
       ##
       # SECURITY
@@ -183,7 +206,7 @@ module <%= config[:classified_slice_name] %>
       # FRAMEWORKS
       #
 
-      # Configure the code that will yield each time <%= config[:classified_slice_name] %>::Action is included
+      # Configure the code that will yield each time <%= config[:classified_app_name] %>::Action is included
       # This is useful for sharing common functionality
       #
       # See: http://www.rubydoc.info/gems/lotus-controller#Configuration
@@ -192,12 +215,13 @@ module <%= config[:classified_slice_name] %>
         # before :authenticate!    # run an authentication before callback
       end
 
-      # Configure the code that will yield each time <%= config[:classified_slice_name] %>::View is included
+      # Configure the code that will yield each time <%= config[:classified_app_name] %>::View is included
       # This is useful for sharing common functionality
       #
       # See: http://www.rubydoc.info/gems/lotus-view#Configuration
       view.prepare do
         include Lotus::Helpers
+        include <%= config[:classified_app_name] %>::Assets::Helpers
       end
     end
 
@@ -207,9 +231,6 @@ module <%= config[:classified_slice_name] %>
     configure :development do
       # Don't handle exceptions, render the stack trace
       handle_exceptions false
-
-      # Serve static assets during development
-      serve_assets      true
     end
 
     ##
@@ -218,9 +239,6 @@ module <%= config[:classified_slice_name] %>
     configure :test do
       # Don't handle exceptions, render the stack trace
       handle_exceptions false
-
-      # Serve static assets during development
-      serve_assets      true
     end
 
     ##
@@ -230,6 +248,26 @@ module <%= config[:classified_slice_name] %>
       # scheme 'https'
       # host   'example.org'
       # port   443
+
+      assets do
+        # Don't compile static assets in production mode (eg. Sass, ES6)
+        #
+        # See: http://www.rubydoc.info/gems/lotus-assets#Configuration
+        compile false
+
+        # Use digest file name for asset paths
+        #
+        # See: http://lotusrb.org/guides/assets/digest
+        digest  true
+
+        # Content Delivery Network (CDN)
+        #
+        # See: http://lotusrb.org/guides/assets/content-delivery-network
+        #
+        # scheme 'https'
+        # host   'cdn.example.org'
+        # port   443
+      end
     end
   end
 end

data/lib/lotus/generators/{slice → app}/templates/application.html.erb.tt

@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= config[:classified_slice_name] %></title>
+    <title><%= config[:classified_app_name] %></title>
+    <%%= favicon %>
   </head>
   <body>
     <%%= yield %>

data/lib/lotus/generators/app/views/application_layout.rb.tt

@@ -0,0 +1,7 @@
+module <%= config[:classified_app_name] %>
+  module Views
+    class ApplicationLayout
+      include <%= config[:classified_app_name] %>::Layout
+    end
+  end
+end

data/lib/lotus/generators/application/app/.env.development.tt

@@ -1,3 +1,4 @@
 # Define ENV variables for development environment
 <%= config[:upcase_app_name] %>_DATABASE_URL="<%= config[:database_config][:uri][:development] %>"
 <%= config[:upcase_app_name] %>_SESSIONS_SECRET="<%= SecureRandom.hex(32) %>"
+SERVE_STATIC_ASSETS="true"

data/lib/lotus/generators/application/app/.env.test.tt

@@ -1,3 +1,4 @@
 # Define ENV variables for test environment
 <%= config[:app_name].to_env_s %>_DATABASE_URL="<%= config[:database_config][:uri][:test] %>"
 <%= config[:upcase_app_name] %>_SESSIONS_SECRET="<%= SecureRandom.hex(32) %>"
+SERVE_STATIC_ASSETS="true"

data/lib/lotus/generators/application/app/Gemfile.tt

@@ -12,6 +12,7 @@ gem 'lotus-controller',  require: false, github: 'lotus/controller'
 gem 'lotus-view',        require: false, github: 'lotus/view'
 gem 'lotus-model',       require: false, github: 'lotus/model'
 gem 'lotus-mailer',      require: false, github: 'lotus/mailer'
+gem 'lotus-assets',      require: false, github: 'lotus/assets'
 gem 'lotusrb',                           github: 'lotus/lotus'
 <%- else -%>
 gem 'lotusrb',       '<%= Lotus::VERSION %>'

data/lib/lotus/generators/application/app/Rakefile.minitest.tt

@@ -1,4 +1,5 @@
 require 'rake'
+require 'lotus/rake_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|

data/lib/lotus/generators/application/app/Rakefile.rspec.tt

@@ -1,4 +1,5 @@
 require 'rake'
+require 'lotus/rake_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)

data/lib/lotus/generators/application/app/config/application.rb.tt

@@ -1,4 +1,5 @@
 require 'lotus/helpers'
+require 'lotus/assets'
 
 module <%= config[:classified_app_name] %>
   class Application < Lotus::Application
@@ -113,18 +114,40 @@ module <%= config[:classified_app_name] %>
       ##
       # ASSETS
       #
-
-      # Specify sources for assets
-      # The directory `public/` is added by default
-      #
-      # assets << [
-      #   'vendor/javascripts'
-      # ]
-
-      # Enabling serving assets
-      # Defaults to false
-      #
-      # serve_assets false
+      assets do
+        # JavaScript compressor
+        #
+        # Supported engines:
+        #
+        #   * :builtin
+        #   * :uglifier
+        #   * :yui
+        #   * :closure
+        #
+        # See: http://lotusrb.org/guides/assets/compressors
+        #
+        # In order to skip JavaScript compression comment the following line
+        javascript_compressor :builtin
+
+        # Stylesheet compressor
+        #
+        # Supported engines:
+        #
+        #   * :builtin
+        #   * :yui
+        #   * :sass
+        #
+        # See: http://lotusrb.org/guides/assets/compressors
+        #
+        # In order to skip stylesheet compression comment the following line
+        stylesheet_compressor :builtin
+
+        # Specify sources for assets
+        #
+        sources << [
+          'app/assets'
+        ]
+      end
 
       ##
       # SECURITY
@@ -195,6 +218,7 @@ module <%= config[:classified_app_name] %>
       # See: http://www.rubydoc.info/gems/lotus-view#Configuration
       view.prepare do
         include Lotus::Helpers
+        include <%= config[:classified_app_name] %>::Assets::Helpers
       end
     end
 
@@ -204,9 +228,6 @@ module <%= config[:classified_app_name] %>
     configure :development do
       # Don't handle exceptions, render the stack trace
       handle_exceptions false
-
-      # Serve static assets during development
-      serve_assets      true
     end
 
     ##
@@ -215,9 +236,6 @@ module <%= config[:classified_app_name] %>
     configure :test do
       # Don't handle exceptions, render the stack trace
       handle_exceptions false
-
-      # Serve static assets during development
-      serve_assets      true
     end
 
     ##
@@ -227,6 +245,26 @@ module <%= config[:classified_app_name] %>
       # scheme 'https'
       # host   'example.org'
       # port   443
+
+      assets do
+        # Don't compile static assets in production mode (eg. Sass, ES6)
+        #
+        # See: http://www.rubydoc.info/gems/lotus-assets#Configuration
+        compile false
+
+        # Use digest file name for asset paths
+        #
+        # See: http://lotusrb.org/guides/assets/digest
+        digest  true
+
+        # Content Delivery Network (CDN)
+        #
+        # See: http://lotusrb.org/guides/assets/content-delivery-network
+        #
+        # scheme 'https'
+        # host   'cdn.example.org'
+        # port   443
+      end
     end
   end
 end

data/lib/lotus/generators/application/app/gitignore.tt

@@ -1,2 +1,4 @@
 /db/<%= config[:app_name] %>_development
 /db/<%= config[:app_name] %>_test
+/public/assets*
+/tmp

data/lib/lotus/generators/application/app/lotusrc.tt

@@ -1,3 +1,3 @@
-architecture=app
-test=<%= config[:test] %>
-template=erb
+<%= Lotus::Lotusrc::ARCHITECTURE_KEY %>=<%= Lotus::Lotusrc::APP_ARCHITECTURE %>
+<%= Lotus::Lotusrc::TEST_KEY %>=<%= config[:test] %>
+<%= Lotus::Lotusrc::TEMPLATE_KEY %>=<%= Lotus::Lotusrc::DEFAULT_TEMPLATE %>

data/lib/lotus/generators/application/app/spec_helper.rb.rspec.tt

@@ -58,6 +58,11 @@ RSpec.configure do |config|
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
 
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
   # Limits the available syntax to the non-monkey patched syntax that is
   # recommended. For more details, see:
   #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
@@ -97,4 +102,3 @@ RSpec.configure do |config|
   Kernel.srand config.seed
 =end
 end
-

data/lib/lotus/generators/application/app/templates/application.html.erb.tt

@@ -2,6 +2,7 @@
 <html>
   <head>
     <title><%= config[:classified_app_name] %></title>
+    <%%= favicon %>
   </head>
   <body>
     <%%= yield %>

data/lib/lotus/generators/application/container/.env.development.tt

@@ -1,2 +1,3 @@
 # Define ENV variables for development environment
 <%= config[:app_name].to_env_s %>_DATABASE_URL="<%= config[:database_config][:uri][:development] %>"
+SERVE_STATIC_ASSETS="true"

data/lib/lotus/generators/application/container/.env.test.tt

@@ -1,2 +1,3 @@
 # Define ENV variables for test environment
 <%= config[:app_name].to_env_s %>_DATABASE_URL="<%= config[:database_config][:uri][:test] %>"
+SERVE_STATIC_ASSETS="true"

data/lib/lotus/generators/application/container/Gemfile.tt

@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gem 'bundler'
 gem 'rake'
-
 <%- if config[:lotus_head] -%>
 gem 'lotus-utils',       require: false, github: 'lotus/utils'
 gem 'lotus-router',      require: false, github: 'lotus/router'
@@ -12,6 +11,7 @@ gem 'lotus-controller',  require: false, github: 'lotus/controller'
 gem 'lotus-view',        require: false, github: 'lotus/view'
 gem 'lotus-model',       require: false, github: 'lotus/model'
 gem 'lotus-mailer',      require: false, github: 'lotus/mailer'
+gem 'lotus-assets',      require: false, github: 'lotus/assets'
 gem 'lotusrb',                           github: 'lotus/lotus'
 <%- else -%>
 gem 'lotusrb',     '<%= Lotus::VERSION %>'