rix 0.1.1 → 0.2.0

data/bin/rix

@@ -6,8 +6,10 @@ require 'rix'
 require 'optparse'
 
 Rix::Registry.instance.register 'add-element', Rix::Commands::AddElement
+Rix::Registry.instance.register 'add-attribute', Rix::Commands::AddAttribute
 Rix::Registry.instance.register 'remove', Rix::Commands::Remove
 Rix::Registry.instance.register 'rename', Rix::Commands::Rename
+Rix::Registry.instance.register 'trim', Rix::Commands::Trim
 Rix::Registry.instance.register 'count', Rix::Commands::Count
 Rix::Registry.instance.register 'show', Rix::Commands::Show
 Rix::Registry.instance.register 'help', Rix::Commands::Help
@@ -17,6 +19,7 @@ if ARGV.size == 0
 elsif not ARGV[0].start_with? '-'
   name = ARGV.shift
   command = Rix::Registry.instance[name]
+  command.out = $stdout
   begin
     command.execute
   rescue => e

data/lib/rix.rb

@@ -3,10 +3,14 @@ require 'rix/registry'
 require 'rix/command'
 require 'rix/commands/help'
 require 'rix/commands/add_element'
+require 'rix/commands/add_attribute'
 require 'rix/commands/remove'
 require 'rix/commands/rename'
+require 'rix/commands/trim'
 require 'rix/commands/count'
 require 'rix/commands/show'
 require 'rix/commands/unknown'
 require 'rix/help'
 require 'rix/version'
+
+include REXML

data/lib/rix/command.rb

@@ -2,6 +2,7 @@ require 'rix/commands/unknown'
 
 module Rix
   class Command
+    attr_accessor :out
     attr_accessor :files
     attr_accessor :xpath
 
@@ -33,13 +34,7 @@ module Rix
         # on Mac, Linux etc. this will have no effect.
         Dir[pattern].each do |path|
           File.open(path, 'r') do |file|
-            document = REXML::Document.new(file)
-            nodes = REXML::XPath.match(document, @xpath)
-            before(path, nodes)
-            nodes.each do |node|
-              on_node(node)
-            end
-            after(path, document)
+            on_source(file, path)
           end
         end
       end
@@ -47,22 +42,37 @@ module Rix
       after_all
     end
 
-    def before_all
+    def on_source(source, name)
+      document = Document.new(source, :ignore_whitespace_nodes => :all, :attribute_quote => :quote)
+      on_document(document, name)
     end
 
-    def before(path, nodes)
+    def on_document(document, name)
+      nodes = XPath.match(document, @xpath)
+      before(name, document, nodes)
+      nodes.each do |node|
+        on_node(node)
+        on_element(node)   if node.is_a? Element
+        on_attribute(node) if node.is_a? Attribute
+        on_text(node)      if node.is_a? Text
+      end
+      after(name, document)
     end
 
-    def on_node(node)
-    end
+    def before_all; end
 
-    def after(path, document)
-      #File.open(path, 'w') do |file|
-      #  document.write file
-      #end
-    end
+    def before(name, document, nodes); end
 
-    def after_all
-    end
+    def on_node(node); end
+
+    def on_element(element); end
+
+    def on_attribute(attribute); end
+
+    def on_text(text); end
+
+    def after(name, document); end
+
+    def after_all; end
   end
 end

data/lib/rix/commands/add_attribute.rb

@@ -0,0 +1,32 @@
+module Rix
+  module Commands
+    class AddAttribute < Command
+      attr_accessor :name
+      attr_accessor :value
+
+      def opts
+        OptionParser.new do |opts|
+          opts.banner = "Usage: rix add-attribute [options] <xpath> <files>"
+          opts.separator ""
+          opts.separator "Options:"
+          opts.on("-n", "--name NAME", "The name of the new attribute") { |name| @name = name }
+          opts.on("-v", "--value VALUE", "The value of the new attribute") { |value| @value = value }
+        end
+      end
+
+      def before_all
+        raise "Missing option: -n, --name" if @name.nil? or @name.empty?
+      end
+
+      def on_element(element)
+        element.add_attribute(@name, @value)
+      end
+
+      def after(path, document)
+        File.open(path, 'w') do |file|
+          document.write file
+        end
+      end
+    end
+  end
+end

data/lib/rix/commands/add_element.rb

@@ -18,8 +18,8 @@ module Rix
         raise "Missing option: -n, --name" if @name.nil? or @name.empty?
       end
 
-      def on_node(node)
-        element = node.add_element @name
+      def on_element(parent)
+        element = parent.add_element @name
         element.text = @value
       end
 

data/lib/rix/commands/count.rb

@@ -5,8 +5,8 @@ module Rix
         "Usage: rix count <xpath> <files>"
       end
 
-      def before(path, nodes)
-        puts "#{path}: #{nodes.size}"
+      def before(name, document, nodes)
+        out.puts "#{name}: #{nodes.size}"
       end
     end
   end

data/lib/rix/commands/help.rb

@@ -1,6 +1,8 @@
 module Rix
   module Commands
     class Help
+      attr_accessor :out
+
       def help
         HELP
       end
@@ -8,17 +10,17 @@ module Rix
       def execute
         case ARGV.size
         when 0
-          puts Rix::HELP
+          out.puts Rix::HELP
         when 1
           name = ARGV[0]
           if name.downcase == 'commands'
-            puts "Available commands:"
-            Registry.instance.commands.each_key { |command| puts "  #{command}" }
+            out.puts "Available commands:"
+            Registry.instance.commands.each_key { |command| out.puts "  #{command}" }
           else
-            puts Registry.instance[name].help
+            out.puts Registry.instance[name].help
           end
         else
-          puts HELP
+          out.puts HELP
         end
       end
 

data/lib/rix/commands/remove.rb

@@ -6,10 +6,13 @@ module Rix
         "Usage: rix remove <xpath> <files>"
       end
 
-      def on_node(node)
-        node.parent.delete_element node if node.is_a? REXML::Element
-        # BUG: 'node.element.delete_attribute node' doesn't work
-        node.element.delete_attribute node.name if node.is_a? REXML::Attribute
+      def on_element(element)
+        element.parent.delete_element element
+      end
+
+      def on_attribute(attribute)
+        # BUG: 'attribute.element.delete_attribute attribute' doesn't work
+        attribute.element.delete_attribute attribute.name
       end
 
       def after(path, document)

data/lib/rix/commands/rename.rb

@@ -16,8 +16,12 @@ module Rix
         raise "Missing option: -n, --name" if @name.nil? or @name.empty?
       end
 
-      def on_node(node)
-        node.name = @name if node.respond_to? :name
+      def on_element(element)
+        element.name = @name
+      end
+
+      def on_attribute(attribute)
+        attribute.name = @name
       end
 
       def after(path, document)

data/lib/rix/commands/show.rb

@@ -2,7 +2,7 @@ module Rix
   module Commands
     class Show < Command
       def initialize
-        @formatter = REXML::Formatters::Pretty.new
+        @formatter = Formatters::Pretty.new
         @formatter.compact = true
       end
 
@@ -11,8 +11,8 @@ module Rix
       end
 
       def on_node(node)
-        @formatter.write(node, $stdout)
-        puts
+        @formatter.write(node, out)
+        out.puts
       end
     end
   end

data/lib/rix/commands/trim.rb

@@ -0,0 +1,37 @@
+module Rix
+  module Commands
+    class Trim < Command
+
+      def help
+        "Usage: rix trim <xpath> <files>"
+      end
+
+      def on_element(element)
+        element.text = element.text.strip if element.has_text?
+      end
+
+      def on_attribute(attribute)
+        attribute.element.attributes[attribute.name] = attribute.to_s.strip
+        attribute.element.attributes[attribute.name]
+      end
+
+      def on_text(text)
+        stripped = text.to_s.strip
+        # Leave 'empty' nodes intact
+        if stripped.size > 0
+          child = Text.new(stripped)
+          text.replace_with(child)
+          child.to_s
+        else
+          text.to_s
+        end
+      end
+
+      def after(path, document)
+        File.open(path, 'w') do |file|
+          document.write file
+        end
+      end
+    end
+  end
+end

data/lib/rix/commands/unknown.rb

@@ -1,7 +1,7 @@
 module Rix
   module Commands
     class UnknownCommand
-      attr_accessor :name
+      attr_accessor :out, :name
 
       def message
         "Unknown command: #{name}. Type 'rix help commands' for a list of available commands."
@@ -12,7 +12,7 @@ module Rix
       end
 
       def execute
-        puts message
+        out.puts message
       end
     end
   end

data/lib/rix/version.rb

@@ -1,3 +1,3 @@
 module Rix
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rix
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-24 00:00:00.000000000Z
+date: 2011-08-28 00:00:00.000000000Z
 dependencies: []
 description: Command-line XML editing and refactoring
 email: richard.hubers@gmail.com
@@ -20,12 +20,14 @@ extra_rdoc_files: []
 files:
 - bin/rix
 - lib/rix/command.rb
+- lib/rix/commands/add_attribute.rb
 - lib/rix/commands/add_element.rb
 - lib/rix/commands/count.rb
 - lib/rix/commands/help.rb
 - lib/rix/commands/remove.rb
 - lib/rix/commands/rename.rb
 - lib/rix/commands/show.rb
+- lib/rix/commands/trim.rb
 - lib/rix/commands/unknown.rb
 - lib/rix/help.rb
 - lib/rix/registry.rb