dti_nitf 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/dti_nitf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dti_nitf}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Turner"]
-  s.date = %q{2010-02-23}
+  s.date = %q{2010-02-25}
   s.description = %q{Helps you processes the 'XML' (Quotes intentional) from DTI's XML export into valid NITF documents or Story & Media objects}
   s.email = %q{mark@amerine.net}
   s.extra_rdoc_files = [

data/lib/dti_nitf.rb

@@ -3,7 +3,7 @@ dir = File.dirname(__FILE__)
 require File.join(dir, 'dti_nitf/nitf')
 require File.join(dir, 'dti_nitf/story')
 
-# require 'pp'
+require 'pp'
 # 
 # file_contents = File.read('/tmp/02/a1furn 020810.xml')
 # story = DTI::Story.new(file_contents)

data/lib/dti_nitf/story.rb

@@ -10,7 +10,6 @@ module DTI
       self.correction = false
       
       cracked = Crack::XML.parse(self.raw_xml)
-      #pp cracked
       
       if cracked["nitf"]['head']['original_storyid']
         self.correction = true 
@@ -31,8 +30,8 @@ module DTI
       self.pub_date = pub_data["date.publication"].rstrip
       self.page = pub_data["position.sequence"].rstrip.to_i
       
-      self.body = join_hash(doc_body["body.content"]["p"])
-      self.body = fix_quotes(self.body)
+      self.body = doc_body["body.content"]["p"].collect{|d| "<p>#{d}</p>"}.join
+      self.body = fix_escaped_elements(self.body)
       
       if !self.correction?
         self.byline = doc_body["body.head"]["byline"]["person"].gsub!(/^By\s/, '').rstrip if doc_body["body.head"]["byline"]
@@ -49,20 +48,10 @@ module DTI
       self.correction
     end
     
-    def join_hash(hash)
-      hash_string =""
-      hash.each { |h|
-        hash_string << "<p>#{h}</p>"
-      }
-      return hash_string
-    end
-    
-    def fix_quotes(string)
-      string.gsub! "\342\200\230", "'"
-      string.gsub! "\342\200\231", "'"
-      string.gsub! "\342\200\234", '"'
-      string.gsub! "\342\200\235", '"'
-      string
+    def fix_escaped_elements(string)
+      return_string = string
+      return_string.gsub! /\342\200[\230\231]/, "'"
+      return_string.gsub! /\342\200[\234\235]/, '"'
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Mark Turner
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -08:00
+date: 2010-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency