Integrate with Lotus::Helper

hanami · Mar 6, 2015 · 8314e18 · 8314e18
1 parent 0318125
commit 8314e18
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 16 deletions.
diff --git a/lib/lotus/generators/application/container.rb b/lib/lotus/generators/application/container.rb
@@ -9,24 +9,26 @@ class Container < Abstract
         def initialize(command)
           super
 
-          @slice_generator     = Slice.new(command)
-          @lotus_head          = options.fetch(:lotus_head)
-          @test                = options[:test]
-          @database            = options[:database]
-          @lotus_model_version = '~> 0.2'
+          @slice_generator        = Slice.new(command)
+          @lotus_head             = options.fetch(:lotus_head)
+          @test                   = options[:test]
+          @database               = options[:database]
+          @lotus_model_version    = '~> 0.2'
+          @lotus_helpers_version  = '~> 0.0'
 
           cli.class.source_root(source)
         end
 
         def start
 
           opts      = {
-            app_name:            app_name,
-            lotus_head:          @lotus_head,
-            test:                @test,
-            database:            @database,
-            database_config:     database_config,
-            lotus_model_version: @lotus_model_version
+            app_name:               app_name,
+            lotus_head:             @lotus_head,
+            test:                   @test,
+            database:               @database,
+            database_config:        database_config,
+            lotus_model_version:    @lotus_model_version,
+            lotus_helpers_version:  @lotus_helpers_version
           }
 
           templates = {

diff --git a/lib/lotus/generators/application/container/Gemfile.tt b/lib/lotus/generators/application/container/Gemfile.tt
@@ -12,8 +12,9 @@ gem 'lotus-view',        require: false, github: 'lotus/view'
 gem 'lotus-model',       require: false, github: 'lotus/model'
 gem 'lotusrb',                           github: 'lotus/lotus'
 <%- else -%>
-gem 'lotusrb',      '<%= Lotus::VERSION %>'
-gem 'lotus-model', '<%= config[:lotus_model_version] %>'
+gem 'lotusrb',        '<%= Lotus::VERSION %>'
+gem 'lotus-model',    '<%= config[:lotus_model_version] %>'
+gem 'lotus-helpers',  '<%= config[:lotus_helpers_version] %>'
 <%- end -%>
 
 <%- if config[:database_config][:gem] %>

diff --git a/lib/lotus/generators/slice/application.rb.tt b/lib/lotus/generators/slice/application.rb.tt
@@ -1,3 +1,5 @@
+require 'lotus/helpers'
+
 module <%= config[:classified_slice_name] %>
   class Application < Lotus::Application
     configure do
@@ -194,7 +196,7 @@ module <%= config[:classified_slice_name] %>
       #
       # See: http://www.rubydoc.info/gems/lotus-view#Configuration
       view.prepare do
-        # include MyRoutingHelpers # included in all the views
+        include Lotus::Helpers
       end
     end
 

diff --git a/lotusrb.gemspec b/lotusrb.gemspec
@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'lotus-router',     '~> 0.2', '>= 0.2.1'
   spec.add_dependency 'lotus-controller', '~> 0.3', '>= 0.3.2'
   spec.add_dependency 'lotus-view',       '~> 0.3'
+  spec.add_dependency 'lotus-helpers',     '~> 0.0'
   spec.add_dependency 'shotgun',          '~> 0.9'
   spec.add_dependency 'dotenv',           '~> 1.0'
   spec.add_dependency 'thor',             '~> 0.19'

diff --git a/test/commands/new_test.rb b/test/commands/new_test.rb
@@ -46,8 +46,9 @@ def container_options
         content = @root.join('Gemfile').read
         content.must_match %(gem 'bundler')
         content.must_match %(gem 'rake')
-        content.must_match %(gem 'lotusrb',      '#{ Lotus::VERSION }')
-        content.must_match %(gem 'lotus-model', '~> 0.2')
+        content.must_match %(gem 'lotusrb',        '#{ Lotus::VERSION }')
+        content.must_match %(gem 'lotus-model',    '~> 0.2')
+        content.must_match %(gem 'lotus-helpers',  '~> 0.0')
         content.must_match %(gem 'capybara')
       end
 
@@ -579,6 +580,7 @@ def container_options
     describe 'apps/web/application.rb' do
       it 'generates it' do
         content = @root.join('apps/web/application.rb').read
+        content.must_match %(require 'lotus/helpers')
         content.must_match %(module Web)
         content.must_match %(class Application < Lotus::Application)
 
@@ -617,6 +619,7 @@ def container_options
 
         content.must_match %(controller.prepare)
         content.must_match %(view.prepare)
+        content.must_match %(include Lotus::Helpers)
 
         # per environment configuration
         content.must_match %(configure :development do)