chili 0.2.1 → 0.2.2

data/README.md

@@ -96,9 +96,9 @@ Access in your overrides/extension views through the namespaced model:
 <%= current_user.becomes(ChiliSocial::User).likes %>
 ```
 
-### Adding new stylesheets/javascripts
+### Stylesheets/javascripts
 
-Add files as usual in `app/assets/chili_social/javascripts|stylesheets` and inject them into the layout using an override:
+Files added to `app/assets/chili_social/javascripts|stylesheets` are automatically injected into the layout using a pre-generated override:
 
 ```erb
 <% # app/overrides/layouts/application/assets.html.erb.deface %>
@@ -107,6 +107,8 @@ Add files as usual in `app/assets/chili_social/javascripts|stylesheets` and inje
 <%= javascript_include_tag 'chili_social/application' %>
 ```
 
+If you don't need any css/js in your extension, you can remove this file.
+
 ## Gotchas
 
 - Chili will not be able to automount if you use a catch-all route in your main app (ie `match '*a', to: 'errors#routing'`), you will have to remove the catch-all or manually add the engine to the main app's routes file.

data/lib/chili/template.rb

@@ -36,6 +36,7 @@ end
 # Remove dummy stuff
 remove_dir 'test'
 
+# Set up rspec
 inject_into_file "lib/#{name}/engine.rb", :after => " g.scaffold_controller :chili\n" do <<-RUBY
       g.test_framework :rspec, view_specs: false, routing_specs: false, controller_specs: false
       g.integration_tool :rspec
@@ -74,5 +75,13 @@ create_file example_file_path do <<-RUBY
 RUBY
 end
 
+# Add assets override
+create_file 'app/overrides/layouts/application/assets.html.erb.deface' do <<-RUBY
+<!-- insert_bottom 'head' -->
+<%= stylesheet_link_tag '#{name}/application' %>
+<%= javascript_include_tag '#{name}/application' %>
+RUBY
+end
+
 # Disable bundler
 def run_bundle ; end

data/lib/chili/version.rb

@@ -1,3 +1,3 @@
 module Chili
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/dummy/template/app/overrides/layouts/application/assets.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_bottom 'head' -->
+<%= stylesheet_link_tag 'chili_template/application' %>
+<%= javascript_include_tag 'chili_template/application' %>

data/spec/dummy/template/chili_template.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
   s.add_dependency "rails", "~> 3.2.3"
-  s.add_dependency 'chili', '~> 0.2.0'
+  s.add_dependency 'chili', '~> 0.2.2'
 
   s.add_development_dependency "sqlite3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chili
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70351662907460 !ruby/object:Gem::Requirement
+  requirement: &70189184713320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70351662907460
+  version_requirements: *70189184713320
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70351662906960 !ruby/object:Gem::Requirement
+  requirement: &70189184712820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70351662906960
+  version_requirements: *70189184712820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70351662906500 !ruby/object:Gem::Requirement
+  requirement: &70189184712340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70351662906500
+  version_requirements: *70189184712340
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70351662906040 !ruby/object:Gem::Requirement
+  requirement: &70189184711880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70351662906040
+  version_requirements: *70189184711880
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70351662905660 !ruby/object:Gem::Requirement
+  requirement: &70189184711460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351662905660
+  version_requirements: *70189184711460
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70351662905200 !ruby/object:Gem::Requirement
+  requirement: &70189184710880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351662905200
+  version_requirements: *70189184710880
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70351662904780 !ruby/object:Gem::Requirement
+  requirement: &70189184710380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351662904780
+  version_requirements: *70189184710380
 description: The spicy extension framework
 email:
 - jens@balvig.com
@@ -192,6 +192,7 @@ files:
 - spec/dummy/template/app/assets/images/chili_template/.gitkeep
 - spec/dummy/template/app/assets/javascripts/chili_template/application.js
 - spec/dummy/template/app/assets/stylesheets/chili_template/application.css
+- spec/dummy/template/app/overrides/layouts/application/assets.html.erb.deface
 - spec/dummy/template/app/overrides/layouts/application/example.html.erb.deface
 - spec/dummy/template/chili_template.gemspec
 - spec/dummy/template/config/routes.rb
@@ -217,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3163804124466460800
+      hash: 385854585272327348
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -226,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3163804124466460800
+      hash: 385854585272327348
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -312,6 +313,7 @@ test_files:
 - spec/dummy/template/app/assets/images/chili_template/.gitkeep
 - spec/dummy/template/app/assets/javascripts/chili_template/application.js
 - spec/dummy/template/app/assets/stylesheets/chili_template/application.css
+- spec/dummy/template/app/overrides/layouts/application/assets.html.erb.deface
 - spec/dummy/template/app/overrides/layouts/application/example.html.erb.deface
 - spec/dummy/template/chili_template.gemspec
 - spec/dummy/template/config/routes.rb