configurable_engine 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OGZiYTdlNTY5MDQyNjNiYmMxMDEzOGUwNGYwM2FmMGI5OGQ1ZTQ0Zg==
-  data.tar.gz: !binary |-
-    MDVlZTJjMjg3ZGM5OWJkZDA2NjcxMDVmODI3MGJmNWRjZmVjOGQ4MQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZGE5NWNkYWE4MzQ1YjkzYWNiZmQwODFiMzJkZGZjMjQ2ODQ3NTU4MjA0YWE2
-    Y2I1MDM1N2UzMTM4MGY0NzcwMGQ2YTdiYjk3N2MxZTRlZDRjZDI4ZmQ1MDBj
-    Zjc2ZThlMjYwOThhMTliM2YwZDkyMzc5MjAyNzdkYjhjN2EwMjA=
-  data.tar.gz: !binary |-
-    N2Y0MWEyNTMxODI4MDBiNjgyNTM2NWQ3Y2I3Y2ViNWNlZTVmODRjNzI0ZjZl
-    YjMxYzcxNTQzODBmMWVmMDQ3ZmU2ODUxYjFiZDJkMWU1ZWU2N2VkZjFiOTg1
-    ZTNiMjcxMjk4NmYwYWZlZWMxNDAxZGQ5YzZmMDEyMzlmNzQ0NTc=
+SHA1:
+  metadata.gz: cb3a943a784294cf89013a42e8f31eaa51ca79be
+  data.tar.gz: 5269001890ee44f5f7af4c01be487fd11ee19242
+SHA512:
+  metadata.gz: ea7eadc32bab5381d3ff5d37d4046d7651ca42efa2f8cdfd25b7bb94bd52ba2791b2cad44f76e8d7f78d9576adf8894658a4226f6f09bce8949ee2c27072604c
+  data.tar.gz: 1cdaad24d66960ac916dad4398d9c21055fdb4c5775c67aad36e5388ada409aa56eec7b67c697ac6a7753380d5b2c5d80b4cfed4d840662bdb6118d5ae54c68a

data/.document

@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/.gitignore

@@ -0,0 +1,43 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+#
+# For TextMate
+#*.tmproj
+#tmtags
+#
+# For emacs:
+#*~
+#\#*
+#.\#*
+#
+# For vim:
+#*.swp
+.rvmrc

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -0,0 +1,18 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - jruby-19mode
+env:
+  - DB=sqlite
+  - DB=mysql
+  - DB=postgresql
+gemfile:
+  - Gemfile
+  - gemfiles/Gemfile.rails3_1
+  - gemfiles/Gemfile.rails4_0
+before_script:
+  - mysql -e 'create database strano_test'
+  - psql -c 'create database strano_test' -U postgres
+  - RAILS_ENV=test rake app:db:migrate
+  - rake app:db:test:prepare

data/Gemfile

@@ -1,8 +1,3 @@
-source 'http://rubygems.org'
+instance_eval File.read(File.expand_path('../gemfiles/Gemfile.base', __FILE__))
 
-group :development do
-  gem 'jeweler'
-  gem 'rake'
-  gem 'rspec'
-  gem 'cucumber'
-end
+gem 'rails', '~>3.2.0'

data/Gemfile.lock

@@ -1,72 +1,178 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
-    builder (3.2.2)
-    cucumber (1.3.8)
+    actionmailer (3.2.17)
+      actionpack (= 3.2.17)
+      mail (~> 2.5.4)
+    actionpack (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.17)
+      activesupport (= 3.2.17)
+      builder (~> 3.0.0)
+    activerecord (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activerecord-jdbc-adapter (1.3.6)
+      activerecord (>= 2.2)
+    activerecord-jdbcmysql-adapter (1.3.6)
+      activerecord-jdbc-adapter (~> 1.3.6)
+      jdbc-mysql (>= 5.1.22)
+    activerecord-jdbcpostgresql-adapter (1.3.6)
+      activerecord-jdbc-adapter (~> 1.3.6)
+      jdbc-postgres (>= 9.1)
+    activerecord-jdbcsqlite3-adapter (1.3.6)
+      activerecord-jdbc-adapter (~> 1.3.6)
+      jdbc-sqlite3 (~> 3.7.2)
+    activeresource (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+    activesupport (3.2.17)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    arel (3.0.3)
+    bouncy-castle-java (1.5.0147)
+    builder (3.0.4)
+    capybara (2.2.1)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    coderay (1.1.0)
+    cucumber (1.3.11)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12.1)
+      gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.0.2)
-    diff-lcs (1.2.4)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    gherkin (2.12.1)
+    cucumber-rails (1.4.0)
+      capybara (>= 1.1.2)
+      cucumber (>= 1.2.0)
+      nokogiri (>= 1.5.0)
+      rails (>= 3.0.0)
+    database_cleaner (1.2.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    ffi (1.9.3-java)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    gherkin (2.12.2-java)
       multi_json (~> 1.3)
-    git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (2.0.5)
-    highline (1.6.19)
-    httpauth (0.2.0)
-    jeweler (1.8.7)
-      builder
+    hike (1.2.3)
+    i18n (0.6.9)
+    jdbc-mysql (5.1.28)
+    jdbc-postgres (9.3.1100)
+    jdbc-sqlite3 (3.7.2.1)
+    journey (1.0.4)
+    jruby-openssl (0.9.4)
+      bouncy-castle-java (>= 1.5.0147)
+    json (1.8.1)
+    json (1.8.1-java)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    mini_portile (0.5.2)
+    multi_json (1.8.4)
+    multi_test (0.0.3)
+    mysql2 (0.3.15)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    nokogiri (1.6.1-java)
+      mini_portile (~> 0.5.0)
+    pg (0.17.1)
+    polyglot (0.3.4)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry (0.9.12.6-java)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      spoon (~> 0.0)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.17)
+      actionmailer (= 3.2.17)
+      actionpack (= 3.2.17)
+      activerecord (= 3.2.17)
+      activeresource (= 3.2.17)
+      activesupport (= 3.2.17)
       bundler (~> 1.0)
