mack-active_record 0.7.0.1 → 0.7.1

data/doc/classes/Mack/Database/Migrations.html

@@ -150,7 +150,7 @@ href="Migrations.html#M000011">version</a>
 <pre>
    <span class="ruby-comment cmt"># File lib/mack-active_record/database_migrations.rb, line 6</span>
 6:       <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">migrate</span>
-7:         <span class="ruby-constant">ActiveRecord</span><span class="ruby-operator">::</span><span class="ruby-constant">Migrator</span>.<span class="ruby-identifier">up</span>(<span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span>(<span class="ruby-constant">Mack</span>.<span class="ruby-identifier">root</span>, <span class="ruby-value str">&quot;db&quot;</span>, <span class="ruby-value str">&quot;migrations&quot;</span>))
+7:         <span class="ruby-constant">ActiveRecord</span><span class="ruby-operator">::</span><span class="ruby-constant">Migrator</span>.<span class="ruby-identifier">up</span>(<span class="ruby-constant">Mack</span><span class="ruby-operator">::</span><span class="ruby-constant">Paths</span>.<span class="ruby-identifier">db</span>(<span class="ruby-value str">&quot;migrations&quot;</span>))
 8:       <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -179,7 +179,7 @@ Rolls back the database by the specified number of steps. Default is 1
 12:         <span class="ruby-identifier">cur_version</span> = <span class="ruby-identifier">version</span>.<span class="ruby-identifier">to_i</span>
 13:         <span class="ruby-identifier">target_version</span> = <span class="ruby-identifier">cur_version</span> <span class="ruby-operator">-</span> <span class="ruby-identifier">step</span> 
 14:         <span class="ruby-identifier">target_version</span> = <span class="ruby-value">0</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">target_version</span> <span class="ruby-operator">&lt;</span> <span class="ruby-value">0</span>
-15:         <span class="ruby-constant">ActiveRecord</span><span class="ruby-operator">::</span><span class="ruby-constant">Migrator</span>.<span class="ruby-identifier">down</span>(<span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span>(<span class="ruby-constant">Mack</span>.<span class="ruby-identifier">root</span>, <span class="ruby-value str">&quot;db&quot;</span>, <span class="ruby-value str">&quot;migrations&quot;</span>), <span class="ruby-identifier">target_version</span>)
+15:         <span class="ruby-constant">ActiveRecord</span><span class="ruby-operator">::</span><span class="ruby-constant">Migrator</span>.<span class="ruby-identifier">down</span>(<span class="ruby-constant">Mack</span><span class="ruby-operator">::</span><span class="ruby-constant">Paths</span>.<span class="ruby-identifier">db</span>(<span class="ruby-value str">&quot;migrations&quot;</span>), <span class="ruby-identifier">target_version</span>)
 16:       <span class="ruby-keyword kw">end</span>
 </pre>
           </div>

data/doc/classes/Mack/Database.html

@@ -224,7 +224,7 @@ Dumps the structure of the database to a file.
 67:       <span class="ruby-constant">Mack</span><span class="ruby-operator">::</span><span class="ruby-constant">Database</span>.<span class="ruby-identifier">establish_connection</span>(<span class="ruby-identifier">env</span>)
 68:       <span class="ruby-identifier">dbs</span> = <span class="ruby-identifier">db_settings</span>(<span class="ruby-identifier">env</span>)
 69:       <span class="ruby-identifier">structure</span> = <span class="ruby-value str">&quot;&quot;</span>
