refinerycms-settings 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c63b128a70282fdcf67dad43bfa02430bfe74012
-  data.tar.gz: 66490d66e0fd27b668260e55a79dc497952bc5de
+  metadata.gz: 9775cec5ba773f8cc291a7ded3a154814169ab4e
+  data.tar.gz: d91fc0d665c2e312c28d629ddf9222983323ce54
 SHA512:
-  metadata.gz: 37b3ce800230ef6ce6528036d9ea8eeb13529260bcc1fe08495ae823b17e1844edadcdd3e8892ab0b86613ce2030b860eee28db75ffc87325b8a695c64b702a4
-  data.tar.gz: 1ac20bb6ed79030cfd20a7b27bdadaf17eeafd7447c2967d421ec186cf18acc212e80dc4ee1559ca1b8dbce07d922a9f3f3706b391acf028ddbebc9e8fc24a19
+  metadata.gz: 02cde442a3a360fddcb55e64015c93c5d440f0102a432117142b28c2fc8b9789f0dd84fd27718458f38e7b36e8c59ed3d74a61f8c8fd44789a753d2cc893f559
+  data.tar.gz: 025f977452a4249909ad7b6257dbcd85beca3436b690c22306a5d979939c3bdcf2fa25c596f51a70b113a8c5e7c571e5f990331e8b8c8d5f2659f595bb9fa3cb

data/.gitignore

@@ -1,3 +1,6 @@
 .DS_Store
 Gemfile.lock
 spec/dummy
+
+# Local Gemfile for developing without sharing dependencies
+.gemfile

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
-before_install:
-  - 'if [[ "$TRAVIS_RUBY_VERSION" =~ "jruby" ]] ; then gem update --system ; fi'
+bundler_args: --without development
 before_script:
   - "sh -e /etc/init.d/xvfb start"
-  - "bundle exec rake refinery:testing:dummy_app > /dev/null"
+  - "bundle exec rake refinery:testing:dummy_app"
 script:
   - "DISPLAY=:99.0 bundle exec rspec spec"
 notifications:
@@ -23,14 +22,9 @@ env:
   - DB=mysql
 matrix:
   allow_failures:
-    - rvm: rbx-18mode
     - rvm: rbx-19mode
-    - rvm: jruby-19mode
-    - rvm: jruby-18mode
 rvm:
+  - 2.0.0
   - 1.9.3
-  - 1.8.7
   - rbx-19mode
   - jruby-19mode
-  - rbx-18mode
-  - jruby-18mode

data/Gemfile

@@ -1,64 +1,30 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 
-gem 'refinerycms', '~> 2.0.1'
+gem 'refinerycms', '~> 2.1.0'
+gem 'refinerycms-testing', '~> 2.1.0', :group => :test
+gem 'refinerycms-acts-as-indexed', '~> 1.0.0'
 
-group :development, :test do
-  gem 'refinerycms-testing', '~> 2.0.1'
-  gem 'guard-rspec', '~> 0.6.0'
-
-  platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter'
-    gem 'activerecord-jdbcmysql-adapter'
-    gem 'activerecord-jdbcpostgresql-adapter'
-    gem 'jruby-openssl'
-  end
-
-  unless defined?(JRUBY_VERSION)
-    gem 'sqlite3'
-    gem 'mysql2'
-    gem 'pg'
-  end
-
-  platforms :mswin, :mingw do
-    gem 'win32console'
-    gem 'rb-fchange', '~> 0.0.5'
-    gem 'rb-notifu', '~> 0.0.4'
-  end
-
-  platforms :ruby do
-    gem 'spork', '~> 0.9.0.rc'
-    gem 'guard-spork'
+# Database Configuration
+unless ENV['TRAVIS']
+  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+  gem 'sqlite3', :platform => :ruby
+end
 
-    unless ENV['TRAVIS']
-      require 'rbconfig'
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'rb-fsevent', '>= 0.3.9'
-        gem 'ruby_gntp'
-      end
-      if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '>= 0.5.1'
-        gem 'libnotify',  '~> 0.1.3'
-        gem 'therubyracer', '~> 0.9.9'
-      end
-    end
-  end
+if !ENV['TRAVIS'] || ENV['DB'] == 'mysql'
+  gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
+  gem 'jdbc-mysql', '= 5.1.13', :platform => :jruby
+  gem 'mysql2', :platform => :ruby
+end
 
-  platforms :jruby do
-    unless ENV['TRAVIS']
-      require 'rbconfig'
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'ruby_gntp'
-      end
-      if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '>= 0.5.1'
-        gem 'libnotify',  '~> 0.1.3'
-      end
-    end
-  end
+if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
+  gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+  gem 'pg', :platform => :ruby
 end
 
+gem 'jruby-openssl', :platform => :jruby
+
 # Refinery/rails should pull in the proper versions of these
 group :assets do
   gem 'sass-rails'
@@ -66,4 +32,7 @@ group :assets do
   gem 'uglifier'
 end
 
-gem 'jquery-rails'
+# Load local gems according to Refinery developer preference.
+if File.exist? local_gemfile = File.expand_path('../.gemfile', __FILE__)
+  eval File.read(local_gemfile)
+end

data/Rakefile

@@ -17,3 +17,5 @@ Refinery::Testing::Railtie.load_tasks
 Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
 
 load File.expand_path('../tasks/rspec.rake', __FILE__)
+
+task :default => :spec

data/app/models/refinery/setting.rb

@@ -1,7 +1,7 @@
 module Refinery
   class Setting < Refinery::Core::BaseModel
     extend FriendlyId
-    friendly_id :name
+    friendly_id :name, :use => :slugged
 
     FORM_VALUE_TYPES = [
       ['Multi-line', 'text_area'],
@@ -12,9 +12,6 @@ module Refinery
 
     serialize :value # stores into YAML format
 
-    # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
-    acts_as_indexed :fields => [:name]
-
     attr_accessible :name, :value, :destroyable,
                     :scoping, :restricted, :form_value_type
 
@@ -25,7 +22,7 @@ module Refinery
     after_save do |setting|
       setting.class.rewrite_cache
     end
-    
+
     after_destroy do |setting|
       setting.class.rewrite_cache
     end

data/app/views/refinery/admin/settings/_records.html.erb

@@ -1,8 +1,4 @@
-<% if searching? %>
-  <h2>
-    <%= t('results_for', :scope => 'refinery.admin.search', :query => params[:search]) %>
-  </h2>
-<% end %>
+<%= render 'refinery/admin/search_header', :url => refinery.admin_settings_path %>
 <div class='pagination_container'>
   <% if @settings.any? %>
     <%= render 'settings' %>
@@ -18,4 +14,4 @@
       <% end %>
     </p>
   <% end %>
-</div>
+</div>

data/config/locales/es.yml

@@ -18,14 +18,6 @@ es:
           enabled: "Si, habilita esta funcionalidad"
           restart_may_be_in_order_html: <strong>Recuerda</strong> que puede que necesites reiniciar tu web para que esta opción haga efecto.
           yes_make_this_setting_restricted: "Sí, restringir esta opción sólo para superusuarios."
-          title:
-            frontend_refinery_stylesheets_enabled: Hojas de estilo de refinery en el frontend
-            i18n_translation_current_locale: Idioma actual (Refinery)
-            i18n_translation_default_frontend_locale: Idioma por defecto en el frontend (Refinery)
-            i18n_translation_default_locale: Idioma por defecto (Refinery)
-            i18n_translation_enabled: Traducción activada (Refinery)
-            i18n_translation_frontend_locales: Idiomas disponibles en el frontend (Refinery)
-            i18n_translation_locales: Idiomas disponibles (Refinery)
           help:
             restricted: Hace que sólo los superusuarios (como tu) puedan ver y editar esta opción.
   activerecord:

data/config/routes.rb

@@ -1,6 +1,6 @@
 Refinery::Core::Engine.routes.draw do
   if Refinery::Settings.enable_interface
-    namespace :admin, :path => 'refinery' do
+    namespace :admin, :path => Refinery::Core.backend_route do
       resources :settings, :except => :show
     end
   end

data/db/migrate/20130414130143_add_slug_to_refinery_settings.rb

@@ -0,0 +1,5 @@
+class AddSlugToRefinerySettings < ActiveRecord::Migration
+  def change
+    add_column :refinery_settings, :slug, :string, :unique => true
+  end
+end

data/lib/refinery/settings.rb

@@ -1,5 +1,4 @@
 require 'refinerycms-core'
-require 'acts_as_indexed'
 
 module Refinery
   autoload :SettingsGenerator, 'generators/refinery/settings_generator'

data/lib/refinery/settings/engine.rb

@@ -12,7 +12,6 @@ module Refinery
         Refinery::Plugin.register do |plugin|
           plugin.pathname = root
           plugin.name = 'refinery_settings'
-          plugin.version = %q{2.0.0}
           plugin.menu_match = %r{refinery/settings$}
           plugin.hide_from_menu = !Refinery::Settings.enable_interface
           plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.admin_settings_path }

