thinp_xml 0.0.13 → 0.0.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mzk4OTMyYjhhOTZmM2U2Zjg3MDkwZjFmOTBjMThhMjhjNDJmMWQ5Zg==
+    MGEyOWRlMmFlZjNhNzNjMWZiNWRmZTBlYThkNjliOGEwNDRjMjlkOA==
   data.tar.gz: !binary |-
-    ZjI2ODllODAwZWE2ZGQ1MmExYTc3MmVjNTUxZDgxM2FhMjAxNDQyYg==
+    N2Y3OGM3NDQxYTQ5MzYzN2E5ZDEyYjZlMDE5ZTViMzYzN2E0YzZhZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGMxMzA1MzVlZmVlZjk0MjEzMDk4MWI5ODk0MTc5YTc5MTZlZGUwYmNlMTJm
-    M2Q0ZTEwYmQzZmVjMjM3MjgyYjY3NGVmZmNkOTM5ZWE0ZDQwMzJhZDFjYTA3
-    NGMyNjE3ZDY1ZWFmOTkxYmZkNjBjOWI1NDk5MWVkNzJhOTIyNjc=
+    MzM2OGRiNGY0NWE0YWE3YmRmODQ2NWJmODIzN2ZmYzhhNzNjYTAzZDdjYTli
+    ZDUyNTNlYjZkMzE4OGRjYzU3MmIzODQyMzc0YmY2NGJjZjVmZjE3MjdhMDhm
+    MWY1N2U2MDUyYjFiODg2NTE5NzYxZGVkMzcwNTdiODc1MDdkZDE=
   data.tar.gz: !binary |-
-    YmRjNDlhYjNhMGY4YzYxYjA0ODE5NWExNGExNTg5MzZkY2YwMTNjYjY4Yzlj
-    YTNkNmE2NGZiYjMwNjgwOTY1MDBlMzQ0MWRmMmU5ZmNkN2VkYmYyMmI1Nzgz
-    NzFkYTRjNWMzOTdkYzIyMGJiMmQ5MzE4NTQzNGViOWEzODIzMjQ=
+    YzU1ZDhhMWU1ZmZmZjFkY2M4NThiMTJhMWEwOWY0MjFkNzliMTg1M2QzZTdh
+    NTczMDQ4ZmNjYzhhYTRiYjdkOThjMDVkZmNkZmRhOWVlMWFhMmRlYjc5N2Nm
+    ZWVjZDE2MGI1NjNjNTc2YmE0NjhlZjUwNzRiZjgzMzIwNmQ4ZGM=

data/lib/thinp_xml/cache/parse.rb

@@ -6,16 +6,18 @@ require 'rexml/streamlistener'
 
 #----------------------------------------------------------------
 
-module ThinpXML
+module CacheXML
   module CacheParseDetail
     class Listener
-      include Base::ListenerUtils
+      include ThinpXML::Base::ListenerUtils
       include REXML::StreamListener
 
       attr_reader :metadata
 
       def initialize
         @metadata = Metadata.new(nil, [], [])
+        @in_mappings = false
+        @in_hints = false
       end
 
       def tag_start(tag, args)
@@ -25,11 +27,19 @@ module ThinpXML
         when 'superblock'
           @metadata.superblock = Superblock.new(*get_fields(attr, SUPERBLOCK_FIELDS))
 
+        when 'mappings'
+          @in_mappings = true
+
         when 'mapping'
+          raise "not in mappings section" unless @in_mappings
           m = Mapping.new(*get_fields(attr, MAPPING_FIELDS))
           @metadata.mappings << m
 
+        when 'hints'
+          @in_hints = true
+
         when 'hint'
+          raise "not in hints section" unless @in_hints
           h = Hint.new(*get_fields(attr, HINT_FIELDS))
           @metadata.hints << h
 
@@ -39,6 +49,13 @@ module ThinpXML
       end
 
       def tag_end(tag)
+        case tag
+        when 'mappings'
+          @in_mappings = false
+
+        when 'hints'
+          @in_hints = false
+        end
       end
     end
   end

data/lib/thinp_xml/version.rb

@@ -1,3 +1,3 @@
 module ThinpXml
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/spec/cache_parse_spec.rb

@@ -0,0 +1,33 @@
+require 'thinp_xml/cache/parse'
+
+include CacheXML
+
+#----------------------------------------------------------------
+
+INPUT=<<EOF
+<superblock uuid="" block_size="512" nr_cache_blocks="4096" policy="hints" hint_width="4">
+  <mappings>
+    <mapping cache_block="0" origin_block="4095" dirty="false"/>
+    <mapping cache_block="1" origin_block="0" dirty="false"/>
+    <mapping cache_block="2" origin_block="4" dirty="false"/>
+    <mapping cache_block="3" origin_block="1" dirty="false"/>
+    <mapping cache_block="4" origin_block="8" dirty="false"/>
+  </mappings>
+  <hints>
+    <hint cache_block="0" data="AQAAAA=="/>
+    <hint cache_block="1" data="AAAAAA=="/>
+    <hint cache_block="2" data="AgAAAA=="/>
+    <hint cache_block="3" data="AAAAAA=="/>
+    <hint cache_block="4" data="AwAAAA=="/>
+  </hints>
+</superblock>
+EOF
+
+describe "CacheXML::read_xml" do
+  # a sanity check (debugging some namespace issues)
+  it "should work" do
+    read_xml(StringIO.new(INPUT))
+  end
+end
+
+#----------------------------------------------------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thinp_xml
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Joe Thornber
@@ -153,6 +153,7 @@ files:
 - lib/thinp_xml/version.rb
 - spec/builder_spec.rb
 - spec/cache_builder_spec.rb
+- spec/cache_parse_spec.rb
 - spec/distribution_spec.rb
 - thinp_xml.gemspec
 homepage: ''
@@ -188,4 +189,5 @@ test_files:
 - features/thinp_usage.feature
 - spec/builder_spec.rb
 - spec/cache_builder_spec.rb
+- spec/cache_parse_spec.rb
 - spec/distribution_spec.rb