openxml-package 0.2.3 → 0.2.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ebd723d50d1a88422429fd1400221b2ea4b0fc84
+  data.tar.gz: a661bbe8b35316ae02a92de3fcff0dfd38b0d712
+SHA512:
+  metadata.gz: a5c67e98dff68d23c8366f12aa78229029a2c55c3ebbbc9578d8e63383f175a625717ff4518e55c982dcb5ebf2bae35546548a29de0ce4ca80c961ba1b115ae5
+  data.tar.gz: 20c6d31e69f7d078489d90668c0ab9402699e950aee772571a3cd3be882161235d95ba93ef502b5858d0be348563a29f7537284e7ac7867260779694d7c4a4e7

data/.gitignore

@@ -1,3 +1,4 @@
+.ruby-version
 *.gem
 *.rbc
 .bundle

data/lib/openxml-package/version.rb

@@ -1,3 +1,3 @@
 module OpenXmlPackage
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/openxml/builder.rb

@@ -11,19 +11,24 @@ module OpenXml
     attr_reader :parent
 
     def initialize(options={})
-      @options = {
-        with_xml: true,
-        encoding: "utf-8"
-      }.merge(options)
-      @options[:with_xml] = !!@options[:with_xml] || @options[:standalone] == :yes
+      @to_s_options = { with_xml: true }
 
-      @document = Ox::Document.new({version: "1.0"}.merge(@options))
+      @document = Ox::Document.new(
+        encoding: "utf-8",
+        version: "1.0",
+        standalone: options[:standalone])
       @parent = @document
       yield self if block_given?
     end
 
-    def to_s
-      Ox.dump @document, @options
+    def to_s(args={})
+      options = @to_s_options
+
+      # Unless we would like to debug the files,
+      # don't add whitespace during generation.
+      options = options.merge(indent: -1) unless args[:debug]
+
+      Ox.dump(@document, options).strip
     end
     alias :to_xml :to_s
 

data/lib/openxml/part.rb

@@ -4,15 +4,15 @@ module OpenXml
   class Part
 
     def build_xml(options={})
-      OpenXml::Builder.new(options) { |xml| yield xml }.to_xml
+      OpenXml::Builder.new(options) { |xml| yield xml }
     end
 
     def build_standalone_xml(&block)
-      build_xml({ standalone: :yes }, &block)
+      build_xml(standalone: :yes, &block)
     end
 
     def read
-      strip_whitespace to_xml
+      to_xml.to_s
     end
     alias :content :read
 
@@ -20,11 +20,5 @@ module OpenXml
       raise NotImplementedError
     end
 
-  protected
-
-    def strip_whitespace(xml)
-      xml.lines.map(&:strip).join
-    end
-
   end
 end

data/test/part_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 require "fileutils"
 require "set"
 
-class OpenXmlPartTest < ActiveSupport::TestCase
+class PartTest < ActiveSupport::TestCase
   attr_reader :part, :builder
 
 
@@ -16,39 +16,51 @@ class OpenXmlPartTest < ActiveSupport::TestCase
       setup do
         @builder = @part.build_xml do |xml|
           xml.document do |xml|
-            2.times { xml.child({ attribute: "value", other_attr: "other value" }) }
+            2.times { xml.child(attribute: "value", other_attr: "other value") }
           end
         end
       end
 
       should "build the expected xml" do
-        assert_equal basic_xml, builder.to_s
+        assert_equal basic_xml, builder.to_s(debug: true)
       end
     end
 
     context "Given namespaced xml for one part" do
       setup do
         @builder = @part.build_xml do |xml|
-          xml.document({ "xmlns:ns" => "some:namespace:uri" }) do
-            2.times { xml["ns"].child({ attribute: "value", other_attr: "other value" }) }
+          xml.document("xmlns:ns" => "some:namespace:uri") do
+            2.times { xml["ns"].child(attribute: "value", other_attr: "other value") }
           end
         end
       end
 
       should "build the expected xml" do
-        assert_equal namespaced_xml, builder.to_s
+        assert_equal namespaced_xml, builder.to_s(debug: true)
       end
     end
 
+    context "For a standalone XML element" do
+      setup do
+        @builder = @part.build_standalone_xml do |xml|
+          xml.document do
+            xml.child(attribute: "value", other_attr: "other value")
+          end
+        end
+      end
+
+      should "build the expected xml" do
+        assert_equal standalone_xml, builder.to_s(debug: true)
+      end
+    end
   end
 
 
 
 private
 
-
   def basic_xml
-    <<-STR
+    <<-STR.strip
 <?xml version="1.0" encoding="utf-8"?>
 <document>
   <child attribute="value" other_attr="other value"/>
@@ -58,7 +70,7 @@ private
   end
 
   def namespaced_xml
-    <<-STR
+    <<-STR.strip
 <?xml version="1.0" encoding="utf-8"?>
 <document xmlns:ns="some:namespace:uri">
   <ns:child attribute="value" other_attr="other value"/>
@@ -67,5 +79,13 @@ private
     STR
   end
 
+  def standalone_xml
+    <<-STR.strip
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<document>
+  <child attribute="value" other_attr="other value"/>
+</document>
+    STR
+  end
 
 end

metadata

@@ -1,228 +1,201 @@
 --- !ruby/object:Gem::Specification
 name: openxml-package
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 0.2.4
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ox
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters-turn_reporter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby implementation of OpenXmlPackage
@@ -232,7 +205,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -262,33 +235,26 @@ files:
 homepage: https://github.com/openxml/openxml-package
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 281021661309613493
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 281021661309613493
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby implementation of OpenXmlPackage
 test_files:
 - test/content_types_test.rb