yoga 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d47b133334a8a84e8376462babbbe7ead6a966bd
-  data.tar.gz: d2b5d18e263caf245c93677658dadb1c5c66f36b
+  metadata.gz: 07e30449516ea2a36d8b765b9da9d08d17b3677b
+  data.tar.gz: ca0b935fedcd9ebb0213e4650b5d6d9932c450ee
 SHA512:
-  metadata.gz: fd9eb5267207071585e630dcf03186a0e7f8ac748b578fc207330a2560544f649573d7ebe299fe4820ec53a473e01fc2980048b9484979fb9cb5781b2576fb32
-  data.tar.gz: 14c809c089f72ddfd86d64dad0d4834d6d7faabfe0386efcc487550c0c4615cb81ee5c6cd1bced90b92bf462a6182a040737d81567079b64d602116ffb91d57b
+  metadata.gz: 0041c1f6f886b0218b7f4cb8f86f94a9c33e659ce81bd24c995755fcb872f08ee1c0b58d67be675ac71462aa8897c4d5a7fb336f7c3062ce1c597f8d96d35cf8
+  data.tar.gz: c7dea5a35e57f5490fcf4d5c93f0736276d44ce92dd7edd2b33261ea0fa8514c87777b8ce10a2cb309db8513f5056b7ccbe0dad2df05af411227065231d70ee8

data/lib/yoga/location.rb

@@ -91,6 +91,9 @@ module Yoga
         @line == other.line && @column == other.column
     end
 
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/CyclomaticComplexity
+
     # Unions this location with another location.  This creates a new location,
     # with the two locations combined.  A conflict in the file name causes an
     # error to be raised.
@@ -117,36 +120,28 @@ module Yoga
     # @raise [::ArgumentError] if other's file isn't the receiver's file.
     # @param others [Location]
     # @return [Location]
-    def union(*others)
-      others.each do |other|
-        fail ArgumentError, "Expected #{self.class}, got #{other.class}" \
-          unless other.is_a?(Location)
-        fail ArgumentError, "Expected other to have the same file" unless
-          file == other.file
-      end
-
-      line = construct_range([@line, *others.map(&:line)])
-      column = construct_range([@column, *others.map(&:column)])
-
-      Location.new(@file, line, column)
+    def union(other)
+      fail ArgumentError, "Expected #{self.class}, got #{other.class}" \
+        unless other.is_a?(Location)
+
+      oline = other.line
+      ocolumn = other.column
+
+      file = @file == other.file ? @file : "<unknown>"
+      line =
+        (@line.first < oline.first ? @line.first : oline.first)..
+        (@line.last > oline.last ? @line.last : oline.last)
+      column =
+        (@column.first < ocolumn.first ? @column.first : ocolumn.first)..
+        (@column.last > ocolumn.last ? @column.last : ocolumn.last)
+
+      Location.new(file, line, column)
     end
 
     alias_method :|, :union
 
   private
 
-    # Creates a range from a list of ranges.  This takes the lowest starting
-    # value, and the greatest ending value, and creates a new range from that.
-    #
-    # @param from [<::Range<::Numeric>>]
-    # @return [::Range<::Numeric>]
-    def construct_range(from)
-      first = from.map(&:first).min
-      last = from.map(&:last).max
-
-      first..last
-    end
-
     # Ensures that the given value is a range.  If it's numeric, it's turned
     # into a range with the same starting and ending values.  If it's a range,
     # it's returned.  Otherwise, it fails.

data/lib/yoga/version.rb

@@ -5,5 +5,5 @@ module Yoga
   # The version of the module.
   #
   # @return [::String]
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yoga
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Jeremy Rodi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixture