wikiavro 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c64ef5f767535d9432d8f589411f76dedb6a4b04
-  data.tar.gz: b846af138fe797fa09e9f248bcdb3298e988b5fb
+  metadata.gz: e56d6fb651af9c0df1f835aab0f48a0a57f4ebed
+  data.tar.gz: 267e2c2e40288b7f2beddbf398821974291ee86f
 SHA512:
-  metadata.gz: b5f7cba59679bc913ceaddf95e97f8ed7c63d9f54660d81680db419da09abf2c61ddadd2f2a75b0e199fbfe9f710363edcd889550f76f44acdd6a34e591f69a2
-  data.tar.gz: 8b63a6ae13ce31cc31eb2f5698a0bd586c9645dfbce1be6ae52e45f90315af3015ed1e1f17badaa4f06425483369a369af6adefd0dae2c8ef0555d8f05193f01
+  metadata.gz: b55e5f44171be03a61cb354a965667ec0b47c31f5abe1cde35dc916cc61ca8f826f0ff1a457b53906db3dd16b280237838016c9375fff86fa0601852a2c0fbe9
+  data.tar.gz: b223451fe16a6d0c53e4b7651e72e8fc181152a433085403e2e584c08f481de254e659336424ae8109a5bbc4f1deab3072e60269e7c9157ce2b227b234329a42

data/lib/wikiavro.rb

@@ -1,5 +1,5 @@
 module WikiAvro
-  Version = '0.0.1'
+  Version = '0.0.2'
 end
 
 require 'wikiavro/mediawiki'

data/lib/wikiavro/avro.rb

@@ -50,7 +50,14 @@ EOS
       ]
     }]},
     {"name": "minor", "type": "boolean"},
-    {"name": "comment", "type": ["null", "string"]},
+    {"name": "comment", "type": ["null", {
+      "namespace": "org.rationalwiki",
+      "name": "Comment",
+      "type": "record",
+      "fields": [
+	{"name": "comment", "type": ["null", "string"]}
+      ]
+    }]},
     {"name": "bytes", "type": "long"},
     {"name": "textid", "type": ["null", "string"]},
     {"name": "text", "type": ["null", "string"]}
@@ -152,11 +159,17 @@ EOS
         contributor = nil
       end
 
-      if comment[:deleted].nil?
-        comment = comment[:comment]
-      else
-        raise 'deleted comment has content' if comment[:comment]
-        comment = nil
+      if !comment.nil?
+        if !(comment[:deleted].nil? ^ comment[:comment].nil?)
+          raise 'comment[:deleted] and comment[:comment] should alternate'
+        end
+
+        if comment[:deleted].nil?
+          comment[:comment]
+        else
+          comment.delete :deleted
+          comment[:comment] = nil
+        end
       end
 
       text = nil if !text_deleted.nil?
@@ -166,7 +179,7 @@ EOS
              'n' => n.to_i,
              'timestamp' => timestamp,
              'contributor' => contributor,
-             'minor' => minor.nil?,
+             'minor' => !!minor,
              'comment' => comment,
              'bytes' => bytes.to_i,
              'textid' => textid,

data/lib/wikiavro/mediawiki.rb

@@ -396,9 +396,13 @@ module WikiAvro::MediaWiki
     end
   end
 
-  class Minor < WikiAvro::XML::Inserter
-    def initialize
-      super('minor')
+  class Minor < WikiAvro::XML::Leaf
+    def name
+      'minor'
+    end
+
+    def parse_attributes(w, p, r)
+      p.minor = true
     end
   end
 
@@ -450,15 +454,15 @@ module WikiAvro::MediaWiki
     end
 
     def reset
-      id = nil
-      timestamp = nil
-      contributor = nil
-      minor = nil
-      comment = nil
-      text_deleted = nil
-      bytes = nil
-      textid = nil
-      text = nil
+      @id = nil
+      @timestamp = nil
+      @contributor = nil
+      @minor = nil
+      @comment = nil
+      @text_deleted = nil
+      @bytes = nil
+      @textid = nil
+      @text = nil
     end
 
     def handle_content(w, p, r)
@@ -571,16 +575,16 @@ module WikiAvro::MediaWiki
     end
 
     def reset
-      threadSubject = nil
-      threadParent = nil
-      threadAncestor = nil
-      threadPage = nil
-      threadID = nil
-      threadSummaryPage = nil
-      threadAuthor = nil
-      threadEditStatus = nil
-      threadType = nil
-      threadSignature = nil
+      @threadSubject = nil
+      @threadParent = nil
+      @threadAncestor = nil
+      @threadPage = nil
+      @threadID = nil
+      @threadSummaryPage = nil
+      @threadAuthor = nil
+      @threadEditStatus = nil
+      @threadType = nil
+      @threadSignature = nil
     end
 
     def handle_content(w, p, r)
@@ -620,12 +624,12 @@ module WikiAvro::MediaWiki
     end
 
     def reset
-      title = nil
-      ns = nil
-      id = nil
-      redirect = nil
-      sha1 = nil
-      revision_count = nil
+      @title = nil
+      @ns = nil
+      @id = nil
+      @redirect = nil
+      @sha1 = nil
+      @revision_count = nil
       @revision_count = 0
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wikiavro
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Someon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby