Changeset e67e28d59604c3c34a634ea37824b23bc828b268

Timestamp:

07/28/10 11:43:16 (6 weeks ago)

Author:

Alban Peignier <alban.peignier@…>

Parents:

b71a93afaa069e73dee680b0a22e95f77a1cd660, 1b611f11cff8150feef05ffeef67461d875d87fc

git-committer:

Alban Peignier <alban.peignier@free.fr> / 2010-07-28T11:43:16Z+0200

Message:

Merge branch 'master' of www.dbx.tryphon.priv:/srv/git/boxcontrol

Files:

• app/views/save_points/_save_point_warning.fr.html.erb (modified) (2 diffs)
• app/views/save_points/_save_point_warning.html.erb (modified) (2 diffs)
• config/locales/application_en.yml (modified) (1 diff)
• config/locales/application_fr.yml (modified) (1 diff)
• lib/acts_as_ip_port.rb (modified) (2 diffs)
• lib/puppet_configurable.rb (modified) (2 diffs)
• lib/puppet_configuration.rb (modified) (3 diffs)
• spec/lib/acts_as_ip_port_spec.rb (modified) (2 diffs)
• spec/lib/puppet_configurable_spec.rb (modified) (3 diffs)
• spec/lib/puppet_configuration_spec.rb (modified) (3 diffs)

app/views/save_points/_save_point_warning.fr.html.erb

@@ -1 +1 @@
 <p>
-  Si la configuration de votre LinkBox vous convient, vous pouvez 
+  Si la configuration de votre Box vous convient, vous pouvez 
   la sauvegarder pour qu'elle soit utilisée au prochain redémarrage.
 </p>
@@ -6 +6 @@
 <p>
   <strong>Attention</strong> : si vous sauvegardez une configuration
-  incorrecte, votre LinkBox pourrait ne pas redémarrer correctement !
+  incorrecte, votre Box pourrait ne pas redémarrer correctement !
 </p>

app/views/save_points/_save_point_warning.html.erb

@@ -1 +1 @@
 <p>
-  If the settings of your LinkBox seem fine, you can save it
+  If the settings of your Box seem fine, you can save it
   to use these settings at the next boot.
 </p>
@@ -6 +6 @@
 <p>
   <strong>Warning</strong> : if you save a wrong configuration,
-  your LinkBox may not reboot correctly !
+  your Box may not reboot correctly !
 </p>

config/locales/application_en.yml

@@ -37 +37 @@
     new:
       submit: Save
-  or: or
-  actions:
-    edit: Edit

config/locales/application_fr.yml

@@ -37 +37 @@
     new:
       submit: Sauvegarder
-  or: ou
-  actions:
-    edit: Modifier

lib/acts_as_ip_port.rb

@@ -9 +9 @@
     def acts_as_ip_port(*names)
       options = names.extract_options!
+      
+      options = { :allow_blank => false }.update(options)
 
       minimum_value, message = 
@@ -25 +27 @@
         end
 
-        validates_numericality_of name, :only_integer => true, :greater_than => minimum_value, :less_than => 65536, :message => message
+        validates_numericality_of name, :only_integer => true, :greater_than => minimum_value, :less_than => 65536, :message => message, :allow_blank => options[:allow_blank]
       end
     end

lib/puppet_configurable.rb

@@ -3 +3 @@
   def self.included(base)
     base.extend ClassMethods
+    base.class_eval do
+      alias_method_chain :update_attributes, :save
+    end
   end
 
@@ -21 +24 @@
   end
 
+  def update_attributes_with_save(attributes)
+    update_attributes_without_save attributes
+    save
+  end
+
   def save
     return false if respond_to?(:valid?) and not valid?
+    logger.debug "Save #{puppet_configuration_prefix} attributes: #{attributes.inspect}" if respond_to?(:logger)
     PuppetConfiguration.load.update_attributes(self.attributes, puppet_configuration_prefix).save
   end

lib/puppet_configuration.rb

@@ -47 +47 @@
     self
   end
+
+  def clear(prefix = "")
+    prefix = prefix.to_s
+    @attributes.each_key do |key|
+      @attributes.delete(key) if key.start_with?(prefix)
+    end
+    self
+  end
   
   def normalize_prefix(prefix)
@@ -66 +74 @@
 
   def self.load
