primitive_wrapper 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e2d245c1ee0f7d46c0df391fcd4165fe22095f9
-  data.tar.gz: b7e8d55707e1b244619154de8373a473e364278c
+  metadata.gz: 4c61db086f4cde65ecab2dbb325a3a2ba6b54354
+  data.tar.gz: 5fdce0cf8b22b2c4a25b681c4920426767cdd684
 SHA512:
-  metadata.gz: 6d8791c319f2209cd5bc85dbca416b5471a751a316ad814370cc967e9f5e9f94dd9b2a4d7143a3a92d06ba8f973fbf97e7ef5d35943bbcdba5436b3f9a98d896
-  data.tar.gz: 079ed7917773ad0f916afca375fbddf0285328abda5691cd44cfcaa5b0eedcc786f2158a61bf876a6e6b6b5f5fff4e0818a7c0425ae8bb5f77cda5f62b14da80
+  metadata.gz: fc16390601b8af96ced06a0138f1ace2f3a9256a1cd12d395015583c78efe67498e582410951fae9c4fef692340a7f6018b69b659c485328064573b350f43b96
+  data.tar.gz: 53077599d9802d07811b45521131757c44f120fc0cf8b4c540cb6676d29769854efa3dbf869df9c5f3c78403aa9986385cabb00a29539327de7ef778c19a9d91

data/README.md

@@ -434,17 +434,13 @@ Below is a list of what has changed:
 # :each            XRange         ... redefined to work with descending sequences
 # :reverse_each    XRange         ... reverse version of :each
 # :re_range(ng)    XRange         ... creates new range converting negative start, end to positive given size==ng
-#                                 ... used by XArray access operators that use descending ranges.
+#                                     used by XArray access operators that use descending ranges.
 ```
 
 #### XArray class container for Array with extensions
 
 This creates a wrapped `Array` with behavior that enhances the access operators of `Array`;
-additionally a few new methods were added to the wrapped version.
-The methods `#ssort`, `#ssort!` sort `XArray` elements using `#to_s` on each comparison.
-The methods `#isort`, `#isort!` sort `XArray` elements using `#inspect` on each comparison.
-The method `#to_xa` what added to `Array` as a more terse way of creating a wrapper on `Array`.
-The method `#empty!` was also added. These two aforementioned methods also get included in `XArray`.
+additionally a few new methods were added to the wrapped version as well as the original `Array` class.
 `XArray` mimics the behavior of `Array` but redefines `:[]` and `:[]=` to include lists wich comprise indexes, ranges, and arrays of indexes.
 There is also behavior that defines many-to-one, one-to-many, and many-to-many operations. Note that one-to-one behavior has not changed.
 An example best explains how this works:
@@ -466,6 +462,18 @@ An example best explains how this works:
   ary[-2] = [:a, :b] # ary == [2, "c", 5, 7, "a", "b", 17, 19, :s, :s, :s, [:a, :b], [1, 2, 3]]
 ```
 
+The are a few more upgrades as well as follows:
+
+```ruby
+# :to_xa          Array, XArray  ... Converts Array to XArray unless already an XArray
+# :include?       XArray         ... Updated to support a list of items all of which must be included to return true
+# :include_any?   XArray         ... true if any of the list of itmes are included
+# :delete_at      XArray         ... enhanced version can delete a list of indexes or ranges or arrays of indexes
+#                                    returns what was deleted in the order of the list
+# :ssort, :ssort! XArray         ... sorts with each element called with method :to_s     
+# :isort, :isort! XArray         ... sorts with each element called with method :inspect     
+```
+
 #### Customization
 
 Things should work out of the box, until they don't. This section will detail what customization is possible with what container.
@@ -563,6 +571,10 @@ This can be mostly a matter of taste, but we can choose custom names that convey
 So it is left to you to decide.
 
 ## Revision History
+### Version 1.0.1
+* updated documentation to include undocumented methods
+* fixed XArray `#delete_at` bugs
+
 ### Version 1.0.0
 * fixed wrapper inside wrapper causing stack overflow
 * Documentation updates

data/lib/primitive_wrapper.rb

@@ -1050,18 +1050,38 @@ class XArray < ValueAdd
   end
   def delete_at(*index_list)
     return nil if index_list.empty?
+    rtn = []
     if (index_list.count==1)
       if index_list.first==:all
-        self.empty!
-      end  
-    else
-      list = PrimitiveWrapper::get_list(index_list,size)
-      rtn = []
-      list.sort.reverse.each do |idx|
-        rtn.push = @value.delete_at(idx)
+        rtn = @value.dup
+        @value.empty!
+        return rtn
+      else
+        ii = index_list.first
+        rtn = self[ii]
+        if ii.type_of? Range
+          ii = ii.to_xr
+          ii.re_range!(size)
+          ii.reorder!
+          ii.reverse_each do |idx|
+            @value.delete_at(idx)
+          end
+          return rtn
+        end
       end
-      return rtn
     end
+    rtn = self[*index_list]
+    list = PrimitiveWrapper::get_list(index_list,size)
+    list = list & list  # remove duplicates
+    list.sort.reverse.each do |idx|
+      if idx.type_of? Range
+        t_idx = idx.reorder
+      else
+        t_idx = idx
+      end
+      @value.delete_at(t_idx)
+    end
+    return rtn
   end
   def include?(*list)  # replace with list of stuff
     if list.count==1

data/lib/primitive_wrapper/version.rb

@@ -1,3 +1,3 @@
 module PrimitiveWrapper
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: primitive_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Bryan Colvin