data/refinerycms-settings.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
   s.name              = %q{refinerycms-settings}
-  s.version           = %q{2.0.3}
+  s.version           = %q{2.1.0}
   s.summary           = %q{Settings engine for Refinery CMS}
   s.description       = %q{Adds programmer creatable, user editable settings.}
   s.email             = %q{info@refinerycms.com}
@@ -16,6 +16,5 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency 'refinerycms-core', '~> 2.0.10'
-  s.add_dependency 'acts_as_indexed',  '~> 0.7.7'
+  s.add_dependency 'refinerycms-core', '~> 2.1.0'
 end

data/spec/{requests → features}/refinery/admin/settings_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 module Refinery
   module Admin
     describe "Settings" do
-      login_refinery_user
+      refinery_login_with :refinery_user
 
       context "when interface config is enabled" do
         before do
@@ -19,7 +19,7 @@ module Refinery
         end
 
         context "when no settings" do
-          before(:each) { Refinery::Setting.destroy_all }
+          before { Refinery::Setting.destroy_all }
 
           it "invites to create one" do
             visit refinery.admin_settings_path
@@ -41,19 +41,39 @@ module Refinery
             page.should have_selector('iframe#dialog_iframe')
 
             page.within_frame('dialog_iframe') do
-              fill_in "Name", :with => "test setting"
-              fill_in "Value", :with => "true"
+              fill_in "setting_name", :with => "test setting"
+              fill_in "setting_value", :with => "true"
 
-              click_button "Save"
+              click_button "submit_button"
             end
 
             page.should have_content("'Test Setting' was successfully added.")
             page.should have_content("Test Setting - true")
           end
+
+          it "adds setting with slug unfriendly name", :js => true do
+            visit refinery.admin_settings_path
+            click_link "Add new setting"
+
+            page.should have_selector('iframe#dialog_iframe')
+
+            page.within_frame('dialog_iframe') do
+              fill_in "setting_name", :with => "Test/Setting"
+              fill_in "setting_value", :with => "true"
+
+              click_button "submit_button"
+            end
+
+            page.should have_content("'Test/Setting' was successfully added.")
+            page.should have_content("Test/Setting - true")
+
+            visit refinery.edit_admin_setting_path(Refinery::Setting.last)
+            page.should_not have_content('NoMethodError in Refinery::Admin::BaseController#error_404')
+          end
         end
 
         context "pagination" do
-          before(:each) do
+          before do
             (Refinery::Setting.per_page + 1).times do
               FactoryGirl.create(:setting)
             end

data/spec/models/refinery/setting_spec.rb

@@ -3,95 +3,114 @@ require 'spec_helper'
 module Refinery
   describe Setting do
 
-    before(:each) do
+    before do
       ::Refinery::Setting.set(:creating_from_scratch, nil)
       ::Refinery::Setting.set(:rspec_testing_creating_from_scratch, nil)
     end
 
+    context "slug" do
+      it "should create correct slug" do
+        ::Refinery::Setting.set('test/something', {:value => "Look, a value"})
+        ::Refinery::Setting.last.to_param.should eq('test-something')
+      end
+    end
+
     context "set" do
+      it "should save and get @keram" do
+        ::Refinery::Setting.find_or_set(:twitter, '@keram')
+        setting = ::Refinery::Setting.last
+        setting.value.should eq('@keram')
+      end
+
+      it "should not strip whitespaces" do
+        ::Refinery::Setting.find_or_set(:author, ' benbruscella ')
+        setting = ::Refinery::Setting.last
+        setting.value.should eq(' benbruscella ')
+      end
+
       it "should create a setting that didn't exist" do
         ::Refinery::Setting.get(:creating_from_scratch, :scoping => 'rspec_testing').should eq(nil)
         ::Refinery::Setting.set(:creating_from_scratch, {:value => "Look, a value", :scoping => 'rspec_testing'}).should eq("Look, a value")
       end
 
       it "should override an existing setting" do
