chili 2.0.1 → 3.0.0

data/README.md

@@ -52,7 +52,7 @@ The context of the active_if block is the application controller so you can use
 ```ruby
 # {feature}/lib/social_feature.rb
 module SocialFeature
-  extend Chili::Activatable
+  extend Chili::Base
   active_if { logged_in? && current_user.admin? } # Feature is only visible to logged in admin users
 end
 ```
@@ -83,11 +83,9 @@ but will only be accessible when active_if is true.
 
 ### Migrations
 
-Migrations are handled the same way as engines. Use the
-following commands after you've added a new migration to a feature:
+To copy and run feature db migrations use the following command:
 
-    $ rake social_feature:migrations:install
-    $ rake db:migrate
+    $ rake social_feature:db:migrate
 
 ### Modifying existing models
 

data/chili.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rails", "~> 3.2"
   gem.add_dependency "deface", "~> 1.0.0.rc1"
 
-  gem.add_development_dependency 'rspec', '~> 2.9.0'
-  gem.add_development_dependency 'rspec-rails', '~> 2.9.0'
+  gem.add_development_dependency 'rspec', '~> 2.12.0'
+  gem.add_development_dependency 'rspec-rails', '~> 2.12.0'
   gem.add_development_dependency 'jquery-rails'
-  gem.add_development_dependency 'capybara'
+  gem.add_development_dependency 'capybara', '~> 2.0'
+  gem.add_development_dependency 'xpath'
   gem.add_development_dependency 'sqlite3'
 end

data/lib/chili.rb

@@ -1,8 +1,7 @@
 require "deface"
-require "chili/activatable"
+require "chili/base"
 require "chili/bundler"
 require "chili/engine"
-require "chili/extensions/rails/engine"
 require "chili/feature"
 require "chili/overrides"
 require "chili/version"

data/lib/chili/base.rb

@@ -0,0 +1,11 @@
+require "chili/activatable"
+require "chili/engine_extensions"
+
+module Chili
+  module Base
+    def self.extended(base)
+      base.extend(Activatable)
+      base::Engine.extend(EngineExtensions)
+    end
+  end
+end

data/lib/chili/engine_extensions.rb

@@ -0,0 +1,28 @@
+module Chili
+  module EngineExtensions
+    def self.extended(base)
+      base.rake_tasks do
+        next if self.is_a?(Rails::Application)
+        next unless has_migrations?
+
+        namespace railtie_name do
+          namespace :db do
+            desc "Copy and migrate migrations from #{railtie_name}"
+            task :migrate do
+              Rake::Task["#{railtie_name}:install:migrations"].invoke
+              Rake::Task["db:migrate"].invoke
+            end
+          end
+        end
+      end
+    end
+
+    def automount!(path = nil)
+      engine = self
+      path ||= 'chili/' + engine.parent.to_s.underscore
+      Rails.application.routes.draw do
+        mount engine => path
+      end
+    end
+  end
+end

data/lib/chili/version.rb

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

data/lib/generators/chili/feature/feature_generator.rb

@@ -40,6 +40,7 @@ module Chili
         remove_dir 'script'
         remove_file 'Gemfile'
         remove_file 'Rakefile'
+        remove_file 'MIT-LICENSE'
       end
 
       def remove_jquery_stuff
@@ -63,9 +64,9 @@ module Chili
         prepend_to_file "lib/#{feature.name}.rb", "require \"chili\"\n"
       end
 
-      def include_active_if
+      def include_base_and_active_if
         inject_into_file "lib/#{feature.name}.rb", after: "module #{feature.name.camelcase}\n" do <<-RUBY
-  extend Chili::Activatable
+  extend Chili::Base
   active_if { true } # edit this to activate/deactivate feature at runtime
         RUBY
         end

data/lib/tasks/chili.rake

@@ -0,0 +1,17 @@
+{ spec: 'RSpec::Core::RakeTask', test: 'Rake::TestTask' }.each do |test_lib, rake_task|
+  if Rake::Task.task_defined?(test_lib)
+
+    Rake::Task[test_lib].clear
+    chili_specs = "#{Chili::FEATURE_FOLDER}/**/#{test_lib}/**/*_#{test_lib}.rb"
+
+    task = rake_task.constantize.new(test_lib => 'test:prepare')
+    task.pattern = [task.pattern, chili_specs]
+
+    namespace test_lib do
+      desc "Run tests for all Chili features"
+      rake_task.constantize.new(:chili) do |t|
+        t.pattern = chili_specs
+      end
+    end
+  end
+end

data/spec/README.md

@@ -13,6 +13,6 @@ spec/dummy/app             # dummy app for generating chili features inside
 spec/dummy/blank_feature   # blank feature template used to compare output of generators
 spec/example_app           # rails app containing 2 chili features for integration testing
 spec/generators            # generator tests
