linguistics 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdef8fce2a3ef1d42a5eebbee59b9da384cfe783
-  data.tar.gz: b4bc7c0581b2f5b4a13af5a92e3217d0e35fdb20
+  metadata.gz: d34798efad8371fb583d6594d7e9301f30e0f386
+  data.tar.gz: 7f024ff2fd9d77ae71d1003456037aca606b44de
 SHA512:
-  metadata.gz: 6bde8e8fda5a99fb34c1359ff223384244239b3b13050b95afe126a6e8205402edae8c442c67f40f93e3387642f1ee22ec031f80a80e860dc977927cef1bc669
-  data.tar.gz: 1cf8553c4245c731e56a5c3543761aec0c2c9c5348fc248f10917ccc9feaf423120bf029c706db3b4a47e32a21831bc0e08f4c441ca17946b535ccafe8d162f7
+  metadata.gz: 5cddeae6bd28706064a428f6e7531bef96268d9e9579cab8f946e0648392f310b2b9e56d224ae4ec8881a77ece2405ae3ee749cbd9f4825abb2307d98015d57c
+  data.tar.gz: a2fc49f3d995041e10f260377024fad17f54a6abc0e6e915dc7d62094ecc34f22b97221f7987faa959bcd640f35f9563323fbbec9178a1f145b2bf5844b0176d

checksums.yaml.gz.sig

@@ -1 +1 @@
-Vyl�1���d"Z�����F{��/��O��.j�&��@oa�ş�92��d{N%hm��I]�MP�e
��
 ,����UN f[#l����^UԿ�߫,�U��yE#��Yl�F�ktM���k$T�Rz���-]�v�X@����G念%��${��dsGjF��Α���g��a�΄E��f�#�
+0Ge�W�ڨ���ݠ�#}���cp�ai�¸�����̕�z��O�E�qe�0�K�BBu����r��2F����s̘*�~����yt�=�)�M������A��`,r\^���

data/History.rdoc

@@ -1,3 +1,8 @@
+== v2.1.0 [2015-09-16] Michael Granger <ged@FaerieMUD.org>
+
+- Add an `article` config item to English conjunctions.
+
+
 == v2.0.4 [2015-03-12] Michael Granger <ged@FaerieMUD.org>
 
 Updates and bugfixes for Ruby 2.2.

data/lib/linguistics.rb

@@ -12,10 +12,10 @@ module Linguistics
 
 
 	# Release version
-	VERSION = '2.0.4'
+	VERSION = '2.1.0'
 
 	# VCS version
-	REVISION = %q$Revision: 32d9bdeaf0ea $
+	REVISION = %q$Revision: c4faf117867f $
 
 	# The list of Classes to add linguistic behaviours to.
 	DEFAULT_EXT_CLASSES = [ String, Numeric, Array ]

data/lib/linguistics/en/conjunctions.rb

@@ -21,6 +21,7 @@ module Linguistics::EN::Conjunctions
 		:casefold		=> true,
 		:generalize		=> false,
 		:quantsort		=> true,
+		:article        => true,
 	}
 
 
@@ -83,6 +84,10 @@ module Linguistics::EN::Conjunctions
 	###   list. This sort is also the fallback for indentical quantities (ie.,
 	###   items of the same quantity will be listed in the order they appeared
 	###   in the source list).
+	### [<b>:article</b>]
+	###   If set to <tt>true</tt> (the default), singular items in the list will be
+	###   prefixed with the appropriate indefinite article ("box" -> "a box"). Setting
+	###   it to +false+ will omit this.
 	###
 	def conjunction( args={} )
 		config = CONJUNCTION_DEFAULTS.merge( args )
@@ -101,7 +106,10 @@ module Linguistics::EN::Conjunctions
 		self.log.debug "  phrases is: %p" % [ phrases ]
 
 		# No need for a conjunction if there's only one thing
-		return phrases[0].en.a if phrases.length < 2
+		if phrases.length < 2
+			return phrases[0] unless config[:article]
+			return phrases[0].en.a
+		end
 
 		# Set up a Proc to derive a collector key from a phrase depending on the
 		# configuration
@@ -165,8 +173,11 @@ module Linguistics::EN::Conjunctions
 							count < 10 ? count.en.numwords : count.to_s,
 							phrase.en.plural( count )
 						]
-					else
+					elsif config[:article]
 						phrase.en.a
+					else
+						self.log.debug "No article!"
+						phrase
 					end
 				end
 			end

data/spec/linguistics/en/conjunctions_spec.rb

@@ -59,6 +59,10 @@ describe Linguistics::EN::Conjunctions do
 			expect( array.en.conjunction ).to eq( "a cat" )
 		end
 
