openxml-package 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a0436dc9e0622316c63a9a049ebe243ebe50bd0
-  data.tar.gz: f598315aff5dea761320ef51fe2f64709bba9073
+  metadata.gz: 76da3fa471566c2c7f1e99fe5d830f66288924df
+  data.tar.gz: d55dfa69f9959a7d2bc53ece11d6d82c5b69dc10
 SHA512:
-  metadata.gz: c19ae66a76c4abcd5a4c431e567a0cf55060e35827afba22c2ba27bc35d9f7d1773c009e55b9e3a48d61221aca7c3811ec2a9907f6517432d7df7eebdcbd21ed
-  data.tar.gz: 2c17f6398cd89b909e36e8d3dd6d42a5f761ae7df2da319cf5ca99b609eb17a6c9e82dab5496cc13a5521dfc0e745a0ea2365589494ece87820fa919a7eed6d3
+  metadata.gz: ee814d1eeed9ea6892795afea4075fbe9a7c833d033447ccb292b02e18e46354202082f5cb11690872a172d91a5fd7198c6aed517a9582e5ca768b00fb2d9aac
+  data.tar.gz: de04ea1ad3da58c3e2f1baf56e9d619191a4d59605e2cd30dd030e41c49ff65ea74ba3c8b369c690746e000103e4e0b20713e8944d3182066bbfb75fb9e19a50

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.3.3 - Oct 2, 2018
+
+ - Optimized setting attributes

data/lib/openxml-package/version.rb

@@ -1,3 +1,3 @@
 module OpenXmlPackage
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/openxml/has_attributes.rb

@@ -9,9 +9,10 @@ module OpenXml
 
     module ClassMethods
 
+      RESERVED_NAMES = %w{ tag name namespace properties_tag }.freeze
+
       def attribute(name, expects: nil, one_of: nil, in_range: nil, displays_as: nil, namespace: nil, matches: nil, validation: nil, required: false, deprecated: false)
-        bad_names = %w{ tag name namespace properties_tag }
-        raise ArgumentError if bad_names.member? name.to_s
+        raise ArgumentError if RESERVED_NAMES.member? name.to_s
 
         required_attributes.push(name) if required
 
@@ -86,68 +87,69 @@ module OpenXml
       unset_attributes = required_attributes.reject do |attr|
         instance_variable_defined?("@#{attr}")
       end
-      message = "Required attribute(s) #{unset_attributes.join(", ")} have not been set"
-      raise OpenXml::UnmetRequirementError, message if unset_attributes.any?
+      return if unset_attributes.empty?
+
+      raise OpenXml::UnmetRequirementError, "Required attribute(s) #{unset_attributes.join(", ")} have not been set"
     end
 
     def boolean(value)
-      message = "Invalid #{name}: frame must be true or false"
-      raise ArgumentError, message unless [true, false].member? value
+      return if [true, false].member? value
+      raise ArgumentError, "Invalid #{name}: frame must be true or false"
     end
 
     def hex_color(value)
-      message = "Invalid #{name}: must be :auto or a hex color, e.g. 4F1B8C"
-      raise ArgumentError, message unless value == :auto || value =~ /^[0-9A-F]{6}$/
+      return if value == :auto || value =~ /^[0-9A-F]{6}$/
+      raise ArgumentError, "Invalid #{name}: must be :auto or a hex color, e.g. 4F1B8C"
     end
 
     def hex_digit(value)
-      message = "Invalid #{name}: must be a two-digit hex number, e.g. BF"
-      raise ArgumentError, message unless value =~ /^[0-9A-F]{2}$/
+      return if value =~ /^[0-9A-F]{2}$/
+      raise ArgumentError, "Invalid #{name}: must be a two-digit hex number, e.g. BF"
     end
 
     def hex_digit_4(value)
-      message = "Invalid #{name}: must be a four-digit hex number, e.g. BF12"
-      raise ArgumentError, message unless value =~ /^[0-9A-F]{4}$/
+      return if value =~ /^[0-9A-F]{4}$/
+      raise ArgumentError, "Invalid #{name}: must be a four-digit hex number, e.g. BF12"
     end
 
     def long_hex_number(value)
-      message = "Invalid #{name}: must be an eight-digit hex number, e.g., FFAC0013"
-      raise ArgumentError, message unless value =~ /^[0-9A-F]{8}$/
+      return if value =~ /^[0-9A-F]{8}$/
+      raise ArgumentError, "Invalid #{name}: must be an eight-digit hex number, e.g., FFAC0013"
     end
 
     def hex_string(value)
-      message = "Invalid #{name}: must be a string of hexadecimal numbers, e.g. FFA23C6E"
-      raise ArgumentError, message unless value =~ /^[0-9A-F]+$/
+      return if value =~ /^[0-9A-F]+$/
+      raise ArgumentError, "Invalid #{name}: must be a string of hexadecimal numbers, e.g. FFA23C6E"
     end
 
     def integer(value)
-      message = "Invalid #{name}: must be an integer"
-      raise ArgumentError, message unless value.is_a?(Integer)
+      return if value.is_a?(Integer)
+      raise ArgumentError, "Invalid #{name}: must be an integer"
     end
 
     def positive_integer(value)
-      message = "Invalid #{name}: must be a positive integer"
-      raise ArgumentError, message unless value.is_a?(Integer) && value >= 0
+      return if value.is_a?(Integer) && value >= 0
+      raise ArgumentError, "Invalid #{name}: must be a positive integer"
     end
 
     def string(value)
-      message = "Invalid #{name}: must be a string"
-      raise ArgumentError, message if !value.is_a?(String) || value.length.zero?
+      return if value.is_a?(String) && value.length > 0
+      raise ArgumentError, "Invalid #{name}: must be a string"
     end
 
     def string_or_blank(value)
-      message = "Invalid #{name}: must be a string, even if the string is empty"
-      raise ArgumentError, message unless value.is_a?(String)
+      return if value.is_a?(String)
+      raise ArgumentError, "Invalid #{name}: must be a string, even if the string is empty"
     end
 
     def in_range?(value, range)
-      message = "Invalid #{name}: must be a number between #{range.begin} and #{range.end}"
-      raise ArgumentError, message unless range.include?(value.to_i)
+      return if range.include?(value.to_i)
+      raise ArgumentError, "Invalid #{name}: must be a number between #{range.begin} and #{range.end}"
     end
 
     def percentage(value)
-      message = "Invalid #{name}: must be a percentage"
-      raise ArgumentError, message unless value.is_a?(String) && value =~ /-?[0-9]+(\.[0-9]+)?%/ # Regex supplied in sec. 22.9.2.9 of Office Open XML docs
+      return if value.is_a?(String) && value =~ /-?[0-9]+(\.[0-9]+)?%/ # Regex supplied in sec. 22.9.2.9 of Office Open XML docs
+      raise ArgumentError, "Invalid #{name}: must be a percentage"
     end
 
     def on_or_off(value)
@@ -155,13 +157,13 @@ module OpenXml
     end
 
     def valid_in?(value, list)
-      message = "Invalid #{name}: must be one of #{list} (was #{value.inspect})"
-      raise ArgumentError, message unless list.member?(value)
+      return if list.member?(value)
+      raise ArgumentError, "Invalid #{name}: must be one of #{list} (was #{value.inspect})"
     end
 
     def matches?(value, regexp)
-      message = "Value does not match #{regexp}"
-      raise ArgumentError, message unless value =~ regexp
+      return if value =~ regexp
+      raise ArgumentError, "Value does not match #{regexp}"
     end
 
   end

data/lib/openxml/has_properties.rb

@@ -95,13 +95,15 @@ module OpenXml
 
       def properties_attribute(name, **args)
         properties_element.attribute name, **args
-        define_method "#{name}=" do |value|
-          properties_element.public_send :"#{name}=", value
-        end
+        class_eval <<~RUBY, __FILE__, __LINE__ + 1
+          def #{name}=(value)
+            properties_element.#{name} = value
+          end
 
-        define_method name.to_s do
-          properties_element.public_send name.to_sym
-        end
+          def #{name}
+            properties_element.#{name}
+          end
+        RUBY
       end
 
       def properties_element
@@ -199,9 +201,8 @@ module OpenXml
 
     def ensure_unique_in_group(name, group_index)
       other_names = (choice_groups[group_index] - [name])
-      unique = other_names.none? { |other_name| instance_variable_defined?("@#{other_name}") }
-      message = "Property #{name} cannot also be set with #{other_names.join(", ")}."
-      raise ChoiceGroupUniqueError, message unless unique
+      return if other_names.none? { |other_name| instance_variable_defined?("@#{other_name}") }
+      raise ChoiceGroupUniqueError, "Property #{name} cannot also be set with #{other_names.join(", ")}."
     end
 
     def unmet_choices
@@ -214,8 +215,8 @@ module OpenXml
 
     def ensure_required_choices
       unmet_choice_groups = unmet_choices.map { |index| choice_groups[index].join(", ") }
-      message = "Required choice from among group(s) (#{unmet_choice_groups.join("), (")}) not made"
-      raise OpenXml::UnmetRequirementError, message if unmet_choice_groups.any?
+      return if unmet_choice_groups.empty?
+      raise OpenXml::UnmetRequirementError, "Required choice from among group(s) (#{unmet_choice_groups.join("), (")}) not made"
     end
 
   end

data/lib/openxml/properties/base_property.rb

@@ -38,8 +38,7 @@ module OpenXml
       def validate_tag(tag)
         return if self.class.allowed_tags.include?(tag)
         allowed = self.class.allowed_tags.join(", ")
-        message = "Invalid tag name for #{name}: #{tag.inspect}. It should be one of #{allowed}."
-        raise ArgumentError, message
+        raise ArgumentError, "Invalid tag name for #{name}: #{tag.inspect}. It should be one of #{allowed}."
       end
 
       def render?

data/openxml-package.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rubyzip", "~> 1.2.1"
+  spec.add_dependency "rubyzip", "~> 1.2.2"
   spec.add_dependency "nokogiri"
   spec.add_dependency "ox"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openxml-package
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-26 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +187,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md