Changeset 146

Timestamp:

08/15/2006 13:33:54 (2 years ago)

Author:

why

Message:

• lib/camping/db.rb: The create_schema method takes some options now. The :assume option lets you force a default version if no migration table is found. So, if you know that the user has some of the right tables (you deduce that they have version 1.0 tables,) then you can call create_schema :assume => 1.0 and the 1.0 (and below) upgrades will be skipped.
  
• examples/: altered all the examples to use migrations and create_schema :assume.
  

Location:

trunk

Files:

• Rakefile (modified) (1 diff)
• examples/README (modified) (1 diff)
• examples/blog.rb (modified) (2 diffs)
• examples/campsh.rb (modified) (4 diffs)
• examples/tepee.rb (modified) (3 diffs)
• lib/camping/db.rb (modified) (2 diffs)

trunk/Rakefile

@@ -8 +8 @@
 NAME = "camping"
 REV = File.read(".svn/entries")[/committed-rev="(\d+)"/, 1] rescue nil
-VERS = "1.4" + (REV ? ".#{REV}" : "")
+VERS = ENV['VERSION'] || ("1.4" + (REV ? ".#{REV}" : ""))
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
 RDOC_OPTS = ['--quiet', '--title', "Camping, the Documentation",

trunk/examples/README

@@ -2 +2 @@
 
 From this directory, run: `camping .`
+
+NOTE: You'll need the active_record and acts_as_versioned gems installed.

trunk/examples/blog.rb

@@ -13 +13 @@
 
 module Blog::Models
-    def self.schema(&block)
-        @@schema = block if block_given?
-        @@schema
-    end
-  
     class Post < Base; belongs_to :user; end
     class Comment < Base; belongs_to :user; end
     class User < Base; end
-end
-
-Blog::Models.schema do
-    create_table :blog_posts, :force => true do |t|
-      t.column :id,       :integer, :null => false
-      t.column :user_id,  :integer, :null => false
-      t.column :title,    :string,  :limit => 255
-      t.column :body,     :text
-    end
-    create_table :blog_users, :force => true do |t|
-      t.column :id,       :integer, :null => false
-      t.column :username, :string
-      t.column :password, :string
-    end
-    create_table :blog_comments, :force => true do |t|
-      t.column :id,       :integer, :null => false
-      t.column :post_id,  :integer, :null => false
-      t.column :username, :string
-      t.column :body,     :text
-    end
-    execute "INSERT INTO blog_users (username, password) VALUES ('admin', 'camping')"
+
+    class CreateTheBasics < V 1.0
+      def self.up
+        create_table :blog_posts, :force => true do |t|
+          t.column :id,       :integer, :null => false
+          t.column :user_id,  :integer, :null => false
+          t.column :title,    :string,  :limit => 255
+          t.column :body,     :text
+        end
+        create_table :blog_users, :force => true do |t|
+          t.column :id,       :integer, :null => false
+          t.column :username, :string
+          t.column :password, :string
+        end
+        create_table :blog_comments, :force => true do |t|
+          t.column :id,       :integer, :null => false
+          t.column :post_id,  :integer, :null => false
+          t.column :username, :string
+          t.column :body,     :text
+        end
+        User.create :username => 'admin', :password => 'camping'
+      end
+      def self.down
+        drop_table :blog_posts
+        drop_table :blog_users
+        drop_table :blog_comments
+      end
+    end
 end
 
@@ -267 +269 @@
 def Blog.create
     Camping::Models::Session.create_schema
-    unless Blog::Models::Post.table_exists?
-        ActiveRecord::Schema.define(&Blog::Models.schema)
-    end
+    Blog::Models.create_schema :assume => (Blog::Models::Post.table_exists? ? 1.0 : 0.0)
 end
 

trunk/examples/campsh.rb

@@ -23 +23 @@
 
     def self.create
-        unless CampSh::Models::Command.table_exists?
-            ActiveRecord::Schema.define do
-                create_table :campsh_commands, :force => true do |t|
-                    t.column :id,         :integer, :null => false
-                    t.column :author,     :string,  :limit => 40
-                    t.column :name,       :string,  :limit => 255
-                    t.column :created_at, :datetime
-                    t.column :doc,        :text
-                    t.column :code,       :text
-                end
-                CampSh::Models::Command.create_versioned_table
-            end
-        end
+        Models.create_schema :assume => (Models::Command.table_exists? ? 1.0 : 0.0)
     end
 end
@@ -44 +32 @@
         validates_presence_of :author
         acts_as_versioned
+    end
+    class CreateBasics < V 1.0
+        def self.up
+            create_table :campsh_commands, :force => true do |t|
+                t.column :id,         :integer, :null => false
+                t.column :author,     :string,  :limit => 40
+                t.column :name,       :string,  :limit => 255
+                t.column :created_at, :datetime
+                t.column :doc,        :text
+                t.column :code,       :text
+            end
+            Command.create_versioned_table
+            Command.reset_column_information
+        end
+        def self.down
+            drop_table :campsh_commands
+            Command.drop_versioned_table
+        end
     end
 end
@@ -128 +134 @@
             @cmd = @cmd.versions.find_by_version(version) unless version.nil? or version == @cmd.version.to_s
             @title = "Editing #{name}"
-            @author = cookies.cmd_author or CampSh::ANON
+            @author = @cookies.cmd_author || CampSh::ANON
             render :edit
         end
         def post(name)
-            if input.author != CampSh::ANON
-                cookies.cmd_author = input.author
-            end
+            @cookies.cmd_author = input.command.author
             Command.find_or_create_by_name(name).update_attributes(input.command)
             redirect Show, name
@@ -560 +564 @@
                            :class => "navlink", :accesskey => "E"
             unless @version.version == 1
+                text " | "
                 a 'Back in time', :href => R(Show, @version.name, @version.version-1)
             end
             unless @version.version == @cmd.version
+                text " | "
                 a 'Next',    :href => R(Show, @version.name, @version.version+1)
+                text " | "
                 a 'Current', :href => R(Show, @version.name)
             end
-            small "(#{ @cmd.version.size } revisions)"
+            if @cmd.versions.size > 1
+                small "(#{ @cmd.versions.size } revisions)"
+            end
         end
     end

trunk/examples/tepee.rb

@@ -6 +6 @@
 
 module Tepee::Models
-  def self.schema(&block)
-    @@schema = block if block_given?
-    @@schema
-  end
-  
+
   class Page < Base
     PAGE_LINK = /\[\[([^\]|]*)[|]?([^\]]*)\]\]/