-        @set = ::Refinery::Setting.set(:creating_from_scratch, {:value => "a value", :scoping => 'rspec_testing'})
-        @set.should eq("a value")
+        set = ::Refinery::Setting.set(:creating_from_scratch, {:value => "a value", :scoping => 'rspec_testing'})
+        set.should eq("a value")
 
-        @new_set = ::Refinery::Setting.set(:creating_from_scratch, {:value => "newer replaced value", :scoping => 'rspec_testing'})
-        @new_set.should eq("newer replaced value")
+        new_set = ::Refinery::Setting.set(:creating_from_scratch, {:value => "newer replaced value", :scoping => 'rspec_testing'})
+        new_set.should eq("newer replaced value")
       end
 
       it "should default to form_value_type text_area" do
-        @set = ::Refinery::Setting.set(:creating_from_scratch, {:value => "a value", :scoping => 'rspec_testing'})
+        set = ::Refinery::Setting.set(:creating_from_scratch, {:value => "a value", :scoping => 'rspec_testing'})
         ::Refinery::Setting.find_by_name(:creating_from_scratch.to_s, :conditions => {:scoping => 'rspec_testing'}).form_value_type.should eq("text_area")
       end
 
       it "should fix true as a value to 'true' (string)" do
-        @set = ::Refinery::Setting.set(:creating_from_scratch, {:value => true, :scoping => 'rspec_testing'})
+        set = ::Refinery::Setting.set(:creating_from_scratch, {:value => true, :scoping => 'rspec_testing'})
         ::Refinery::Setting.find_by_name(:creating_from_scratch.to_s, :conditions => {:scoping => 'rspec_testing'})[:value].should eq('true')
-        @set.should eq(true)
+        set.should eq(true)
       end
 
       it "should fix false as a value to 'false' (string)" do
-        @set = ::Refinery::Setting.set(:creating_from_scratch, {:value => false, :scoping => 'rspec_testing'})
+        set = ::Refinery::Setting.set(:creating_from_scratch, {:value => false, :scoping => 'rspec_testing'})
         ::Refinery::Setting.find_by_name(:creating_from_scratch.to_s, :conditions => {:scoping => 'rspec_testing'})[:value].should eq('false')
-        @set.should eq(false)
+        set.should eq(false)
       end
 
       it "should fix '1' as a value with a check_box form_value_type to true" do
-        @set = ::Refinery::Setting.set(:creating_from_scratch, {:value => "1", :scoping => 'rspec_testing', :form_value_type => 'check_box'})
+        set = ::Refinery::Setting.set(:creating_from_scratch, {:value => "1", :scoping => 'rspec_testing', :form_value_type => 'check_box'})
         ::Refinery::Setting.find_by_name(:creating_from_scratch.to_s, :conditions => {:scoping => 'rspec_testing'})[:value].should eq('true')
-        @set.should eq(true)
+        set.should eq(true)
       end
 
       it "should fix '0' as a value with a check_box form_value_type to false" do
-        @set = ::Refinery::Setting.set(:creating_from_scratch, {:value => "0", :scoping => 'rspec_testing', :form_value_type => 'check_box'})
+        set = ::Refinery::Setting.set(:creating_from_scratch, {:value => "0", :scoping => 'rspec_testing', :form_value_type => 'check_box'})
         ::Refinery::Setting.find_by_name(:creating_from_scratch.to_s, :conditions => {:scoping => 'rspec_testing'})[:value].should eq('false')
-        @set.should eq(false)
+        set.should eq(false)
       end
     end
 
     context "get" do
       it "should retrieve a seting that was created" do
-        @set = ::Refinery::Setting.set(:creating_from_scratch, {:value => "some value", :scoping => 'rspec_testing'})
-        @set.should eq('some value')
+        set = ::Refinery::Setting.set(:creating_from_scratch, {:value => "some value", :scoping => 'rspec_testing'})
+        set.should eq('some value')
 
-        @get = ::Refinery::Setting.get(:creating_from_scratch, :scoping => 'rspec_testing')
-        @get.should eq('some value')
+        get = ::Refinery::Setting.get(:creating_from_scratch, :scoping => 'rspec_testing')
+        get.should eq('some value')
       end
 
       it "should also work with setting scoping using string and getting via symbol" do
-        @set = ::Refinery::Setting.set(:creating_from_scratch, {:value => "some value", :scoping => 'rspec_testing'})
-        @set.should eq('some value')
+        set = ::Refinery::Setting.set(:creating_from_scratch, {:value => "some value", :scoping => 'rspec_testing'})
+        set.should eq('some value')
 
-        @get = ::Refinery::Setting.get(:creating_from_scratch, :scoping => :rspec_testing)
-        @get.should eq('some value')
+        get = ::Refinery::Setting.get(:creating_from_scratch, :scoping => :rspec_testing)
+        get.should eq('some value')
       end
 
       it "should also work with setting scoping using symbol and getting via string" do
-        @set = ::Refinery::Setting.set(:creating_from_scratch, {:value => "some value", :scoping => :rspec_testing})
-        @set.should eq('some value')
+        set = ::Refinery::Setting.set(:creating_from_scratch, {:value => "some value", :scoping => :rspec_testing})
+        set.should eq('some value')
 
-        @get = ::Refinery::Setting.get(:creating_from_scratch, :scoping => 'rspec_testing')
-        @get.should eq('some value')
+        get = ::Refinery::Setting.get(:creating_from_scratch, :scoping => 'rspec_testing')
+        get.should eq('some value')
       end
     end
 
     context "find_or_set" do
       it "should create a non existant setting" do
-        @created = ::Refinery::Setting.find_or_set(:creating_from_scratch, 'I am a setting being created', :scoping => 'rspec_testing')
+        created = ::Refinery::Setting.find_or_set(:creating_from_scratch, 'I am a setting being created', :scoping => 'rspec_testing')
 
-        @created.should eq("I am a setting being created")
+        created.should eq("I am a setting being created")
       end
 
       it "should not override an existing setting" do
-        @created = ::Refinery::Setting.set(:creating_from_scratch, {:value => 'I am a setting being created', :scoping => 'rspec_testing'})
-        @created.should eq("I am a setting being created")
+        created = ::Refinery::Setting.set(:creating_from_scratch, {:value => 'I am a setting being created', :scoping => 'rspec_testing'})
+        created.should eq("I am a setting being created")
 
-        @find_or_set_created = ::Refinery::Setting.find_or_set(:creating_from_scratch, 'Trying to change an existing value', :scoping => 'rspec_testing')
+        find_or_set_created = ::Refinery::Setting.find_or_set(:creating_from_scratch, 'Trying to change an existing value', :scoping => 'rspec_testing')
 
-        @created.should eq("I am a setting being created")
+        created.should eq("I am a setting being created")
       end
 
       it "should work without scoping" do

data/spec/routing/settings_routing_spec.rb

@@ -1,9 +1,9 @@
 require "spec_helper"
 
 
-describe "routes for refinery settings", :focus do
+describe "routes for refinery settings" do
 
-  context "when interface config is disabled", :focus do
+  context "when interface config is disabled" do
     before do
       Refinery::Settings.stub(:enable_interface).and_return(false)
       Refinery::Plugins.registered.find_by_name("refinery_settings").hide_from_menu = true
@@ -13,4 +13,4 @@ describe "routes for refinery settings", :focus do
       expect(:get => "/refinery/settings").to_not be_routable
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,56 +1,30 @@
 require 'rubygems'
 
-def setup_environment
-  # Configure Rails Environment
-  ENV["RAILS_ENV"] ||= 'test'
+# Configure Rails Environment
+ENV["RAILS_ENV"] ||= 'test'
 
-  require File.expand_path("../dummy/config/environment", __FILE__)
+require File.expand_path("../dummy/config/environment", __FILE__)
 
-  require 'rspec/rails'
-  require 'capybara/rspec'
-  require 'factory_girl_rails'
+require 'rspec/rails'
+require 'capybara/rspec'
+require 'factory_girl_rails'
 
