deals_with 0.0.4 → 0.0.5

data/lib/deals_with/action_controller/class_methods.rb

@@ -9,8 +9,15 @@ module DealsWith
       end
       
       def deals_with(model_name, options={}, &scope_proc)
-        model_name = model_name.to_s.classify
-        model_class = (model_name.constantize rescue nil)
+        tmp_model_name = model_name.to_s.classify
+        model_class = nil
+        begin
+          model_class = tmp_model_name.constantize
+        rescue
+          tmp_model_name = model_name.to_s.camelize
+          model_class = (tmp_model_name.constantize rescue nil)
+        end
+        model_name = tmp_model_name
         
         unless deals_with_models[model_name]
           
@@ -31,8 +38,8 @@ module DealsWith
       def generate_resource_methods(model_name)
         short_name = model_name.gsub(/.+[:]{2}/, '')
         class_eval %{
-          def #{short_name.tableize}
-            @#{short_name.tableize} ||=
+          def #{short_name.pluralize.underscore}
+            @#{short_name.pluralize.underscore} ||=
               self.class.deals_with_models[#{model_name.inspect}].all(self)
           end
           def #{short_name.underscore}

data/lib/deals_with/resource.rb

@@ -13,7 +13,7 @@ module DealsWith
     
     def initialize(controller_class, model_name, options={}, &scope_proc)
       @controller_class = controller_class
-      @model_name = model_name.to_s.classify
+      @model_name = model_name.to_s
       @options    = options
       @scope_proc = scope_proc
     end
@@ -26,8 +26,12 @@ module DealsWith
     
     def parents
       @parents ||= model_class.reflect_on_all_associations(:belongs_to).collect do |reflection|
-        if reflection.klass.instance_methods.include? model_name.gsub(/.+[:]{2}/, '').tableize
-          controller_class.deals_with_models[reflection.class_name]
+        begin
+          if reflection.klass.instance_methods.include? model_name.gsub(/.+[:]{2}/, '').tableize
+            controller_class.deals_with_models[reflection.class_name]
+          end
+        rescue
+          nil
         end
       end.compact
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deals_with
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Simon Menke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-10 00:00:00 +02:00
+date: 2010-01-05 00:00:00 +01:00
 default_executable: 
 dependencies: []