configvars_rails 0.5.3 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 25e308bc1f988ecdb0f724e46c93b72a11e9a532
+  data.tar.gz: 8552099b84de63bc7835d6336401baafa68c03ef
+SHA512:
+  metadata.gz: b48af680f2fde547c4db473f16d16e0943f9b31fec1142738b3731d5ce8a466fae969fe6d4c4244fd73c64d53f9e8dc9c5aa68b30f42ea54b24e5bba1b1e5be7
+  data.tar.gz: a63fd4be66995cd3b4822adc5747419a88bdbeee13b6f10e02abac8cdd9442aa4b73dab4acbec90da7a408f6399d11e265a6fe14e5915d23cb3a4945d948858d

data/.project

@@ -13,5 +13,6 @@
 	</buildSpec>
 	<natures>
 		<nature>org.radrails.rails.core.railsnature</nature>
+		<nature>com.aptana.ruby.core.rubynature</nature>
 	</natures>
 </projectDescription>

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+env:
+  - DB=mysql:utf8_general_ci
+  - DB=mysql:utf8_bin
+  - DB=pg DB_USER=postgres
+  - DB=sqlite
+gemfile:
+  - Gemfile.rails3
+  - Gemfile.rails4
+rvm:
+  - 1.9.3
+  - 2.0.0

data/Gemfile

@@ -1,8 +1,10 @@
-source "http://rubygems.org"
-gem "rails", ">= 3.2.0"
+source 'http://rubygems.org'
+gem 'rails', '>= 3.2.16'
 
 group :development do
-  gem "bundler", ">= 1.0.0"
-  gem "jeweler", ">= 1.8.3"
-  gem "sqlite3", ">= 1.3.5"
+  gem 'bundler', '>= 1.3.5'
+  gem 'jeweler', '>= 1.8.8'
+  gem 'mysql2', '>= 0.3.14'
+  gem 'pg', '>= 0.17.0'
+  gem 'sqlite3', '>= 1.3.8'
 end

data/Gemfile.lock

@@ -1,95 +1,128 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.2)
-      actionpack (= 3.2.2)
-      mail (~> 2.4.0)
-    actionpack (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    actionmailer (3.2.16)
+      actionpack (= 3.2.16)
+      mail (~> 2.5.4)
+    actionpack (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.16)
+      activesupport (= 3.2.16)
       builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    activerecord (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-    activesupport (3.2.2)
-      i18n (~> 0.6)
+    activeresource (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
+    activesupport (3.2.16)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.0)
+    addressable (2.3.5)
+    arel (3.0.3)
+    builder (3.0.4)
     erubis (2.7.0)
-    git (1.2.5)
-    hike (1.2.1)
-    i18n (0.6.0)
-    jeweler (1.8.3)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    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.20)
+    hike (1.2.3)
+    httpauth (0.2.0)
+    i18n (0.6.9)
+    jeweler (1.8.8)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    journey (1.0.3)
-    json (1.6.5)
-    mail (2.4.3)
-      i18n (>= 0.4.0)
+    journey (1.0.4)
+    json (1.8.1)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
+    mime-types (1.25.1)
+    multi_json (1.8.2)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    mysql2 (0.3.14)
+    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)
+    pg (0.17.0)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.2)
-      actionmailer (= 3.2.2)
-      actionpack (= 3.2.2)
-      activerecord (= 3.2.2)
-      activeresource (= 3.2.2)
-      activesupport (= 3.2.2)
+    rails (3.2.16)
+      actionmailer (= 3.2.16)
+      actionpack (= 3.2.16)
+      activerecord (= 3.2.16)
+      activeresource (= 3.2.16)
+      activesupport (= 3.2.16)
       bundler (~> 1.0)
-      railties (= 3.2.2)
-    railties (3.2.2)
-      actionpack (= 3.2.2)
-      activesupport (= 3.2.2)
+      railties (= 3.2.16)
+    railties (3.2.16)
+      actionpack (= 3.2.16)
+      activesupport (= 3.2.16)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.1.0)
+    rdoc (3.12.2)
       json (~> 1.4)
-    sprockets (2.1.2)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
+    sqlite3 (1.3.8)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.0)
-  jeweler (>= 1.8.3)
-  rails (>= 3.2.0)
-  sqlite3 (>= 1.3.5)
+  bundler (>= 1.3.5)
+  jeweler (>= 1.8.8)
+  mysql2 (>= 0.3.14)
+  pg (>= 0.17.0)
+  rails (>= 3.2.16)
+  sqlite3 (>= 1.3.8)

data/Gemfile.rails3

@@ -0,0 +1,11 @@
+source 'http://rubygems.org'
+gem 'rails', '~> 3.2.16'
+
+group :development do
+  gem 'bundler', '>= 1.3.5'
+  gem 'jeweler', '>= 1.8.8'
+  gem 'mysql2', '>= 0.3.14'
+  gem 'pg', '>= 0.17.0'
+  gem 'sqlite3', '>= 1.3.8'
+end
+

data/Gemfile.rails4

@@ -0,0 +1,11 @@
+source 'http://rubygems.org'
+gem 'rails', '>= 4.0.2'
+
+group :development do
+  gem 'bundler', '>= 1.3.5'
+  gem 'jeweler', '>= 1.8.8'
+  gem 'mysql2', '>= 0.3.14'
+  gem 'pg', '>= 0.17.0'
+  gem 'sqlite3', '>= 1.3.8'
+end
+

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.6.0

data/configvars_rails.gemspec