-  Rails.backtrace_cleaner.remove_silencers!
+Rails.backtrace_cleaner.remove_silencers!
 
-  RSpec.configure do |config|
-    config.mock_with :rspec
-    config.treat_symbols_as_metadata_keys_with_true_values = true
-    config.filter_run :focus => true
-    config.run_all_when_everything_filtered = true
-  end
-
-  # set javascript driver for capybara
-  Capybara.javascript_driver = :selenium
-end
-
-def each_run
-  ActiveSupport::Dependencies.clear
-
-  FactoryGirl.reload
-
-  # Requires supporting files with custom matchers and macros, etc,
-  # in ./support/ and its subdirectories including factories.
-  ([Rails.root.to_s] | ::Refinery::Plugins.registered.pathnames).map{|p|
-    Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
-  }.flatten.sort.each do |support_file|
-    require support_file
-  end
+RSpec.configure do |config|
+  config.mock_with :rspec
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
 end
 
-# If spork is available in the Gemfile it'll be used but we don't force it.
-unless (begin; require 'spork'; rescue LoadError; nil end).nil?
-  Spork.prefork do
-    # Loading more in this block will cause your tests to run faster. However,
-    # if you change any configuration or code from libraries loaded here, you'll
-    # need to restart spork for it take effect.
-    setup_environment
-  end
+# set javascript driver for capybara
+Capybara.javascript_driver = :selenium
 
-  Spork.each_run do
-    # This code will be run each time you run your specs.
-    each_run
-  end
-else
-  setup_environment
-  each_run
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories including factories.
+([Rails.root.to_s] | ::Refinery::Plugins.registered.pathnames).map{|p|
+  Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
+}.flatten.sort.each do |support_file|
+  require support_file
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-settings
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
@@ -17,28 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.10
-- !ruby/object:Gem::Dependency
-  name: acts_as_indexed
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 2.1.0
 description: Adds programmer creatable, user editable settings.
 email: info@refinerycms.com
 executables: []
@@ -49,11 +35,8 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
-- Guardfile
 - Rakefile
 - app/controllers/refinery/admin/settings_controller.rb
-- app/decorators/controllers/refinery/.gitkeep
-- app/decorators/models/refinery/.gitkeep
 - app/helpers/refinery/admin/settings_helper.rb
 - app/models/refinery/setting.rb
 - app/views/refinery/admin/settings/_actions.html.erb
@@ -93,6 +76,7 @@ files:
 - config/locales/zh-TW.yml
 - config/routes.rb
 - db/migrate/20100913234710_create_refinerycms_settings_schema.rb
+- db/migrate/20130414130143_add_slug_to_refinery_settings.rb
 - lib/generators/refinery/settings_generator.rb
 - lib/generators/refinery/templates/config/initializers/refinery/settings.rb.erb
 - lib/refinery/settings.rb
@@ -104,8 +88,8 @@ files:
 - refinerycms-settings.gemspec
 - script/rails
 - spec/factories/settings.rb
+- spec/features/refinery/admin/settings_spec.rb
 - spec/models/refinery/setting_spec.rb
-- spec/requests/refinery/admin/settings_spec.rb
 - spec/routing/settings_routing_spec.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
@@ -129,14 +113,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: refinerycms
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Settings engine for Refinery CMS
 test_files:
 - spec/factories/settings.rb
+- spec/features/refinery/admin/settings_spec.rb
 - spec/models/refinery/setting_spec.rb
-- spec/requests/refinery/admin/settings_spec.rb
 - spec/routing/settings_routing_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/Guardfile

@@ -1,20 +0,0 @@
-guard 'rspec', :version => 2, :cli => "--color" do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/controllers/#{m[1]}_#{m[2]}_spec.rb", "spec/requests/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('spec/spec_helper.rb')                        { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-  # Capybara request specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
-end
-
-guard 'spork', :wait => 60, :cucumber => false, :rspec_env => { 'RAILS_ENV' => 'test' } do
-  watch('config/application.rb')
-  watch('config/environment.rb')
-  watch(%r{^config/environments/.+\.rb$})
-  watch(%r{^config/initializers/.+\.rb$})
-  watch('spec/spec_helper.rb')
-end