array-subindex 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5bd593c29d9bf506cfc8c8c4236c027f643788c
-  data.tar.gz: 3b500bdf72d283175ad127a0486c4a4d26266913
+  metadata.gz: 8f974e1c4e2484751b5cf66c2a52f09d1b03df9c
+  data.tar.gz: 2ac3cd24f9f41d389c41b64c9daaed29c913a62c
 SHA512:
-  metadata.gz: a082683202f921635b63259829fcdc06bfd791bd36308954d1fb38da092c8abd4ee79382bd05a77650f44879c5f90e129cace7c1e148b95c5c56ab6c37eb6f42
-  data.tar.gz: cccdcaa249aea013da28564fbccedf398145fce90f735d5cbf2307acc08d4a39c552d5c5892c3aca94f71f3e61fbcbec77f5f5ff531fed0fa510bdadbee7948e
+  metadata.gz: 09595abe3cba2f5dbefe2f0e0e167a4dc5e660ee6ff8619edfac2a0f78cc57e9d362b41a8810792ec2cbf1e829c682115b657f092664f030e3490aeb86e08e37
+  data.tar.gz: cb9678688923b59857dd31dab7f7beed900b7f11d433df80abab072e9fca0539353f9bf2e10596684a6acbb3f1319ca0eaa902410eceb838fe3e1a27e8163b0d

data/README.md

@@ -11,6 +11,8 @@ Now you can, in Ruby at least:
 
 %w[ foo bar baz ][1.3] == "arb"
 
+[8,9][Rational(2,5)] == 8.4
+
 [ [1,2], [3,4] ][0.5] == 2.5
 ``` 
 
@@ -33,6 +35,8 @@ production environment. Clear?  Good.
 require 'array/subindex'
 ```
 
+..and then go pour yourself a stiff drink because, baby, you're going to need it. In fact, you should make it a double just to be safe.
+
 ## Usage
 
 This gem overrides the Ruby core Array#[] method. That is insane. If a
@@ -67,6 +71,14 @@ In the case of irrational divisions, the results are rounded:
 [1,2,3][1.001] == 2.001
 ```
 
+You can use other number classes, too:
+
+```ruby
+[8,9][Rational(2,5)] == 8.4
+
+[3,4,5][BigDecimal.new("1.5")] == 4.3
+```
+
 For arrays of strings, a concatination of portions of the values are used:
 
 ```ruby

data/array-subindex.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  # spec.add_development_dependency "debugger"
+  spec.add_development_dependency "pry"
 end

data/lib/array/subindex.rb

@@ -1,30 +1,55 @@
 require "array/subindex/version"
 
 class Array
-  def [](index)
-    if (subindex = index.to_f - index.to_i) > 0
-      f = index.to_f.floor
-      c = index.to_f.ceil
-      f_value = self.fetch(f)
-      c_value = self.fetch(c)
-
-      f_value = array_subset(f_value, subindex, :to_end) if
-        array_like?(f_value)
-      c_value = array_subset(c_value, subindex, :from_beginning) if
-        array_like?(c_value)
-
-      if (numeric?(f_value) && numeric?(c_value))
-        subindex_as_number(subindex, f_value, c_value)
-      else
-        subindex_as_string(subindex, f_value, c_value)
-      end
+  def [](index, length=nil)
+    case index.class.to_s.to_sym
+    when :Range
+      fetch_range(index)
+    when :Float, :Rational
+      fetch_subindex(index)
     else
-      self.fetch(index)
+      fetch_integer_index(index, length)
     end
   end
 
 private
 
+  def fetch_subindex(index)
+    subindex = index.to_f - index.to_i
+
+    f = index.to_f.floor
+    c = index.to_f.ceil
+    f_value = self.at(f)
+    c_value = self.at(c)
+
+    f_value = array_subset(f_value, subindex, :to_end) if
+      array_like?(f_value)
+    c_value = array_subset(c_value, subindex, :from_beginning) if
+      array_like?(c_value)
+
+    if (numeric?(f_value) && numeric?(c_value))
+      subindex_as_number(subindex, f_value, c_value)
+    else
+      subindex_as_string(subindex, f_value, c_value)
+    end
+  end
+
+  def fetch_slice(index, length)
+    self.slice(index, length.to_i)
+  end
+
+  def fetch_integer_index(index,length)
+    if length
+      fetch_slice(index, length.to_i)
+    else
+      self.at(index)
+    end
+  end
+
+  def fetch_range(range)
+    self.slice(range.first, range.to_a.length)
+  end
+
   def subindex_as_number(subindex, f_value, c_value)
     f_fractional = f_value.to_f * (1.0 - subindex)
     c_fractional = c_value.to_f * subindex
@@ -51,7 +76,7 @@ private
   end
 
   def array_subset(value, subindex, direction)
-    value = value.to_a
+    value = [*value] # .to_a give deprication warings in 1.8.7  
     subarray = if value.size <= 1
       value
     else

data/lib/array/subindex/version.rb

@@ -1,5 +1,5 @@
 class Array
   module Subindex
-    VERSION = "1.2.0"
+    VERSION = "1.3.1"
   end
 end

data/spec/lib/array/subindex_spec.rb

@@ -5,11 +5,47 @@ describe 'Array::subindex' do
   describe 'preserve previous functionality' do
     subject { [1,2,3] }
     it "returns normal index values with integer indexes" do
-      expect(subject[0]).to eq(1)
-      expect(subject[1]).to eq(2)
-      expect(subject[2]).to eq(3)
+      -1.upto(2) do |i|
+        expect( subject[i] ).to eq( subject.fetch(i) )
+        expect( subject[i] ).to be_a_kind_of(Fixnum)
+      end
+    end
+    
+    it "returns normal ranges" do
+      expect( subject[0..1] ).to eq( [ 1, 2 ] )
+      expect( subject[1..2] ).to eq( [ 2, 3 ] )
+      expect( subject[0..2] ).to eq( [ 1, 2, 3 ] )
+    end
+
+    it "returns normal lengths" do
+      expect( subject[0,1] ).to eq( [1] )
+      expect( subject[0,2] ).to eq( [1,2] )
+      expect( subject[1,2] ).to eq( [2,3] )
+
+      expect( subject[1,0] ).to eq( [] )
+    end
+  end
 
-      expect(subject[-1]).to eq(3)
+  context "float with a mantissa of zero" do
+    
+    context "integer values" do
+      subject  { [ 1, 2 ] }
+
+      it "returns a single index value as a float" do
+        [ 0.0, 1.0].each do |i|
+          expect( subject[i] ).to eq( subject.fetch(i) )
+          expect( subject[i] ).to be_a_kind_of(Float)
+        end
+      end
+    end
+
+    context "string values" do
+      subject { %w[ foo bar ] }
+
+      it "returns a single string value" do
+        expect( subject[0.0] ).to eq( 'foo' )
+        expect( subject[1.0] ).to eq( 'bar' )
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: array-subindex
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Matthew Nielsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Access sub-integer array indexes in Ruby: Array.new([1,2])[0.5] == 1.5'
 email:
 - xunker@pyxidis.org