open_xml_package 0.1.0 → 0.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7c6df8561b12ab2eba68c491b536858c24d1ac7
-  data.tar.gz: 072033ceed3d330101adade0edd83311db91fbc0
+  metadata.gz: 4ab514d2a5048f5d9cebb1ce98e5ee05b0771c2b
+  data.tar.gz: ca0ea6e3605293570f36e607bd6d66a15ae6acbc
 SHA512:
-  metadata.gz: 78ee971bfc8d827ca20a977004fe0bf89c09d4f15eab9f23fa4aebb559052a4215964cf638fff28fca8b3042d5b80d3e4a771504e728f6e2d4f4c5e8db7143ef
-  data.tar.gz: 7ddae79c7891090e17282dd30470e2f3d315176c8b81f7b7376f234ca1d6eb57445e23fe1aae7a9362b7d3f7dbf043960fd0ad36b4f33340f02a2434bc80bfa3
+  metadata.gz: 20d8874515ce63b2110724b7b9e2bc4dd451931e1cdda5f4f163cdd1421fd3795211a82b28d9a2516a465567cb51ce4e851f524b2372fc61500e2aec78e95359
+  data.tar.gz: 642cf512e5dcc44b3c426db90df1f1002a748adc2521fc7325b3ca7f5d05a3253e03a43ee567baec3b7419373f7398e5ee6373fe49d108cdab2d4f1cdadb6261

data/lib/open_xml/builder.rb

@@ -0,0 +1,45 @@
+# Constructing a large XML document (5MB) with the Ox
+# gem is about 4x faster than with Nokogiri and about
+# 5x fater than with Builder.
+#
+# This class mimics the XML Builder DSL.
+require "ox"
+
+module OpenXml
+  class Builder
+
+    def initialize
+      @document = Ox::Document.new(version: "1.0")
+      @current = @document
+      yield self if block_given?
+    end
+
+    def to_s
+      Ox.dump @document
+    end
+    alias :to_xml :to_s
+
+    def method_missing(tag_name, *args)
+      new_element = Ox::Element.new(tag_name)
+      attributes = args.extract_options!
+      attributes.each do |key, value|
+        new_element[key] = value
+      end
+
+      if block_given?
+        begin
+          was_current = @current
+          @current = new_element
+          yield self
+        ensure
+          @current = was_current
+        end
+      elsif value = args.first
+        new_element << value.to_s
+      end
+
+      @current << new_element
+    end
+
+  end
+end

data/lib/open_xml/errors.rb

@@ -1,8 +1,8 @@
 module OpenXml
   module Errors
-    
+
     class MissingContentTypesPart < StandardError
     end
-    
+
   end
 end

data/lib/open_xml/package.rb

@@ -16,11 +16,11 @@ module OpenXml
       def content_types_presets
         @content_types_presets ||= OpenXml::ContentTypesPresets.new
       end
-      
+
       def content_types(&block)
         content_types_presets.instance_eval &block
       end
-      
+
       def open(path)
         if block_given?
           Zip::File.open(path) do |zipfile|
@@ -33,7 +33,7 @@ module OpenXml
 
       def from_stream(stream)
         stream = StringIO.new(stream) if stream.is_a?(String)
-        
+
         # Hack: Zip::Entry.read_c_dir_entry initializes
         # a new Zip::Entry by calling `io.path`. Zip::Entry
         # uses this to open the original zipfile; but in
@@ -41,7 +41,7 @@ module OpenXml
         def stream.path
           self
         end
-        
+
         zipfile = ::Zip::File.new("", true, true)
         zipfile.read_from_stream(stream)
         new(zipfile)
@@ -53,7 +53,7 @@ module OpenXml
     def initialize(zipfile=nil)
       @zipfile = zipfile
       @parts = {}
-      
+
       if zipfile
         read_zipfile!
       else

data/lib/open_xml/part.rb

@@ -1,16 +1,16 @@
 require "nokogiri"
+require "open_xml/builder"
 
 module OpenXml
   class Part
     include ::Nokogiri
 
     def build_xml
-      XML::Builder.new(encoding: "utf-8") { |xml| yield xml }.to_xml
+      OpenXml::Builder.new { |xml| yield xml }.to_xml
     end
 
-    def build_standalone_xml
-      xml = Nokogiri::XML("<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>")
-      XML::Builder.with(xml) { |xml| yield xml }.to_xml
+    def build_standalone_xml(&block)
+      "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" + build_xml(&block)
     end
 
     def read

data/lib/open_xml/rubyzip_fix.rb

@@ -3,7 +3,7 @@ require "zip"
 module Zip
   class InputStream
   protected
-    
+
     # The problem in RubyZip 1.1.0 is that we only call `seek`
     # when `io` is a File. We need to move the cursor to the
     # right position when `io` is a StringIO as well.
@@ -12,6 +12,6 @@ module Zip
       io.seek(offset, ::IO::SEEK_SET)
       io
     end
-    
+
   end
 end

data/lib/open_xml_package/version.rb

@@ -1,3 +1,3 @@
 module OpenXmlPackage
-  VERSION = "0.1.0"
+  VERSION = "0.2.0.beta1"
 end

data/open_xml_package.gemspec

@@ -20,14 +20,17 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rubyzip", "~> 1.1.0"
   spec.add_dependency "nokogiri"
+  spec.add_dependency "ox"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rails", ">= 3.2", "< 5.0"
-  spec.add_development_dependency "turn"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-reporters"
+  spec.add_development_dependency "minitest-reporters-turn_reporter"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rr"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "shoulda-context"
-  
+
 end

data/test/content_types_test.rb

@@ -2,33 +2,33 @@ require "test_helper"
 
 class ContentTypesTest < ActiveSupport::TestCase
   attr_reader :content_types
-  
+
   WORDPROCESSING_DOCUMENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"
-  
+
   setup do
     @content_types = OpenXml::Parts::ContentTypes.new(
       {"xml" => OpenXml::Types::XML, "rels" => OpenXml::Types::RELATIONSHIPS},
       {"word/document.xml" => WORDPROCESSING_DOCUMENT_TYPE})
   end
-  
-  
+
+
   context "Given a path without an override" do
     should "identify the content type from its extension" do
       assert_equal OpenXml::Types::XML, content_types.of("content/some.xml")
     end
   end
-  
+
   context "Given a path with an override" do
     should "identify the content type from its path" do
       assert_equal WORDPROCESSING_DOCUMENT_TYPE, content_types.of("word/document.xml")
     end
   end
-  
+
   context "Given a path with an unrecognized extension" do
     should "be nil" do
       assert_equal nil, content_types.of("img/screenshot.jpg")
     end
   end
-  
-  
+
+
 end

data/test/open_xml_package_test.rb

@@ -4,9 +4,9 @@ require "set"
 
 class OpenXmlPackageTest < ActiveSupport::TestCase
   attr_reader :package, :temp_file
-  
-  
-  
+
+
+
   context "#add_part" do
     should "accept a path and a part" do
       package = OpenXml::Package.new
@@ -15,21 +15,21 @@ class OpenXmlPackageTest < ActiveSupport::TestCase
       end
     end
   end
-  
-  
-  
+
+
+
   context "Writing" do
     setup do
       @temp_file = expand_path "../tmp/test.zip"
       FileUtils.rm temp_file, force: true
     end
-    
+
     context "Given a simple part" do
       setup do
         @package = OpenXml::Package.new
         package.add_part "content/document.xml", OpenXml::Parts::UnparsedPart.new(document_content)
       end
-      
+
       should "write a valid zip file with the expected parts" do
         package.write_to temp_file
         assert File.exists?(temp_file), "Expected the file #{temp_file.inspect} to have been created"
@@ -38,9 +38,9 @@ class OpenXmlPackageTest < ActiveSupport::TestCase
       end
     end
   end
-  
-  
-  
+
+
+
   context "Reading" do
     context "Given a sample Word document" do
       setup do
@@ -61,64 +61,64 @@ class OpenXmlPackageTest < ActiveSupport::TestCase
           "word/theme/theme1.xml",
           "word/webSettings.xml" ]
       end
-      
+
       context ".open" do
         setup do
           @package = OpenXml::Package.open(temp_file)
         end
-        
+
         teardown do
           package.close
         end
-        
+
         should "discover the expected parts" do
           assert_equal @expected_contents, package.parts.keys.to_set
         end
-        
+
         should "read their content on-demand" do
           assert_equal web_settings_content, package.get_part("word/webSettings.xml").content
         end
       end
-      
+
       context ".from_stream" do
         setup do
           @package = OpenXml::Package.from_stream(File.open(temp_file, "rb", &:read))
         end
-        
+
         should "also discover the expected parts" do
           assert_equal @expected_contents, package.parts.keys.to_set
         end
-        
+
         should "read their content" do
           assert_equal web_settings_content, package.get_part("word/webSettings.xml").content
         end
       end
-      
+
       context "ContentTypes" do
         setup do
           @package = OpenXml::Package.open(temp_file)
         end
-        
+
         teardown do
           package.close
         end
-        
+
         should "be parsed" do
           assert_equal %w{jpeg png rels xml}, package.content_types.defaults.keys.sort
           assert_equal "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml",
             package.content_types.overrides["/word/document.xml"]
         end
       end
-      
+
       context "Rels" do
         setup do
           @package = OpenXml::Package.open(temp_file)
         end
-        
+
         teardown do
           package.close
         end
-        
+
         should "be parsed" do
           assert_equal %w{docProps/core.xml docProps/app.xml word/document.xml docProps/thumbnail.jpeg},
             package.rels.map(&:target)
@@ -126,11 +126,11 @@ class OpenXmlPackageTest < ActiveSupport::TestCase
       end
     end
   end
-  
-  
-  
+
+
+
 private
-  
+
   def document_content
     <<-STR
     <document>
@@ -138,13 +138,13 @@ private
     </document>
     STR
   end
-  
+
   def web_settings_content
     "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\r\n<w:webSettings xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" mc:Ignorable=\"w14\"><w:allowPNG/><w:doNotSaveAsSingleFile/></w:webSettings>"
   end
-  
+
   def expand_path(path)
     File.expand_path(File.join(File.dirname(__FILE__), path))
   end
-  
+
 end

data/test/test_helper.rb

@@ -7,9 +7,10 @@ end
 
 require "rails"
 require "rails/test_help"
-require "turn"
 require "pry"
 require "rr"
 require "shoulda/context"
+require "minitest/reporters/turn_reporter"
+MiniTest::Reporters.use! Minitest::Reporters::TurnReporter.new
 
 require "open_xml_package"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_xml_package
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.beta1
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ox
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +101,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters-turn_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -168,6 +210,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/open_xml/builder.rb
 - lib/open_xml/content_types_presets.rb
 - lib/open_xml/errors.rb
 - lib/open_xml/package.rb
@@ -200,12 +243,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Ruby implementation of OpenXmlPackage