its-it 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01864b89d966bb4cd9bbeea11caa15072e77890f
-  data.tar.gz: 24f7526c94e6a0b4d103581647f18fbd42f32583
+  metadata.gz: 91594b559afe659b0b318b56656b24734ff4578a
+  data.tar.gz: c80b8e6f4603ba93bfdbabda28f39a46775b366c
 SHA512:
-  metadata.gz: fabb650c7deb98f7d2b5dcc62897c36a5eec8f27bca33265ec307a624f4b1266f2c25e42aff209382658452a471986895c5952465c5749df2c57f0323d4915c0
-  data.tar.gz: d58f503c0ac24465d3aa61bf8385082b958f0765aa533f49127abf004c71a5f55127d8be505c16a2747c38d823268e7fe6f6455ced79052b6c510a318e0c0de1
+  metadata.gz: f855655e03f0d87b226dc8f90311782c60e39389b6b1e2c9c599c471ca33800b08a1e5be480682a37edf9a8f014192ce24e01cea0c9d918c402b1e389b9d0778
+  data.tar.gz: 8eb73444f90f0e353f295468036927b8d4d4f6345c3e54b76bcd52bf831f164310dd5840bde5eebb9364b39ffed342ae5acd4b52af04e12448a786cd2a0d18db

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.2.3
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
 
 before_install: gem install bundler -v ">= 1.10.0" --conservative

data/README.md

@@ -62,9 +62,11 @@ items.map &it.to_s.capitalize
 
 ### Hash comprehensions
 
-When used with hash comprehensions, the `|key, val|` pair of arguments are presented to `its` as an array.  E.g.
+When used with hash comprehensions, the `|key, val|` pair of arguments are presented to `its` as a tuple that can be accessed array-like via `[0]` or `[1]` and/or struct-like via `#key` and `#value` methods.  E.g.
 
 ```ruby
+{dogs: 1, cats: 2, goats:3}.select &its.key =~ /^c/ # => {cats: 2}
+{dogs: 1, cats: 2, goats:3}.select &its.value.even? # => {cats: 2}
 {dogs: 1, cats: 2, goats:3}.select &its[1].even? # => {cats: 2}
 ```
 
@@ -128,7 +130,7 @@ gem "its-it"
 
 ## Compatibility
 
-Tested on MRI ruby 1.9.3, 2.0.0 and 2.2.3
+Tested on MRI ruby 1.9.3, 2.1.9, 2.2.5, and 2.3.1
 
 (MRI ruby 1.8.7 was supported up through version 1.1.1)
 
@@ -136,14 +138,11 @@ Tested on MRI ruby 1.9.3, 2.0.0 and 2.2.3
 
 Release Notes
 
+* 1.3.0 Add `#key` and `#value` for Hash comprehensions; plus minor internal cleanup.
 * 1.2.1 Don't leak all of ItsIt into main, just ItsIt::Kernel.  Thanks to [klg](https://github.com/kjg)
 * 1.2.0 Add support for Hash comprehensions; drop support for ruby 1.8.7
 * 1.1.1 Remove dependency on BlankSlate
 
 This gem is orignally based on Jay Philips'
-[methodphitamine](https://github.com/jicksta/methodphitamine) gem. It has been
-updated to be compatible with ruby 1.9 and gemspec, added case statement
-support, renamed its-it, and installed on [rubygems.org](http://rubygems.org).
- Unlike methodphitamine, this gem includes only `its` and `it`, not the
-"maybe" monad.
+[methodphitamine](https://github.com/jicksta/methodphitamine) gem. It has been made available on [rubygems.org](http://rubygems.org), and updated over the years.
 

data/lib/its-it/it.rb

@@ -1,5 +1,3 @@
-#require 'blankslate' unless defined? BasicObject
-
 # This module contains an It class which queues any methods called on it
 # and can be converted into a Proc. The Proc it generates executes the queued
 # methods in the order received on the argument passed to the block, allowing
@@ -10,7 +8,7 @@
 module ItsIt
 
   # The class instantiated by the <code>it</code> and <code>its</code> kernel methods.
-  class It < (defined?(BasicObject) ? BasicObject : Object)
+  class It < BasicObject
 
     instance_methods.map(&:to_s).each do |method|
       undef_method method unless method.start_with? "__"
@@ -25,9 +23,21 @@ module ItsIt
       self
     end
 
+    module KeyValAccessors
+      def key
+        self[0]
+      end
+      def value
+        self[1]
+      end
+    end
+
     def to_proc
       Kernel.send :proc do |*obj|
-        obj = obj.shift if obj.size == 1
+        case obj.size
+        when 1 then obj = obj.shift     # array comprehension, gets one arg
+        when 2 then obj.extend(KeyValAccessors) # hash comprehension, gets two args
+        end
         @queue.inject(obj) { |chain,(method, args,block)| chain.send(method, *args, &block) }
       end
     end

data/lib/its-it/version.rb

@@ -1,3 +1,3 @@
 module ItsIt
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/spec/it_spec.rb

@@ -29,7 +29,7 @@ describe ItsIt::It do
   end
   
   it "should chain methods" do
-    expect(it.reverse.swapcase.succ).to eq("TSET A SI SIHu")
+    expect((it.reverse.swapcase.succ).to_proc.call(TestString)).to eq("TSET A SI SIHu")
   end
   
   it "should respond to to_proc()" do
@@ -46,8 +46,19 @@ describe ItsIt::It do
     expect((it < 1) === 2).to be_falsey
   end
 
-  it "should work with hashes (multiple args)" do
-    expect({a: 1, b:2}.select &it[1] == 2).to eq({b:2})
+  context "hash comprehension" do
+    it "presents `key` accessor" do
+      expect({a: 1, b:2}.select &it.key == :b).to eq({b:2})
+    end
+
+    it "presents `value` accessor" do
+      expect({a: 1, b:2}.select &it.value == 2).to eq({b:2})
+    end
+
+    it "presents as an array" do
+      expect({a: 1, b:2}.select &it[1] == 2).to eq({b:2})
+    end
+
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: its-it
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Ronen Barzel