-70:       <span class="ruby-identifier">output_file</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span>(<span class="ruby-constant">Mack</span>.<span class="ruby-identifier">root</span>, <span class="ruby-value str">&quot;db&quot;</span>, <span class="ruby-node">&quot;#{env}_schema_structure.sql&quot;</span>)
+70:       <span class="ruby-identifier">output_file</span> = <span class="ruby-constant">Mack</span><span class="ruby-operator">::</span><span class="ruby-constant">Paths</span>.<span class="ruby-identifier">db</span>(<span class="ruby-node">&quot;#{env}_schema_structure.sql&quot;</span>)
 71:       <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">dbs</span>[<span class="ruby-identifier">:adapter</span>]
 72:       <span class="ruby-keyword kw">when</span> <span class="ruby-value str">&quot;mysql&quot;</span>
 73:         <span class="ruby-constant">File</span>.<span class="ruby-identifier">open</span>(<span class="ruby-identifier">output_file</span>, <span class="ruby-value str">&quot;w&quot;</span>) {<span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span> <span class="ruby-identifier">f</span>.<span class="ruby-identifier">puts</span> <span class="ruby-constant">ActiveRecord</span><span class="ruby-operator">::</span><span class="ruby-constant">Base</span>.<span class="ruby-identifier">connection</span>.<span class="ruby-identifier">structure_dump</span>}

data/doc/classes/Mack/ViewHelpers/ActiveRecordHelpers.html

@@ -168,7 +168,7 @@
 55:         <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">app_errors</span>.<span class="ruby-identifier">empty?</span>
 56:           <span class="ruby-identifier">app_errors</span>.<span class="ruby-identifier">uniq!</span>
 57:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">view_partial</span>.<span class="ruby-identifier">nil?</span>
-58:             <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span>(<span class="ruby-constant">Mack</span>.<span class="ruby-identifier">root</span>, <span class="ruby-value str">&quot;app&quot;</span>, <span class="ruby-value str">&quot;views&quot;</span>, <span class="ruby-value str">&quot;application&quot;</span>, <span class="ruby-value str">&quot;_error_messages.html.erb&quot;</span>))
+58:             <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-constant">Mack</span><span class="ruby-operator">::</span><span class="ruby-constant">Paths</span>.<span class="ruby-identifier">views</span>(<span class="ruby-value str">&quot;application&quot;</span>, <span class="ruby-value str">&quot;_error_messages.html.erb&quot;</span>))
 59:               <span class="ruby-identifier">render</span>(<span class="ruby-identifier">:partial</span>, <span class="ruby-value str">&quot;application/error_messages&quot;</span>, <span class="ruby-identifier">:locals</span> =<span class="ruby-operator">&gt;</span> {<span class="ruby-identifier">:errors</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">app_errors</span>})
 60:             <span class="ruby-keyword kw">else</span>
 61:               <span class="ruby-identifier">render</span>(<span class="ruby-identifier">:inline</span>, <span class="ruby-constant">DEFAULT_PARTIAL</span>, <span class="ruby-identifier">:locals</span> =<span class="ruby-operator">&gt;</span> {<span class="ruby-identifier">:errors</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">app_errors</span>})

data/doc/created.rid

@@ -1 +1 @@
-Fri, 29 Aug 2008 11:35:52 -0400
+Mon, 08 Sep 2008 10:56:06 -0400

data/doc/files/README.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Aug 25 10:11:26 -0400 2008</td>
+      <td>Mon Sep 08 10:32:41 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/mack-active_record/database_migrations_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Aug 29 11:33:20 -0400 2008</td>
+      <td>Mon Sep 08 10:32:41 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/mack-active_record/database_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Aug 29 11:33:20 -0400 2008</td>
+      <td>Mon Sep 08 10:32:41 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/mack-active_record/generators_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Aug 29 11:33:20 -0400 2008</td>
+      <td>Mon Sep 08 10:32:41 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/mack-active_record/helpers/orm_helpers_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Aug 29 11:33:20 -0400 2008</td>
+      <td>Mon Sep 08 10:32:41 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/mack-active_record/migration_generator/migration_generator_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Aug 25 10:11:27 -0400 2008</td>
+      <td>Mon Sep 08 10:32:41 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/mack-active_record/model_generator/model_generator_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Aug 25 10:11:27 -0400 2008</td>
+      <td>Mon Sep 08 10:32:41 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/mack-active_record/test_extensions_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Aug 29 11:33:20 -0400 2008</td>
+      <td>Mon Sep 08 10:32:42 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/mack-active_record_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Aug 29 11:33:20 -0400 2008</td>
+      <td>Mon Sep 08 10:32:41 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/mack-active_record_tasks_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Aug 29 11:33:20 -0400 2008</td>
+      <td>Mon Sep 08 10:32:42 -0400 2008</td>
     </tr>
     </table>
   </div>

data/lib/mack-active_record/database.rb

@@ -67,7 +67,7 @@ module Mack
       Mack::Database.establish_connection(env)
       dbs = db_settings(env)
       structure = ""
-      output_file = File.join(Mack.root, "db", "#{env}_schema_structure.sql")
+      output_file = Mack::Paths.db("#{env}_schema_structure.sql")
       case dbs[:adapter]
       when "mysql"
         File.open(output_file, "w") {|f| f.puts ActiveRecord::Base.connection.structure_dump}
@@ -82,7 +82,7 @@ module Mack
     
     private
     def self.db_settings(env)
-      dbs = YAML::load(ERB.new(IO.read(File.join(Mack.root, "config", "database.yml"))).result)
+      dbs = YAML::load(ERB.new(IO.read(Mack::Paths.config("database.yml"))).result)
       dbs = dbs[env]
       dbs.symbolize_keys!
       return dbs

data/lib/mack-active_record/database_migrations.rb

@@ -4,7 +4,7 @@ module Mack
       
       # Migrates the database to the latest version
       def self.migrate
-        ActiveRecord::Migrator.up(File.join(Mack.root, "db", "migrations"))
+        ActiveRecord::Migrator.up(Mack::Paths.db("migrations"))
       end
       
       # Rolls back the database by the specified number of steps. Default is 1
@@ -12,7 +12,7 @@ module Mack
         cur_version = version.to_i
         target_version = cur_version - step 
         target_version = 0 if target_version < 0
-        ActiveRecord::Migrator.down(File.join(Mack.root, "db", "migrations"), target_version)
+        ActiveRecord::Migrator.down(Mack::Paths.db("migrations"), target_version)
       end
       
       # Not implemented

data/lib/mack-active_record/helpers/orm_helpers.rb

@@ -55,7 +55,7 @@ module Mack
         unless app_errors.empty?
           app_errors.uniq!
           if view_partial.nil?
-            if File.exist?(File.join(Mack.root, "app", "views", "application", "_error_messages.html.erb"))
+            if File.exist?(Mack::Paths.views("application", "_error_messages.html.erb"))
               render(:partial, "application/error_messages", :locals => {:errors => app_errors})
             else
               render(:inline, DEFAULT_PARTIAL, :locals => {:errors => app_errors})

data/lib/mack-active_record.rb

@@ -23,6 +23,4 @@ end
 
 ActiveRecord::Base.logger = Mack.logger
 
-Mack::Database.establish_connection(Mack.env)
-
-require File.join(File.dirname(__FILE__), 'mack-active_record_tasks')
+Mack::Database.establish_connection(Mack.env)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-active_record
 version: !ruby/object:Gem::Version 
-  version: 0.7.0.1
+  version: 0.7.1
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-29 00:00:00 -04:00
+date: 2008-09-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.0.1
+        version: 0.7.1
     version: 
 description: "mack-active_record was developed by: markbates"
 email: mark@mackframework.com