@@ -2,14 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: configvars_rails 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "configvars_rails"
-  s.version = "0.5.3"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = "2012-03-13"
+  s.date = "2013-12-07"
   s.description = "This gem provides a model and simple controller for\n    storing global application configuration in a database. This allows the\n    configuration to change without source code modifications."
   s.email = "victor@costan.us"
   s.extra_rdoc_files = [
@@ -18,8 +19,11 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".project",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
+    "Gemfile.rails3",
+    "Gemfile.rails4",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -62,28 +66,34 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/pwnall/configvars_rails"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.17"
+  s.rubygems_version = "2.1.11"
   s.summary = "Global configuration variables for Rails 3 applications."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.2.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.8.3"])
-      s.add_development_dependency(%q<sqlite3>, [">= 1.3.5"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.2.16"])
+      s.add_development_dependency(%q<bundler>, [">= 1.3.5"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.8.8"])
+      s.add_development_dependency(%q<mysql2>, [">= 0.3.14"])
+      s.add_development_dependency(%q<pg>, [">= 0.17.0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 1.3.8"])
     else
-      s.add_dependency(%q<rails>, [">= 3.2.0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.8.3"])
-      s.add_dependency(%q<sqlite3>, [">= 1.3.5"])
+      s.add_dependency(%q<rails>, [">= 3.2.16"])
+      s.add_dependency(%q<bundler>, [">= 1.3.5"])
+      s.add_dependency(%q<jeweler>, [">= 1.8.8"])
+      s.add_dependency(%q<mysql2>, [">= 0.3.14"])
+      s.add_dependency(%q<pg>, [">= 0.17.0"])
+      s.add_dependency(%q<sqlite3>, [">= 1.3.8"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.2.0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.8.3"])
-    s.add_dependency(%q<sqlite3>, [">= 1.3.5"])
+    s.add_dependency(%q<rails>, [">= 3.2.16"])
+    s.add_dependency(%q<bundler>, [">= 1.3.5"])
+    s.add_dependency(%q<jeweler>, [">= 1.8.8"])
+    s.add_dependency(%q<mysql2>, [">= 0.3.14"])
+    s.add_dependency(%q<pg>, [">= 0.17.0"])
+    s.add_dependency(%q<sqlite3>, [">= 1.3.8"])
   end
 end
 

data/lib/configvars_rails/controller.rb

@@ -5,19 +5,19 @@ module ConfigvarsRails
 
 # Included by the config vars management controller.
 #
-# Some parts of the codebase expect the controller to be named 
+# Some parts of the codebase expect the controller to be named
 # ConfigVarsController.
 module Controller
   extend ActiveSupport::Concern
-  
+
   included do
     layout 'config_vars'
   end
 
   # GET /config_vars
   def index
-    @config_vars = ConfigVar.order(:name).all
-    
+    @config_vars = ConfigVar.order(:name).to_a
+
     defined_names = ConfigvarsRails.variable_names
     default_names = defined_names - @config_vars.map { |var| var.name.to_sym }
     @default_vars = default_names.map { |name|
@@ -28,52 +28,51 @@ module Controller
       format.html # index.html.erb
     end
   end
-    
+
   # GET /config_vars/http_user
   def show
     edit
-    render :text => @config_var.value
+    render text: @config_var.value
   end
 
   # GET /config_vars/http_user/edit
   def edit
-    @config_var = ConfigVar.where(:name => params[:name]).first
+    @config_var = ConfigVar.where(name: params[:name]).first
     unless @config_var
-      @config_var = ConfigVar.new :name => params[:name]
+      @config_var = ConfigVar.new name: params[:name]
       if descriptor = ConfigvarsRails.variable_descriptor(params[:name])
         @config_var.value = descriptor.default_value
       end
-    end      
+    end
   end
 
   # PUT /config_vars/http_user
   def update
-    @config_var = ConfigVar.where(:name => params[:name]).first
+    @config_var = ConfigVar.where(name: params[:config_var][:name]).first
     unless @config_var
-      @config_var = ConfigVar.new params[:config_var]
-      @config_var.name = params[:name]
+      @config_var = ConfigVar.new update_params[:config_var]
     end
 
     respond_to do |format|
       success = if @config_var.new_record?
         @config_var.save
       else
-        @config_var.update_attributes(params[:config_var])
+        @config_var.update_attributes update_params[:config_var]
       end
       if success
         format.html do
           redirect_to config_vars_url,
-              :notice => 'Configuration variable was successfully updated.'
+              notice: 'Configuration variable was successfully updated.'
         end
       else
-        format.html { render :action => :edit }
+        format.html { render action: :edit }
       end
     end
   end
 
   # DELETE /config_vars/http_user
   def destroy
-    @config_var = ConfigVar.where(:name => params[:name]).first
+    @config_var = ConfigVar.where(name: params[:name]).first
     @config_var.destroy
 
     respond_to do |format|
@@ -81,6 +80,20 @@ module Controller
     end
   end
 
+  if defined? ActiveModel::ForbiddenAttributesProtection
+    # Rails 4.
+
+    # Parameters used to change a config variable.
+    def update_params
+      params.permit config_var: [:name, :value]
+    end
+  else
+    # Rails 3.
+    def update_params
+      params
+    end
+  end
+
 end  # module ConfigvarsRails::Controller
 
 end  # namespace ConfigvarsRails

data/lib/configvars_rails/generators/templates/001_create_config_vars.rb

@@ -1,10 +1,10 @@
 class CreateConfigVars < ActiveRecord::Migration
   def self.up
     create_table :config_vars do |t|
-      t.string :name, :length => 64, :null => false
-      t.binary :value, :length => 1024, :null => false
+      t.string :name, length: 64, null: false
+      t.binary :value, length: 1024, null: false
     end
-    add_index :config_vars, :name, :unique => true, :null => false
+    add_index :config_vars, :name, unique: true
   end
 
   def self.down

data/lib/configvars_rails/generators/templates/config_vars/edit.html.erb

@@ -1,7 +1,7 @@
 <h2>Editing Configuration Variable</h2>
 
-<%= form_for(@config_var, :url => config_var_path(@config_var),
-                          :html => { :method => :put }) do |f| %>
+<%= form_for(@config_var, url: config_var_path,
+                          html: { method: :put }) do |f| %>
   <% if @config_var.errors.any? %>
     <div id="error_explanation">
       <h3><%= pluralize(@config_var.errors.count, "error") %> prohibited this config_var from being saved:</h3>

data/lib/configvars_rails/generators/templates/config_vars/index.html.erb

@@ -24,7 +24,7 @@
               'undefined' %>
     </td>
     <td><%= link_to 'Edit', edit_config_var_path(config_var) %></td>
-    <td><%= link_to 'Reset to default', config_var, :method => :delete %></td>
+    <td><%= link_to 'Reset to default', config_var, method: :delete %></td>
   </tr>
 <% end %>
 </table>
@@ -46,7 +46,7 @@
     <td><%= name %></td>
     <td><%= descriptor.value_type %></td>
     <td><%= descriptor.default_value %></td>
-    <td><%= link_to 'Edit', edit_config_var_path(:name => name) %></td>
+    <td><%= link_to 'Edit', edit_config_var_path(name: name) %></td>
   </tr>
 <% end %>
 </table>

data/lib/configvars_rails/model.rb

@@ -9,10 +9,10 @@ module Model
 
   included do
     # The name of the configuration variable.
-    validates :name, :uniqueness => true, :length => 1..64, :presence => true
+    validates :name, uniqueness: true, length: 1..64, presence: true
   
     # The value of the configuration variable.
-    validates :value, :length => 0..1024, :exclusion => { :in => [nil] }
+    validates :value, length: 0..1024, exclusion: { in: [nil] }
   end
 
 
@@ -20,7 +20,7 @@ module Model
   module ClassMethods
     # Access configuration flags by ConfigVar['flag_name'].
     def [](name)
-      var = where(:name => name).first
+      var = where(name: name).first
       return var.value if var
       
       descriptor = ConfigvarsRails.variable_descriptor name
@@ -31,8 +31,8 @@ module Model
     
     # Set configuration flags by ConfigVar['flag_name'] = 'flag_value'.
     def []=(name, value)
-      flag = where(:name => name).first
-      flag ||= new :name => name
+      flag = where(name: name).first
+      flag ||= new name: name
       flag.value = value
       flag.save!
       value

data/lib/configvars_rails/routes.rb

@@ -9,15 +9,14 @@ module Routes
 # :nodoc: mixed into ActionPack's route mapper.
 module MapperMixin
   def config_vars
-    get 'config_vars/:name/edit' => 'config_vars#edit', :as => :edit_config_var,
-        :constraints => { :name => /[^\/]+/ }
-    get 'config_vars/:name' => 'config_vars#show', :as => :config_var,
-        :constraints => { :name => /[^\/]+/ }    
-    put 'config_vars/:name' => 'config_vars#update',
-        :constraints => { :name => /[^\/]+/ }    
+    get 'config_vars' => 'config_vars#index', as: :config_vars
+    get 'config_vars/:name/edit' => 'config_vars#edit', as: :edit_config_var,
+        constraints: { name: /[^\/]+/ }
+    get 'config_vars/:name' => 'config_vars#show', as: :config_var,
+        constraints: { name: /[^\/]+/ }
+    put 'config_vars' => 'config_vars#update'
     delete 'config_vars/:name' => 'config_vars#destroy',
-        :constraints => { :name => /[^\/]+/ }    
-    get 'config_vars' => 'config_vars#index', :as => :config_vars
+        constraints: { name: /[^\/]+/ }
   end
 end
 

data/test/config_var_test.rb

@@ -2,7 +2,7 @@ require File.expand_path('../test_helper', __FILE__)
 
 class ConfigVarTest < ActiveSupport::TestCase
   def setup
-    @var = ConfigVar.new :name => 'var', :value => 'var_value'
+    @var = ConfigVar.new name: 'var', value: 'var_value'
   end
   
   test "setup" do
@@ -36,6 +36,6 @@ class ConfigVarTest < ActiveSupport::TestCase
   test "convenience set" do
     ConfigVar['other_var'] = 'other_value'
     assert_equal 'other_value',
-                 ConfigVar.where(:name => 'other_var').first.value
+                 ConfigVar.where(name: 'other_var').first.value
   end
 end

data/test/config_vars_controller_api_test.rb

@@ -19,7 +19,7 @@ class ConfigVarsControllerApiTest < ActionController::TestCase
   test "should get index" do
     get :index
     assert_response :success
-    
+
     assert assigns(:config_vars).include?(config_vars(:app_uri)),
            "@config_vars doesn't have a database fixture"
     assert assigns(:default_vars).map(&:first).
@@ -29,13 +29,13 @@ class ConfigVarsControllerApiTest < ActionController::TestCase
   end
 
   test "should get variable value" do
-    get :show, :name => @config_var.to_param
+    get :show, name: @config_var.to_param
     assert_response :success
     assert_equal @config_var.value, @response.body
   end
-  
+
   test "edit with preset name and default value" do
-    get :edit, :name => 'config_vars.http_user'
+    get :edit, name: 'config_vars.http_user'
     assert_response :success
     assert_equal 'config_vars.http_user', assigns(:config_var).name
     assert_equal 'config', assigns(:config_var).value
@@ -44,7 +44,7 @@ class ConfigVarsControllerApiTest < ActionController::TestCase
   test "should create config_var" do
     attributes = @config_var.attributes.merge 'name' => 'other_uri'
     assert_difference('ConfigVar.count') do
-      put :update, :config_var => attributes, :name => 'other_uri'
+      put :update, config_var: attributes
     end
 
     assert_redirected_to config_vars_url
@@ -52,27 +52,26 @@ class ConfigVarsControllerApiTest < ActionController::TestCase
   end
 
   test "should get edit" do
-    get :edit, :name => @config_var.to_param
+    get :edit, name: @config_var.to_param
     assert_response :success
   end
 
   test "should update config_var" do
-    put :update, :name => @config_var.to_param,
-                 :config_var => @config_var.attributes
+    put :update, config_var: @config_var.attributes
     assert_redirected_to config_vars_url
   end
 
   test "should destroy config_var" do
     assert_difference('ConfigVar.count', -1) do
-      delete :destroy, :name => @config_var.to_param
+      delete :destroy, name: @config_var.to_param
     end
 
     assert_redirected_to config_vars_url
   end
-  
+
   test "cannot access config vars without authentication" do
     request.env.delete 'HTTP_AUTHORIZATION'
     get :index
-    assert_response :unauthorized    
+    assert_response :unauthorized
   end
 end

data/test/helpers/db_setup.rb

@@ -1,5 +1,17 @@
-ActiveRecord::Base.establish_connection :adapter => 'sqlite3',
-                                        :database => ':memory:'
+case ENV['DB']
+when /mysql/i
+  `mysql -u root -e "DROP DATABASE IF EXISTS plugin_dev; CREATE DATABASE plugin_dev;"`
+  ActiveRecord::Base.establish_connection adapter: 'mysql2',
+      database: 'plugin_dev', username: 'root', password: ''
+when /pg/i
+  `psql -d postgres -c "DROP DATABASE IF EXISTS plugin_dev;"`
+  `psql -d postgres -c "CREATE DATABASE plugin_dev;"`
+  ActiveRecord::Base.establish_connection adapter: 'postgresql',
+      database: 'plugin_dev', username: ENV['USER'], password: ''
+else
+  ActiveRecord::Base.establish_connection adapter: 'sqlite3',
+                                          database: ':memory:'
+end
 ActiveRecord::Base.configurations = true
 
 ActiveRecord::Migration.verbose = false
@@ -11,11 +23,11 @@ require 'configvars_rails/generators/templates/config_var.rb'
 # :nodoc: open TestCase to setup fixtures
 class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
-  
+
   self.fixture_path =
       File.expand_path '../../../lib/configvars_rails/generators/templates',
                        __FILE__
-  
+
   self.use_transactional_fixtures = false
   self.use_instantiated_fixtures  = false
   self.pre_loaded_fixtures = false

data/test/helpers/rails.rb

@@ -18,5 +18,11 @@ end
 # For javascript_include_tag in the config_vars layout.
 ActionController::Base.config.assets_dir = '.'
 ActionController::Base.config.javascripts_dir = '.'
-ActionView::Helpers::AssetTagHelper.
-    register_javascript_expansion(:defaults => ['rails.js'])
+
+if ActionView::Helpers::AssetTagHelper.respond_to?(:register_javascript_expansion)
+  # Rails 3.
+  ActionView::Helpers::AssetTagHelper.
+      register_javascript_expansion(defaults: ['rails.js'])
+else
+  # Rails 4 doesn't seem to need anything.
+end

data/test/helpers/routes.rb

@@ -1,7 +1,13 @@
 # :nodoc: the routes used in all tests
 class ActionController::TestCase
   def setup_routes
-    @routes = ActionController::Routing::RouteSet.new
+    if defined? ActionDispatch::Routing
+      # Rails 4.
+      @routes = ActionDispatch::Routing::RouteSet.new
+    else
+      # Rails 3.
+      @routes = ActionController::Routing::RouteSet.new
+    end
     @routes.draw do
       # NOTE: this route should be kept in sync with the config_vars template.
       config_vars
@@ -9,6 +15,6 @@ class ActionController::TestCase
     end
     ApplicationController.send :include, @routes.url_helpers
   end
-  
+
   setup :setup_routes
 end

data/test/routes_test.rb

@@ -7,19 +7,18 @@ class RoutesTest < ActionController::TestCase
   tests ConfigVarsController
 
   test "config_vars routes" do
-    assert_routing({:path => "/config_vars", :method => :get},
-                   {:controller => 'config_vars', :action => 'index'})
-    assert_routing({:path => "/config_vars/http.user", :method => :get},
-                   {:controller => 'config_vars', :action => 'show',
-                    :name => 'http.user'})
-    assert_routing({:path => "/config_vars/http.user", :method => :put},
-                   {:controller => 'config_vars', :action => 'update',
-                    :name => 'http.user'})
-    assert_routing({:path => "/config_vars/http.user", :method => :delete},
-                   {:controller => 'config_vars', :action => 'destroy',
-                    :name => 'http.user'})
-    assert_routing({:path => "/config_vars/http.user/edit", :method => :get},
-                   {:controller => 'config_vars', :action => 'edit',
-                    :name => 'http.user'})
+    assert_routing({path: "/config_vars", method: :get},
+                   {controller: 'config_vars', action: 'index'})
+    assert_routing({path: "/config_vars/http.user", method: :get},
+                   {controller: 'config_vars', action: 'show',
+                    name: 'http.user'})
+    assert_routing({path: "/config_vars", method: :put},
+                   {controller: 'config_vars', action: 'update'})
+    assert_routing({path: "/config_vars/http.user", method: :delete},
+                   {controller: 'config_vars', action: 'destroy',
+                    name: 'http.user'})
+    assert_routing({path: "/config_vars/http.user/edit", method: :get},
+                   {controller: 'config_vars', action: 'edit',
+                    name: 'http.user'})
   end
 end

metadata

@@ -1,63 +1,103 @@
 --- !ruby/object:Gem::Specification
 name: configvars_rails
 version: !ruby/object:Gem::Version
-  version: 0.5.3
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Victor Costan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70107924322540 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.16
   type: :runtime
   prerelease: false
-  version_requirements: *70107924322540
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.16
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70107924321760 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *70107924321760
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70107924321120 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.8
   type: :development
   prerelease: false
-  version_requirements: *70107924321120
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.8.8
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.14
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.14
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70107924320020 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.3.8
   type: :development
   prerelease: false
-  version_requirements: *70107924320020
-description: ! "This gem provides a model and simple controller for\n    storing global
-  application configuration in a database. This allows the\n    configuration to change
-  without source code modifications."
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.8
+description: |-
+  This gem provides a model and simple controller for
+      storing global application configuration in a database. This allows the
+      configuration to change without source code modifications.
 email: victor@costan.us
 executables: []
 extensions: []
@@ -66,8 +106,11 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .project
+- .travis.yml
 - Gemfile
 - Gemfile.lock
+- Gemfile.rails3
+- Gemfile.rails4
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -109,29 +152,25 @@ files:
 homepage: http://github.com/pwnall/configvars_rails
 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'
-      segments:
-      - 0
-      hash: -1731949087483486988
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Global configuration variables for Rails 3 applications.
 test_files: []