-      git (>= 1.2.5)
-      github_api (= 0.10.1)
-      highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
-      rake
-      rdoc
-    json (1.8.0)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    multi_json (1.8.0)
-    multi_test (0.0.2)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.1.0)
-    rdoc (4.0.1)
+      railties (= 3.2.17)
+    railties (3.2.17)
+      actionpack (= 3.2.17)
+      activesupport (= 3.2.17)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.1.1)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.14.1)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.1)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.3)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
+    slop (3.4.7)
+    spoon (0.0.4)
+      ffi
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.9)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.38)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
-  cucumber
-  jeweler
+  activerecord-jdbcmysql-adapter
+  activerecord-jdbcpostgresql-adapter
+  activerecord-jdbcsqlite3-adapter
+  capybara
+  cucumber-rails
+  database_cleaner
+  jruby-openssl
+  mysql2
+  pg
+  pry
+  rails (~> 3.2.0)
   rake
-  rspec
+  rspec-rails
+  sqlite3

data/Rakefile

@@ -1,45 +1,18 @@
-require 'rubygems'
-require 'bundler'
+#!/usr/bin/env rake
 begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "configurable_engine"
-  gem.homepage = "http://github.com/paulca/configurable_engine"
-  gem.license = "MIT"
-  gem.summary = %Q{Database-backed configuration for Rails 3, with defaults from config file.}
-  gem.description = %Q{Configurable is a Rails 3 engine that allows you to set up config variables in a config file, specifying default values for all environments. These variables can then be set on a per-app basis using a user facing configuration screen. }
-  gem.email = "paul@rslw.com"
-  gem.authors = ["Paul Campbell"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  gem.add_runtime_dependency 'rails', '>3'
-  gem.add_runtime_dependency 'activerecord', '>3'
-  gem.files = FileList["[A-Za-z]*", "lib/**/*", "app/**/*", "config/*"]
-end
-# Jeweler::RubygemsDotOrgTasks.new
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
 
-require 'rspec/core'
+Bundler::GemHelper.install_tasks
+Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
+# require 'rspec/core'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-require 'cucumber/rake/task'
-Cucumber::Rake::Task.new(:features)
-
-task :default => :spec
 
+desc "Run all specs in spec directory (excluding plugin specs)"
+RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
+task :default => [:spec, :cucumber]

data/app/models/configurable.rb

@@ -1,10 +1,14 @@
 class Configurable < ActiveRecord::Base
 
-  validates_presence_of :name
-  validates_uniqueness_of :name
+  after_save :invalidate_cache, if: -> { ConfigurableEngine::Engine.config.use_cache }
+
+  validates_presence_of    :name
+  validates_uniqueness_of  :name
+
+  validate :type_of_value
 
   def self.defaults
-    HashWithIndifferentAccess.new(
+    @defaults ||= HashWithIndifferentAccess.new(
       YAML.load_file(
         Rails.root.join('config', 'configurable.yml')
       )
@@ -27,7 +31,15 @@ class Configurable < ActiveRecord::Base
   def self.[](key)
     return self.defaults[key][:default] unless table_exists?
 
-    value = find_by_name(key).try(:value) || self.defaults[key][:default]
+    value = if ConfigurableEngine::Engine.config.use_cache
+        Rails.cache.fetch("configurable_engine:#{key}") {
+          find_by_name(key).try(:value)
+        }
+      else
+        find_by_name(key).try(:value)
+      end
+
+    value ||= self.defaults[key][:default]
     case self.defaults[key][:type]
     when 'boolean'
       [true, 1, "1", "t", "true"].include?(value)
@@ -56,4 +68,23 @@ class Configurable < ActiveRecord::Base
     end
   end
 
-end
+  private
+
+  def type_of_value
+    return unless name
+    case Configurable.defaults[name][:type]
+    when 'boolean'
+      [true, 1, "1", "true", false, 0, "0", "false"].include?(value)
+    when 'decimal'
+      Float(value) rescue errors.add(:value, I18n.t("activerecord.errors.messages.invalid"))
+    when 'integer'
+      Integer(value) rescue errors.add(:value, I18n.t("activerecord.errors.messages.invalid"))
+    when 'list'
+      value.is_a?(Array) rescue errors.add(:value, I18n.t("activerecord.errors.messages.invalid"))
+    end
+  end
+
+  def invalidate_cache
+    Rails.cache.delete("configurable_engine:#{self.name}")
+  end
+end