chili 3.0.0 → 3.1.0

data/README.md

@@ -35,7 +35,9 @@ Chili features are like mini apps that are created inside your main app's lib/ch
 As an example, assuming you want to add a beta feature named "social" that shows a new like-button
 to a subset of users, first within your main app run:
 
-    $ rails g chili:feature social
+```bash
+$ rails g chili:feature social
+```
 
 This will:
 
@@ -60,11 +62,17 @@ end
 ### Modifying view templates in main app
 
 Chili uses Deface to dynamically modify existing view templates (see [Deface docs](https://github.com/spree/deface#using-the-deface-dsl-deface-files) for details)
-Add overrides to the `app/overides` directory mirroring the path of the view you want to modify.
-For example, assuming the main app has the partial `app/views/posts/_post.html.erb`:
+To generate an override to the feature, run the deface generator specifying the name of the feature and path to the template you want to modify.
+For example, assuming the main app has the partial `app/views/posts/_post.html.erb` run:
+
+```bash
+$ rails g social_feature deface:override posts/_post like_button
+```
+
+This will create a dummy override at `{feature}/app/overrides/posts/_post/like_button.html.erb.deface` that you can edit:
 
 ```erb
-<% # {feature}/app/overrides/posts/_post/like_button.html.erb.deface (folder should mirror main app view path) %>
+<% # {feature}/app/overrides/posts/_post/like_button.html.erb.deface %>
 <!-- insert_bottom 'tr' -->
 <td><%= link_to 'Like!', social_feature.likes_path(like: {post_id: post}), method: :post %></td>
 ```
@@ -85,7 +93,9 @@ but will only be accessible when active_if is true.
 
 To copy and run feature db migrations use the following command:
 
-    $ rake social_feature:db:migrate
+```bash
+$ rake social_feature:db:migrate
+```
 
 ### Modifying existing models
 

data/chili.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Chili::VERSION
 
   gem.add_dependency "rails", "~> 3.2"
-  gem.add_dependency "deface", "~> 1.0.0.rc1"
+  gem.add_dependency "deface", "~> 1.0.0.rc2"
 
   gem.add_development_dependency 'rspec', '~> 2.12.0'
   gem.add_development_dependency 'rspec-rails', '~> 2.12.0'

data/lib/chili/version.rb

@@ -1,3 +1,3 @@
 module Chili
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

data/spec/dummy/blank_feature/blank_feature.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
 
-  s.add_dependency "rails", "~> 3.2.9"
-  s.add_dependency 'chili', '~> 3.0'
+  s.add_dependency "rails", "~> 3.2.13"
+  s.add_dependency 'chili', '~> 3.1'
 
   s.add_development_dependency "sqlite3"
 end

data/spec/generators/chili/generator_proxy_spec.rb

@@ -17,6 +17,13 @@ describe Chili::GeneratorProxy do
     end
   end
 
+  context 'running deface override generator' do
+    it "generates namespaced override properly" do
+      puts `cd #{app.path} && rails g blank_feature deface:override posts/index add_links`
+      File.exist?(File.join(app.path, 'lib/chili/blank_feature/app/overrides/posts/index/add_links.html.erb.deface')).should be_true
+    end
+  end
+
   context 'passing in options' do
     it "passes options on to rails generator" do
       puts `cd #{app.path} && rails g blank_feature scaffold post --stylesheets=false`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chili
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -297,7 +297,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2891570347868177261
+      hash: -1451030424463406941
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -306,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2891570347868177261
+      hash: -1451030424463406941
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23