garden 0.0.5.pre → 0.0.6.pre

data/lib/garden/mediators.rb

@@ -2,22 +2,50 @@ module Garden
   module Mediators
     class Table
       
-      def self.parse_table_name namish
-        namish.parameterize.underscore
+      # def self.parse_table_name namish
+      #   namish.parameterize.underscore
+      # end
+      
+      def self.find_model_class namish
+        clazz = nil
+        namish = namish.singularize
+        
+        begin
+          # try the format as it should be. Camelcase, and with :: or / for modules
+          # Module::Classname
+          clazz = namish.underscore.classify.constantize
+        rescue
+          begin
+            # try the format "Class Name" by turning spaced words into camelcase
+            clazz = namish.parameterize.underscore.classify.constantize
+          rescue
+            begin
+              # try the format "Class Name" by turning spaced words into module separators
+              clazz = namish.gsub(/ /, "/").underscore.classify.constantize
+            rescue
+              puts "Nope"
+            end
+          end
+        end
+        clazz
       end
       
       def initialize namish
         
-        @name = Table.parse_table_name namish
+        @clazz = Table.find_model_class namish
         
-        # Get the ActiveRecord model from the tablename.
-        begin
-          @clazz = @name.classify.constantize
-          raise "Class #{@clazz.to_s} is not an ActiveRecord subclass." unless @clazz.new.is_a?(ActiveRecord::Base)
-        rescue Exception => e
-          puts " ** Could not derive ActiveRecord model from the provided name: #{namish}. Exception: #{e.message}"
+        if @clazz.nil? || !@clazz.new.is_a?(ActiveRecord::Base)
+          raise "Class '#{namish}' could not be parsed to an ActiveRecord subclass."
         end
         
+        # Get the ActiveRecord model from the tablename.
+        # begin
+        #   @clazz = @name.classify.constantize
+        #   raise "Class #{@clazz.to_s} is not an ActiveRecord subclass." unless @clazz.new.is_a?(ActiveRecord::Base)
+        # rescue Exception => e
+        #   puts " ** Could not derive ActiveRecord model from the provided name: #{namish}. Exception: #{e.message}"
+        # end
+        
         @instance = @clazz.new
         
       end
@@ -43,6 +71,15 @@ module Garden
         Instance.new @clazz, attributes
       end
 
+
+      def class_exists?(name)
+        begin
+          true if Kernel.const_get(name)
+        rescue NameError
+          false
+        end
+      end
+      
     end
   end
 end

data/lib/garden/version.rb

@@ -1,3 +1,3 @@
 module Garden
-  VERSION = "0.0.5.pre"
+  VERSION = "0.0.6.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garden
 version: !ruby/object:Gem::Version
-  version: 0.0.5.pre
+  version: 0.0.6.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-16 00:00:00.000000000Z
+date: 2011-09-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &70343008328480 !ruby/object:Gem::Requirement
+  requirement: &70113378924860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70343008328480
+  version_requirements: *70113378924860
 description: ! 'Allows you to organize your seeds in different formats. Typical seeds.rb,
   yaml fixtures, and a variety of spreadsheet formats. '
 email: