Merge 7994700 into 403ba27

.gitignore

@@ -8,3 +8,4 @@ spec/dummy/tmp/
 spec/dummy/.sass-cache
 .coveralls.yml
 coverage/
+test_widget.*

Gemfile

@@ -18,4 +18,5 @@ group :test do
   gem 'simplecov',  require: false
   gem 'rspec-rails', '~> 2.14'
   gem 'pry-rails',   '~> 0.3'
+  gem 'generator_spec'
 end

Gemfile.lock

@@ -59,6 +59,9 @@ GEM
     docile (1.1.3)
     erubis (2.7.0)
     execjs (2.2.1)
+    generator_spec (0.9.2)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
     hike (1.2.3)
     i18n (0.6.9)
     jquery-rails (3.1.1)
@@ -150,6 +153,7 @@ DEPENDENCIES
   better_errors (~> 1.0)
   coveralls
   dashing-rails!
+  generator_spec
   jquery-rails (~> 3.0)
   pry-rails (~> 0.3)
   rspec-rails (~> 2.14)

app/controllers/dashing/widgets_controller.rb

@@ -34,7 +34,7 @@ def prepend_view_paths
     end
 
     def main_app_view_path
-      Dashing.config.widgets_views_path.call
+      Dashing.config.widgets_views_path
     end
 
     def template_not_found

lib/dashing/configuration.rb

@@ -37,9 +37,9 @@ def initialize
       @dashboard_layout_path  = 'dashing/dashboard'
 
       # Widgets
-      @widgets_views_path     = -> { Rails.root.join('app', 'views', 'dashing', 'widgets') }
-      @widgets_js_path        = 'app/assets/javascripts/dashing'
-      @widgets_css_path       = 'app/assets/stylesheets/dashing'
+      @widgets_views_path     = Rails.root.join('app', 'views', 'dashing', 'widgets')
+      @widgets_js_path        = Rails.root.join('app', 'assets', 'javascripts', 'dashing')
+      @widgets_css_path       = Rails.root.join('app', 'assets', 'stylesheets', 'dashing')
     end
 
     def redis

lib/dashing/engine.rb

@@ -2,14 +2,6 @@ module Dashing
   class Engine < ::Rails::Engine
     isolate_namespace Dashing
 
-    config.assets.paths.unshift       Dashing::Engine.root.join('vendor', 'assets', 'fonts', 'dashing')
-    config.assets.paths.unshift       Dashing::Engine.root.join('vendor', 'assets', 'javascripts', 'dashing')
-    config.assets.paths.unshift       Dashing::Engine.root.join('vendor', 'assets', 'stylesheets', 'dashing')
-    config.assets.paths.unshift       Dashing.config.widgets_js_path
-    config.assets.paths.unshift       Dashing.config.widgets_css_path
-
-    config.assets.precompile << /\.(?:svg|eot|woff|ttf)$/
-
-    config.paths['app/views'].unshift Dashing::Engine.root.join('app', 'views', 'dashing', 'widgets')
+    paths['app/views'].unshift Dashing::Engine.root.join('app', 'views', 'dashing', 'widgets')
   end
 end

lib/dashing/railtie.rb

@@ -1,5 +1,18 @@
 module Dashing
   class Railtie < ::Rails::Railtie
+
+    initializer 'configure assets' do |app|
+      app.configure do
+        config.assets.paths.unshift       Dashing::Engine.root.join('vendor', 'assets', 'fonts', 'dashing')
+        config.assets.paths.unshift       Dashing::Engine.root.join('vendor', 'assets', 'javascripts', 'dashing')
+        config.assets.paths.unshift       Dashing::Engine.root.join('vendor', 'assets', 'stylesheets', 'dashing')
+        config.assets.paths.unshift       Dashing.config.widgets_js_path
+        config.assets.paths.unshift       Dashing.config.widgets_css_path
+
+        config.assets.precompile << /\.(?:svg|eot|woff|ttf)$/
+      end
+    end
+
     initializer 'require dashing jobs' do
       Dir[Dashing.config.jobs_path.call.join('**', '*.rb')].each { |file| require file }
     end

lib/generators/dashing/widget_generator.rb

@@ -7,7 +7,7 @@ class WidgetGenerator < ::Rails::Generators::NamedBase
       desc 'Creates a new Dashing widget.'
 
       def widget
-        template 'widgets/new.html',    Dashing.config.widgets_views_path.call.join("#{file_name}.html")
+        template 'widgets/new.html',    Dashing.config.widgets_views_path.join("#{file_name}.html")
         template 'widgets/new.scss',    Dashing.config.widgets_css_path.join('widgets', "#{file_name}.scss")
         template 'widgets/new.coffee',  Dashing.config.widgets_js_path.join('widgets', "#{file_name}.coffee")
       end

spec/lib/dashing/configuration_spec.rb

@@ -28,9 +28,9 @@
   it { expect(instance.dashboard_layout_path).to  eq('dashing/dashboard') }
 
   # Widgets
-  it { expect(instance.widgets_views_path.call.to_s).to include('app/views/dashing/widgets') }
-  it { expect(instance.widgets_js_path).to        eq('app/assets/javascripts/dashing') }
-  it { expect(instance.widgets_css_path).to       eq('app/assets/stylesheets/dashing') }
+  it { expect(instance.widgets_views_path.to_s).to include('app/views/dashing/widgets') }
+  it { expect(instance.widgets_js_path.to_s).to    include('app/assets/javascripts/dashing') }
+  it { expect(instance.widgets_css_path.to_s).to   include('app/assets/stylesheets/dashing') }
 
   describe '#request_thread_count' do
 

spec/lib/generators/widget_generator_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'generator_spec'
+require 'generators/dashing/widget_generator'
+
+describe Dashing::Generators::WidgetGenerator do
+
+  arguments %w(test_widget)
+
+  before do
+    run_generator
+  end
+
+  after do
+    `find #{Rails.root.join('app')} -name "test_widget.*" -delete`
+  end
+
+  it 'creates widget files' do
+    assert_file Rails.root.join 'app/views/dashing/widgets/test_widget.html'
+    assert_file Rails.root.join 'app/assets/javascripts/dashing/widgets/test_widget.coffee'
+    assert_file Rails.root.join 'app/assets/stylesheets/dashing/widgets/test_widget.scss'
+  end
+end