openxml-package 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d6a0da91c83a3de0209c39c9d29016da44e3ffc
-  data.tar.gz: 08f26c9b65ec985d6b784341cd288b15f58cea8d
+  metadata.gz: e4ac578cfd771b07653d4fdc0fec13bf8880369e
+  data.tar.gz: 03a116e7818d9fcc01c9a1384bc678227a4b2f1e
 SHA512:
-  metadata.gz: da26c7fc3fa5e983c0a6f78ebb5149e3ca562991ba182e44d516a226451ac95522ee41a09ca8c4c1ccc6c328eac29d595c14bc06055d6fb3bb5030c6fcbe1032
-  data.tar.gz: 6965c0f5343a7328c78a7a6fba636dad620f9ed316e223e82a2ef6d153f79dcae22f63cd23b7c5d30ff2ba962981d32bd149a35c1532b97f896533d5843574d5
+  metadata.gz: be40b47eda1c018675dd49cf3f7979fbd32bf9623a5528ab18697dbb25cce9c4c3c544a57071fca663749bfe015a9fdc8b07f00709c60670fb6b2e978ec1ec81
+  data.tar.gz: 1a3a835d1deb48d3dd0e376552abda27754a07762fcda8c09236582f01ef800b2349f995e97406fe13699a76aac5b5dcae1b1a6d1b8a28051daed313888413a1

data/lib/openxml-package/version.rb

@@ -1,3 +1,3 @@
 module OpenXmlPackage
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/openxml/builder.rb

@@ -5,7 +5,6 @@
 # This class mimics the XML Builder DSL.
 require "ox"
 require "openxml/builder/element"
-require "openxml/builder/namespace"
 
 module OpenXml
   class Builder
@@ -28,39 +27,19 @@ module OpenXml
     end
     alias :to_xml :to_s
 
-    # Adapted from Nokogiri's builder.rb
     def [](ns)
-      if @parent != @document
-        @ns = @parent.namespace_definitions.find { |x| x.prefix == ns.to_s }
-      end
-      return self if @ns
-
-      @parent.ancestors.each do |a|
-        next if a == @document
-        @ns = a.namespace_definitions.find { |x| x.prefix == ns.to_s }
-        return self if @ns
-      end
-
-      @ns = { :pending => ns.to_s }
+      @ns = ns.to_sym if ns
       return self
     end
 
     def method_missing(tag_name, *args)
       new_element = OpenXml::Builder::Element.new(tag_name)
-      new_element.parent = @parent
       attributes = extract_options!(args)
       attributes.each do |key, value|
         new_element[key] = value
       end
 
-      # Adapted from Nokogiri's builder.rb
-      if @ns.is_a? OpenXml::Builder::Namespace
-        new_element.namespace = @ns
-      elsif @ns.is_a? Hash
-        new_element.namespace = new_element.namespace_definitions.find { |x| x.prefix == @ns[:pending] }
-        raise ArgumentError, "Namespace #{@ns[:pending]} has not been defined" if new_element.namespace.nil?
-      end
-
+      new_element.namespace = @ns
       @ns = nil
 
       if block_given?

data/lib/openxml/builder/element.rb

@@ -2,7 +2,6 @@ module OpenXml
   class Builder
     class Element < SimpleDelegator
       attr_reader :namespace
-      attr_accessor :parent
 
       def initialize(*args)
         super Ox::Element.new(*args)
@@ -10,15 +9,18 @@ module OpenXml
 
       def []=(attribute, value)
         namespace_def = attribute.downcase.to_s.match /^xmlns(?:\:(?<prefix>.*))?$/
-        add_namespace(namespace_def[:prefix], value.to_s) if namespace_def
+        namespaces << namespace_def[:prefix].to_sym if namespace_def && namespace_def[:prefix]
         super
       end
 
       def namespace=(ns)
-        @namespace = ns
+        @namespace = ns.to_sym if ns
         tag = name.match(/^(?:\w*?\:)?(?<tag>\w*)$/i)[:tag]
-        self.value = "#{namespace.prefix}:#{tag}" if namespace.is_a? OpenXml::Builder::Namespace
-        self.value = "#{namespace}:#{tag}" if namespace.is_a? String
+        self.value = "#{namespace}:#{tag}" if namespace
+      end
+
+      def namespaces=(ns)
+        @namespaces = Array(ns)
       end
 
       def namespaces
@@ -26,18 +28,6 @@ module OpenXml
       end
       alias :namespace_definitions :namespaces
 
-      def ancestors
-        parents = [self]
-        parents << parent.ancestors unless parent.nil? || !parent.respond_to?(:ancestors)
-        parents.flatten
-      end
-
-    private
-
-      def add_namespace(prefix, uri)
-        namespaces << OpenXml::Builder::Namespace.new(prefix, uri)
-      end
-
     end
   end
 end

data/test/element_test.rb

@@ -0,0 +1,38 @@
+require "test_helper"
+
+class ElementTest < ActiveSupport::TestCase
+  attr_reader :element
+
+  setup do
+    @element = OpenXml::Builder::Element.new("tag")
+  end
+
+  context "The element" do
+    should "correctly assign attributes" do
+      element[:attribute] = "value"
+      element["namespaced:attribute"] = "value"
+      dump = Ox.dump(element.__getobj__)
+      assert_equal "\n<tag attribute=\"value\" namespaced:attribute=\"value\"/>\n", dump
+    end
+
+    should "parse out available namespace prefixes from namespace definition attributes" do
+      nsdef_prefix = "xmlns:namespace"
+      nsdef_uri = "http://schema.somenamespace.org/"
+      element[nsdef_prefix] = nsdef_uri
+      assert_equal [:namespace], element.namespaces
+    end
+
+    should "only parse namespace definition attributes with a prefix" do
+      element["xmlns"] = "http://schema.somenamespace.org/"
+      assert element.namespaces.empty?
+    end
+
+    should "correctly use a namespace prefix" do
+      element.namespace = "namespace"
+      dump = Ox.dump(element.__getobj__)
+      assert_equal "\n<namespace:tag/>\n", dump
+    end
+  end
+
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openxml-package
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -214,7 +214,6 @@ files:
 - lib/openxml-package/version.rb
 - lib/openxml/builder.rb
 - lib/openxml/builder/element.rb
-- lib/openxml/builder/namespace.rb
 - lib/openxml/content_types_presets.rb
 - lib/openxml/errors.rb
 - lib/openxml/package.rb
@@ -227,6 +226,7 @@ files:
 - lib/openxml/types.rb
 - openxml-package.gemspec
 - test/content_types_test.rb
+- test/element_test.rb
 - test/package_test.rb
 - test/part_test.rb
 - test/support/sample.docx
@@ -257,6 +257,7 @@ specification_version: 4
 summary: A Ruby implementation of OpenXmlPackage
 test_files:
 - test/content_types_test.rb
+- test/element_test.rb
 - test/package_test.rb
 - test/part_test.rb
 - test/support/sample.docx

data/lib/openxml/builder/namespace.rb

@@ -1,13 +0,0 @@
-module OpenXml
-  class Builder
-    class Namespace
-      attr_accessor :prefix, :uri
-
-      def initialize(prefix, uri)
-        @prefix = prefix.to_s
-        @uri = uri
-      end
-
-    end
-  end
-end