[68973] branches/gsoc10-mpwa
jrozner at macports.org
jrozner at macports.org
Fri Jun 18 20:09:20 PDT 2010
Revision: 68973
http://trac.macports.org/changeset/68973
Author: jrozner at macports.org
Date: 2010-06-18 20:09:16 -0700 (Fri, 18 Jun 2010)
Log Message:
-----------
modified schema to create one to many mappings for categories
Modified Paths:
--------------
branches/gsoc10-mpwa/app/models/port.rb
branches/gsoc10-mpwa/app/views/ports/show.html.erb
branches/gsoc10-mpwa/db/schema.rb
Added Paths:
-----------
branches/gsoc10-mpwa/app/models/category.rb
branches/gsoc10-mpwa/app/models/supplimental_category.rb
branches/gsoc10-mpwa/db/migrate/20100616212915_create_supplimental_categories.rb
branches/gsoc10-mpwa/db/migrate/20100616213022_create_categories.rb
branches/gsoc10-mpwa/db/migrate/20100616213132_update_port_for_new_category_implementation.rb
branches/gsoc10-mpwa/test/fixtures/categories.yml
branches/gsoc10-mpwa/test/fixtures/supplimental_categories.yml
branches/gsoc10-mpwa/test/unit/category_test.rb
branches/gsoc10-mpwa/test/unit/supplimental_category_test.rb
Added: branches/gsoc10-mpwa/app/models/category.rb
===================================================================
--- branches/gsoc10-mpwa/app/models/category.rb (rev 0)
+++ branches/gsoc10-mpwa/app/models/category.rb 2010-06-19 03:09:16 UTC (rev 68973)
@@ -0,0 +1,2 @@
+class Category < ActiveRecord::Base
+end
Modified: branches/gsoc10-mpwa/app/models/port.rb
===================================================================
--- branches/gsoc10-mpwa/app/models/port.rb 2010-06-19 00:26:35 UTC (rev 68972)
+++ branches/gsoc10-mpwa/app/models/port.rb 2010-06-19 03:09:16 UTC (rev 68973)
@@ -2,4 +2,6 @@
has_many :port_dependencies
has_many :dependencies, :through => :port_dependencies
has_many :comments
+ has_one :category
+ has_many :supplimental_categories
end
Added: branches/gsoc10-mpwa/app/models/supplimental_category.rb
===================================================================
--- branches/gsoc10-mpwa/app/models/supplimental_category.rb (rev 0)
+++ branches/gsoc10-mpwa/app/models/supplimental_category.rb 2010-06-19 03:09:16 UTC (rev 68973)
@@ -0,0 +1,2 @@
+class SupplimentalCategory < ActiveRecord::Base
+end
Modified: branches/gsoc10-mpwa/app/views/ports/show.html.erb
===================================================================
--- branches/gsoc10-mpwa/app/views/ports/show.html.erb 2010-06-19 00:26:35 UTC (rev 68972)
+++ branches/gsoc10-mpwa/app/views/ports/show.html.erb 2010-06-19 03:09:16 UTC (rev 68973)
@@ -1,49 +1,51 @@
-<p>
- <b>Name:</b>
- <%=h @port.name %>
-</p>
+<div id="content">
+ <p>
+ <strong>Name:</strong> <%=h @port.name %>
+ </p>
-<p>
- <b>Path:</b>
- <%=h @port.path %>
-</p>
+ <p>
+ <strong>Current Version:</strong> <%=h @port.version %>
+ </p>
-<p>
- <b>Version:</b>
- <%=h @port.version %>
-</p>
+ <p>
+ <strong>Licenses:</strong> <%=h @port.licenses %>
+ </p>
-<p>
- <b>Description:</b>
- <%=h @port.description %>
-</p>
+ <p>
+ <strong>Categories:</strong> <%=h @port.categories %>
+ </p>
-<p>
- <b>Licenses:</b>
- <%=h @port.licenses %>
-</p>
+ <p>
+ <strong>Variants:</strong> <%=h @port.variants %>
+ </p>
-<p>
- <b>Categories:</b>
- <%=h @port.categories %>
-</p>
+ <p>
+ <strong>Dependencies:</strong>
+ <% @port.dependencies.each do |dependency| %>
+ <%= link_to dependency.name, dependency %>
+ <% end %>
+ </p>
-<p>
- <b>Variants:</b>
- <%=h @port.variants %>
-</p>
-
-<% form_for([@port, @comment]) do |f| %>
- <%= f.error_messages %>
-
<p>
- <%= f.label :body, "Text" %><br />
- <%= f.text_area :body %>
+ <strong>Description:</strong> <%=h @port.description %>
</p>
+
<p>
- <%= f.submit 'Create' %>
+ <strong>SVN Path:</strong> <%=h @port.path %>
</p>
-<% end %>
-<%= link_to 'Edit', edit_port_path(@port) %> |
-<%= link_to 'Back', ports_path %>
\ No newline at end of file
+ <% form_for([@port, @comment]) do |f| %>
+ <%= f.error_messages %>
+
+ <p>
+ <%= f.label :body, "<strong>Comment</strong>" %><br />
+ <%= f.text_area :body %>
+ </p>
+ <p>
+ <%= f.submit 'Create' %>
+ </p>
+ <% end %>
+
+ <%= link_to 'Edit', edit_port_path(@port) %> |
+ <%= link_to 'Back', ports_path %>
+</div>
\ No newline at end of file
Added: branches/gsoc10-mpwa/db/migrate/20100616212915_create_supplimental_categories.rb
===================================================================
--- branches/gsoc10-mpwa/db/migrate/20100616212915_create_supplimental_categories.rb (rev 0)
+++ branches/gsoc10-mpwa/db/migrate/20100616212915_create_supplimental_categories.rb 2010-06-19 03:09:16 UTC (rev 68973)
@@ -0,0 +1,14 @@
+class CreateSupplimentalCategories < ActiveRecord::Migration
+ def self.up
+ create_table :supplimental_categories do |t|
+ t.string :name
+ t.integer :port_id
+
+ t.timestamps
+ end
+ end
+
+ def self.down
+ drop_table :supplimental_categories
+ end
+end
Added: branches/gsoc10-mpwa/db/migrate/20100616213022_create_categories.rb
===================================================================
--- branches/gsoc10-mpwa/db/migrate/20100616213022_create_categories.rb (rev 0)
+++ branches/gsoc10-mpwa/db/migrate/20100616213022_create_categories.rb 2010-06-19 03:09:16 UTC (rev 68973)
@@ -0,0 +1,13 @@
+class CreateCategories < ActiveRecord::Migration
+ def self.up
+ create_table :categories do |t|
+ t.string :name
+
+ t.timestamps
+ end
+ end
+
+ def self.down
+ drop_table :categories
+ end
+end
Added: branches/gsoc10-mpwa/db/migrate/20100616213132_update_port_for_new_category_implementation.rb
===================================================================
--- branches/gsoc10-mpwa/db/migrate/20100616213132_update_port_for_new_category_implementation.rb (rev 0)
+++ branches/gsoc10-mpwa/db/migrate/20100616213132_update_port_for_new_category_implementation.rb 2010-06-19 03:09:16 UTC (rev 68973)
@@ -0,0 +1,11 @@
+class UpdatePortForNewCategoryImplementation < ActiveRecord::Migration
+ def self.up
+ rename_column :ports, :categories, :category_id
+ change_column :ports, :category_id, :integer
+ end
+
+ def self.down
+ change_column :ports, :category_id, :string
+ rename_column :ports, :category_id
+ end
+end
\ No newline at end of file
Modified: branches/gsoc10-mpwa/db/schema.rb
===================================================================
--- branches/gsoc10-mpwa/db/schema.rb 2010-06-19 00:26:35 UTC (rev 68972)
+++ branches/gsoc10-mpwa/db/schema.rb 2010-06-19 03:09:16 UTC (rev 68973)
@@ -9,8 +9,14 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20100609202815) do
+ActiveRecord::Schema.define(:version => 20100616213132) do
+ create_table "categories", :force => true do |t|
+ t.string "name"
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ end
+
create_table "comments", :force => true do |t|
t.integer "port_id"
t.text "body"
@@ -31,11 +37,18 @@
t.string "version"
t.text "description"
t.string "licenses"
- t.string "categories"
+ t.integer "category_id", :limit => 255
t.string "variants"
t.datetime "created_at"
t.datetime "updated_at"
t.string "maintainers"
end
+ create_table "supplimental_categories", :force => true do |t|
+ t.string "name"
+ t.integer "port_id"
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ end
+
end
Added: branches/gsoc10-mpwa/test/fixtures/categories.yml
===================================================================
--- branches/gsoc10-mpwa/test/fixtures/categories.yml (rev 0)
+++ branches/gsoc10-mpwa/test/fixtures/categories.yml 2010-06-19 03:09:16 UTC (rev 68973)
@@ -0,0 +1,7 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+one:
+ name:
+
+two:
+ name: MyString
Added: branches/gsoc10-mpwa/test/fixtures/supplimental_categories.yml
===================================================================
--- branches/gsoc10-mpwa/test/fixtures/supplimental_categories.yml (rev 0)
+++ branches/gsoc10-mpwa/test/fixtures/supplimental_categories.yml 2010-06-19 03:09:16 UTC (rev 68973)
@@ -0,0 +1,9 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+one:
+ name: MyString
+ port_id: 1
+
+two:
+ name: MyString
+ port_id: 1
Added: branches/gsoc10-mpwa/test/unit/category_test.rb
===================================================================
--- branches/gsoc10-mpwa/test/unit/category_test.rb (rev 0)
+++ branches/gsoc10-mpwa/test/unit/category_test.rb 2010-06-19 03:09:16 UTC (rev 68973)
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class CategoryTest < ActiveSupport::TestCase
+ # Replace this with your real tests.
+ test "the truth" do
+ assert true
+ end
+end
Added: branches/gsoc10-mpwa/test/unit/supplimental_category_test.rb
===================================================================
--- branches/gsoc10-mpwa/test/unit/supplimental_category_test.rb (rev 0)
+++ branches/gsoc10-mpwa/test/unit/supplimental_category_test.rb 2010-06-19 03:09:16 UTC (rev 68973)
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class SupplimentalCategoryTest < ActiveSupport::TestCase
+ # Replace this with your real tests.
+ test "the truth" do
+ assert true
+ end
+end
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100618/1bd10a27/attachment-0001.html>
More information about the macports-changes
mailing list