configvars_rails 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/app/helpers/config_vars_helper.rb

@@ -3,4 +3,9 @@ module ConfigVarsHelper
   def config_var(name)
     ConfigVar[name]
   end
+  
+  # Application name used in view title
+  def config_vars_app_name
+    Rails.application.class.name.split('::', 2).first
+  end
 end

data/configvars_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{configvars_rails}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2011-03-09}
+  s.date = %q{2011-03-21}
   s.description = %q{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.}
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
     "lib/configvars_rails/generators/templates/config_vars_controller.rb",
     "lib/configvars_rails/generators/templates/config_vars_controller_test.rb",
     "lib/configvars_rails/generators/templates/config_vars_initializer.rb",
+    "lib/configvars_rails/generators/templates/layouts/config_vars.html.erb",
     "lib/configvars_rails/model.rb",
     "lib/configvars_rails/routes.rb",
     "test/config_var_test.rb",
@@ -47,6 +48,7 @@ Gem::Specification.new do |s|
     "test/helpers/application_controller.rb",
     "test/helpers/db_setup.rb",
     "test/helpers/initializers.rb",
+    "test/helpers/rails.rb",
     "test/helpers/routes.rb",
     "test/helpers/view_helpers.rb",
     "test/routes_test.rb",
@@ -63,6 +65,7 @@ Gem::Specification.new do |s|
     "test/helpers/application_controller.rb",
     "test/helpers/db_setup.rb",
     "test/helpers/initializers.rb",
+    "test/helpers/rails.rb",
     "test/helpers/routes.rb",
     "test/helpers/view_helpers.rb",
     "test/routes_test.rb",

data/lib/configvars_rails/controller.rb

@@ -28,13 +28,13 @@ module ControllerClassMethods
   def config_vars_auth(*args)
     include AuthInstanceMethods
     before_filter :config_vars_http_basic_check, *args
+    layout 'config_vars'
   end
 end
 
 # Included in controllers that call config_vars_controller.
 module ControllerInstanceMethods
   # GET /config_vars
-  # GET /config_vars.xml
   def index
     @config_vars = ConfigVar.order(:name).all
     
@@ -91,8 +91,7 @@ module ControllerInstanceMethods
     end
   end
 
-  # DELETE /config_vars/1
-  # DELETE /config_vars/1.xml
+  # DELETE /config_vars/http_user
   def destroy
     @config_var = ConfigVar.where(:name => params[:name]).first
     @config_var.destroy

data/lib/configvars_rails/generators/all_generator.rb

@@ -24,6 +24,8 @@ class AllGenerator < Rails::Generators::Base
       copy_file File.join('config_vars', view_name),
                 File.join('app', 'views', 'config_vars', view_name)
     end
+    copy_file File.join('layouts', 'config_vars.html.erb'),
+              File.join('app', 'views', 'layouts', 'config_vars.html.erb')
     route 'config_vars'
     
     copy_file 'config_vars_initializer.rb',

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

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

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

@@ -1,4 +1,4 @@
-<h1>Set Configuration Variables</h1>
+<h2>Set Configuration Variables</h2>
 
 <table class="configuration_variables">
   <tr>
@@ -29,7 +29,7 @@
 <% end %>
 </table>
 
-<h1>Available Configuration Variables</h1>
+<h2>Available Configuration Variables</h2>
 
 <table class="configuration_variables">
   <tr>

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

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title><%= config_vars_app_name %> Vars</title>
+    <%= javascript_include_tag :defaults %>
+  </head>
+  <body>
+    <h1><%= config_vars_app_name %> Configuration Vars</h1>
+<%= yield %>
+  </body>
+</html>

data/test/config_vars_controller_api_test.rb

@@ -11,7 +11,9 @@ class ConfigVarsControllerApiTest < ActionController::TestCase
 
   setup do
     @config_var = config_vars(:app_uri)
-    request.env['HTTP_AUTHORIZATION'] = encode_credentials('config', 'vars')    
+    request.env['HTTP_AUTHORIZATION'] =
+        ActionController::HttpAuthentication::Basic.encode_credentials('config',
+                                                                       'vars')
   end
 
   test "should get index" do
@@ -72,9 +74,4 @@ class ConfigVarsControllerApiTest < ActionController::TestCase
     get :index
     assert_response :unauthorized    
   end
-  
-  # Verbatim, from ActiveController's own unit tests.
-  def encode_credentials(username, password)
-    "Basic #{ActiveSupport::Base64.encode64("#{username}:#{password}")}"
-  end  
 end

data/test/helpers/rails.rb

@@ -0,0 +1,22 @@
+# Fake application.
+module ConfigVarsApp
+  class Application
+  end
+end
+
+# Mock Rails.application used in the config_vars layout.
+#
+# This mocks Rails for ConfigVars classes, but not for everything else.
+module ConfigVarsHelper
+  module Rails
+    def self.application
+      ConfigVarsApp::Application.new
+    end
+  end
+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'])

data/test/test_helper.rb

@@ -15,3 +15,4 @@ require 'helpers/application_controller.rb'
 require 'helpers/db_setup.rb'
 require 'helpers/initializers.rb'
 require 'helpers/routes.rb'
+require 'helpers/rails.rb'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: configvars_rails
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Victor Costan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 -05:00
+date: 2011-03-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,6 +83,7 @@ files:
 - lib/configvars_rails/generators/templates/config_vars_controller.rb
 - lib/configvars_rails/generators/templates/config_vars_controller_test.rb
 - lib/configvars_rails/generators/templates/config_vars_initializer.rb
+- lib/configvars_rails/generators/templates/layouts/config_vars.html.erb
 - lib/configvars_rails/model.rb
 - lib/configvars_rails/routes.rb
 - test/config_var_test.rb
@@ -91,6 +92,7 @@ files:
 - test/helpers/application_controller.rb
 - test/helpers/db_setup.rb
 - test/helpers/initializers.rb
+- test/helpers/rails.rb
 - test/helpers/routes.rb
 - test/helpers/view_helpers.rb
 - test/routes_test.rb
@@ -136,6 +138,7 @@ test_files:
 - test/helpers/application_controller.rb
 - test/helpers/db_setup.rb
 - test/helpers/initializers.rb
+- test/helpers/rails.rb
 - test/helpers/routes.rb
 - test/helpers/view_helpers.rb
 - test/routes_test.rb