configurable_engine 0.4.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6818d2942967d86bf45d1e1c65cb13308baa2895
-  data.tar.gz: d8980df6e210571c7ed06b799ac4eb61b36986be
+SHA256:
+  metadata.gz: 541d4ad357b6438a52c6b017f67cd7d83a3f84069671c69952a55babc64afec9
+  data.tar.gz: 99acc47f826dedf5d0b6a6e35020864028e58977c8a6f072ac9a4152b62e29df
 SHA512:
-  metadata.gz: 671f136a982caff40684be36d236506fd2621eb2eba35d35f16f3b771a5b00eac9f21967ca2a12d1982bc731c83d06a8c7dbef9dcca2ea7b943c58ccf9498c7d
-  data.tar.gz: 3c5a422c4cc0ef2304f80f9d8cf7cbf8136075079cdecae88c96a4b3a063e7607043f1a31b27fda6c1b1640b478da8d098fc718341bb23f4e9d6f92126c8e4b3
+  metadata.gz: df600a1f9d9c6af12d826983027fd05bdd90f0879d0cfea87320fccfe4301df62296c5e05b552c3c75ed9f90059ea630e4dd927808a7a25ab0f0371dbbd75c35
+  data.tar.gz: b2e0e897399245a072d060d7e714baf3924a393cde664cd8449ea10c98dacee9e01cbba086d1b12fc4dd9688183f1793d6fbfcef5a4beb9a348632607aa99eaa

data/CHANGELOG.md

@@ -1,3 +1,33 @@
+### v2.0.0 - August 20, 2020
+**features**
+Configurable_Engine is mountable. This allows folks to use it with a catch-all route
+
+**breaking changes**
+Existing users must add `mount ConfigurableEngine::Engine, at: "/admin/configurable"` to their routes.rb. Routing helpers may not work as they used to.
+
+### v1.0.0 - August 20, 2020
+**features**
+Official rails 5.2 support
+
+**breaking changes**
+No further support for rails < 5.2
+
+### v0.5.0 - August 3, 2018
+**features**
+Official rails 4.2 support (Thanks @ento)
+
+**breaking changes**
+No further support for rails < 4.2, and non-mri rubies. Happy to accept those back as PRs!
+
+
+### v0.4.8 - March 4, 2015
+**bug fix**
+Cacheing was just totally broken.  Whoops! (thanks, @antoshalee)
+
+### v0.4.7 - November 4, 2014
+**bug fix**
+Configurable broke for users using cacheing.
+
 ### v0.4.6 - October 28, 2014
 **cleanup**
 When using Configurable with cache, destroying a configurable instance erases it from cache

data/README.md

@@ -1,6 +1,6 @@
 # Configurable [![Build Status](https://travis-ci.org/paulca/configurable_engine.png?branch=master)](https://travis-ci.org/paulca/configurable_engine)
 
