extjs-mvc 0.3.6 → 0.3.7

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/lib/extjs/data/store.rb

@@ -69,19 +69,30 @@ module ExtJS::Data
 private
 
     def self.get_controller(name)
-      if (defined?(Rails))
-        "#{name.to_s.camelize}Controller".constantize
-      else
-        Extlib::Inflection.constantize("#{Extlib::Inflection.camelize(name)}")
+      begin
+        if (defined?(Rails))
+          "#{name.to_s.camelize}Controller".constantize
+        else
+          Extlib::Inflection.constantize("#{Extlib::Inflection.camelize(name)}")
+        end
+      rescue NameError
+        throw NameError.new("ExtJS::Store failed with an unknown controller named '#{name.to_s}'")
       end
     end
-
+        
     def self.get_model(controller, model)
-      if (defined?(Rails))
-        ((model) ? model : controller.singularize).camelize.constantize
-      else
-        Extlib::Inflection.constantize(Extlib::Inflection.camelize(((model) ? model : Extlib::Inflection.singularize(controller))))
+      unless model.class == Class
+        begin
+          if (defined?(Rails))
+            model = ((model) ? model : controller.singularize).camelize.constantize
+          else
+            model = Extlib::Inflection.constantize(Extlib::Inflection.camelize(((model) ? model : Extlib::Inflection.singularize(controller))))
+          end
+        rescue NameError => e
+          throw NameError.new("EXTJS::Store found an unknown model #{model.to_s})")
+        end
       end
+      model
     end
     
     def proxy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: extjs-mvc
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Chris Scott
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 -05:00
+date: 2010-02-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency