refinerycms-settings 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dff237e551123dee6e9c3ced6281227539cb2614
-  data.tar.gz: 100702ad1e1e8b554e38443d0f9ea71fb75ec305
+  metadata.gz: b996c2cc75a4f725c2cf6d70ed67ac7277a93e6c
+  data.tar.gz: b5d5585e04ca065315c798127b9c793435d714bd
 SHA512:
-  metadata.gz: aa0f73f3b5d6783ffbc52643518f82adebb2c62d23b53fa729b119441e71bd5aa7d4b601d09626ca09b3620dc05a3c076a5586e202f31c30d36850565d84470c
-  data.tar.gz: a3adac76e534b6e5278a0831a6b793da87a29c69f1c6e01575cd096b2b676f179f4d93099ed4ae41844d601deca4a430a847b5edbf05dc7e9159d60bfab133d8
+  metadata.gz: 8edc77367390f65772d45052b61d392d4cc37da5670e3a518ddbcf9269d95924a143e9e62f31bc38af2226e8cc3868723a115a897a3b8d3a902d505c5f8d8715
+  data.tar.gz: 910e7b789dacd9b04c879a0d46e317ac544248c7c088356bb28ad51fb1c8bdeade407b8b0cfe851e1511f46e3aa26b70b132d5904d8e000ce4fae6141ca35536

data/.travis.yml

@@ -1,5 +1,8 @@
 language: ruby
 bundler_args: --without development
+cache:
+  - bundler: true
+sudo: false
 before_script:
   - "sh -e /etc/init.d/xvfb start"
   - "bundle exec rake refinery:testing:dummy_app"
@@ -20,11 +23,7 @@ notifications:
 env:
   - DB=postgresql
   - DB=mysql
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode
 rvm:
+  - 2.2
+  - 2.1
   - 2.0.0
-  - 1.9.3
-  - rbx-19mode
-  - jruby-19mode

data/Gemfile

@@ -2,35 +2,37 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'refinerycms', '~> 2.1.1'
-gem 'refinerycms-testing', '~> 2.1.1', :group => :test
-gem 'refinerycms-acts-as-indexed', '~> 1.0.0'
+gem 'refinerycms', github: 'refinery/refinerycms'
+gem 'refinerycms-i18n', github: 'refinery/refinerycms-i18n'
+gem 'refinerycms-acts-as-indexed', github: 'refinery/refinerycms-acts-as-indexed'
+gem "mime-types", "~> 1.25"
+
+group :test do
+  gem 'refinerycms-testing', github: 'refinery/refinerycms'
+  gem 'poltergeist'
+  gem 'capybara-email', '~> 2.4'
+end
 
 # Database Configuration
 unless ENV['TRAVIS']
-  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-  gem 'sqlite3', :platform => :ruby
+  gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
+  gem 'sqlite3', platform: :ruby
 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
+  gem 'activerecord-jdbcmysql-adapter', platform: :jruby
+  gem 'jdbc-mysql', '= 5.1.13', platform: :jruby
+  gem 'mysql2', platform: :ruby
 end
 
 if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
-  gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
-  gem 'pg', :platform => :ruby
+  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'
-  gem 'coffee-rails'
-  gem 'uglifier'
-end
+gem 'sass-rails', '~> 4.0.0'
+gem 'coffee-rails', '~> 4.0.0'
 
 # Load local gems according to Refinery developer preference.
 if File.exist? local_gemfile = File.expand_path('../.gemfile', __FILE__)

data/Rakefile

@@ -13,8 +13,7 @@ if File.exists?(APP_RAKEFILE)
 end
 
 require "refinerycms-testing"
-Refinery::Testing::Railtie.load_tasks
-Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
+Refinery::Testing::Railtie.load_dummy_tasks File.dirname(__FILE__)
 
 load File.expand_path('../tasks/rspec.rake', __FILE__)
 

data/app/controllers/refinery/admin/settings_controller.rb

@@ -6,8 +6,7 @@ module ::Refinery
 
       crudify :'refinery/setting',
               :order => "name ASC",
-              :redirect_to_url => :redirect_to_where?,
-              :xhr_paging => true
+              :redirect_to_url => :redirect_to_where?
 
       before_filter :sanitise_params, :only => [:create, :update]
 
@@ -50,6 +49,12 @@ module ::Refinery
       def sanitise_params
         params.delete(:scoping)
       end
+
+      def setting_params
+        params.require(:setting).permit(:title, :name, :value, :destroyable,
+                                          :scoping, :restricted, :form_value_type)
+      end
+
     end
   end
 end

data/app/models/refinery/setting.rb

@@ -1,7 +1,15 @@
+require 'friendly_id'
+
 module Refinery
   class Setting < Refinery::Core::BaseModel
     extend FriendlyId
-    friendly_id :name, :use => :slugged
+
+    friendly_id :name, use: [:slugged, :finders]
+
+    # If name changes tell friendly_id to regenerate slug when saving record
+    def should_generate_new_friendly_id?
+      name_changed?
+    end
 
     FORM_VALUE_TYPES = [
       ['Multi-line', 'text_area'],
@@ -12,93 +20,30 @@ module Refinery
 
     serialize :value # stores into YAML format
 
-    attr_accessible :name, :value, :destroyable,
-                    :scoping, :restricted, :form_value_type
-
     before_save do |setting|
       setting.restricted = false if setting.restricted.nil?
     end
 
-    after_save do |setting|
-      setting.class.rewrite_cache
-    end
-
-    after_destroy do |setting|
-      setting.class.rewrite_cache
-    end
-
     class << self
       # Number of settings to show per page when using will_paginate
       def per_page
         12
       end
 
-      def ensure_cache_exists!
-        if (result = Rails.cache.read(cache_key, :multithread => true)).nil?
-          result = rewrite_cache
-        end
-
-        result
-      end
-      protected :ensure_cache_exists!
-
-      def cache_read(name = nil, scoping = nil)
-        result = ensure_cache_exists!
-
-        if name.present?
-          scoping = scoping.to_s if scoping.is_a?(Symbol)
-          result = result.detect do |rs|
-            rs[:name] == name.to_s.downcase.to_sym and rs[:scoping] == scoping
-          end
-          result = result[:value] if !result.nil? and result.keys.include?(:value)
-        end
-
-        result
-      end
-
-      def to_cache(settings)
-        settings.collect do |rs|
-          {
-            :name => rs.name.to_s.downcase.to_sym,
-            :value => rs.value,
-            :scoping => rs.scoping,
-            :destroyable => rs.destroyable
-          }
-        end
-      end
-
-      def rewrite_cache
-        # delete cache
-        Rails.cache.delete(cache_key, :multithread => true)
-
-        # generate new cache
-        result = (to_cache(all) if (table_exists? rescue false))
-
-        # write cache
-        Rails.cache.write(cache_key, result, :multithread => true)
-
-        # return cache, or lack thereof.
-        result ||= []
-      end
-
-      def cache_key
-        [Refinery::Core.base_cache_key, 'settings_cache'].join('_')
-      end
-
       # find_or_set offers a convenient way to
       def find_or_set(name, the_value, options={})
         # Merge default options with supplied options.
         options = {
-          :scoping => nil,
-          :restricted => false,
-          :form_value_type => 'text_area'
+          scoping: nil,
+          restricted: false,
+          form_value_type: 'text_area'
         }.merge(options)
 
         # try to find the setting first
-        value = get(name, :scoping => options[:scoping])
+        value = get(name, scoping: options[:scoping])
 
         # if the setting's value is nil, store a new one using the existing functionality.
-        value = set(name, options.merge({:value => the_value})) if value.nil?
+        value = set(name, options.merge(value: the_value)) if value.nil?
 
         # Return what we found.
         value
@@ -108,8 +53,9 @@ module Refinery
 
       # Retrieve the current value for the setting whose name is supplied.
       def get(name, options = {})
-        options = {:scoping => nil}.update(options)
-        cache_read(name, options[:scoping])
+        options = {scoping: nil}.update(options)
+        where(name: name, scoping: options[:scoping])
+          .select(:value).map(&:value).first
       end
 
       alias :[] :get
@@ -118,7 +64,7 @@ module Refinery
         return (value.is_a?(Hash) ? value[:value] : value) unless (table_exists? rescue false)
 
         scoping = (value[:scoping] if value.is_a?(Hash) and value.has_key?(:scoping))
-        setting = find_or_initialize_by_name_and_scoping(name.to_s, scoping)
+        setting = where(name: name.to_s, scoping: scoping).first_or_initialize
 
         # you could also pass in {:value => 'something', :scoping => 'somewhere'}
         unless value.is_a?(Hash) and value.has_key?(:value)
@@ -139,12 +85,8 @@ module Refinery
       end
     end
 
-    # prettier version of the name.
-    # site_name becomes Site Name
     def title
-      result = name.to_s.titleize
-      result << " (#{scoping.titleize})" if scoping.is_a?(String)
-      result
+      self[:title].presence || auto_title
     end
 
     # form_value is so that on the web interface we can display a sane value.
@@ -162,14 +104,12 @@ module Refinery
 
     def value=(new_value)
       # must convert "1" to true and "0" to false when supplied using 'check_box', unfortunately.
-      if ["1", "0"].include?(new_value) and form_value_type == 'check_box'
-        new_value = new_value == "1" ? true : false
+      if %w[1 0].include?(new_value) && form_value_type == 'check_box'
+        new_value = new_value == "1"
       end
 
       # must convert to string if true or false supplied otherwise it becomes 0 or 1, unfortunately.
-      if [true, false].include?(new_value)
-        new_value = new_value.to_s
-      end
+      new_value = new_value.to_s if [true, false].include?(new_value)
 
       super
     end
@@ -201,5 +141,13 @@ module Refinery
       current_value
     end
 
+    # prettier version of the name.
+    # site_name becomes Site Name
+    def auto_title
+      result = name.to_s.titleize
+      result << " (#{scoping.titleize})" if scoping.is_a?(String)
+      result
+    end
+
   end
 end

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

@@ -2,15 +2,14 @@
 
   <%= render '/refinery/admin/error_messages', :object => @setting, :include_object_name => true %>
 
-  <div class='field'>
-    <%= f.label :name %>
+  <div class='field'>    
   <% if action_name =~ /(new)|(create)/ %>
+    <%= f.label :name %>
     <%= f.text_field :name, :class => "larger widest" %>
   <% else %>
-    <label class='stripped' for='setting_value'>
-      <%= @setting.title %>
-    </label>
-    <span class="preview">- (<%= @setting.name %>)</span>
+    <%= f.label :title %>
+		<%= f.text_field :title, :value => @setting.title, :class => "larger widest" %>
+		<span class="preview">(<%= @setting.name %>)</span>
   <% end %>
   <% if current_refinery_user.has_role?(:superuser) && @setting.new_record? %>
     <div class='field'>

data/config/locales/de.yml

@@ -12,7 +12,7 @@ de:
           new: Neue Einstellung erstellen
         records:
           empty_set: Es gibt noch keine Einstellungen.
-          create_first: Klicken Sie auf '%{link}', um Ihre erste Einstellung anzulegen.
+          create_first: "Klicken Sie auf '%{link}', um Ihre erste Einstellung anzulegen."
         form:
           enabled: "Ja, die Einstellung aktivieren."
           restart_may_be_in_order_html: "<strong>Bitte beachten Sie</strong>, dass Sie Ihre Website eventuell neu starten müssen, damit die Einstellungen angewendet werden."
@@ -23,8 +23,7 @@ de:
     models:
       refinery/setting: Einstellungen
     attributes:
-      refinery:
-        setting:
-          name: Name
-          value: Wert
-          restricted: Eingeschränkt
+      refinery/setting:
+        name: Name
+        value: Wert
+        restricted: Eingeschränkt

data/config/locales/en.yml

@@ -24,6 +24,7 @@ en:
       refinery/setting: setting
     attributes:
       refinery/setting:
+        title: Title
         name: Name
         value: Value
         restricted: Restricted

data/config/locales/ja.yml

@@ -19,7 +19,6 @@ ja:
           yes_make_this_setting_restricted: "管理人のみ閲覧可能にする。"
           help:
             restricted: 管理人のみが変更出来るようにします。
-            activity_show_limit: ダッシュボードで表示されるアイテムの数を制限します。
   activerecord:
     models:
       refinery/setting: 設定

data/db/migrate/20130422105953_add_title_to_refinery_settings.rb

@@ -0,0 +1,5 @@
+class AddTitleToRefinerySettings < ActiveRecord::Migration
+  def change
+    add_column :refinery_settings, :title, :string
+  end
+end

data/refinerycms-settings.gemspec

@@ -3,12 +3,11 @@
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
   s.name              = %q{refinerycms-settings}
-  s.version           = %q{2.1.1}
+  s.version           = %q{3.0.0}
   s.summary           = %q{Settings engine for Refinery CMS}
   s.description       = %q{Adds programmer creatable, user editable settings.}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
-  s.rubyforge_project = %q{refinerycms}
   s.authors           = ['Philip Arndt', 'Uģis Ozols']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
@@ -16,5 +15,6 @@ 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.1.1'
+  s.add_dependency    'refinerycms-core',     ['~> 3.0', '>= 3.0.0']
+  s.add_dependency    'friendly_id',          ['~> 5.0', '>= 5.0.1']
 end

data/spec/features/refinery/admin/settings_spec.rb

@@ -2,19 +2,19 @@ require "spec_helper"
 
 module Refinery
   module Admin
-    describe "Settings" do
+    describe "Settings", :type => :feature do
       refinery_login_with :refinery_user
 
       context "when interface config is enabled" do
         before do
-          Refinery::Settings.stub(:enable_interface).and_return(true)
+          allow(Refinery::Settings).to receive(:enable_interface).and_return(true)
         end
 
         it "shows up in menu" do
           visit refinery.admin_root_path
 
           within('nav') do
-            page.should have_content "Settings"
+            expect(page).to have_content "Settings"
           end
         end
 
@@ -23,14 +23,14 @@ module Refinery
 
           it "invites to create one" do
             visit refinery.admin_settings_path
-            page.should have_content("There are no settings yet. Click 'Add new setting' to add your first setting.")
+            expect(page).to have_content("There are no settings yet. Click 'Add new setting' to add your first setting.")
           end
         end
 
         it "shows add new setting link" do
           visit refinery.admin_settings_path
-          page.should have_content("Add new setting")
-          page.should have_selector("a[href*='/refinery/settings/new']")
+          expect(page).to have_content("Add new setting")
+          expect(page).to have_selector("a[href*='/refinery/settings/new']")
         end
 
         context "new/create" do
@@ -38,7 +38,7 @@ module Refinery
             visit refinery.admin_settings_path
             click_link "Add new setting"
 
-            page.should have_selector('iframe#dialog_iframe')
+            expect(page).to have_selector('iframe#dialog_iframe')
 
             page.within_frame('dialog_iframe') do
               fill_in "setting_name", :with => "test setting"
@@ -46,16 +46,16 @@ module Refinery
 
               click_button "submit_button"
             end
-
-            page.should have_content("'Test Setting' was successfully added.")
-            page.should have_content("Test Setting - true")
+            expect(page).not_to have_css("#dialog_iframe")
+            expect(page).to have_content("'Test Setting' was successfully added.")
+            expect(page).to 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')
+            expect(page).to have_selector('iframe#dialog_iframe')
 
             page.within_frame('dialog_iframe') do
               fill_in "setting_name", :with => "Test/Setting"
@@ -64,11 +64,34 @@ module Refinery
               click_button "submit_button"
             end
 
-            page.should have_content("'Test/Setting' was successfully added.")
-            page.should have_content("Test/Setting - true")
+            expect(page).to have_content("'Test/Setting' was successfully added.")
+            expect(page).to 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')
+            expect(page).not_to have_content('NoMethodError in Refinery::Admin::BaseController#error_404')
+          end
+        end
+
+        context "edit/update" do
+          before(:each) {::Refinery::Setting.set(:rspec_testing_edit_and_update, 1)}
+
+          it "modifies setting", :js => true do
+            visit refinery.admin_settings_path
+            find("a[href*='/refinery/settings/rspec_testing_edit_and_update/edit']").click
+
+            expect(page).to have_selector('iframe#dialog_iframe')
+            page.within_frame('dialog_iframe') do
+
+              expect(find_field('Title').value).to eql("Rspec Testing Edit And Update")
+
+              fill_in "Title", :with => "Edit and Update Title"
+              fill_in "Value", :with => "2"
+
+              click_button "Save"
+            end
+
+            expect(page).to have_content("'Edit and Update Title' was successfully updated.")
+            expect(page).to have_content("Edit and Update Title - 2")
           end
         end
 
@@ -82,14 +105,14 @@ module Refinery
           specify "page links" do
             visit refinery.admin_settings_path
 
-            page.should have_selector("a[href*='settings?page=2']")
+            expect(page).to have_selector("a[href*='settings?page=2']")
           end
         end
       end
 
       context "when interface config is disabled" do
         before do
-          Refinery::Settings.stub(:enable_interface).and_return(false)
+          allow(Refinery::Settings).to receive(:enable_interface).and_return(false)
           Refinery::Plugins.registered.find_by_name("refinery_settings").hide_from_menu = true
         end
 
@@ -97,7 +120,7 @@ module Refinery
           visit refinery.admin_root_path
 
           within('nav') do
-            page.should_not have_content "Settings"
+            expect(page).not_to have_content "Settings"
           end
         end
       end

data/spec/models/refinery/setting_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Refinery
-  describe Setting do
+  describe Setting, :type => :model do
 
     before do
       ::Refinery::Setting.set(:creating_from_scratch, nil)
@@ -11,7 +11,7 @@ module Refinery
     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')
+        expect(::Refinery::Setting.last.to_param).to eq('test-something')
       end
     end
 
@@ -19,81 +19,81 @@ module Refinery
       it "should save and get @keram" do
         ::Refinery::Setting.find_or_set(:twitter, '@keram')
         setting = ::Refinery::Setting.last
-        setting.value.should eq('@keram')
+        expect(setting.value).to 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 ')
+        expect(setting.value).to 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")
+        expect(::Refinery::Setting.get(:creating_from_scratch, :scoping => 'rspec_testing')).to eq(nil)
+        expect(::Refinery::Setting.set(:creating_from_scratch, {:value => "Look, a value", :scoping => 'rspec_testing'})).to 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")
+        expect(set).to 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")
+        expect(new_set).to 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'})
-        ::Refinery::Setting.find_by_name(:creating_from_scratch.to_s, :conditions => {:scoping => 'rspec_testing'}).form_value_type.should eq("text_area")
+        expect(::Refinery::Setting.find_by(:name => 'creating_from_scratch', :scoping => 'rspec_testing').form_value_type).to 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'})
-        ::Refinery::Setting.find_by_name(:creating_from_scratch.to_s, :conditions => {:scoping => 'rspec_testing'})[:value].should eq('true')
-        set.should eq(true)
+        expect(::Refinery::Setting.find_by(:name => 'creating_from_scratch', :scoping => 'rspec_testing')[:value]).to eq('true')
+        expect(set).to 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'})
-        ::Refinery::Setting.find_by_name(:creating_from_scratch.to_s, :conditions => {:scoping => 'rspec_testing'})[:value].should eq('false')
-        set.should eq(false)
+        expect(::Refinery::Setting.find_by(:name => 'creating_from_scratch', :scoping => 'rspec_testing')[:value]).to eq('false')
+        expect(set).to 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'})
-        ::Refinery::Setting.find_by_name(:creating_from_scratch.to_s, :conditions => {:scoping => 'rspec_testing'})[:value].should eq('true')
-        set.should eq(true)
+        expect(::Refinery::Setting.find_by(:name => 'creating_from_scratch', :scoping => 'rspec_testing')[:value]).to eq('true')
+        expect(set).to 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'})
-        ::Refinery::Setting.find_by_name(:creating_from_scratch.to_s, :conditions => {:scoping => 'rspec_testing'})[:value].should eq('false')
-        set.should eq(false)
+        expect(::Refinery::Setting.find_by(:name => 'creating_from_scratch', :scoping => 'rspec_testing')[:value]).to eq('false')
+        expect(set).to 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')
+        expect(set).to eq('some value')
 
         get = ::Refinery::Setting.get(:creating_from_scratch, :scoping => 'rspec_testing')
-        get.should eq('some value')
+        expect(get).to 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')
+        expect(set).to eq('some value')
 
         get = ::Refinery::Setting.get(:creating_from_scratch, :scoping => :rspec_testing)
-        get.should eq('some value')
+        expect(get).to 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')
+        expect(set).to eq('some value')
 
         get = ::Refinery::Setting.get(:creating_from_scratch, :scoping => 'rspec_testing')
-        get.should eq('some value')
+        expect(get).to eq('some value')
       end
     end
 
@@ -101,22 +101,34 @@ module Refinery
       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.should eq("I am a setting being created")
+        expect(created).to 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")
+        expect(created).to 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')
 
-        created.should eq("I am a setting being created")
+        expect(created).to eq("I am a setting being created")
       end
 
       it "should work without scoping" do
-        ::Refinery::Setting.find_or_set(:rspec_testing_creating_from_scratch, 'Yes it worked').should eq('Yes it worked')
+        expect(::Refinery::Setting.find_or_set(:rspec_testing_creating_from_scratch, 'Yes it worked')).to eq('Yes it worked')
       end
     end
 
+    describe "#should_generate_new_friendly_id?" do
+      context "when name changes" do
+        it "regenerates slug upon save" do
+          setting = FactoryGirl.create(:setting, :name => "Test Name")
+
+          setting.name = "Test Name 2"
+          setting.save!
+
+          expect(setting.slug).to eq("test-name-2")
+        end
+      end
+    end
   end
 end

data/spec/routing/settings_routing_spec.rb

@@ -1,11 +1,11 @@
 require "spec_helper"
 
 
-describe "routes for refinery settings" do
+describe "routes for refinery settings", :type => :routing do
 
   context "when interface config is disabled" do
     before do
-      Refinery::Settings.stub(:enable_interface).and_return(false)
+      allow(Refinery::Settings).to receive(:enable_interface).and_return(false)
       Refinery::Plugins.registered.find_by_name("refinery_settings").hide_from_menu = true
     end
 

data/spec/spec_helper.rb

@@ -13,13 +13,13 @@ 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
+require 'capybara/poltergeist'
+Capybara.javascript_driver = :poltergeist
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories including factories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-settings
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -9,31 +9,57 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: friendly_id
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 5.0.1
 description: Adds programmer creatable, user editable settings.
 email: info@refinerycms.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Rakefile
 - app/controllers/refinery/admin/settings_controller.rb
@@ -77,6 +103,7 @@ files:
 - config/routes.rb
 - db/migrate/20100913234710_create_refinerycms_settings_schema.rb
 - db/migrate/20130414130143_add_slug_to_refinery_settings.rb
+- db/migrate/20130422105953_add_title_to_refinery_settings.rb
 - lib/generators/refinery/settings_generator.rb
 - lib/generators/refinery/templates/config/initializers/refinery/settings.rb.erb
 - lib/refinery/settings.rb
@@ -103,17 +130,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: refinerycms
-rubygems_version: 2.1.0
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Settings engine for Refinery CMS