atna 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGIyMmIwYmZiMGFhMzVlMWEwMDEyYmU2Y2Y2MWM5NzY1ODg5NmRlNQ==
+    ZmY1NTRhNmQwMjg2ODA0MGJmZmNkMjIzYWViM2YwZmI4YzA3MzU3Ng==
   data.tar.gz: !binary |-
-    MDkwZDg3MGViMmY2NTg0MmM5ZWM0OTZkMzU5OTY1YzIxZTRlOTYwZQ==
+    OTk0ZWNhOWViNDlkOGVhZGUwNjU0OWEwNDE3MmIxYzFkMmUxYjE0OA==
 SHA512:
   metadata.gz: !binary |-
-    YmU1MmQxNTg5NWY2MDMwMTBmNWY3NDcxNmQzMmIyZDM0OTUxMWVlNjVjNjMy
-    NmVjZTY1NmI1YjJkNmY1MjM1ZGIxMjg3MTg4MjZhMWEwYzg0OTgwYmVjMjc2
-    MWYwOWQwZWIxOGUxZjZmOTVlNDlkZGRhYWZjZTE2OGZmNzg3YmE=
+    ZmRlNWQ5MmI5MzkyNGZiZGNhMTQ5ZTNhOGMxZDE4MGY4NDQxZWU2OTA4Yjg2
+    MmQzMTMwYjY0ZjA3YWJjZjcyM2I4ZWRmYTdjNmM3NTc3YjIxYjc2MzliZTIy
+    YjlkZGNiYjViNjg1NGJkNzkxYjQ5ZWE0OWU2ZTdkM2Q0OTllNjk=
   data.tar.gz: !binary |-
-    YWNkMDcxYzg2OWQzNjBlMDZmODJlZDI0N2U0Y2RhYTc1NzFiMWIxMmExM2Jj
-    ZWMwYzdiMTBkYmQxNjhiY2ZhNzNjZGY3ODBjZjIwYjhhM2Q2ZWZiZDFmNzg3
-    NTNlNDEyODYxNDNiMzBhYzNkYmI4YmZjNWQ5NTQ3YWEzYjYwODE=
+    Nzg5YjMxOTI1MDgxOWQ5ZjU0NmQyYTNkZDU3ODU0MjNkMTg3ZDA2YTZkM2U1
+    M2ZlYjYxN2ZlMTEyY2VhYTcyNzZmOTE1OTI5NzZjZmM2M2ZkNmE0OWEzNjNk
+    YjJjOTk5NWU0NTUwYTFjNjk3MmE4MTFkNjhkNDJlZjhmNzUyODk=

data/lib/atna/rfc3881.rb

@@ -21,7 +21,7 @@ module ATNA
   #                                                "EventTypeCode" => [{ :code => "2" }, { :code => "3" }])
   #   msg << AuditMessage::ActiveParticipant.new(:UserID => "user2",
   #                                              "RoleIDCode" => [{ :code => "1" }, { :code => "2" }])
-  #   # ...
+  #   msg << AuditMessage::ParticipantObjectIdentification.new("ParticipantObjectName" => { :__text__ => "Name" })
   module RFC3881
     class AuditMessage < ATNA::Utils::XmlBuilder::Base
       class EventIdentification < ATNA::Utils::XmlBuilder::Base
@@ -60,7 +60,7 @@ module ATNA
           "Telephone Number"                  => 3,
         }
 
-        attributes :UserID, :AlternativeUserID, :UserName, :UserIsRequester
+        attributes :UserID, :AlternativeUserID, :UserName, :UserIsRequestor
         attributes :NetworkAccessPointID, :NetworkAccessPointTypeCode
 
         class RoleIDCode < ATNA::Utils::XmlBuilder::Base

data/lib/atna/utils/xml_builder.rb

@@ -3,6 +3,8 @@ module ATNA
   module Utils
     module XmlBuilder
       class Base
+        TEXT_KEY = :__text__
+
         def self.attributes(*names)
           self.instance_eval do
             @attribute_names ||= []
@@ -10,6 +12,10 @@ module ATNA
               @attribute_names << name.to_s.to_sym
             end
 
+            if @attribute_names.include?(ATNA::Utils::XmlBuilder::Base::TEXT_KEY)
+              raise "Duplicated attribute name for TEXT [#{ATNA::Utils::XmlBuilder::Base::TEXT_KEY.inspect}]"
+            end
+
             next @attribute_names.dup
           end
         end
@@ -27,7 +33,7 @@ module ATNA
         end
 
         def self.valid_attribute?(name)
-          attributes.include?(name.to_s.to_sym)
+          attributes.include?(name.to_s.to_sym) || TEXT_KEY == name
         end
 
         def self.node_class(string = false)
@@ -72,6 +78,8 @@ module ATNA
                 end
               when Hash
                 add_child(element_class.new(value))
+              else
+                raise "Unknown value type [#{value.class}]"
               end
             else
               raise "Unknown key [#{key.inspect}]"
@@ -86,51 +94,54 @@ module ATNA
           return self
         end
 
-        alias_method :add_child, :<<
-
-          # Convert XML
-          #
-          # xml ::
-          def to_xml(xml = nil)
-            if xml
+        alias_method :add_child, :'<<'
+
+        # Convert XML
+        #
+        # xml ::
+        def to_xml(xml = nil)
+          if xml
+            build_xml(xml)
+            return
+          else
+            builder = Nokogiri::XML::Builder.new(:encoding => "UTF-8") do |xml|
               build_xml(xml)
-              return
-            else
-              builder = Nokogiri::XML::Builder.new(:encoding => "UTF-8") do |xml|
-                build_xml(xml)
-              end
-
-              return builder.doc.to_xml
             end
-          end
 
-          def element_name
-            self.class.name.split("::").last.to_sym
+            return builder.doc.to_xml
           end
+        end
 
-          def sorted_children
-            children_order = self.class.children_order
-            @children.sort do |a,b|
-              children_order.index(a.class) <=> children_order.index(b.class)
-            end
+        def element_name
+          self.class.name.split("::").last.to_sym
+        end
+
+        def sorted_children
+          children_order = self.class.children_order
+          @children.sort do |a,b|
+            children_order.index(a.class) <=> children_order.index(b.class)
           end
+        end
 
-          # Build xml by Nokogiri
-          def build_xml(xml)
-            xml.send(element_name, attributes) do
-              sorted_children.each do |element|
-                element.to_xml(xml)
-              end
+        # Build xml by Nokogiri
+        def build_xml(xml)
+          attrs = attributes
+          text = attrs.delete(ATNA::Utils::XmlBuilder::Base::TEXT_KEY)
+
+          xml.send(element_name, text, attrs) do
+            sorted_children.each do |element|
+              element.to_xml(xml)
             end
           end
-          private :build_xml
+        end
+        private :build_xml
 
-          # Delete nil attributes on copy
-          def attributes
-            @attributes.dup.delete_if { |k,v| v.nil? }
-          end
-          private :attributes
+        # Delete nil attributes on copy
+        def attributes
+          @attributes.dup.delete_if { |k,v| v.nil? }
         end
+        private :attributes
       end
     end
   end
+end

data/lib/atna/version.rb

@@ -1,3 +1,3 @@
 module Atna
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atna
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tetsuhisa MAKINO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler