mongoid-dsl 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d37b0c5bd20a3683ae4c76517067425243b05167
-  data.tar.gz: a4daa266cce7305dc49cbe06d8e2b58ae18955b0
+  metadata.gz: f39e270dbec92926dffe278614230fcc9e404bba
+  data.tar.gz: e5239ffcf0fb792376df65b1339a2627d26569f3
 SHA512:
-  metadata.gz: 5f40b0a3a3e312ea6826548c6aa0f60f5b91075101672c199014122efcadca90c8b3c4f3b91625781a85003a7fad724bf89097dd75db0665e10b8a7548554f54
-  data.tar.gz: d24096d26076067c67594216aa4086cbfb5c2bd650d66f114a45ab855203128e7c440f4571cbbe68ae3f7659adae27ef69c0c190df81f62bd2a3c7f4fc9a5564
+  metadata.gz: 13aa7bc9b3a32a975714372d7cc5c9bb55ce83525f13723a81afe5260fb5c530317e4596b79279241018137131362ad5a832494e15f4df60b4130c1983653589
+  data.tar.gz: 97449c93b223e46603958d97353c8b54bd749972692b3f6d1e50f348d506c875e73e907d0a14b2505101bda0d5a767c68f1b2c9c297909eda44fae0c362243f5

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.5

data/lib/mongoid-dsl/monkey.rb

@@ -587,32 +587,30 @@ module Mongoid
         # convert mongoid name
         def convert_model_name
 
-          unless self.class <= Class || self.class <= String || self.class <= Symbol || self.class <= NilClass
-            raise ArgumentError, "invalid input, must be Class or String: => #{self.class} (#{self})"
+          unless self.class <= ::Class || self.class <= ::String || self.class <= ::Symbol || self.class <= ::NilClass
+            return super;# raise ArgumentError, "invalid input, must be Class or String: => #{self.class} (#{self})"
           end
 
-          if self.class <= NilClass
+          if self.class <= ::NilClass
             return nil
           end
 
-          case self.class.to_s
+          case true
 
-            when "Class"
+            when self.class == ::Class
               return self.to_s.split('::').last.underscore
 
-            when "String","Symbol"
-              Mongoid.models.each do |one_model_name|
-                if  self.to_s == one_model_name.to_s.split('::').last.underscore || \
-                    self.to_s == one_model_name.to_s.split('::').last.underscore+('s')
-
-                  return one_model_name.to_s.constantize
+            when ![ ::Symbol, ::String].select{ |klass|self.class <= klass }.empty?
 
+              Mongoid.models.each do |model_name|
+                mongoid_model_name= model_name.mongoid_name
+                unless [mongoid_model_name,mongoid_model_name+'s'].select{|mn| self.to_s == mn }.empty?
+                  return model_name.to_s.constantize
                 end
               end
 
               return self.to_s.split('::').last.underscore
 
-
           end
 
           return nil
@@ -622,18 +620,14 @@ module Mongoid
         alias :mongoize_name        :convert_model_name
         alias :mongoid_name         :convert_model_name
 
-        alias :mongoid_name_convert :convert_model_name
-
       end
 
     end
 
     # for manual include
-    begin
-      self.__send__ :include, Mongoid::DSL::Document::Include
-      def self.included klass
-        klass.__send__ :extend,Mongoid::DSL::Document::Extend
-      end
+    self.__send__ :include, Mongoid::DSL::Document::Include
+    def self.included klass
+      klass.__send__ :extend,Mongoid::DSL::Document::Extend
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-dsl
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler