lotusrb 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52e1d51949b1c0cdaa5dfe36c2758dc9e82624b9
-  data.tar.gz: 8a743bcca2c6ae96f85179b38383e0dfe99b2af1
+  metadata.gz: 935451417df1119d39a85bc9f5a4ab0b254f5f4a
+  data.tar.gz: 35a84423b6d404016700fb068965dcc1649742db
 SHA512:
-  metadata.gz: dc6bf38f66898013a9192239faface94696b5032996c02f77866eb174bfe4242a7ac64f8642d6a67a228947562dfb59bf6cbd57f31919cd5b2e33ddcc2a5fb61
-  data.tar.gz: 25ef374ff36f82fcfc98aa74c0b5e5d5323ca1403d35686370a3b792be7054a990012702bae2b2d3910d64047341a1ef6c62216f43188305e4aae6a25ee8cfe5
+  metadata.gz: 804e4de1c16d7840bcf859608af64eeb68687ccc0dc64f10de35b06bf8660d9c74e6bdaebca9636ec0ecadafc928252a5d989a89548b20e5ff1cacb66da325b0
+  data.tar.gz: e2ba8789564318ad4d99d489eeed5d42b8484cf21a7124140f6bcfa57d65442ce401217e6ae68a27a425bf0db7c20d2d914c53869fad85b28803e62f0e639035

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Lotus
 A complete web framework for Ruby
 
+## v0.4.1 - 2015-07-10
+### Added
+- [Trung Lê] Alias `--database` as `--db` for `lotus new`
+
+### Fixed
+- [Alfonso Uceda Pompa] Ensure to load correctly apps in `lotus console`
+- [Alfonso Uceda Pompa] Ensure to not duplicate prefix for Container mounted apps (eg `/admin/admin/dashboard`)
+- [Alfonso Uceda Pompa] Ensure generator for application arch to generate session secret
+- [Alfonso Uceda Pompa & Trung Lê & Hiếu Nguyễn] Exit unsuccessfully when `lotus generate model` doesn't receive a mandatory name for model
+- [Miguel Molina] Exit unsuccessfully when `lotus new --database` receives an unknown value
+- [Luca Guidi] Ensure to prepend sessions middleware, so other Rack components can have access to HTTP session
+
 ## v0.4.0 - 2015-06-23
 ### Added
 - [Luca Guidi] Database migrations and new CLI commands for database operations

data/FEATURES.md

@@ -3,6 +3,8 @@
 
 ## Features
 
+## v0.4.1 - 2015-07-10
+
 ## v0.4.0 - 2015-06-23
 
 - Application architecture

data/lib/lotus/cli.rb

@@ -61,12 +61,12 @@ module Lotus
     end
 
     desc 'new', 'generates a new application'
-    method_option :database,             aliases: '-d',             desc: 'application database',     type: :string,  default: 'filesystem'
-    method_option :architecture,         aliases: ['-a', '--arch'], desc: 'application architecture', type: :string,  default: 'container'
+    method_option :database,             aliases: ['-d', '--db'],   desc: 'application database (filesystem/memory/postgresql/sqlite3/mysql)', type: :string,  default: 'filesystem'
+    method_option :architecture,         aliases: ['-a', '--arch'], desc: 'application architecture (container/app)', type: :string, default: 'container'
     method_option :application,                                     desc: 'application name',         type: :string,  default: 'web'
     method_option :application_base_url,                            desc: 'application base url',     type: :string,  default: '/'
     method_option :path,                                            desc: 'path',                     type: :string
-    method_option :test,                                            desc: 'application test framework (rspec/minitest)', type: :string,  default: 'minitest'
+    method_option :test,                                            desc: 'application test framework (rspec/minitest)', type: :string, default: 'minitest'
     method_option :lotus_head,                                      desc: 'use Lotus HEAD',           type: :boolean, default: false
     method_option :help,                 aliases: '-h',             desc: 'displays the usage method'
 
@@ -79,7 +79,7 @@ module Lotus
       end
     end
 
-    desc 'generate', 'generates action, model or migration'
+    desc 'generate', 'generates app, action, model or migration'
     method_option :application_base_url, desc: 'application base url',                                      type: :string
     method_option :path,                 desc: 'applications path',                                         type: :string
     method_option :url,                  desc: 'relative URL for action',                                   type: :string

data/lib/lotus/commands/console.rb

@@ -28,8 +28,8 @@ module Lotus
 
         # Add convenience methods to the main:Object binding
         TOPLEVEL_BINDING.eval('self').send(:include, Methods)
-        Lotus::Application.preload_applications!
 
+        load_application
         engine.start
       end
 
@@ -57,6 +57,14 @@ module Lotus
           }
         )
       end
+
+      def load_application
+        if @environment.container?
+          Lotus::Container.new
+        else
+          Lotus::Application.preload_applications!
+        end
+      end
     end
   end
 end

data/lib/lotus/commands/routes.rb

@@ -2,11 +2,22 @@ module Lotus
   module Commands
     class Routes
       def initialize(environment)
-        environment.require_application_environment
+        @environment = environment
+        @environment.require_application_environment
       end
 
       def start
-        puts Lotus::Container.new.routes.inspector.to_s
+        puts app.routes.inspector.to_s
+      end
+
+      private
+
+      def app
+        if @environment.container?
+          Lotus::Container.new
+        else
+          Lotus::Application.applications.first.new
+        end
       end
     end
   end

data/lib/lotus/environment.rb

@@ -1,6 +1,7 @@
 require 'thread'
 require 'pathname'
 require 'dotenv'
+require 'lotus/utils'
 require 'lotus/utils/hash'
 require 'lotus/lotusrc'
 
@@ -360,7 +361,13 @@ module Lotus
     # @see Lotus::Commands::Server
     # @see Lotus::Environment::CODE_RELOADING
     def code_reloading?
-      @options.fetch(:code_reloading) { !!CODE_RELOADING[environment] }
+      # JRuby doesn't implement fork that's why shotgun cannot be used.
+      if Utils.jruby?
+        puts "JRuby doesn't support code reloading."
+        false
+      else
+        @options.fetch(:code_reloading) { !!CODE_RELOADING[environment] }
+      end
     end
 
     # @since 0.4.0

data/lib/lotus/generators/action.rb

@@ -10,6 +10,14 @@ module Lotus
       # @api private
       ACTION_SEPARATOR = /\/|\#/
 