@@ -17 +13 @@
     acts_as_versioned
   end
-end
 
-Tepee::Models.schema do
-  create_table :tepee_pages, :force => true do |t|
-    t.column :title, :string, :limit => 255
-    t.column :body, :text
+  class CreateTepee < V 1.0
+    def self.up
+      create_table :tepee_pages, :force => true do |t|
+        t.column :title, :string, :limit => 255
+        t.column :body, :text
+      end
+      Page.create_versioned_table
+      Page.reset_column_information
+    end
+    def self.down
+      drop_table :tepee_pages
+      Page.drop_versioned_table
+    end
   end
-  Tepee::Models::Page.create_versioned_table
+
 end
 
@@ -130 +134 @@
 
 def Tepee.create
-  unless Tepee::Models::Page.table_exists?
-    ActiveRecord::Schema.define(&Tepee::Models.schema)
-    Tepee::Models::Page.reset_column_information
-  end
+  Tepee::Models.create_schema :assume => (Tepee::Models::Page.table_exists? ? 1.0 : 0.0)
 end
 

trunk/lib/camping/db.rb

@@ -25 +25 @@
   end
 
-  def self.create_schema
+  def self.create_schema(opts = {})
+    opts[:assume] ||= 0
+    opts[:version] ||= @final
     if @migrations
       unless SchemaInfo.table_exists?
@@ -35 +37 @@
       end
 
-      si = SchemaInfo.find(:first) || SchemaInfo.new(:version => 0)
+      si = SchemaInfo.find(:first) || SchemaInfo.new(:version => opts[:assume])
       @migrations.each do |k|
         k.migrate(:up) if si.version < k.version
       end
-      si.update_attributes(:version => @final)
+      si.update_attributes(:version => opts[:version])
     end
   end