mug 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17f7a48a6bfa945c6760d07cca504c9d368414b6
-  data.tar.gz: 3e6f798ad9030e7d8de51d805ea22092bed9af96
+  metadata.gz: a1d1008a00d350eb456faeba3099fa1f4ef91319
+  data.tar.gz: a9acb854fcfb95e52f3b057524ee55113c5c424a
 SHA512:
-  metadata.gz: b35026ab417cc017594e49fdbcb042ec9319cf5918026ba57ffb5b5f208b4e8a7222f9e99cdb8ffd09951d4985df7a913420d0ce64e0a6b441a7c6add7b2f55a
-  data.tar.gz: 210d8afdc5f5ac618eb25fe5a0e79a92dc09e124c761448d4e224f0ae4068038782ef9528b8d4372799211f7513adc949e21fdb1c7a06bec03aa9dc548fe34a1
+  metadata.gz: 1811cbb8b2476aaf45d4d79535788da251b1da359d908d8893e42aae36a68f54807ddbf64794c2704b0ef1560411bd0e1cb55b9beb128ab8bfa9f4bdfc64379c
+  data.tar.gz: 0263bd5cf6aa93bcc181684a8a7b7f1b21fbaede2c1d46de2c015d7064bac723e54ba0a6bbf9a01472d6b4b61fa3b688304de6cd374e6c63e430a20d66779bf9

data/lib/mug/fragile-method-chain.rb

@@ -11,9 +11,9 @@ class FragileMethodChain
 	#
 	# Creates a FragileMethodChain which will send its first method to +o+
 	#
-	def initialize o
+	def initialize o, falsy: true
 		@o = o
-		@chain = []
+		@falsy = falsy
 	end
 
 	#
@@ -23,24 +23,31 @@ class FragileMethodChain
 	# returned in the chain, or its end result.
 	#
 	def _!
-		@chain.inject(@o) do |o,x|
-			a,b = x
-			break o unless o
-			o.__send__(*a, &b)
-		end
+		@o
 	end
 
-	# Record the method args/block
+	# Delegate the method args/block
 	def method_missing *a, &b #:nodoc:
-		@chain << [a,b]
+		if __defer?
+			@o = @o.__send__(*a, &b)
+		end
 		self
 	end
 
-	# Explicitly record :_? as a method in the chain.
+	# Explicitly invoke :_? as a method in the chain.
 	def _? #:nodoc:
-		@chain << [[ :_? ],nil]
+		# Unconditionally invoke it, so the eventual _! doesn't fail
+		#if __defer?
+			@o = @o.__send__(:_?)
+		#end
 		self
 	end
+
+	# Return true iff @o is deferable.
+	def __defer?
+		return @o if @falsy
+		! @o.nil?
+	end
 end
 
 class Object
@@ -53,7 +60,7 @@ class Object
 end
 
 =begin
-Copyright (c) 2013, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2013,2016, Matthew Kerwin <matthew@kerwin.net.au>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

data/lib/mug/matchdata/each.rb

@@ -54,6 +54,12 @@ Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
 copyright notice and this permission notice appear in all copies.
 
+Additional license is granted to the Ruby Core Team to use this software
+in the ruby core or ruby standard libraries without including the above
+copyright notice nor this permission notice.  Subsequently, such a copy
+of this software becomes wholly subject to the relevant licensing terms
+of the ruby core or ruby standard libraries.
+
 THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

data/lib/mug/matchdata/hash.rb

@@ -40,6 +40,12 @@ Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
 copyright notice and this permission notice appear in all copies.
 
+Additional license is granted to the Ruby Core Team to use this software
+in the ruby core or ruby standard libraries without including the above
+copyright notice nor this permission notice.  Subsequently, such a copy
+of this software becomes wholly subject to the relevant licensing terms
+of the ruby core or ruby standard libraries.
+
 THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

data/test/test-fragile-method-chain.rb

@@ -60,6 +60,12 @@ class Test_fmc < Test::Unit::TestCase
 	def test_fmc_nested
 		a = FMCTest::A.new
 		assert_equal( 1, a._?.b._?.c._!.to_i._! )
+		a.b.c = false
+		assert_equal( false, a._?.b._?.c._!.to_i._! )
+		a.b = false
+		assert_equal( false, a._?.b._?.c._!.to_i._! )
+		a = false
+		assert_equal( false, a._?.b._?.c._!.to_i._! )
 	end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mug
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Matthew Kerwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies: []
 description: |
   == MUG: Matty's Ultimate Gem
@@ -93,29 +93,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: 'MUG: Matty''s Ultimate Gem'
 test_files:
-- test/test-clamp.rb
+- test/test-fragile-method-chain.rb
+- test/test-maybe.rb
+- test/test-hashop.rb
+- test/test-loop-with.rb
+- test/test-counts.rb
+- test/test-array-minus.rb
+- test/test-bool.rb
 - test/test-rexproc.rb
 - test/test-tau.rb
-- test/test-matchdata_each.rb
-- test/test-matchdata_hash.rb
-- test/test-array-extend.rb
+- test/test-apply.rb
+- test/test-clamp.rb
 - test/test-iterator-for.rb
-- test/test-top.rb
-- test/test-and-or.rb
-- test/test-self.rb
-- test/test-counts.rb
 - test/test-negativity.rb
-- test/test-bool.rb
+- test/test-matchdata_hash.rb
+- test/test-self.rb
+- test/test-and-or.rb
 - test/test-hashmap.rb
-- test/test-loop-with.rb
-- test/test-maybe.rb
-- test/test-hashop.rb
+- test/test-matchdata_each.rb
 - test/test-iterator-method.rb
-- test/test-apply.rb
-- test/test-array-minus.rb
-- test/test-fragile-method-chain.rb
+- test/test-array-extend.rb
+- test/test-top.rb