-spec/lib                   # lib unit tests
+spec/chili                 # chili unit tests
 spec/requests              # integration tests
 ```

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.8"
-  s.add_dependency 'chili', '~> 2.0'
+  s.add_dependency "rails", "~> 3.2.9"
+  s.add_dependency 'chili', '~> 3.0'
 
   s.add_development_dependency "sqlite3"
 end

data/spec/dummy/blank_feature/lib/blank_feature.rb

@@ -2,6 +2,6 @@ require "chili"
 require "blank_feature/engine"
 
 module BlankFeature
-  extend Chili::Activatable
+  extend Chili::Base
   active_if { true } # edit this to activate/deactivate feature at runtime
 end

data/spec/example_app/lib/chili/invites_feature/lib/invites_feature.rb

@@ -2,6 +2,6 @@ require "chili"
 require "invites_feature/engine"
 
 module InvitesFeature
-  extend Chili::Activatable
+  extend Chili::Base
   active_if { logged_in? }
 end

data/spec/example_app/lib/chili/social_feature/lib/social_feature.rb

@@ -2,6 +2,6 @@ require "chili"
 require "social_feature/engine"
 
 module SocialFeature
-  extend Chili::Activatable
+  extend Chili::Base
   active_if { logged_in? && current_user.admin? }
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../example_app/config/environment", __FILE__)
 require 'rspec/rails'
+require 'capybara/rspec'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chili
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +93,22 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: xpath
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -140,16 +156,19 @@ files:
 - chili.gemspec
 - lib/chili.rb
 - lib/chili/activatable.rb
+- lib/chili/base.rb
 - lib/chili/bundler.rb
 - lib/chili/engine.rb
-- lib/chili/extensions/rails/engine.rb
+- lib/chili/engine_extensions.rb
 - lib/chili/feature.rb
 - lib/chili/overrides.rb
 - lib/chili/version.rb
 - lib/generators/chili/feature/USAGE
 - lib/generators/chili/feature/feature_generator.rb
 - lib/generators/chili/generator_proxy.rb
+- lib/tasks/chili.rake
 - spec/README.md
+- spec/chili/activatable_spec.rb
 - spec/dummy/app/app/controllers/application_controller.rb
 - spec/dummy/app/config/application.rb
 - spec/dummy/app/config/boot.rb
@@ -158,7 +177,6 @@ files:
 - spec/dummy/app/config/environments/development.rb
 - spec/dummy/app/config/environments/test.rb
 - spec/dummy/app/script/rails
-- spec/dummy/blank_feature/MIT-LICENSE
 - spec/dummy/blank_feature/README.rdoc
 - spec/dummy/blank_feature/app/assets/images/blank_feature/.gitkeep
 - spec/dummy/blank_feature/app/assets/javascripts/blank_feature/application.js
@@ -260,10 +278,9 @@ files:
 - spec/example_app/public/favicon.ico
 - spec/example_app/script/rails
 - spec/example_app/spec/support/user_macros.rb
+- spec/features/social_extension_spec.rb
 - spec/generators/chili/feature_generator_spec.rb
 - spec/generators/chili/generator_proxy_spec.rb
-- spec/lib/chili/activatable_spec.rb
-- spec/requests/social_extension_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy_app.rb
 homepage: http://balvig.github.com/chili/
@@ -280,7 +297,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1121667919544637223
+      hash: 2891570347868177261
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -289,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1121667919544637223
+      hash: 2891570347868177261
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -298,6 +315,7 @@ specification_version: 3
 summary: The spicy feature toggle framework
 test_files:
 - spec/README.md
+- spec/chili/activatable_spec.rb
 - spec/dummy/app/app/controllers/application_controller.rb
 - spec/dummy/app/config/application.rb
 - spec/dummy/app/config/boot.rb
@@ -306,7 +324,6 @@ test_files:
 - spec/dummy/app/config/environments/development.rb
 - spec/dummy/app/config/environments/test.rb
 - spec/dummy/app/script/rails
-- spec/dummy/blank_feature/MIT-LICENSE
 - spec/dummy/blank_feature/README.rdoc
 - spec/dummy/blank_feature/app/assets/images/blank_feature/.gitkeep
 - spec/dummy/blank_feature/app/assets/javascripts/blank_feature/application.js
@@ -408,9 +425,8 @@ test_files:
 - spec/example_app/public/favicon.ico
 - spec/example_app/script/rails
 - spec/example_app/spec/support/user_macros.rb
+- spec/features/social_extension_spec.rb
 - spec/generators/chili/feature_generator_spec.rb
 - spec/generators/chili/generator_proxy_spec.rb
-- spec/lib/chili/activatable_spec.rb
-- spec/requests/social_extension_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy_app.rb

data/lib/chili/extensions/rails/engine.rb

@@ -1,9 +0,0 @@
-class Rails::Engine
-  def self.automount!(path = nil)
-    engine = self
-    path ||= 'chili/' + engine.parent.to_s.underscore
-    Rails.application.routes.draw do
-      mount engine => path
-    end
-  end
-end

data/spec/dummy/blank_feature/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright 2012 YOURNAME
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.