+      # @since 0.4.1
+      # @api private
+      ROUTE_ENDPOINT_SEPARATOR = '#'.freeze
+
+      # @since 0.4.1
+      # @api private
+      QUOTED_NAME = /(\"|\'|\\)/
+
       # @since 0.3.0
       # @api private
       SUFFIX           = '.rb'.freeze
@@ -27,7 +35,7 @@ module Lotus
       def initialize(command)
         super
 
-        @name = Utils::String.new(name).underscore
+        @name = Utils::String.new(name).underscore.gsub(QUOTED_NAME, '')
         @controller, @action = @name.split(ACTION_SEPARATOR)
         @controller_name     = Utils::String.new(@controller).classify
         @action_name         = Utils::String.new(@action).classify
@@ -119,7 +127,7 @@ module Lotus
 
         # Insert at the top of the file
         cli.insert_into_file _routes_path, before: /\A(.*)/ do
-          "get '#{ _route_url }', to: '#{ @name }'\n"
+          "get '#{ _route_url }', to: '#{ _route_endpoint }'\n"
         end
       end
 
@@ -129,6 +137,12 @@ module Lotus
         options.fetch(:url, "/#{ @controller }")
       end
 
+      # @since 0.4.1
+      # @api private
+      def _route_endpoint
+        "#{ @controller }#{ROUTE_ENDPOINT_SEPARATOR}#{ @action }"
+      end
+
       # @since 0.3.0
       # @api private
       def _routes_path

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

@@ -110,7 +110,7 @@ module Lotus
           end
 
           unless git_dir_present?
-            cli.template(source.join('gitignore.tt'), target.join('.gitignore'), opts)
+            cli.template(source.join(database_type == :file_system ? 'gitignore.tt' : '.gitignore'), target.join('.gitignore'), opts)
             cli.run("git init #{Shellwords.escape(target)}", capture: true)
           end
         end
@@ -174,8 +174,10 @@ module Lotus
             "sqlite://db/#{Shellwords.escape(app_name)}"
           when 'memory'
             "memory://localhost/#{app_name}"
-          else
+          when 'filesystem'
             "file:///db/#{app_name}"
+          else
+            raise "\"#{@database}\" is not a valid database type"
           end
         end
       end

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

@@ -1,3 +1,3 @@
 # 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) %>"
+<%= config[:upcase_app_name] %>_SESSIONS_SECRET="<%= SecureRandom.hex(32) %>"

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

@@ -1,3 +1,3 @@
 # 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) %>"
+<%= config[:upcase_app_name] %>_SESSIONS_SECRET="<%= SecureRandom.hex(32) %>"

data/lib/lotus/generators/application/container.rb

@@ -19,7 +19,6 @@ module Lotus
         end
 
         def start
-
           opts      = {
             app_name:              app_name,
             lotus_head:            @lotus_head,
@@ -91,7 +90,7 @@ module Lotus
           end
 
           unless git_dir_present?
-            cli.template(source.join('gitignore.tt'), target.join('.gitignore'), opts)
+            cli.template(source.join(database_type == :file_system ? 'gitignore.tt' : '.gitignore'), target.join('.gitignore'), opts)
             cli.run("git init #{Shellwords.escape(target)}", capture: true)
           end
 
@@ -157,8 +156,10 @@ module Lotus
             "sqlite://db/#{Shellwords.escape(app_name)}"
           when 'memory'
             "memory://localhost/#{app_name}"
-          else
+          when 'filesystem'
             "file:///db/#{app_name}"
+          else
+            raise "\"#{@database}\" is not a valid database type"
           end
         end
 

data/lib/lotus/generators/model.rb

@@ -17,6 +17,8 @@ module Lotus
       # @since 0.3.1
       # @api private
       def start
+        assert_model!
+
         opts = {
           model_name: @model_name
         }
@@ -75,6 +77,14 @@ module Lotus
       def name
         Utils::String.new(app_name || super).underscore
       end
+
+      # @since 0.4.1
+      # @api private
+      def assert_model!
+        if @model_name.nil? || @model_name.empty?
+          raise Lotus::Commands::Generate::Error.new("Missing model name")
+        end
+      end
     end
   end
 end

data/lib/lotus/middleware.rb

@@ -62,7 +62,7 @@ module Lotus
     #
     # @since 0.2.0
     def use(middleware, *args, &blk)
-      @stack << [middleware, args, blk]
+      @stack.unshift [middleware, args, blk]
     end
 
     # @api private

data/lib/lotus/version.rb

@@ -2,5 +2,5 @@ module Lotus
   # Defines the version
   #
   # @since 0.1.0
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/lotusrb.gemspec

@@ -6,8 +6,8 @@ require 'lotus/version'
 Gem::Specification.new do |spec|
   spec.name          = 'lotusrb'
   spec.version       = Lotus::VERSION
-  spec.authors       = ['Luca Guidi']
-  spec.email         = ['me@lucaguidi.com']
+  spec.authors       = ['Luca Guidi', 'Trung Lê', 'Alfonso Uceda Pompa']
+  spec.email         = ['me@lucaguidi.com', 'trung.le@ruby-journal.com', 'uceda73@gmail.com']
   spec.summary       = %q{A complete web framework for Ruby}
   spec.description   = %q{A complete web framework for Ruby}
   spec.homepage      = 'http://lotusrb.org'
@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency 'lotus-utils',      '~> 0.5'
-  spec.add_dependency 'lotus-router',     '~> 0.4', '>= 0.4.1'
+  spec.add_dependency 'lotus-utils',      '~> 0.5', '>= 0.5.1'
+  spec.add_dependency 'lotus-router',     '~> 0.4', '>= 0.4.2'
   spec.add_dependency 'lotus-controller', '~> 0.4', '>= 0.4.4'
-  spec.add_dependency 'lotus-view',       '~> 0.4'
+  spec.add_dependency 'lotus-view',       '~> 0.4', '>= 0.4.3'
   spec.add_dependency 'lotus-helpers',    '~> 0.2'
   spec.add_dependency 'shotgun',          '~> 0.9'
   spec.add_dependency 'dotenv',           '~> 2.0'

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: lotusrb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Luca Guidi
+- Trung Lê
+- Alfonso Uceda Pompa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotus-utils
@@ -17,6 +19,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +29,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: lotus-router
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +41,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +51,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: lotus-controller
   requirement: !ruby/object:Gem::Requirement
@@ -71,6 +79,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -78,6 +89,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: lotus-helpers
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +207,8 @@ dependencies:
 description: A complete web framework for Ruby
 email:
 - me@lucaguidi.com
+- trung.le@ruby-journal.com
+- uceda73@gmail.com
 executables:
 - lotus
 extensions: []
@@ -253,6 +269,7 @@ files:
 - lib/lotus/generators/application/app/.env.development.tt
 - lib/lotus/generators/application/app/.env.test.tt
 - lib/lotus/generators/application/app/.env.tt
+- lib/lotus/generators/application/app/.gitignore
 - lib/lotus/generators/application/app/.gitkeep
 - lib/lotus/generators/application/app/Gemfile.tt
 - lib/lotus/generators/application/app/Rakefile.minitest.tt
@@ -282,6 +299,7 @@ files:
 - lib/lotus/generators/application/container/.env.development.tt
 - lib/lotus/generators/application/container/.env.test.tt
 - lib/lotus/generators/application/container/.env.tt
+- lib/lotus/generators/application/container/.gitignore
 - lib/lotus/generators/application/container/.gitkeep
 - lib/lotus/generators/application/container/Gemfile.tt
 - lib/lotus/generators/application/container/Rakefile.minitest.tt