mapping 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 518729390fbe28863bc436cefe3393ec40d10a87
-  data.tar.gz: e4f1954ce1c52b3081b6e660566cf92ae2116380
+  metadata.gz: 38e9698d7009c8d838738039e9ba4c29f44d5790
+  data.tar.gz: db7a33ede063bb85ac88333b6ffb5995b69e37bb
 SHA512:
-  metadata.gz: 5fbd2d73f546d8ebde886914c10d2ec4e7b6828553d3411b014833864b3a398bc3f1ad5e9bb037c15ec283e2c1d33adffe7139e62c66d6ba915217f092ff414e
-  data.tar.gz: e89ea99b339695029eebb3ae0daa4008579dd287ff55ef98a5a00eb7f58aff566c9bc4c808d133cd613b50b64499440a1b0d6482a8a66be821108eed9e50b191
+  metadata.gz: a08b617fa48172c3dcea82eea31724964d2df9e3a9010ad281e80b58d0bd9b56a22575960d743ca30c15d678475ae9a1901a5c89aa444aacbb4db469c7ce078e
+  data.tar.gz: 0714653af91b12b198574f05b17f68e0440931f438d59418339109f816a8a128e510a739b8026eb1c061930f84ed86e393de14f12bbe052375f6c6814bb321a9

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
   - 2.3.0
+  - 2.4.0
 env: COVERAGE=true

data/lib/mapping/descendants.rb

@@ -0,0 +1,25 @@
+# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Mapping
+	def self.lookup_descendants(klass)
+		ObjectSpace.each_object(Class).select{|other| other < klass}
+	end
+end

data/lib/mapping/model.rb

@@ -33,22 +33,24 @@ module Mapping
 		end
 		
 		# Add a mapping from a given input class to a specific block.
-		def self.map(klass, &block)
-			method_name = self.method_for_mapping(klass)
-			define_method(method_name, &block)
+		def self.map(*klasses, &block)
+			klasses.each do |klass|
+				method_name = self.method_for_mapping(klass)
+				define_method(method_name, &block)
+			end
 		end
 		
 		# Sometimes you just want to map things to themselves (the identity function). This makes it convenient to specify a lot of identity mappings.
 		def self.map_identity(*klasses)
-			klasses.each do |klass|
-				self.map(klass) {|value| value}
-			end
+			self.map(*klasses) {|value| value}
 		end
 		
 		# Remove a mapping, usually an inherited one, which you don't want.
-		def self.unmap(klass)
-			method_name = self.method_for_mapping(klass)
-			undef_method(method_name)
+		def self.unmap(*klasses)
+			klasses.each do |klass|
+				method_name = self.method_for_mapping(klass)
+				undef_method(method_name)
+			end
 		end
 		
 		# The primary function, which maps an input object to an output object.

data/lib/mapping/object_model.rb

@@ -23,15 +23,7 @@ require_relative 'model'
 module Mapping
 	# Provides a useful starting point for object based mappings. Handles, true, false, nil, Array and Hash by default, simply by passing through.
 	class ObjectModel < Model
-		map_identity(NilClass, TrueClass, FalseClass, Float, Rational, String)
-		
-		if 0.class == Integer
-			# Ruby 2.4+ Integer unification
-			map_identity(Integer)
-		else
-			# Ruby < 2.4
-			map_identity(Fixnum, Bignum)
-		end
+		map_identity(NilClass, TrueClass, FalseClass, String, *Mapping.lookup_descendants(Numeric))
 		
 		map(Array) do |items|
 			items.collect{|object| map(object)}

data/lib/mapping/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Mapping
-	VERSION = "1.0.1"
+	VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mapping
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,7 @@ files:
 - README.md
 - Rakefile
 - lib/mapping.rb
+- lib/mapping/descendants.rb
 - lib/mapping/model.rb
 - lib/mapping/object_model.rb
 - lib/mapping/version.rb