better_ranges 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c468002e6d99d8b363b9d9d8633e06b38ff87b3a
-  data.tar.gz: e3f6c169d6cc951555576ec423f068a2d2dc3fab
+  metadata.gz: d04f8f961e79e072b4f76c04a5d24c56a2dc6ed5
+  data.tar.gz: 6c0041e4a5e835d3d48e4e45644700fbe2f837f3
 SHA512:
-  metadata.gz: bcf7070b2a67d0aafc67552b9f794a15ffc853aee82905d1406cf8bdfeb1655f857cbe992b1f31143fab4ad04b13699f3e7dc9cfa52240362f6a68cafcc95307
-  data.tar.gz: 2a248c8da4946747fcbb047006f921736862177e4603992d42a4fd13b3ee9c85096f920e3643457a1ce048d9d503deae26000e586a5a16e50c51afe3ba249d22
+  metadata.gz: 673874f7f3571d50b407737720a377d1294901a83301643395eddf1c458022dce9e3ad028153bd49798bc9cc659a3d0c6bf369b5f5bde22614dfaf29ecfe1da0
+  data.tar.gz: 91c59ea36adddae6243a8033992560c9b35d2baf7177309e0252239893f93a715efcb5037a44182cfe50062a18b760b81935e9c4d2e3f4a2587ee4d06559a737

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/better_ranges.png)](http://badge.fury.io/rb/better_ranges)
+
 # BetterRanges
 
 Adds support for basic set operations to the ruby Range class through the addition of a new SparseRange class.

data/better_ranges.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = BetterRanges::VERSION
   spec.authors       = ['Michael Ziminsky']
   spec.email         = ['mgziminsky@gmail.com']
-  spec.summary       = 'Add support for set operations to the ruby Range class'
+  spec.summary       = 'Adds support for basic set operations to the ruby Range class through the addition of a new SparseRange class'
   spec.homepage      = 'https://github.com/mgziminsky/better_ranges'
   spec.license       = 'MIT'
 

data/lib/better_ranges/range_operators.rb

@@ -2,19 +2,23 @@ require 'better_ranges/sparse_range'
 
 module BetterRanges
   module RangeOperators
-    def |(x)
-      SparseRange.new(self, *x)
+    def |(other)
+      SparseRange.new(self, *other)
     end
 
-    def -(x)
-      SparseRange.new(self) - x
+    def -(other)
+      SparseRange.new(self) - other
     end
 
-    def &(x)
-      SparseRange.new(self) & x
+    def &(other)
+      SparseRange.new(self) & other
     end
 
-    alias :+ :|
+    alias_method :+, :|
+    alias_method :union, :|
+
+    alias_method :minus, :-
+    alias_method :intersect, :&
   end
 end
 

data/lib/better_ranges/sparse_range.rb

@@ -3,13 +3,10 @@ module BetterRanges
     include Enumerable
 
     def initialize(*data)
-      @ranges = [*data].map! do |x|
-        if (x.is_a?(Enumerable))
-          if (x.none?)
-            return nil
-          elsif (x.is_a?(SparseRange))
-            return x.ranges.clone
-          end
+      @data = [*data].map! do |x|
+        if x.is_a?(Enumerable)
+          return nil if x.none?
+          return x.data.clone if x.is_a?(SparseRange)
         end
         x
       end
@@ -18,8 +15,8 @@ module BetterRanges
 
     def each(&block)
       Enumerator.new do |yielder|
-        @ranges.each do |r|
-          yield_each(r){ |x| yielder.yield x}
+        @data.each do |r|
+          yield_each(r) { |x| yielder.yield x }
         end
       end.each(&block)
     end
@@ -27,9 +24,9 @@ module BetterRanges
     def step(num = 1, &block)
       i = 0
       Enumerator.new do |yielder|
-        @ranges.each do |r|
+        @data.each do |r|
           yield_each(r) do |x|
-            yielder.yield x if ((i % num) == 0)
+            yielder.yield x if (i % num) == 0
             i += 1
           end
         end
@@ -37,33 +34,33 @@ module BetterRanges
     end
 
     def last
-      read_val(@ranges.last).last
+      read_val(@data.last).last
     end
 
     def |(x)
-      SparseRange.new(@ranges, *x)
+      SparseRange.new(@data, *x)
     end
 
     def -(x)
       diff = SparseRange.new
-      diff_data = diff.ranges
+      diff_data = diff.data
 
       i = 0
       next_val = lambda do
-        throw :done unless i < @ranges.length
-        v = read_val(@ranges[i])
+        throw :done unless i < @data.length
+        v = read_val(@data[i])
         i += 1
         v
       end
 
       catch(:done) do
-        other = (x.is_a?(SparseRange) ? x : SparseRange.new(x)).ranges
+        other = (x.is_a?(SparseRange) ? x : SparseRange.new(x)).data
 
         start, finish = next_val.call
         other.each do |r|
           other_start, other_finish = read_val(r)
 
-          while (finish < other_start)
+          while finish < other_start
             diff_data << write_val(start, finish)
             start, finish = next_val.call
           end
@@ -83,23 +80,23 @@ module BetterRanges
 
     def &(x)
       intersect = SparseRange.new
-      intersect_data = intersect.ranges
+      intersect_data = intersect.data
 
       i = 0
       next_val = lambda do
-        throw :done unless i < @ranges.length
-        v = read_val(@ranges[i])
+        throw :done unless i < @data.length
+        v = read_val(@data[i])
         i += 1
         v
       end
 
       catch(:done) do
-        other = (x.is_a?(SparseRange) ? x : SparseRange.new(x)).ranges
+        other = (x.is_a?(SparseRange) ? x : SparseRange.new(x)).data
 
         start, finish = next_val.call
         other.each do |r|
           other_start, other_finish = read_val(r)
-          start, finish = next_val.call while (finish < other_start)
+          start, finish = next_val.call while finish < other_start
 
           until other_finish < start
             first = [start, other_start].max
@@ -120,34 +117,34 @@ module BetterRanges
     end
 
     def <<(x)
-      @ranges << [*(x.is_a?(SparseRange) ? x.ranges : x)]
+      @data << [*(x.is_a?(SparseRange) ? x.data : x)]
       optimize
 
       self
     end
 
     def inspect
-      @ranges.inspect
+      @data.inspect
     end
 
     def include?(x)
-      @ranges.any? do |r|
+      @data.any? do |r|
         r.is_a?(Range) ? r.include?(x) : x == r
       end
     end
 
     def empty?
-      @ranges.empty?
+      @data.empty? || size == 0
     end
 
     def size
-      @ranges.inject(0){|c, x| c + (x.is_a?(Range) ? x.count : 1)}
+      @data.reduce(0) { |a, e| a + (e.is_a?(Range) ? e.count : 1) }
     end
 
     def ==(x)
-      other = (x.is_a?(SparseRange) ? x : SparseRange.new(x)).ranges
+      other = (x.is_a?(SparseRange) ? x : SparseRange.new(x)).data
       i = 0
-      (@ranges.length == other.length) && @ranges.all? do |e|
+      (@data.length == other.length) && @data.all? do |e|
         o = other[i]
         i += 1
         (e == o) || (read_val(e) == read_val(o))
@@ -156,28 +153,29 @@ module BetterRanges
 
     # TODO: Calculate hash without creating the temp array
     def hash
-      @ranges.map(&method(:read_val)).hash
+      @data.map(&method(:read_val)).hash
     end
 
-    alias :+ :|
-    alias :union :|
+    alias_method :+, :|
+    alias_method :union, :|
 
-    alias :minus :-
-    alias :intersect :&
+    alias_method :minus, :-
+    alias_method :intersect, :&
 
-    alias :add :<<
+    alias_method :add, :<<
 
-    alias :cover? :include?
-    alias :=== :include?
+    alias_method :cover?, :include?
+    alias_method :===, :include?
 
-    alias :eql? :==
+    alias_method :eql?, :==
 
     protected
-    attr_reader :ranges
+
+    attr_reader :data
 
     def yield_each(e)
-      if (e.is_a?(Range))
-        e.each{|x| yield x}
+      if e.is_a?(Range)
+        e.each { |x| yield x }
       else
         yield e
       end
@@ -186,7 +184,11 @@ module BetterRanges
     private
 
     def read_val(x)
-      x.is_a?(Range) ? [x.first, (x.exclude_end? ? x.max : x.last)] : [x, x]
+      if x.is_a?(Range)
+        [x.first, (x.exclude_end? ? x.max : x.last)]
+      else
+        [x, x]
+      end
     end
 
     def write_val(start, finish)
@@ -194,17 +196,17 @@ module BetterRanges
     end
 
     def optimize
-      @ranges.flatten!
-      @ranges.compact!
-      @ranges.sort!{|a,b| (a <=> b) || (read_val(a) <=> read_val(b))}
+      @data.flatten!
+      @data.compact!
+      @data.sort! { |a, b| (a <=> b) || (read_val(a) <=> read_val(b)) }
 
       fixed = []
-      start, finish = read_val(@ranges.first)
+      start, finish = read_val(@data.first)
 
-      for i in (1...@ranges.length)
-        first, last = read_val(@ranges[i])
+      for i in (1...@data.length)
+        first, last = read_val(@data[i])
 
-        if (finish.succ >= first)
+        if finish.succ >= first
           finish = last if last > finish
         else
           fixed << write_val(start, finish)
@@ -213,7 +215,7 @@ module BetterRanges
       end
       fixed << write_val(start, finish) if finish
 
-      @ranges = fixed
+      @data = fixed
     end
   end
 end
@@ -223,7 +225,7 @@ class Range
 
   def <=>(other)
     comp = nil
-    if (other.is_a?(Range) || other.is_a?(BetterRanges::SparseRange))
+    if other.is_a?(Range) || other.is_a?(BetterRanges::SparseRange)
       comp = (first <=> other.first)
       comp = (last <=> other.last) if comp == 0
       if comp == 0
@@ -237,4 +239,4 @@ class Range
     end
     comp
   end
-end
+end

data/lib/better_ranges/version.rb

@@ -1,3 +1,3 @@
 module BetterRanges
-  VERSION = "1.0.0"
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_ranges
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Ziminsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,8 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Add support for set operations to the ruby Range class
+summary: Adds support for basic set operations to the ruby Range class through the
+  addition of a new SparseRange class
 test_files:
 - spec/better_ranges_spec.rb
 - spec/sparse_range_spec.rb