multitype 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31fd13aa6edb45c77dff6a27f1f0e86205b26058
-  data.tar.gz: 34651ec1ffb2ae2067988b8bbd3d39a17ba0e16f
+  metadata.gz: d0be09639666335fce74afed223dbcd4b43e4a79
+  data.tar.gz: e94e9a6f4817d0640f03bdeb24f462ba599b700e
 SHA512:
-  metadata.gz: 6453bac963334d070f745ae156e3030c30c4a0a9e03192b14d06fe17c5d5632516bf9268d7f579526af7851ba9961c704dec0c9719ed50516a7b061cdd9015d2
-  data.tar.gz: c48478da8607993dfd77103094fff64eca7c8fc2df102e5ad55c671e85352bde606d10908cbd9ee31a199e4f1c938c12e5de0c1eebe6d3d0cd4f403336061dec
+  metadata.gz: 08737b68bef83c843befce142e19a756163a19c51a6a2a60d835bc6ff07261678938540ef93a81d268970a40be361ece20aa86fc3aaadf4c30f76d6a962f2e31
+  data.tar.gz: ee82b279a1450e96a347dcad1f76cde7c8ae4a1a4fc67336bd045bc838282e9d45aed2a92dbfaac61f9614f8f89e0c467251900b2b73563547eca1694a8a2378

data/lib/multitype.rb

@@ -27,14 +27,22 @@ module Multitype
   module ClassMethods
 
     def type_comparator(type, *comparators)
-      __send__(:attr_accessor, *comparators)
+      new_comparators = comparators.inject({}) do |out, comparator|
+        if comparator.is_a?(Hash)
+          out.merge(comparator)
+        else
+          out.merge({comparator => comparator})
+        end
+      end
+
+      __send__(:attr_accessor, *new_comparators.keys)
       __create_multitype_datastore__
 
       # Get the type name if a typeset is passed as an object
       type = type.type if type.is_a?(Object) && type.respond_to?(:__multitype_typeset__)
 
       # Append to the list comparator columns
-      __update_multitype_cache__(type, :comparators, comparators)
+      __update_multitype_cache__(type, :comparators, new_comparators)
     end
 
     def type_alias(type, *aliases)
@@ -121,11 +129,11 @@ module Multitype
             match = true # Did we find a match
 
             # Loop through the type comparators to find a match
-            __get_multitype_cache__(type, :comparators).each do |comparator|
+            __get_multitype_cache__(type, :comparators).each do |model_comparator, typeset_comparator|
 
               # Check the comparator for a match
-              match = if typeset.respond_to?(comparator) && self.respond_to?(comparator)
-                typeset.__send__(comparator) == self.__send__(comparator)
+              match = if typeset.respond_to?(typeset_comparator) && self.respond_to?(model_comparator)
+                typeset.__send__(typeset_comparator) == self.__send__(model_comparator)
               else
                 false
               end

data/lib/multitype/version.rb

@@ -1,3 +1,3 @@
 module Multitype
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/support/fake_model.rb

@@ -23,6 +23,20 @@ class FakeModel
     end
   end
 
+  type_comparator :apple, compare: :title
+
+  deftype :apple, 'Testing Hash Comparator 1', title: :tree do
+    def run
+      :tree
+    end
+  end
+
+  deftype :apple, 'Testing Hash Comparator 2', title: :pie do
+    def run
+      :pie
+    end
+  end
+
   deftype :general, 'APrefined', class: ATypeSet
   deftype :general, 'BPrefined', class: BTypeSet
 

data/spec/tests/multitype_spec.rb

@@ -36,6 +36,16 @@ describe "Test the multitype with FakeModel" do
     result = FakeModel.new.override.run()
     result.should == :works
   end
+
+  it "Should use a hash for comparing multiple typesets 1" do
+    result = FakeModel.new(:tree).apple.run()
+    result.should == :tree
+  end
+
+  it "Should use a hash for comparing multiple typesets 2" do
+    result = FakeModel.new(:pie).apple.run()
+    result.should == :pie
+  end
 end
 
 describe "Test the multitype with FakeModel2 (inherits FakeModel)" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multitype
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kelly Becker