chili 0.3.1 → 0.3.2

data/.gitignore

@@ -16,7 +16,7 @@ spec/dummy/example/db/*.sqlite3
 spec/dummy/example/log/*.log
 spec/dummy/example/tmp/
 spec/dummy/example/.sass-cache
-spec/dummy/example/vendor/chili/template_ext
+spec/dummy/example/vendor/chili/blank_extension
 spec/dummy/example/Gemfile
 tmp
 .DS_Store

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in chili.gemspec
 gemspec
 gem 'rake'
+gem 'deface', github: 'railsdog/deface'

data/README.md

@@ -26,11 +26,11 @@ Chili extensions are like mini apps that are created inside your main app's vend
 As an example, assuming you want to add a new extension named "social" that exposes a new feature in the form of a like-button
 to a subset of users, first within your main app run:
 
-    $ rails g chili social
+    $ rails g chili:extension social
 
 This is basically a shortcut for running the `rails plugin new` engine generator with a custom template and will:
 
-1. Create a the directory `vendor/chili/social_ext` containing the basic structure for the extension
+1. Create a the directory `vendor/chili/social_extension` containing the basic structure for the extension
 2. Add a reference to the extension to the main app gemfile
 
 Since the extension is mounted as a gem you'll have to run `bundle`
@@ -38,12 +38,12 @@ after this to start using the extension.
 
 ### Define who can see the extension
 
-Use the active_if block to control whether new controllers/overrides are visible or not.
+Use the active_if block to control whether new the extension is visible or not.
 The context of the active_if block is the application controller so you can use any methods available to that.
 
 ```ruby
-# lib/social_ext.rb
-module SocialExt
+# lib/social_extension.rb
+module SocialExtension
   extend Chili::Activatable
   active_if { logged_in? && current_user.admin? } # Extension is only visible to logged in admin users
 end
@@ -58,13 +58,13 @@ For example, assuming the main app has the partial `app/views/posts/_post.html.e
 ```erb
 <% # app/overrides/posts/_post/like_button.html.erb.deface (folder should mirror main app view path) %>
 <!-- insert_bottom 'tr' -->
-<td><%= link_to 'Like!', social_ext.likes_path(like: {post_id: post}), method: :post %></td>
+<td><%= link_to 'Like!', social_extension.likes_path(like: {post_id: post}), method: :post %></td>
 ```
 
 ### Adding new resources
 
 Go to the extension's directory and use `rails g scaffold Like`. The new resource will be namespaced to SocialExt::Like
-and automounted in the main app at `/chili/social_ext/likes`, but only accessible when active_if is true.
+and automounted in the main app at `/chili/social_extension/likes`, but only accessible when active_if is true.
 All the rules for using [isolated engine models](http://railscasts.com/episodes/277-mountable-engines?view=asciicast) apply.
 
 ### Migrations
@@ -72,7 +72,7 @@ All the rules for using [isolated engine models](http://railscasts.com/episodes/
 Migrations are handled the same way as engines. Use the
 following commands after you've added a new migration to your extension:
 
-    $ rake social_ext:migrations:install
+    $ rake social_extension:migrations:install
     $ rake db:migrate
 
 ### Modifying existing models
@@ -81,8 +81,8 @@ Create a model with the same name as the one you want to modify by running: `rai
 and edit it to inherit from the original:
 
 ```ruby
-# app/models/social_ext/user.rb
-module SocialExt
+# app/models/social_extension/user.rb
+module SocialExtension
   class User < ::User
     has_many :likes
   end
@@ -92,19 +92,19 @@ end
 Access in your overrides/extension views through the namespaced model:
 
 ```erb
-<%= SocialExt::User.first.likes %>
-<%= current_user.becomes(SocialExt::User).likes %>
+<%= SocialExtension::User.first.likes %>
+<%= current_user.becomes(SocialExtension::User).likes %>
 ```
 
 ### Stylesheets/javascripts
 
-Files added to the extension's `app/assets/social_ext/javascripts|stylesheets` directory are automatically injected into the layout using a pre-generated override:
+Files added to the extension's `app/assets/social_extension/javascripts|stylesheets` directory are automatically injected into the layout using a pre-generated override:
 
 ```erb
 <% # app/overrides/layouts/application/assets.html.erb.deface %>
 <!-- insert_bottom 'head' -->
-<%= stylesheet_link_tag 'social_ext/application' %>
-<%= javascript_include_tag 'social_ext/application' %>
+<%= stylesheet_link_tag 'social_extension/application' %>
+<%= javascript_include_tag 'social_extension/application' %>
 ```
 
 If you don't need any css/js in your extension, you can remove this file.

data/lib/chili/engine.rb

@@ -1,5 +1,9 @@
 module Chili
   class Engine < ::Rails::Engine
+    initializer 'chili.deface' do |app|
+      app.config.deface.namespaced = true
+    end
+
     initializer 'chili.controller' do |app|
       ActiveSupport.on_load(:action_controller) do
         include Chili::Overrides

data/lib/chili/version.rb

@@ -1,3 +1,3 @@
 module Chili
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/generators/chili/USAGE

@@ -2,7 +2,7 @@ Description:
     Generate a new chili extension
 
 Example:
-    rails generate chili social
+    rails generate chili:extension social
 
     This will create:
-        basic extension structure in vendor/chili_social
+        basic extension structure in vendor/chili/social_extension

data/lib/generators/chili/extension_generator.rb

@@ -0,0 +1,109 @@
+module Chili
+  module Generators
+    class ExtensionGenerator < Rails::Generators::NamedBase
+      NAME = "#{ARGV[0]}_extension"
+      PATH = "vendor/chili/#{NAME}"
+
+      def run_plugin_generator
+        ARGV[0] = PATH
+        ARGV[1] = "--mountable"
+        ARGV[2] = '--skip-test-unit'
+        ARGV[3] = '--skip-bundle'
+
+        require 'rails/generators'
+        require 'rails/generators/rails/plugin_new/plugin_new_generator'
+        Rails::Generators::PluginNewGenerator.start
+      end
+
+      def reset_destination_root
+        self.destination_root = ''
+      end
+
+      def edit_gemspec
+        require File.expand_path('../../../chili/version', __FILE__)
+        gemspec = "#{NAME}.gemspec"
+        gsub_file gemspec, '# s.add_dependency "jquery-rails"', "s.add_dependency 'chili', '~> #{Chili::VERSION}'"
+        gsub_file gemspec, 'TODO: Your name', `git config user.NAME`.chomp
+        gsub_file gemspec, 'TODO: Your email', `git config user.email`.chomp
+        gsub_file gemspec, /TODO(:\s)?/, ''
+      end
+
+      def add_gem_to_main_gemfile
+        append_to_file "../../../Gemfile", "gem '#{NAME}', path: '#{PATH}'"
+      end
+
+      def remove_unused_files
+        remove_dir "app/controllers/#{NAME}"
+        remove_dir "app/helpers/#{NAME}"
+        remove_dir 'app/views/layouts'
+        remove_file 'Gemfile'
+        remove_file 'Rakefile'
+      end
+
+      def remove_jquery_stuff
+        gsub_file "app/assets/javascripts/#{NAME}/application.js", "//= require jquery_ujs\n", ''
+        gsub_file "app/assets/javascripts/#{NAME}/application.js", "//= require jquery\n", ''
+      end
+
+      def set_up_custom_generator
+        inject_into_file "lib/#{NAME}/engine.rb", after: "isolate_namespace #{NAME.camelcase}\n" do <<-RUBY
+    config.generators do |g|
+      g.scaffold_controller :chili
+    end
+        RUBY
+        end
+      end
+
+      def 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
+        RUBY
+        end
+      end
+
+      def clean_up_gitignore
+        gsub_file ".gitignore", /test\/dummy.*\n/, ''
+      end
+
+      def automount_engine
+        prepend_to_file 'config/routes.rb', "#{NAME.camelcase}::Engine.automount!\n"
+      end
+
+      def include_chili_libs
+        prepend_to_file "lib/#{NAME}.rb", "require \"chili\"\n"
+      end
+
+      def include_active_if
+        inject_into_file "lib/#{NAME}.rb", :after => "module #{NAME.camelcase}\n" do <<-RUBY
+  extend Chili::Activatable
+  active_if { logged_in? }
+        RUBY
+        end
+      end
+
+      def add_dummy_override
+        example_file_path = "app/overrides/layouts/application/example.html.erb.deface"
+        create_file example_file_path do <<-RUBY
+<!-- insert_bottom 'body' -->
+<div style='background: #FFF;text-align: center; padding: 4px 0;position: fixed;width: 100%;z-index: 9999;top: 0;'>
+  #{NAME} active - edit/remove this file:<br/>
+  <strong>#{PATH}/#{example_file_path}</strong><br/>
+  <%= link_to 'deface docs', 'https://github.com/railsdog/deface', target: '_blank' %>
+</div>
+        RUBY
+        end
+      end
+
+      def 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
+      end
+    end
+
+  end
+end

data/spec/dummy/blank_extension/README.rdoc

@@ -0,0 +1,3 @@
+= BlankExtension
+
+This project rocks and uses MIT-LICENSE.

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

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

data/spec/dummy/{template_ext → blank_extension}/app/overrides/layouts/application/example.html.erb.deface

@@ -1,6 +1,6 @@
 <!-- insert_bottom 'body' -->
 <div style='background: #FFF;text-align: center; padding: 4px 0;position: fixed;width: 100%;z-index: 9999;top: 0;'>
-  template_ext active - edit/remove this file:<br/>
-  <strong>vendor/chili/template_ext/app/overrides/layouts/application/example.html.erb.deface</strong><br/>
+  blank_extension active - edit/remove this file:<br/>
+  <strong>vendor/chili/blank_extension/app/overrides/layouts/application/example.html.erb.deface</strong><br/>
   <%= link_to 'deface docs', 'https://github.com/railsdog/deface', target: '_blank' %>
 </div>

data/spec/dummy/{template_ext/template_ext.gemspec → blank_extension/blank_extension.gemspec}

@@ -1,22 +1,22 @@
 $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
-require "template_ext/version"
+require "blank_extension/version"
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
-  s.name        = "template_ext"
-  s.version     = TemplateExt::VERSION
+  s.name        = "blank_extension"
+  s.version     = BlankExtension::VERSION
   s.authors     = ["GIT_AUTHOR"]
   s.email       = ["GIT_EMAIL"]
   s.homepage    = ""
-  s.summary     = "Summary of TemplateExt."
-  s.description = "Description of TemplateExt."
+  s.summary     = "Summary of BlankExtension."
+  s.description = "Description of BlankExtension."
 
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
 
-  s.add_dependency "rails", "~> 3.2.6"
-  s.add_dependency 'chili', '~> 0.3.1'
+  s.add_dependency "rails", "~> 3.2.8"
+  s.add_dependency 'chili', '~> 0.3.2'
 
   s.add_development_dependency "sqlite3"
 end

data/spec/dummy/blank_extension/config/routes.rb

@@ -0,0 +1,3 @@
+BlankExtension::Engine.automount!
+BlankExtension::Engine.routes.draw do
+end

data/spec/dummy/{template_ext/lib/template_ext.rb → blank_extension/lib/blank_extension.rb}

@@ -1,7 +1,7 @@
 require "chili"
-require "template_ext/engine"
+require "blank_extension/engine"
 
-module TemplateExt
+module BlankExtension
   extend Chili::Activatable
   active_if { logged_in? }
 end

data/spec/dummy/{example/vendor/chili/social_ext/lib/social_ext → blank_extension/lib/blank_extension}/engine.rb

@@ -1,6 +1,6 @@
-module SocialExt
+module BlankExtension
   class Engine < ::Rails::Engine
-    isolate_namespace SocialExt
+    isolate_namespace BlankExtension
     config.generators do |g|
       g.scaffold_controller :chili
       g.test_framework :rspec, view_specs: false, routing_specs: false, controller_specs: false

data/spec/dummy/{template_ext/lib/template_ext → blank_extension/lib/blank_extension}/version.rb

@@ -1,3 +1,3 @@
-module TemplateExt
+module BlankExtension
   VERSION = "0.0.1"
 end

data/spec/dummy/{template_ext/lib/tasks/template_ext_tasks.rake → blank_extension/lib/tasks/blank_extension_tasks.rake}

@@ -1,4 +1,4 @@
 # desc "Explaining what the task does"
-# task :template_ext do
+# task :blank_extension do
 #   # Task goes here
 # end

data/spec/dummy/{template_ext → blank_extension}/script/rails

@@ -2,7 +2,7 @@
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/template_ext/engine', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/blank_extension/engine', __FILE__)
 
 require 'rails/all'
 require 'rails/engine/commands'

data/spec/dummy/example/config/application.rb

@@ -4,7 +4,8 @@ require 'rails/all'
 
 Bundler.require
 require "chili"
-require "social_ext"
+require "social_extension"
+require "invites_extension"
 
 module Dummy
   class Application < Rails::Application

data/spec/dummy/example/config/boot.rb

@@ -8,4 +8,5 @@ if File.exist?(gemfile)
 end
 
 $:.unshift File.expand_path('../../../../../lib', __FILE__)
-$:.unshift File.expand_path('../../vendor/chili/social_ext/lib', __FILE__)
+$:.unshift File.expand_path('../../vendor/chili/social_extension/lib', __FILE__)
+$:.unshift File.expand_path('../../vendor/chili/invites_extension/lib', __FILE__)

data/spec/dummy/example/db/migrate/20120513032032_create_social_extension_likes.rb

@@ -0,0 +1,11 @@
+# This migration comes from social_extension (originally 20120513031021)
+class CreateSocialExtensionLikes < ActiveRecord::Migration
+  def change
+    create_table :social_extension_likes do |t|
+      t.integer :post_id
+      t.integer :user_id
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/example/db/schema.rb

@@ -19,7 +19,7 @@ ActiveRecord::Schema.define(:version => 20120513032032) do
     t.datetime "updated_at", :null => false
   end
 
-  create_table "social_ext_likes", :force => true do |t|
+  create_table "social_extension_likes", :force => true do |t|
     t.integer  "post_id"
     t.integer  "user_id"
     t.datetime "created_at", :null => false

data/spec/dummy/example/vendor/chili/invites_extension/.gitignore

@@ -0,0 +1,3 @@
+.bundle/
+log/*.log
+pkg/

data/spec/dummy/example/vendor/chili/invites_extension/app/assets/javascripts/invites_extension/application.js

@@ -0,0 +1,13 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require_tree .

data/spec/dummy/example/vendor/chili/invites_extension/app/assets/stylesheets/invites_extension/application.css

@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+ */

data/spec/dummy/example/vendor/chili/invites_extension/app/overrides/posts/index/disclaimer.html.erb.deface

@@ -0,0 +1,2 @@
+<!-- insert_after '#posts' -->
+<p class='disclaimer'>Invite functionality is also in beta</p>

data/spec/dummy/example/vendor/chili/invites_extension/config/routes.rb

@@ -0,0 +1,3 @@
+InvitesExtension::Engine.automount!
+InvitesExtension::Engine.routes.draw do
+end