-    self.new.tap(&:load)
+    unless pending_transaction?
+      self.new.tap(&:load)
+    else
+      Thread.current[:puppet_configuration]
+    end
+  end
+
+  def self.transaction(&block)
+    configuration = PuppetConfiguration.load
+    Thread.current[:puppet_configuration] = configuration
+    begin
+      yield configuration
+    ensure
+      Thread.current[:puppet_configuration] = nil
+    end
+    configuration.save
+  end
+
+  def self.pending_transaction?
+    not Thread.current[:puppet_configuration].nil?
   end
 
   def save
+    return true if PuppetConfiguration.pending_transaction?
+
+    Rails.logger.debug "write puppet configuration into #{configuration_file}"
     File.open(configuration_file, "w") do |f|
       @attributes.each_pair do |key, value|
@@ -84 +114 @@
     false
   end
+  
+  def self.destroy
+    File.delete(PuppetConfiguration.configuration_file) if File.exists?(PuppetConfiguration.configuration_file)
+  end
 
 end

spec/lib/acts_as_ip_port_spec.rb

@@ -10 +10 @@
     acts_as_ip_port :port
     acts_as_ip_port :user_port, :user_port => true
+    acts_as_ip_port :optionnal_port, :allow_blank => true
   end
 
@@ -41 +42 @@
   end
 
+  it "should not accept value blank value by default" do
+    @model.should_not allow_values_for(:port, "")
+  end
+
+  context "when allow_blank is true" do
+
+    it "should accept value blank value" do
+      @model.should allow_values_for(:optionnal_port, "")
+    end
+    
+  end
+
   describe "user port" do
 

spec/lib/puppet_configurable_spec.rb

@@ -5 +5 @@
 
   class TestConfigurable
+    attr_accessor :attributes
+    alias_method :update_attributes, :attributes=
+
     include PuppetConfigurable
-
-    attr_accessor :attributes
 
     def initialize(attributes = {})
       @attributes = attributes
     end
-
-    alias_method :update_attributes, :attributes=
   end
 
@@ -87 +86 @@
   describe "class method load" do
     
-    it "should create a new Network instance and load it" do
+    it "should create a new instance and load it" do
       TestConfigurable.should_receive(:new).and_return(@configurable)
       @configurable.should_receive(:load)
@@ -95 +94 @@
   end
 
+  describe "update_attributes" do
+    
+    it "should save the instance" do
+      @configurable.should_receive(:save)
+      @configurable.update_attributes(:dummy => true)
+    end
+
+  end
+
 end

spec/lib/puppet_configuration_spec.rb

@@ -14 +14 @@
   def delete_configuration_file
     File.delete(PuppetConfiguration.configuration_file) if File.exists?(PuppetConfiguration.configuration_file)
-  end
-
-  it "should use tmp/config.pp as default configuration file" do
-    PuppetConfiguration.configuration_file.should == "tmp/config.pp"
   end
 
@@ -80 +76 @@
       @puppet_configuration.save.should be_false
     end
+
+    it "should not store configuration if transaction is pending" do
+      PuppetConfiguration.stub!(:pending_transaction?).and_return(true)
+      File.should_not_receive(:open)
+      @puppet_configuration.save.should be_true
+    end
    
   end
@@ -119 +121 @@
   end
 
+  describe "clear" do
+    
+    it "should remove keys with given prefix" do
+      @puppet_configuration[:prefix_key] = "value"
+      @puppet_configuration.clear(:prefix)
+      @puppet_configuration[:prefix_key].should be_nil
+    end
+
+    it "should keep keys with doesn't match the prefix" do
+      @puppet_configuration[:key] = "value"
+      @puppet_configuration.clear(:prefix)
+      @puppet_configuration[:key].should == "value"
+    end
+
+    it "should clear all keys without prefix" do
+      @puppet_configuration[:key] = "value"
+      @puppet_configuration.clear
+      @puppet_configuration.should be_empty
+    end
+
+    it "should return the PuppetConfiguration instance" do
+      @puppet_configuration.clear.should == @puppet_configuration
+    end
+
+  end
+
+  describe "transaction" do
+
+    it "should instance a single PuppetConfiguration" do
+      PuppetConfiguration.should_receive(:new).and_return(@puppet_configuration)
+      PuppetConfiguration.transaction do
+        3.times do 
+          PuppetConfiguration.load.should == @puppet_configuration
+        end
+      end
+    end
+
+    it "should save once PuppetConfiguration after transaction" do
+      PuppetConfiguration.stub!(:new).and_return(@puppet_configuration)
+      @puppet_configuration.should_receive(:save)
+      PuppetConfiguration.transaction do
+      end
+    end
+    
+  end
+
 end