ts-admin 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 528db841c6ef8e98947079034726aa5a4ce3214b
-  data.tar.gz: 5fe471e105e13a03729202b24991bd301c357825
+  metadata.gz: 8cfd3ae8690d1a8d7947db457375f7ef7b1cb93b
+  data.tar.gz: d873461743c02ff698fd70dccf7c595399ec7977
 SHA512:
-  metadata.gz: 68fd21ece886a89189657474545b41a7098164e946bae268d82a6a848f8d32884186b368e6118bf1481979dbce20257bdfef2ae96d958454a4dd32a89ff2b037
-  data.tar.gz: c1ad67697964dc72e52e1c0d558f203fef5d92c001e9b6a69e8218034c1a57dfcad6dbf136f0004768b352dfaeb9cfd50a9859ec810ad085b3ae76cfba473564
+  metadata.gz: 25cc66b1569c8319b3e5a2340db91438c5aea729050216124cc5ddaf84ecd4000fa0c83d946725a7c192740b8cc557507f71842af139b4defae30ee1754f62db
+  data.tar.gz: e2b9b88282ee405f46ca8137ab511511661cf11f89b993ffdb2b75204c7cc656993820171dbac30f9259c3f10e451220e1a626fcc92392e4a215cd05082e3350

data/app.rb

@@ -17,5 +17,6 @@ APP_CONFIG = {
 # Make sure that Ramaze knows where you are
 Ramaze.options.roots = [__DIR__]
 
-require __DIR__('lib/ts-admin/traffic_server')
+$: << __DIR__('lib')
+require 'ts-admin'
 require __DIR__('controller/init')

data/controller/remap.rb

@@ -14,13 +14,14 @@ class RemapController < Controller
     if request.post?
       @from = request[:from]
       @to = request[:to]
-      if traffic_server.add_remap(@type, @from, @to)
+      if (entry = traffic_server.new_remap_entry(@type, @from, @to)).valid?
+        traffic_server.remap_entries << entry
         traffic_server.save
         restart_traffic_server
-        flash[:info] = "Remap entry added"
+        flash[:info] = "#{entry.type.to_s.capitalize} definition added"
         call(r('/'))
       else
-        flash[:error] = "Invalid Remap entry"
+        set_errors(entry)
         render_view :form
       end
     else
@@ -37,21 +38,31 @@ class RemapController < Controller
     if request.post?
       @from = request[:from]
       @to = request[:to]
-      if traffic_server.edit_remap(@id, @from, @to)
-        traffic_server.save
-        restart_traffic_server
-        flash[:info] = "Remap entry updated"
-        call(r('/'))
+      if entry = traffic_server.remap_entries.get_id(@id).first
+        entry.from = @from
+        entry.to = @to
+        if entry.valid?
+          traffic_server.save
+          restart_traffic_server
+          flash[:info] = "#{entry.type.to_s.capitalize} definition updated"
+          call(r('/'))
+        else
+          set_errors(entry)
+          render_view :form
+        end
       else
-        flash[:error] = "Invalid Remap entry"
+        flash[:error] = "Remap definition not found"
         render_view :form
       end
     else
-      @entry = traffic_server.find_remap_by_id(@id)
-      @from = @entry[:from]
-      @to = @entry[:to]
-      @type = @entry[:type]
-      render_view :form
+      if @entry = traffic_server.remap_entries.get_id(@id).first
+        @type = @entry.type
+        @from = @entry.from
+        @to = @entry.to
+        render_view :form
+      else
+        call(r('/'))
+      end
     end
   end
 
@@ -59,11 +70,14 @@ class RemapController < Controller
     return unless login_required
     set_env
 
-    traffic_server.delete_remap(request[:id])
-    traffic_server.save
-    restart_traffic_server
+    @id = request[:id]
 
-    flash[:info] = "Remap entry removed"
+    if entry = traffic_server.remap_entries.get_id(@id).first
+      traffic_server.remap_entries.delete(entry)
+      traffic_server.save
+      restart_traffic_server
+      flash[:info] = "#{entry.type.to_s.capitalize} definition removed"
+    end
 
     call(r('/'))
   end
@@ -83,4 +97,17 @@ class RemapController < Controller
     @type = request[:type]
   end
 
+  def set_errors(entry)
+    case entry.errors.first
+    when :type_invalid
+      flash[:error] = "Invalid remap type: #{entry.type.to_s}"
+    when :from_invalid
+      flash[:error] = "Invalid from: #{entry.from.to_s}"
+    when :to_invalid
+      flash[:error] = "Invalid to: #{entry.to.to_s}"
+    when :duplicate_entry
+      flash[:error] = "Duplicate remap definition"
+    end
+  end
+
 end

data/layout/default.xhtml

@@ -39,7 +39,7 @@
     <footer id="footer">
       <p>
         &copy; 2012-2013 <a href="http://www.sic-software.com/">SIC! Software GmbH</a><br />
-        <a href="https://github.com/SICSoftwareGmbH/TSAdmin">TSAdmin</a> is free software and is licensed under the MIT license.
+        <a href="https://github.com/SICSoftwareGmbH/TSAdmin">TSAdmin</a> (v#{TSAdmin::VERSION}) is free software and is licensed under the MIT license.
       </p>
     </footer>
   </div>

data/lib/ts-admin/traffic_server.rb

@@ -5,89 +5,87 @@ module TSAdmin
   class TrafficServer
     MARKER_TEXT = "CONFIGURATION FROM TSADMIN"
 
-    def initialize(options={})
-      @options = {
-          'config_path' => '/etc/trafficserver',
-          'restart_cmd' => '/etc/init.d/trafficserver restart'
-        }.merge(options)
-      @config_path = @options['config_path']
-    end
-
-    def redirects
-      load unless defined?(@redirects)
-      @redirects.dup.freeze
-    end
-
-    def maps
-      load unless defined?(@maps)
-      @maps.dup.freeze
-    end
+    class RemapError < StandardError; end
 
-    def find_remap_by_id(id)
-      (maps + redirects).select{|m| m[:id] == id}.first
+    class ValidatingArray < Array
+      class InvalidObject < StandardError; end
+      def add(o)
+        raise InvalidObject unless o.respond_to?(:valid?) && o.valid?
+        super
+      end
+      def method_missing(m, *args, &block)
+        if m.to_s =~ /^get_(\w+)$/ && args.count == 1
+          select{|i| i.respond_to?($1) && i.send($1) == args[0]}
+        else
+          super
+        end
+      end
     end
 
-    def add_remap(type, from, to, options={})
-      load
+    class RemapEntry
+      attr_accessor :type, :id, :from, :to
 
-      return unless list = case type.to_sym
-        when :map
-          @maps
-        when :redirect
-          @redirects
-        else
-          nil
-        end
+      def initialize(ts, type, from, to)
+        @ts = ts
+        @type = type.to_sym
+        @from = from.downcase
+        @to = to.downcase
+        @id = Digest::SHA1.hexdigest(@from)
+      end
 
-      id = Digest::SHA1.hexdigest("#{from}_#{to}")
+      def valid?
+        errors.count == 0
+      end
 
-      return false if find_remap_by_id(id)
-      return false unless validate_url(from) && validate_url(to)
+      def errors
+        e = []
+        e << :type_invalid unless [:map, :redirect].include?(@type)
+        e << :from_invalid unless valid_url?(@from)
+        e << :to_invalid unless valid_url?(@to)
+        e << :duplicate_entry unless @ts.remap_entries.get_from(@from).select{|e| e != self}.count == 0
+        e.compact.uniq
+      end
 
-      list << {:id => id, :type => type.to_sym, :from => from, :to => to, :options => options}
+      private
 
-      true
+      def valid_url?(url)
+        !!(url =~ URI::regexp) rescue false
+      end
     end
 
-    def edit_remap(id, from, to, options=nil)
-      return false unless validate_url(from) && validate_url(to)
-      return false unless entry = find_remap_by_id(id)
-      entry[:from] = from
-      entry[:to] = to
-      entry[:options] = options unless options.nil?
-      entry[:id] = Digest::SHA1.hexdigest("#{from}_#{to}")
+    def initialize(options={})
+      @options = {
+          'config_path' => '/etc/trafficserver',
+          'restart_cmd' => '/etc/init.d/trafficserver restart'
+        }.merge(options)
+      @config_path = @options['config_path']
     end
 
-    def delete_remap(id)
-      load
-
-      @maps.delete_if{|m| m[:id] == id}
-      @redirects.delete_if{|m| m[:id] == id}
+    def remap_entries
+      load unless defined?(@remap_entries)
+      @remap_entries
+    end
 
-      true
+    def new_remap_entry(type, from, to)
+      RemapEntry.new(self, type, from, to)
     end
 
     def save
       own_config = ''
-      own_config << "#{marker_begin}\n"
-      redirects.each do |redirect|
-        options = redirect[:options] ? '' : ''
-        own_config << "redirect #{redirect[:from]} #{redirect[:to]} #{options}\n"
-      end
-      maps.each do |map|
-        options = map[:options] ? '' : ''
-        own_config << "map #{map[:from]} #{map[:to]} #{options}\n"
+      own_config << "#{self.class.marker_begin}\n"
+      remap_entries.each do |remap_entry|
+        own_config << "#{remap_entry.type.to_s} #{remap_entry.from} #{remap_entry.to}\n"
       end
-      own_config << "#{marker_end}\n"
+      own_config << "#{self.class.marker_end}\n"
 
       file_content = ''
       in_config_block = false
       own_config_written = false
       File.read(remap_path).each_line do |line|
-        if line.strip == marker_begin
+        if line.strip == self.class.marker_begin
           in_config_block = true
           next
-        elsif line.strip == marker_end
+        elsif line.strip == self.class.marker_end
           in_config_block = false
           next
         end
@@ -112,28 +110,19 @@ module TSAdmin
 
     private
 
-    def marker_begin
-      "# BEGIN #{MARKER_TEXT}"
-    end
-
-    def marker_end
-      "# END #{MARKER_TEXT}"
-    end
-
     def remap_path
       File.join(@config_path, 'remap.config')
     end
 
     def load
-      @redirects = []
-      @maps = []
+      @remap_entries = ValidatingArray.new
 
       in_config_block = false
       File.read(remap_path).each_line do |line|
-        if line.strip == marker_begin
+        if line.strip == self.class.marker_begin
           in_config_block = true
           next
-        elsif line.strip == marker_end
+        elsif line.strip == self.class.marker_end
           in_config_block = false
           next
         end
@@ -141,19 +130,17 @@ module TSAdmin
         next unless in_config_block
 
         type, from, to, *options = line.split(/\s+/)
-        id = Digest::SHA1.hexdigest("#{from}_#{to}")
-        case type.to_sym
-        when :redirect
-          @redirects << {:id => id, :type => type.to_sym, :from => from, :to => to, :options => {}}
-        when :map
-          @maps << {:id => id, :type => type.to_sym, :from => from, :to => to, :options => {}}
-        end
+        @remap_entries << RemapEntry.new(self, type, from, to)
+        @remap_entries.delete_if{|e| !e.valid?}
       end
     end
 
-    def validate_url(url)
-      !!(url =~ URI::regexp) rescue false
+    def self.marker_begin
+      "# BEGIN #{MARKER_TEXT}"
     end
 
+    def self.marker_end
+      "# END #{MARKER_TEXT}"
+    end
   end
 end

data/lib/ts-admin/version.rb

@@ -1,3 +1,3 @@
 module TSAdmin
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/view/remap/form.xhtml

@@ -1,6 +1,6 @@
 <div class="grid_12 content">
   <header>
-    <h2>Remap entry</h2>
+    <h2>#{@type.capitalize} entry</h2>
   </header>
   <form method="post" action="/remap/#{defined?(@id) ? 'edit' : 'new'}">
     <p>

data/view/remap/list.xhtml

@@ -7,14 +7,14 @@
   </header>
   <p>
     <ul class="remap">
-      <?r @traffic_server.send("#{@type}s").each_with_index do |map, i| ?>
+      <?r @traffic_server.remap_entries.get_type(@type.to_sym).each do |entry| ?>
         <li>
-          <span class="url from"><a href="#{map[:from]}">#{remap_url_highlight_scheme(map[:from])}</a></span>
+          <span class="url from"><a href="#{entry.from}">#{remap_url_highlight_scheme(entry.from)}</a></span>
           <span class="arrow icon-chevron-right"></span>
-          <span class="url to"><a href="#{map[:to]}">#{remap_url_highlight_scheme(map[:to])}</a></span>
+          <span class="url to"><a href="#{entry.to}">#{remap_url_highlight_scheme(entry.to)}</a></span>
           <span class="buttons">
-            <a class="icon-pencil" href="/remap/edit?id=#{map[:id]}" title="Edit"></a>
-            <a class="icon-trash" href="/remap/delete?id=#{map[:id]}" title="Delete"></a>
+            <a class="icon-pencil" href="/remap/edit?id=#{entry.id}" title="Edit"></a>
+            <a class="icon-trash" href="/remap/delete?id=#{entry.id}" title="Delete"></a>
           </span>
         </li>
       <?r end ?>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ts-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-01 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler