Skip to content

Updates to support Rails 3.x with asset pipeline #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 0 additions & 50 deletions generators/schema_browser/schema_browser_generator.rb

This file was deleted.

68 changes: 68 additions & 0 deletions lib/generators/schema_browser/schema_browser_generator.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
require 'rails/generators'

class SchemaBrowserGenerator < Rails::Generators::Base
def self.source_root
@source_root ||= File.join(File.dirname(__FILE__), 'templates')
end

def generate_schema_browser
images = ["back.gif",
"h_1-n.gif",
"h_n-1.gif",
"move_cross.gif",
"shadow_bottom.png",
"shadow_corner.png",
"shadow.png",
"shadow_right.png",
"v_1-n.gif",
"v_n-1.gif"]
directory_name = "vendor/assets/images/schema_browser"
Dir.mkdir(directory_name) unless File.exists?(directory_name)

images.each do |img|
copy_file "assets/images/#{img}", "vendor/assets/images/schema_browser/#{img}"
end

javascripts = ["ajax.js",
"animator.js",
"generic.js",
"io.js",
"main.js",
"objects.js",
"settings.js",
"sql_types.js",
"style.js"]

directory_name = "vendor/assets/javascripts/schema_browser"
Dir.mkdir(directory_name) unless File.exists?(directory_name)

javascripts.each do |js|
copy_file "assets/javascripts/#{js}", "vendor/assets/javascripts/schema_browser/#{js}"
end

stylesheets = ["bar.css",
"foo",
"style.css"]

directory_name = "vendor/assets/stylesheets/schema_browser"
Dir.mkdir(directory_name) unless File.exists?(directory_name)

stylesheets.each do |css|
copy_file "assets/stylesheets/#{css}", "vendor/assets/stylesheets/schema_browser/#{css}"
end

directory_name = "app/controllers"
Dir.mkdir(directory_name) unless File.exists?(directory_name)
copy_file "app/controllers/schema_browser_controller.rb", "app/controllers/schema_browser_controller.rb"

directory_name = "app/views/schema_browser"
Dir.mkdir(directory_name) unless File.exists?(directory_name)
copy_file "app/views/schema_browser/index.html.erb", "app/views/schema_browser/index.html.erb"
copy_file "app/views/schema_browser/schema.xml.builder", "app/views/schema_browser/schema.xml.builder"

directory_name = "app/views/layouts"
Dir.mkdir(directory_name) unless File.exists?(directory_name)
copy_file "app/views/layouts/schema_browser.html.erb", "app/views/layouts/schema_browser.html.erb"

end
end
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ function Relation_update() {
break;
}
var eri = this.elem_4.getElementsByTagName('img');
eri[0].setAttribute("src","/images/schema_browser/"+imgsrc+".gif");
eri[0].setAttribute("src","/assets/schema_browser/"+imgsrc+".gif");
}

Relation.prototype = new abstractParent();
Expand Down Expand Up @@ -526,7 +526,7 @@ function Relation(parent_1, row_1, parent_2, row_2, id) {
this._div.appendChild(this.elem_3);

this.e_relation = document.createElement("img");
this.e_relation.setAttribute("src","/images/schema_browser/move_cross.gif");
this.e_relation.setAttribute("src","/assets/schema_browser/move_cross.gif");
this.e_relation.setAttribute("width","11");
this.e_relation.setAttribute("height","11");

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url("/stylesheets/schema_browser/bar.css");
@import url("/assets/schema_browser/bar.css");
/* ---------------------------------- spolecne deklarace ------------------------------- */

body {
Expand All @@ -7,11 +7,11 @@ body {
padding: 0px;
margin: 0px;
_font-size: x-small;
background: url('/stylesheets/schema_browser/foo') fixed; /* ie hack */
background: url('/assets/schema_browser/foo') fixed; /* ie hack */
}

#root {
background-image: url("/images/schema_browser/back.gif");
background-image: url("/assets/schema_browser/back.gif");
}

#bar {
Expand All @@ -23,7 +23,7 @@ body {
}

#shadow {
background-image: url("/images/schema_browser/shadow.png");
background-image: url("/assets/schema_browser/shadow.png");
width: 100%;
height: 8px;
position: relative;
Expand Down Expand Up @@ -115,7 +115,7 @@ body {
}

.shadow_right {
background-image: url("/images/schema_browser/shadow_right.png");
background-image: url("/assets/schema_browser/shadow_right.png");
width: 8px;
height: 100%;
position: absolute;
Expand All @@ -125,7 +125,7 @@ body {
}

.shadow_bottom {
background-image: url("/images/schema_browser/shadow_bottom.png");
background-image: url("/assets/schema_browser/shadow_bottom.png");
width: 100%;
height: 8px;
position: absolute;
Expand All @@ -135,7 +135,7 @@ body {
}

.shadow_corner {
background-image: url("/images/schema_browser/shadow_corner.png");
background-image: url("/assets/schema_browser/shadow_corner.png");
width: 8px;
height: 8px;
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion lib/schema_table.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def attributes

def create_relation(reflection)
referenced_table = @@tables[reflection.class_name.tableize]
from_column_name = reflection.primary_key_name.to_s
from_column_name = reflection.foreign_key.to_s
raise "Field '#{from_column_name}' that should reference #{reflection.class_name} is not present in the database" if column(from_column_name).nil?
column(from_column_name).foreign_key = true
return if reflection.options[:polymorphic]
Expand Down