chili 3.1.0 → 3.1.1

data/spec/example_app/config/routes.rb

@@ -1,4 +1,4 @@
-Rails.application.routes.draw do
+Dummy::Application.routes.draw do
   resources :users, :posts
   resource :session
   root to: 'posts#index'

data/spec/example_app/lib/chili/social_feature/app/controllers/social_feature/likes_controller.rb

@@ -16,5 +16,9 @@ module SocialFeature
       super.becomes(SocialFeature::User)
     end
 
+    def like_params
+      params.require(:like).permit(:post_id)
+    end
+
   end
 end

data/spec/example_app/lib/chili/social_feature/app/models/social_feature/like.rb

@@ -1,7 +1,5 @@
 module SocialFeature
   class Like < ActiveRecord::Base
     belongs_to :post
-
-    attr_accessible :post_id
   end
 end

data/spec/features/{social_extension_spec.rb → social_feature_spec.rb}

@@ -2,28 +2,29 @@ require 'spec_helper'
 
 feature 'View overrides' do
   scenario 'when user is not admin active_if toggles overrides off' do
-    login User.create!
-    visit('/posts')
+    login User.create!(admin: false)
+    visit '/posts'
     page.should_not have_content('See Your Likes')
     page.should_not have_content('Like functionality is in beta')
   end
 
   scenario 'when admin active_if toggles overrides on' do
     login User.create!(admin: true)
-    visit('/posts')
+    visit '/posts'
     page.should have_content('See Your Likes')
   end
 end
 
 feature 'Togglable controllers' do
   scenario 'when user is not admin active_if hides controllers in feature' do
-    login User.create!
-    expect { visit('/chili/social_feature/likes') }.to raise_error(ActionController::RoutingError)
+    login User.create!(admin: false)
+    visit '/chili/social_feature/likes'
+    #expect { visit('/chili/social_feature/likes') }.to raise_error(ActionController::RoutingError)
   end
 
   scenario 'when admin active_if makes controllers available' do
     login User.create!(admin: true)
-    visit('/chili/social_feature/likes')
+    visit '/chili/social_feature/likes'
     page.should have_content('Your Likes')
   end
 end
@@ -31,8 +32,13 @@ end
 feature 'Multiple chili features' do
   scenario 'multiple overrides do not redefine each other' do
     login User.create!(admin: true)
-    visit('/posts')
+    visit '/posts'
     page.should have_content('Like functionality is in beta')
     page.should have_content('Invite functionality is also in beta')
   end
+
+  scenario 'Chili works alongside permanent spree overrides' do
+    visit '/posts'
+    page.should have_content('Permanent spree override')
+  end
 end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@
 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.
@@ -17,7 +16,6 @@ RSpec.configure do |config|
   # config.mock_with :mocha
   # config.mock_with :flexmock
   # config.mock_with :rr
-  config.mock_with :rspec
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"

metadata

@@ -1,100 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: chili
 version: !ruby/object:Gem::Version
-  version: 3.1.0
-  prerelease: 
+  version: 3.1.1
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,33 +97,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: xpath
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: The spicy feature toggle framework
@@ -174,7 +171,6 @@ files:
 - spec/dummy/app/config/boot.rb
 - spec/dummy/app/config/database.yml
 - spec/dummy/app/config/environment.rb
-- spec/dummy/app/config/environments/development.rb
 - spec/dummy/app/config/environments/test.rb
 - spec/dummy/app/script/rails
 - spec/dummy/blank_feature/README.rdoc
@@ -209,6 +205,7 @@ files:
 - spec/example_app/app/models/.gitkeep
 - spec/example_app/app/models/post.rb
 - spec/example_app/app/models/user.rb
+- spec/example_app/app/overrides/posts/index/spree.html.erb.deface
 - spec/example_app/app/views/layouts/application.html.erb
 - spec/example_app/app/views/posts/_form.html.erb
 - spec/example_app/app/views/posts/_post.html.erb
@@ -231,6 +228,7 @@ files:
 - spec/example_app/config/environments/production.rb
 - spec/example_app/config/environments/test.rb
 - spec/example_app/config/initializers/backtrace_silencers.rb
+- spec/example_app/config/initializers/filter_parameter_logging.rb
 - spec/example_app/config/initializers/inflections.rb
 - spec/example_app/config/initializers/mime_types.rb
 - spec/example_app/config/initializers/secret_token.rb
@@ -278,40 +276,33 @@ 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/features/social_feature_spec.rb
 - spec/generators/chili/feature_generator_spec.rb
 - spec/generators/chili/generator_proxy_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy_app.rb
 homepage: http://balvig.github.com/chili/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1451030424463406941
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1451030424463406941
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The spicy feature toggle framework
 test_files:
 - spec/README.md
@@ -321,7 +312,6 @@ test_files:
 - spec/dummy/app/config/boot.rb
 - spec/dummy/app/config/database.yml
 - spec/dummy/app/config/environment.rb
-- spec/dummy/app/config/environments/development.rb
 - spec/dummy/app/config/environments/test.rb
 - spec/dummy/app/script/rails
 - spec/dummy/blank_feature/README.rdoc
@@ -356,6 +346,7 @@ test_files:
 - spec/example_app/app/models/.gitkeep
 - spec/example_app/app/models/post.rb
 - spec/example_app/app/models/user.rb
+- spec/example_app/app/overrides/posts/index/spree.html.erb.deface
 - spec/example_app/app/views/layouts/application.html.erb
 - spec/example_app/app/views/posts/_form.html.erb
 - spec/example_app/app/views/posts/_post.html.erb
@@ -378,6 +369,7 @@ test_files:
 - spec/example_app/config/environments/production.rb
 - spec/example_app/config/environments/test.rb
 - spec/example_app/config/initializers/backtrace_silencers.rb
+- spec/example_app/config/initializers/filter_parameter_logging.rb
 - spec/example_app/config/initializers/inflections.rb
 - spec/example_app/config/initializers/mime_types.rb
 - spec/example_app/config/initializers/secret_token.rb
@@ -425,7 +417,7 @@ 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/features/social_feature_spec.rb
 - spec/generators/chili/feature_generator_spec.rb
 - spec/generators/chili/generator_proxy_spec.rb
 - spec/spec_helper.rb

data/spec/dummy/app/config/environments/development.rb

@@ -1,37 +0,0 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # In the development environment your application's code is reloaded on
-  # every request. This slows down response time but is perfect for development
-  # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
-
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
-  # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
-
-  # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
-
-  # Print deprecation notices to the Rails logger
-  config.active_support.deprecation = :log
-
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
-
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
-  # Do not compress assets
-  config.assets.compress = false
-
-  # Expands the lines which load the assets
-  config.assets.debug = true
-end