-A Rails 3/4 configuration engine. An update to [Behavior](http://github.com/paulca/behavior) for Rails 3 and 4.
+A Rails 4 configuration engine. An update to [Behavior](http://github.com/paulca/behavior) for Rails 4.
 
 ## How it works ##
 
@@ -10,7 +10,7 @@ If you or your app users need to change these variables, Configurable stores new
 
 ## Installation ##
 
-Configurable is available as a Ruby gem. Simply add it to your Rails 3 app's `Gemfile`:
+Configurable is available as a Ruby gem. Simply add it to your Rails 4 app's `Gemfile`:
 
 ```ruby
 gem 'configurable_engine'
@@ -22,11 +22,17 @@ Then run the `configurable_engine:install` generator:
 $ rails generate configurable_engine:install
 ```
 
+this will
+- add config/configurable.yml
+- create a migration for your configurable table
+- mount the UI in your routes (defaulting to admin/configurables)
+
+
 ## Usage ##
 
-There are two parts to how configurable_engine works. First of all there is a config file, config/configurable.yml. This file controls the variables that are allowed to be set in the app.
+There are two parts to how configurable_engine works. First of all there is a config file, `config/configurable.yml`. This file controls the variables that are allowed to be set in the app.
 
-For example, if you wanted to have access to a config variable "site_title", put this in configurable.yml:
+For example, if you wanted to have access to a config variable `site_title`, put this in `configurable.yml`:
 
 ```yaml
 site_title:
@@ -58,7 +64,7 @@ and include `ConfigurableEngine::ConfigurablesController`, eg.
 ```ruby
 class Admin::ConfigurablesController < ApplicationController
   # include the engine controller actions
-  include ConfigurableEngine::ConfigurablesController
+  include ConfigurableEngine::ConfigurablesControllerMethods
 
   # add your own filter(s) / layout
   before_filter :protect_my_code
@@ -100,16 +106,50 @@ Price:
   type: decimal             # coerces the value to a decimal
 ```
 
-## Cacheing ##
+## Caching ##
 
 If you want to use rails caching of Configurable updates, simply set
 
-
 ```ruby
 config.use_cache = true
 ```
+
 in your `config/application.rb` (or `config/production.rb`)
 
+## Styling the interface ##
+
+To style the web interface you are advised to use Sass. Here's an example scss file that will make the interface bootstrap-3 ready:
+
+```
+@import 'bootstrap';
+
+.configurable-container {
+  @extend .col-md-6;
+
+  .configurable-options {
+    form {
+      @extend .form-horizontal;
+
+      .configurable {
+        @extend .col-md-12;
+        @extend .form-group;
+
+        textarea, input[type=text], input[type=password] {
+          @extend .form-control;
+        }
+      }
+
+      input[type=submit] {
+        @extend .btn;
+        @extend .btn-primary;
+      }
+    }
+  }
+}
+```
+
+Just save this into your rails assets and you're ready to go.
+
 ## Running the Tests ##
 
 The tests for this rails engine are in the `spec` and `features` directories.  They use the dummy rails app in `spec/dummy`
@@ -130,4 +170,3 @@ All contributions are welcome. Just fork the code, ensure your changes include a
 
 Copyright (c) 2011 Paul Campbell. See LICENSE.txt for
 further details.
-

data/app/controllers/configurable_engine/configurables_controller.rb

@@ -0,0 +1,5 @@
+module ConfigurableEngine
+  class ConfigurablesController < ApplicationController
+    include ConfigurableEngine::ConfigurablesControllerMethods
+  end
+end

data/app/models/configurable.rb

@@ -1,4 +1,6 @@
 class Configurable < ActiveRecord::Base
+  serialize :value
+
   after_save    :invalidate_cache, if: -> { ConfigurableEngine::Engine.config.use_cache }
   after_destroy :invalidate_cache, if: -> { ConfigurableEngine::Engine.config.use_cache }
 
@@ -29,20 +31,44 @@ class Configurable < ActiveRecord::Base
     end
   end
 
+  def self.cache_key(key)
+    "configurable_engine:#{key}"
+  end
+
   def self.[](key)
     return parse_value key, defaults[key][:default] unless table_exists?
 
-    config = if ConfigurableEngine::Engine.config.use_cache
-      Rails.cache.fetch("configurable_engine:#{key}") {
-        find_by_name(key)
-      }
-    else
-      find_by_name(key)
+    value, found = [false, false]
+    database_finder = -> do
+      config = find_by_name(key)
+      found = !!config
+      value = config.try(:value)
     end
 
-    return parse_value key, defaults[key][:default] unless config
 
-    config.value
+    if ConfigurableEngine::Engine.config.use_cache
+      found = Rails.cache.exist?(cache_key(key))
+      if found
+        value = Rails.cache.fetch(cache_key(key))
+      else
+        database_finder.call
+        if found
+          Rails.cache.write cache_key(key), value
+        end
+      end
+    else
+      database_finder.call
+    end
+
+    if found
+      value
+    else
+      parse_value(key, defaults[key][:default]).tap do |val|
+        if ConfigurableEngine::Engine.config.use_cache
+          Rails.cache.write cache_key(key), val
+        end
+      end
+    end
   end
 
   def value
@@ -55,7 +81,7 @@ class Configurable < ActiveRecord::Base
       [true, 1, "1", "t", "true"].include?(value)
     when 'decimal'
       value ||= 0
-      BigDecimal.new(value.to_s)
+      BigDecimal(value.to_s)
     when 'integer'
       value.to_i
     when 'list'
@@ -65,6 +91,12 @@ class Configurable < ActiveRecord::Base
       else
         value.split("\n").collect { |v| v =~ /,/ ? v.split(',') : v }
       end
+    when 'date'
+      if value.is_a? Date
+        value
+      else
+       Date.parse(value) if value.present?
+      end
     else
       value
     end
@@ -111,6 +143,8 @@ class Configurable < ActiveRecord::Base
       Integer(value) rescue false
     when 'list'
       value.is_a?(Array)
+    when 'date'
+      value.is_a?(Date)
     else
       true
     end
@@ -122,6 +156,6 @@ class Configurable < ActiveRecord::Base
   end
 
   def invalidate_cache
-    Rails.cache.delete("configurable_engine:#{self.name}")
+    Rails.cache.delete(Configurable.cache_key self.name)
   end
 end

data/app/views/configurable_engine/configurables/show.html.erb

@@ -0,0 +1,31 @@
+<div class='configurable-container'>
+
+  <div class="header">
+    <h2>Config</h2>
+  </div>
+
+  <div class="configurable-options">
+    <%= form_tag(configurable_path, :method => :put) do -%>
+      <%- @keys.each do |key| -%>
+        <%- options = Configurable.defaults[key] -%>
+        <div class="configurable">
+          <%= label_tag key, options[:name] %>
+          <%- if options[:type] == 'boolean' %>
+            <%= hidden_field_tag key, "0" %>
+            <%= check_box_tag key, "1", Configurable.send(key) %>
+          <%- elsif options[:type] == 'password' -%>
+            <%= password_field_tag key, Configurable.send(key) %>
+          <%- elsif options[:type] == 'text' -%>
+            <%= text_area_tag key, Configurable.send(key) %>
+          <%- elsif options[:type] == 'list' -%>
+            <%= text_area_tag key, Configurable.serialized_value(key) -%>
+          <%- else -%>
+            <%= text_field_tag key, Configurable.send(key) %>
+          <%- end -%>
+        </div>
+      <%- end -%>
+
+      <%= submit_tag 'Save' %>
+    <%- end -%>
+  </div>
+</div>

data/config/routes.rb

@@ -1,5 +1,3 @@
-Rails.application.routes.draw do
-  namespace :admin do
-    resource :configurable
-  end
-end
+ConfigurableEngine::Engine.routes.draw do
+  resource :configurable, path: '/'
+end

data/lib/configurable_engine.rb

@@ -1,2 +1,2 @@
 require 'configurable_engine/engine'
-require 'configurable_engine/configurables_controller'
+require 'configurable_engine/configurables_controller_methods'

data/lib/configurable_engine/{configurables_controller.rb → configurables_controller_methods.rb}

@@ -1,5 +1,5 @@
 module ConfigurableEngine
-  module ConfigurablesController
+  module ConfigurablesControllerMethods
     def show
       @keys = Configurable.keys
     end
@@ -15,11 +15,11 @@ module ConfigurableEngine
         end
 
       if failures.empty?
-        redirect_to admin_configurable_path, :notice => "Changes successfully updated"
+        redirect_to configurable_path, :notice => "Changes successfully updated"
       else
         flash[:error] = failures.flat_map(&:errors).flat_map(&:full_messages).join(',')
-        redirect_to admin_configurable_path
+        redirect_to configurable_path
       end
     end
   end
-end
+end

data/lib/configurable_engine/engine.rb

@@ -1,8 +1,10 @@
 module ConfigurableEngine
-  class Engine < Rails::Engine
+  class Engine < ::Rails::Engine
+    engine_name "configurable"
+    isolate_namespace ConfigurableEngine
     config.use_cache = false
     config.generators do |g|
       g.test_framework :rspec
     end
   end
-end
+end

data/lib/configurable_engine/version.rb

@@ -1,3 +1,3 @@
 module ConfigurableEngine
-  VERSION = '0.4.6'
-end
+  VERSION = '2.0.0'
+end

data/lib/generators/configurable_engine/install_generator.rb

@@ -20,5 +20,9 @@ class InstallGenerator < Rails::Generators::Base
       copy_file 'configurable.yml', 'config/configurable.yml'
       migration_template 'migration.rb', 'db/migrate/create_configurables.rb'
     end
+
+    def mount_interface
+      route 'mount ConfigurableEngine::Engine, at: "/admin/configurable"'
+    end
   end
-end
+end

data/lib/generators/configurable_engine/templates/migration.rb

@@ -1,4 +1,4 @@
-class CreateConfigurables < ActiveRecord::Migration
+class CreateConfigurables < ActiveRecord::Migration[5.2]
   def self.up
     create_table :configurables do |t|
       t.string :name
@@ -14,4 +14,4 @@ class CreateConfigurables < ActiveRecord::Migration
     remove_index :configurables, :name
     drop_table :configurables
   end
-end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: configurable_engine
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Paul Campbell
 - Michael Glass
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,17 +17,17 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: 3.1.0
-description: 'Configurable is a Rails 3/4 engine that allows you to set up config
-  variables in a config file, specifying default values for all environmentspec. These
-  variables can then be set on a per-app basis using a user facing configuration screen. '
+        version: 5.2.0
+description: 'Configurable is a Rails 4 engine that allows you to set up config variables
+  in a config file, specifying default values for all environmentspec. These variables
+  can then be set on a per-app basis using a user facing configuration screen. '
 email: paul@rslw.com
 executables: []
 extensions: []
@@ -38,12 +38,12 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
-- app/controllers/admin/configurables_controller.rb
+- app/controllers/configurable_engine/configurables_controller.rb
 - app/models/configurable.rb
-- app/views/admin/configurables/show.html.erb
+- app/views/configurable_engine/configurables/show.html.erb
 - config/routes.rb
 - lib/configurable_engine.rb
-- lib/configurable_engine/configurables_controller.rb
+- lib/configurable_engine/configurables_controller_methods.rb
 - lib/configurable_engine/engine.rb
 - lib/configurable_engine/version.rb
 - lib/generators/configurable_engine/install_generator.rb
@@ -53,7 +53,7 @@ homepage: http://github.com/paulca/configurable_engine
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -68,9 +68,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
-summary: Database-backed configuration for Rails 3, with defaults from config file.
+summary: Database-backed configuration for Rails 4, with defaults from config file.
 test_files: []

data/app/controllers/admin/configurables_controller.rb

@@ -1,3 +0,0 @@
-class Admin::ConfigurablesController < ApplicationController
-  include ConfigurableEngine::ConfigurablesController
-end

data/app/views/admin/configurables/show.html.erb

@@ -1,24 +0,0 @@
-<h2>Config</h2>
-
-<%= form_tag(admin_configurable_path, :method => :put) do -%>
-  <%- @keys.each do |key| -%>
-    <%- options = Configurable.defaults[key] -%>
-    <div class="configurable">
-      <%= label_tag key, options[:name] %>
-      <%- if options[:type] == 'boolean' %>
-        <%= hidden_field_tag key, "0" %>
-        <%= check_box_tag key, "1", Configurable.send(key) %>
-      <%- elsif options[:type] == 'password' -%>
-        <%= password_field_tag key, Configurable.send(key) %>
-      <%- elsif options[:type] == 'text' -%>
-        <%= text_area_tag key, Configurable.send(key) %>
-      <%- elsif options[:type] == 'list' -%>
-        <%= text_area_tag key, Configurable.serialized_value(key) -%>
-      <%- else -%>
-        <%= text_field_tag key, Configurable.send(key) %>
-      <%- end -%>
-    </div>
-  <%- end -%>
-  
-  <%= submit_tag 'Save' %>
-<%- end -%>