+		it "omits the indefinite article if :article is `false`" do
+			expect( array.en.conjunction(article: false) ).to eq( "cat" )
+		end
+
 	end
 
 
@@ -78,6 +82,10 @@ describe Linguistics::EN::Conjunctions do
 			expect( array.en.conjunction(:conjunctive => '') ).to eq( "a cat a dog" )
 		end
 
+		it "doesn't add indefinite articles if :article is set to `false`" do
+			expect( array.en.conjunction( article: false ) ).to eq( "cat and dog" )
+		end
+
 	end
 
 
@@ -120,6 +128,12 @@ describe Linguistics::EN::Conjunctions do
 				'chicken, a goose, a Dog, and a goose' )
 		end
 
+		it "omits the indefinite article if :article is `false`" do
+			expect( array.en.conjunction(combine: false, article: false) ).to eq(
+				'cat, dog, fox, dog, chicken, chicken, Fox, '\
+				'chicken, goose, Dog, and goose' )
+		end
+
 		it "doesn't combine the differently-cased ones if :casefold is turned off" do
 			expect( array.en.conjunction(:casefold => false) ).to eq(
 				'three chickens, two dogs, two geese, a cat, a fox, a Fox, '\

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linguistics
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Michael Granger
@@ -12,7 +12,7 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTQwMzE5MDQzNTI2WhcNMTUwMzE5MDQzNTI2WjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTUwNDAxMjEyNDEzWhcNMTYwMzMxMjEyNDEzWjA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
   ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb92mkyYwuGBg1oRxt2tkH
   +Uo3LAsaL/APBfSLzy8o3+B3AUHKCjMUaVeBoZdWtMHB75X3VQlvXfZMyBxj59Vo
@@ -23,14 +23,14 @@ cert_chain:
   AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSZ0hCV
   qoHr122fGKelqffzEQBhszAcBgNVHREEFTATgRFnZWRARmFlcmllTVVELm9yZzAc
   BgNVHRIEFTATgRFnZWRARmFlcmllTVVELm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
-  TuL1Bzl6TBs1YEzEubFHb9XAPgehWzzUudjDKzTRd+uyZmxnomBqTCQjT5ucNRph
-  3jZ6bhLNooLQxTjIuHodeGcEMHZdt4Yi7SyPmw5Nry12z6wrDp+5aGps3HsE5WsQ
-  Zq2EuyEOc96g31uoIvjNdieKs+1kE+K+dJDjtw+wTH2i63P7r6N/NfPPXpxsFquo
-  wcYRRrHdR7GhdJeT+V8Q8Bi5bglCUGdx+8scMgkkePc98k9osQHypbACmzO+Bqkv
-  c7ZKPJcWBv0sm81+FCZXNACn2f9jfF8OQinxVs0O052KbGuEQaaiGIYeuuwQE2q6
-  ggcrPfcYeTwWlfZPu2LrBg==
+  lUKo3NXePpuvN3QGsOLJ6QhNd4+Q9Rz75GipuMrCl296V8QFkd2gg9EG44Pqtk+9
+  Zac8TkKc9bCSR0snakp+cCPplVvZF0/gMzkSTUJkDBHlNV16z73CyWpbQQa+iLJ4
+  uisI6gF2ZXK919MYLn2bFJfb7OsCvVfyTPqq8afPY+rq9vlf9ZPwU49AlD8bPRic
+  0LX0gO5ykvETIOv+WgGcqp96ceNi9XVuJMh20uWuw6pmv/Ub2RqAf82jQSbpz09G
+  G8LHR7EjtPPmqCCunfyecJ6MmCNaiJCBxq2NYzyNmluPyHT8+0fuB5kccUVZm6CD
+  xn3DzOkDE6NYbk8gC9rTsA==
   -----END CERTIFICATE-----
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -66,14 +66,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Linguistics is a framework for building linguistic utilities for Ruby objects

metadata.gz.sig

@@ -1,3 +1,3 @@
-�w|�4{8��1E��EH�2�JLg���FP:���k߳��7��v]n�#C���Q��,�I
-.ӘÙ�_�pˡD[�G��N^M��qcL^%�3����0�
-��:�Ôs��vD�+F���u-��r�]Y���S���F_���ת
+��.Ï%�!J�r�u�����}�������+s�UȈ'9�
+��D���j\U�&�k� '�K���/'�K����3��Ya��JQT�
��"'HE?	;L�Y& ?�4���_�����ra��'u 5(S!
���V����]���x9F�;+�餌o�;l(癭�=
+��8�߫C琗qY�W�6���1�wW��{�'e�4MRfL�<:�xV>t�w��K�����/��~��vj߳�՞