dr_nic_magic_models 0.9.1 → 0.9.2

data/History.txt

@@ -1,3 +1,12 @@
+*** 0.9.2 / 2007-4-30
+
++ 1 major buxfix:
+    + #generate_validations now works if you haven't already created a connection to the database; previously
+			validations wouldn't get created until you had already established the connection; now it does it for 
+			you if its not already established
+		+ Associations can be generated via the assignment methods, e.g. @membership.group= will generate the "belongs_to :group" association now. This allows the website tutorial to work correctly! Yay. That is, you can now do: Membership.create(:person => person, :group => group)
+		+ has_many's should work now
+
 *** 0.9.1 / 2007-4-11
 
 + 1 minor enhancement:

data/lib/dr_nic_magic_models/magic_model.rb

@@ -47,9 +47,10 @@ module DrNicMagicModels::MagicModel
     end
     
     def find_belongs_to(method, *args, &block)
+      method_clean = clean_method method
       fkc = 
         begin
-          self.class.connection.foreign_key_constraints(self.class.table_name, method) 
+          self.class.connection.foreign_key_constraints(self.class.table_name, method_clean) 
         rescue NotImplementedError 
           nil
         end
@@ -59,19 +60,20 @@ module DrNicMagicModels::MagicModel
           :foreign_key => fkc.first.foreign_key, 
           :class_name => self.class.class_name(fkc.first.reference_table)}
       else
-        foreign_key = self.class.columns.select {|column| column.name == method.to_s.foreign_key}.first
+        foreign_key = self.class.columns.select {|column| column.name == method_clean.to_s.foreign_key}.first
       end
       options ||= {}
-      return add_belongs_to(method, options, *args, &block) if foreign_key
+      return add_belongs_to(method, method_clean, options, *args, &block) if foreign_key
     end
 
-    def add_belongs_to(method, options, *args, &block)
-      self.class.send 'belongs_to', method, options rescue puts $!
+    def add_belongs_to(method, method_clean, options, *args, &block)
+      self.class.send 'belongs_to', method_clean.to_sym, options rescue puts $!
       self.send(method, *args, &block)
     end
     
     def find_has_some(method, *args, &block)
-      fkc = [method.to_s.pluralize, method.to_s.singularize].inject({}) do |pair, table_name|
+      method_clean = clean_method method
+      fkc = [method_clean.to_s.pluralize, method_clean.to_s.singularize].inject({}) do |pair, table_name|
         fkc = begin
                 self.class.connection.foreign_key_constraints(table_name)
               rescue NotImplementedError
@@ -91,17 +93,16 @@ module DrNicMagicModels::MagicModel
         end
       end
       unless foreign_key
-        klass = Module.const_get method.to_s.downcase.singularize.camelize rescue nil
+        klass = Module.const_get method_clean.to_s.downcase.singularize.camelize rescue nil
         foreign_key = klass.columns.select {|column| column.name == self.class.name.foreign_key}.first if klass
       end
       options ||= {}
-      return add_has_some(method, options, *args, &block) if foreign_key
+      return add_has_some(method, method_clean, options, *args, &block) if foreign_key
     end
           
-    def add_has_some(method, options, *args, &block)
-      _method = method.to_s
-      association = _method.singularize == _method ? 'has_one' : 'has_many'
-      self.class.send association, method, options rescue puts $!
+    def add_has_some(method, method_clean, options, *args, &block)
+      association = method_clean.singularize == method_clean ? 'has_one' : 'has_many'
+      self.class.send association, method_clean.to_sym, options rescue puts $!
       self.send(method, *args, &block)
     end
     
@@ -119,9 +120,14 @@ module DrNicMagicModels::MagicModel
     end
     
     def add_has_some_through(join_table, method, *args, &block)
-      puts "#{self.class}.has_many #{method.inspect}, #{join_table.inspect}, #{args.inspect}"
       self.class.send 'has_many', method, :through => join_table.to_sym
       self.send(method, *args, &block)
     end
+    
+  private
+    
+    def clean_method(method)
+      method.to_s.gsub(/=$/,'') # remove any = from the end of the method name
+    end
   end
 end

data/lib/dr_nic_magic_models/validations.rb

@@ -5,6 +5,9 @@ module DrNicMagicModels
 
       logger = DrNicMagicModels::Logger
 
+      # Ensure that the connection to db is established, else validations don't get created.
+      ActiveRecord::Base.connection
+      
       # Code reworked from http://www.redhillconsulting.com.au/rails_plugins.html
       # Thanks Red Hill Consulting for using an MIT licence :o)
 

data/lib/dr_nic_magic_models/version.rb

@@ -2,7 +2,7 @@ module DrNicMagicModels #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/website/index.html

@@ -275,7 +275,7 @@ demonstrated above) to have the brilliantly simple support that Rails/ActiveReco
 </pre></p>
 
 
-	<p>The final association trick is a ripper. Automatic generation of <code>has_many :through</code> associations&#8230;</p>
+	<p>That final association trick is a ripper. Automatic generation of <code>has_many :through</code> associations&#8230;</p>
 
 
 	<p><pre class="syntax">
@@ -390,7 +390,7 @@ other stories and things.</p>
 	<p>Comments are welcome. Send an email to <a href="mailto:drnicwilliams@gmail.com">Dr Nic Williams</a>
 or via his blog at <a href="http://www.drnicwilliams.com">http://www.drnicwilliams.com</a></p>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 11th April 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 30th April 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -200,7 +200,7 @@ group.memberships
 </pre>
 
 
-The final association trick is a ripper. Automatic generation of <code>has_many :through</code> associations...
+That final association trick is a ripper. Automatic generation of <code>has_many :through</code> associations...
 
 <pre syntax="ruby">
 >> person.groups

data/website/version-raw.js

@@ -1,3 +1,3 @@
 // Version JS file
-var version = "0.9.1";
+var version = "0.9.2";
 MagicAnnouncement.show('magicmodels', version);

data/website/version.js

@@ -1,4 +1,4 @@
 // Version JS file
-var version = "0.9.1";
+var version = "0.9.2";
 
 document.write(" - " + version);

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: dr_nic_magic_models
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
-date: 2007-04-11 00:00:00 +02:00
+  version: 0.9.2
+date: 2007-04-30 00:00:00 +02:00
 summary: Dr Nic's Magic Models - Invisible validations, assocations and Active Record models themselves!
 require_paths: 
 - lib