refinerycms-settings 2.0.2 → 2.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c63b128a70282fdcf67dad43bfa02430bfe74012
+  data.tar.gz: 66490d66e0fd27b668260e55a79dc497952bc5de
+SHA512:
+  metadata.gz: 37b3ce800230ef6ce6528036d9ea8eeb13529260bcc1fe08495ae823b17e1844edadcdd3e8892ab0b86613ce2030b860eee28db75ffc87325b8a695c64b702a4
+  data.tar.gz: 1ac20bb6ed79030cfd20a7b27bdadaf17eeafd7447c2967d421ec186cf18acc212e80dc4ee1559ca1b8dbce07d922a9f3f3706b391acf028ddbebc9e8fc24a19

data/.travis.yml

@@ -1,16 +1,36 @@
+language: ruby
+before_install:
+  - 'if [[ "$TRAVIS_RUBY_VERSION" =~ "jruby" ]] ; then gem update --system ; fi'
 before_script:
+  - "sh -e /etc/init.d/xvfb start"
   - "bundle exec rake refinery:testing:dummy_app > /dev/null"
-script: "bundle exec rspec ./spec"
+script:
+  - "DISPLAY=:99.0 bundle exec rspec spec"
 notifications:
-  email:
-    - parndt@gmail.com
-    - ugis.ozolss@gmail.com
+  email: true
+  irc:
+    use_notice: true
+    skip_join: true
+    channels:
+      - "irc.freenode.org#refinerycms"
+  campfire:
+    on_success: always
+    on_failure: always
+    rooms:
+      - secure: "JaX+Ckvdd2wqL2bD6t8PHvMDBHxWBlCrkBKPcDKxV0t0DOwzzzwxMryVqcRi\nPsmM/zvmWFATDyRmivhNOpu4lRg9RytSroxZ9nkmbLDqjCyEAZ6tv4yZXME/\nPaxPwmfwgS9g8TKjj3lSWS7rEpqqg0D5S0XIfIHrj6KB6LUmFHc="
 env:
   - DB=postgresql
   - DB=mysql
+matrix:
+  allow_failures:
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode
+    - rvm: jruby-19mode
+    - rvm: jruby-18mode
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - rbx
-  - jruby
+  - 1.8.7
+  - rbx-19mode
+  - jruby-19mode
+  - rbx-18mode
+  - jruby-18mode

data/app/models/refinery/setting.rb

@@ -20,15 +20,12 @@ module Refinery
 
     before_save do |setting|
       setting.restricted = false if setting.restricted.nil?
-      if setting.value.present? && setting.value.is_a?(String)
-        setting.value = YAML.parse(setting.value).to_ruby
-      end
     end
 
     after_save do |setting|
       setting.class.rewrite_cache
     end
-
+    
     after_destroy do |setting|
       setting.class.rewrite_cache
     end

data/config/routes.rb

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

data/lib/generators/refinery/settings_generator.rb

@@ -1,5 +1,10 @@
 module Refinery
   class SettingsGenerator < Rails::Generators::Base
+    source_root File.expand_path("../templates", __FILE__)
+
+    def generate_settings_initializer
+      template "config/initializers/refinery/settings.rb.erb", File.join(destination_root, "config", "initializers", "refinery", "settings.rb")
+    end
 
     def rake_db
       rake("refinery_settings:install:migrations")

data/lib/generators/refinery/templates/config/initializers/refinery/settings.rb.erb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+Refinery::Settings.configure do |config|
+  # Configure whether to show settings in the admin menu, and enable admin users to change these settings
+  # config.enable_interface = <%= Refinery::Settings.enable_interface.inspect %>
+end

data/lib/refinery/settings.rb

@@ -1,4 +1,5 @@
 require 'refinerycms-core'
+require 'acts_as_indexed'
 
 module Refinery
   autoload :SettingsGenerator, 'generators/refinery/settings_generator'
@@ -6,6 +7,7 @@ module Refinery
   module Settings
 
     require 'refinery/settings/engine'
+    require 'refinery/settings/configuration'
 
     class << self
       attr_writer :root

data/lib/refinery/settings/configuration.rb

@@ -0,0 +1,9 @@
+module Refinery
+  module Settings
+    include ActiveSupport::Configurable
+
+    config_accessor :enable_interface
+
+    self.enable_interface = true
+  end
+end

data/lib/refinery/settings/engine.rb

@@ -14,6 +14,7 @@ module Refinery
           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 }
         end
       end

data/readme.md

@@ -7,6 +7,17 @@
 Refinery Settings was extracted from Refinery CMS just before 2.0.0 was released
 and can now be used separately.
 
+## Installation
+Add the gem to you Gemfile:
+
+    gem 'refinerycms-settings'
+
+Generate and install the necessary migrations:
+
+    rails generate refinery:settings
+    rake db:migrate
+    
+
 ## How do I Make my Own Settings?
 
 ### In view

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.2}
+  s.version           = %q{2.0.3}
   s.summary           = %q{Settings engine for Refinery CMS}
   s.description       = %q{Adds programmer creatable, user editable settings.}
   s.email             = %q{info@refinerycms.com}
@@ -16,5 +16,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.0.1'
+  s.add_dependency 'refinerycms-core', '~> 2.0.10'
+  s.add_dependency 'acts_as_indexed',  '~> 0.7.7'
 end

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

@@ -5,53 +5,84 @@ module Refinery
     describe "Settings" do
       login_refinery_user
 
-      context "when no settings" do
-        before(:each) { Refinery::Setting.destroy_all }
+      context "when interface config is enabled" do
+        before do
+          Refinery::Settings.stub(:enable_interface).and_return(true)
+        end
 
-        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.")
+        it "shows up in menu" do
+          visit refinery.admin_root_path
+
+          within('nav') do
+            page.should have_content "Settings"
+          end
         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']")
-      end
+        context "when no settings" do
+          before(:each) { Refinery::Setting.destroy_all }
 
-      context "new/create" do
-        it "adds setting", :js => true do
+          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.")
+          end
+        end
+
+        it "shows add new setting link" do
           visit refinery.admin_settings_path
-          click_link "Add new setting"
+          page.should have_content("Add new setting")
+          page.should have_selector("a[href*='/refinery/settings/new']")
+        end
+
+        context "new/create" do
+          it "adds setting", :js => true do
+            visit refinery.admin_settings_path
+            click_link "Add new setting"
 
-          page.should have_selector('iframe#dialog_iframe')
+            page.should have_selector('iframe#dialog_iframe')
 
-          page.within_frame('dialog_iframe') do
-            fill_in "Name", :with => "test setting"
-            fill_in "Value", :with => "true"
+            page.within_frame('dialog_iframe') do
+              fill_in "Name", :with => "test setting"
+              fill_in "Value", :with => "true"
 
-            click_button "Save"
+              click_button "Save"
+            end
+
+            page.should have_content("'Test Setting' was successfully added.")
+            page.should have_content("Test Setting - true")
+          end
+        end
+
+        context "pagination" do
+          before(:each) do
+            (Refinery::Setting.per_page + 1).times do
+              FactoryGirl.create(:setting)
+            end
           end
 
-          page.should have_content("'Test Setting' was successfully added.")
-          page.should have_content("Test Setting - true")
+          specify "page links" do
+            visit refinery.admin_settings_path
+
+            page.should have_selector("a[href*='settings?page=2']")
+          end
         end
       end
 
-      context "pagination" do
-        before(:each) do
-          (Refinery::Setting.per_page + 1).times do
-            FactoryGirl.create(:setting)
-          end
+      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
         end
 
-        specify "page links" do
-          visit refinery.admin_settings_path
+        it "does not show up in menu" do
+          visit refinery.admin_root_path
 
-          page.should have_selector("a[href*='settings?page=2']")
+          within('nav') do
+            page.should_not have_content "Settings"
+          end
         end
       end
+
+
     end
   end
 end

data/spec/routing/settings_routing_spec.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-settings
 version: !ruby/object:Gem::Version
-  version: 2.0.2
-  prerelease: 
+  version: 2.0.3
 platform: ruby
 authors:
 - Philip Arndt
@@ -10,24 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        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
 description: Adds programmer creatable, user editable settings.
 email: info@refinerycms.com
 executables: []
@@ -83,7 +94,9 @@ files:
 - config/routes.rb
 - db/migrate/20100913234710_create_refinerycms_settings_schema.rb
 - lib/generators/refinery/settings_generator.rb
+- lib/generators/refinery/templates/config/initializers/refinery/settings.rb.erb
 - lib/refinery/settings.rb
+- lib/refinery/settings/configuration.rb
 - lib/refinery/settings/engine.rb
 - lib/refinerycms-settings.rb
 - license.md
@@ -93,36 +106,37 @@ files:
 - spec/factories/settings.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
 homepage: http://refinerycms.com
 licenses:
 - MIT
+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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: refinerycms
-rubygems_version: 1.8.22
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Settings engine for Refinery CMS
 test_files:
 - spec/factories/settings.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: