configvars_rails 0.2.3 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/configvars_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{configvars_rails}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2010-08-10}
+  s.date = %q{2010-08-12}
   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.}
@@ -35,14 +35,13 @@ Gem::Specification.new do |s|
      "lib/configvars_rails/generators/templates/001_create_config_vars.rb",
      "lib/configvars_rails/generators/templates/config_var.rb",
      "lib/configvars_rails/generators/templates/config_vars.yml",
-     "lib/configvars_rails/generators/templates/config_vars/_form.html.erb",
      "lib/configvars_rails/generators/templates/config_vars/edit.html.erb",
      "lib/configvars_rails/generators/templates/config_vars/index.html.erb",
-     "lib/configvars_rails/generators/templates/config_vars/new.html.erb",
      "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/model.rb",
+     "lib/configvars_rails/routes.rb",
      "test/config_var_test.rb",
      "test/config_vars_controller_api_test.rb",
      "test/descriptor_test.rb",
@@ -51,6 +50,7 @@ Gem::Specification.new do |s|
      "test/helpers/initializers.rb",
      "test/helpers/routes.rb",
      "test/helpers/view_helpers.rb",
+     "test/routes_test.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/pwnall/configvars_rails}
@@ -59,15 +59,16 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Global configuration variables for Rails 3 applications.}
   s.test_files = [
-    "test/test_helper.rb",
+    "test/config_var_test.rb",
      "test/config_vars_controller_api_test.rb",
      "test/descriptor_test.rb",
      "test/helpers/application_controller.rb",
+     "test/helpers/db_setup.rb",
      "test/helpers/initializers.rb",
      "test/helpers/routes.rb",
-     "test/helpers/db_setup.rb",
      "test/helpers/view_helpers.rb",
-     "test/config_var_test.rb"
+     "test/routes_test.rb",
+     "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/configvars_rails/controller.rb

@@ -42,47 +42,43 @@ module ControllerInstanceMethods
       format.html # index.html.erb
     end
   end
-
-  # GET /config_vars/new
-  # GET /config_vars/new.xml
-  def new
-    @config_var = ConfigVar.new :name => params[:name]
-    if params[:name] and descriptor = ConfigvarsRails.variable_descriptor(params[:name])
-      @config_var.value = descriptor.default_value
-    end
-
-    respond_to do |format|
-      format.html # new.html.erb
-    end
+    
+  # GET /config_vars/http_user
+  def show
+    edit
+    render :text => @config_var.value
   end
 
-  # GET /config_vars/1/edit
+  # GET /config_vars/http_user/edit
   def edit
-    @config_var = ConfigVar.find(params[:id])
-  end
-
-  # POST /config_vars
-  # POST /config_vars.xml
-  def create
-    @config_var = ConfigVar.new(params[:config_var])
-
-    respond_to do |format|
-      if @config_var.save!
-        format.html { redirect_to(config_vars_url, :notice => 'Configuration variable was successfully created.') }
-      else
-        format.html { render :action => :new }
+    @config_var = ConfigVar.where(:name => params[:name]).first
+    unless @config_var
+      @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/1
-  # PUT /config_vars/1.xml
+  # PUT /config_vars/http_user
   def update
-    @config_var = ConfigVar.find(params[:id])
+    @config_var = ConfigVar.where(:name => params[:name]).first
+    unless @config_var
+      @config_var = ConfigVar.new params[:config_var]
+      @config_var.name = params[:name]
+    end
 
     respond_to do |format|
-      if @config_var.update_attributes(params[:config_var])
-        format.html { redirect_to(config_vars_url, :notice => 'Configuration variable was successfully updated.') }
+      success = if @config_var.new_record?
+        @config_var.save
+      else
+        @config_var.update_attributes(params[:config_var])
+      end
+      if success
+        format.html do
+          redirect_to config_vars_url,
+              :notice => 'Configuration variable was successfully updated.'
+        end
       else
         format.html { render :action => :edit }
       end
@@ -92,7 +88,7 @@ module ControllerInstanceMethods
   # DELETE /config_vars/1
   # DELETE /config_vars/1.xml
   def destroy
-    @config_var = ConfigVar.find(params[:id])
+    @config_var = ConfigVar.where(:name => params[:name]).first
     @config_var.destroy
 
     respond_to do |format|

data/lib/configvars_rails/generators/all_generator.rb

@@ -20,13 +20,11 @@ class AllGenerator < Rails::Generators::Base
               File.join('app', 'controllers', 'config_vars_controller.rb')    
     copy_file File.join('config_vars_controller_test.rb'),
               File.join('test', 'functional', 'config_vars_controller_test.rb')
-    [
-      '_form.html.erb', 'edit.html.erb', 'index.html.erb', 'new.html.erb'
-    ].each do |view_name|
+    ['edit.html.erb', 'index.html.erb'].each do |view_name|
       copy_file File.join('config_vars', view_name),
                 File.join('app', 'views', 'config_vars', view_name)
     end
-    route 'resources :config_vars'
+    route 'config_vars'
     
     copy_file 'config_vars_initializer.rb',
               File.join('config', 'initializers', 'config_vars.rb')    

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

@@ -1,5 +1,30 @@
 <h1>Editing Configuration Variable</h1>
 
-<%= render 'form' %>
+<%= 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>
+
+      <ul>
+      <% @config_var.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :name %><br />
+    <%= f.text_field :name %>
+  </div>
+  <div class="field">
+    <%= f.label :value %><br />
+    <%= f.text_field :value %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>
 
 <%= link_to 'Back', config_vars_path %>

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

@@ -46,7 +46,7 @@
     <td><%= name %></td>
     <td><%= descriptor.value_type %></td>
     <td><%= descriptor.default_value %></td>
-    <td><%= link_to 'Edit', new_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

@@ -61,6 +61,11 @@ module ModelInstanceMethods
   def descriptor
     ConfigvarsRails.variable_descriptor name
   end
+  
+  # Use name instead of ID on all URLs.
+  def to_param
+    name
+  end
 end  # module ConfigvarsRails::Model::ModelInstanceMethods
 
 ActiveRecord::Base.send :include, ModelMixin

data/lib/configvars_rails/routes.rb

@@ -0,0 +1,28 @@
+require 'action_pack'
+
+# :nodoc: namespace
+module ConfigvarsRails
+
+# :nodoc: namespace
+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 => /[^\/]+/ }    
+    delete 'config_vars/:name' => 'config_vars#destroy',
+        :constraints => { :name => /[^\/]+/ }    
+    get 'config_vars' => 'config_vars#index', :as => :config_vars
+  end
+end
+
+ActionDispatch::Routing::Mapper.send :include, MapperMixin
+
+end  # namespace ConfigvarsRails::Routes
+
+end  # namespace ConfigvarsRails

data/lib/configvars_rails.rb

@@ -5,6 +5,7 @@ end
 require 'configvars_rails/controller.rb'
 require 'configvars_rails/descriptor.rb'
 require 'configvars_rails/model.rb'
+require 'configvars_rails/routes.rb'
 
 if defined?(Rails)
   require 'configvars_rails/engine.rb'

data/test/config_vars_controller_api_test.rb

@@ -25,19 +25,14 @@ class ConfigVarsControllerApiTest < ActionController::TestCase
            "@default_vars doesn't have config_vars:http_user"
   end
 
-  test "should get new" do
-    get :new
+  test "should get variable value" do
+    get :show, :name => @config_var.to_param
     assert_response :success
+    assert_equal @config_var.value, @response.body
   end
   
-  test "new with preset name" do
-    get :new, :name => 'undefined'
-    assert_response :success
-    assert_equal 'undefined', assigns(:config_var).name
-  end
-
-  test "new with preset name and default value" do
-    get :new, :name => 'config_vars.http_user'
+  test "edit with preset name and default value" do
+    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
@@ -46,26 +41,27 @@ class ConfigVarsControllerApiTest < ActionController::TestCase
   test "should create config_var" do
     attributes = @config_var.attributes.merge 'name' => 'other_uri'
     assert_difference('ConfigVar.count') do
-      post :create, :config_var => attributes
+      put :update, :config_var => attributes, :name => 'other_uri'
     end
 
     assert_redirected_to config_vars_url
+    assert_equal ConfigVar['other_uri'], @config_var.value
   end
 
   test "should get edit" do
-    get :edit, :id => @config_var.to_param
+    get :edit, :name => @config_var.to_param
     assert_response :success
   end
 
   test "should update config_var" do
-    put :update, :id => @config_var.to_param,
+    put :update, :name => @config_var.to_param,
                  :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, :id => @config_var.to_param
+      delete :destroy, :name => @config_var.to_param
     end
 
     assert_redirected_to config_vars_url

data/test/helpers/routes.rb

@@ -4,7 +4,7 @@ class ActionController::TestCase
     @routes = ActionController::Routing::RouteSet.new
     @routes.draw do
       # NOTE: this route should be kept in sync with the config_vars template.
-      resources :config_vars
+      config_vars
     end
     ApplicationController.send :include, @routes.url_helpers
   end

data/test/routes_test.rb

@@ -0,0 +1,25 @@
+require File.expand_path('../test_helper', __FILE__)
+
+require 'configvars_rails/generators/templates/config_vars_controller.rb'
+
+
+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'})
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: configvars_rails
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Victor Costan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 -04:00
+date: 2010-08-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,14 +80,13 @@ files:
 - lib/configvars_rails/generators/templates/001_create_config_vars.rb
 - lib/configvars_rails/generators/templates/config_var.rb
 - lib/configvars_rails/generators/templates/config_vars.yml
-- lib/configvars_rails/generators/templates/config_vars/_form.html.erb
 - lib/configvars_rails/generators/templates/config_vars/edit.html.erb
 - lib/configvars_rails/generators/templates/config_vars/index.html.erb
-- lib/configvars_rails/generators/templates/config_vars/new.html.erb
 - 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/model.rb
+- lib/configvars_rails/routes.rb
 - test/config_var_test.rb
 - test/config_vars_controller_api_test.rb
 - test/descriptor_test.rb
@@ -96,6 +95,7 @@ files:
 - test/helpers/initializers.rb
 - test/helpers/routes.rb
 - test/helpers/view_helpers.rb
+- test/routes_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/pwnall/configvars_rails
@@ -132,12 +132,13 @@ signing_key:
 specification_version: 3
 summary: Global configuration variables for Rails 3 applications.
 test_files: 
-- test/test_helper.rb
+- test/config_var_test.rb
 - test/config_vars_controller_api_test.rb
 - test/descriptor_test.rb
 - test/helpers/application_controller.rb
+- test/helpers/db_setup.rb
 - test/helpers/initializers.rb
 - test/helpers/routes.rb
-- test/helpers/db_setup.rb
 - test/helpers/view_helpers.rb
-- test/config_var_test.rb
+- test/routes_test.rb
+- test/test_helper.rb

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

@@ -1,25 +0,0 @@
-<%= form_for(@config_var) 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>
-
-      <ul>
-      <% @config_var.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <div class="field">
-    <%= f.label :name %><br />
-    <%= f.text_field :name %>
-  </div>
-  <div class="field">
-    <%= f.label :value %><br />
-    <%= f.text_field :value %>
-  </div>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %>

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

@@ -1,5 +0,0 @@
-<h1>Editing Configuration Variable</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Back', config_vars_path %>