dr_nic_magic_models 0.7.1 → 0.8.0

data/scripts/txt2js

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+
+require 'redcloth'
+require 'syntax/convertors/html'
+require 'erb'
+require 'active_support'
+require '../lib/dr_nic_magic_models/version.rb'
+
+version  = DrNicMagicModels::VERSION::STRING
+download = 'http://rubyforge.org/projects/magicmodels'
+
+class Fixnum
+  def ordinal
+    # teens
+    return 'th' if (10..19).include?(self % 100)
+    # others
+    case self % 10
+    when 1: return 'st'
+    when 2: return 'nd'
+    when 3: return 'rd'
+    else    return 'th'
+    end
+  end
+end
+
+class Time
+  def pretty
+    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
+  end
+end
+
+def convert_syntax(syntax, source)
+  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
+end
+
+if ARGV.length >= 1
+  src, template = ARGV
+  template ||= 'template.js'
+else
+  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
+  exit!
+end
+
+template = ERB.new(File.open(template).read)
+
+title = nil
+body = nil
+File.open(src) do |fsrc|
+  title_text = fsrc.readline
+  body = fsrc.read
+  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
+end
+stat = File.stat(src)
+created = stat.ctime
+modified = stat.mtime
+
+$stdout << template.result(binding)

data/test/connections/native_postgresql/connection.rb

@@ -0,0 +1,14 @@
+print "Using Postgres\n"
+require 'logger'
+
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+db1 = "dr_nic_magic_models_unittest"
+
+ActiveRecord::Base.establish_connection(
+  :adapter  => "postgresql",
+  :username => "postgres",
+  :password => "postgres",
+  :encoding => "utf8",
+  :database => db1
+)

data/test/fixtures/adjectives.yml

@@ -0,0 +1,3 @@
+first:
+  id: 1
+  name: kind

data/test/fixtures/adjectives_fun_users.yml

@@ -0,0 +1,3 @@
+first:
+  fun_user_id: 1
+  adjective_id: 1

data/test/fixtures/db_definitions/mysql.drop.sql

@@ -1,30 +1,4 @@
-DROP TABLE accounts;
-DROP TABLE funny_jokes;
-DROP TABLE companies;
-DROP TABLE topics;
-DROP TABLE developers;
-DROP TABLE projects;
-DROP TABLE developers_projects;
-DROP TABLE customers;
-DROP TABLE orders;
-DROP TABLE movies;
-DROP TABLE subscribers;
-DROP TABLE booleantests;
-DROP TABLE auto_id_tests;
-DROP TABLE entrants;
-DROP TABLE colnametests;
-DROP TABLE mixins;
-DROP TABLE people;
-DROP TABLE readers;
-DROP TABLE binaries;
-DROP TABLE computers;
-DROP TABLE tasks;
-DROP TABLE posts;
-DROP TABLE comments;
-DROP TABLE authors;
-DROP TABLE categories;
-DROP TABLE categories_posts;
-DROP TABLE fk_test_has_fk;
-DROP TABLE fk_test_has_pk;
-DROP TABLE keyboards;
-DROP TABLE legacy_things;
+DROP TABLE fun_users;
+DROP TABLE groups;
+DROP TABLE group_memberships;
+DROP TABLE group_tag;

data/test/fixtures/db_definitions/mysql.sql

@@ -1,16 +1,20 @@
 CREATE TABLE `fun_users` (
   `id` int(11) NOT NULL auto_increment,
+  `type` varchar(255) NOT NULL,
   `firstname` varchar(50) NOT NULL,
   `lastname` varchar(50) NOT NULL,
   `login` varchar(50) NOT NULL,
-  `email` varchar(50) NULL,
+  `email` varchar(50) NULL,  
   PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
 
 CREATE TABLE `groups` (
   `id` int(11) NOT NULL auto_increment,
-  `name` varchar(50) NOT NULL,
+  `name` varchar(50) NOT NULL UNIQUE,
   `description` varchar(50) default NULL,
+  `some_int` integer default NULL,
+  `some_float` float default NULL,
+  `some_bool` boolean default NULL,
   PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
 
@@ -21,10 +25,34 @@ CREATE TABLE `group_memberships` (
   PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
 
+CREATE TABLE `adjectives` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(255),
+  PRIMARY KEY  (`id`)
+) TYPE=InnoDB;
+
+CREATE TABLE `adjectives_fun_users` (
+  `fun_user_id` int(11) NOT NULL,
+  `adjective_id` int(11) NOT NULL,
+  PRIMARY KEY  (`fun_user_id`,`adjective_id`)
+) TYPE=InnoDB;
+
+
 CREATE TABLE `group_tag` (
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(50) NOT NULL,
   `group_id` int(11) NOT NULL,
+  `referenced_group_id` int(11) NULL UNIQUE,  
   PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
 
+ALTER TABLE `group_tag`
+  ADD FOREIGN KEY (`group_id`) REFERENCES `groups` (`id`) ON DELETE CASCADE;
+
+ALTER TABLE `group_tag`
+  ADD FOREIGN KEY (`referenced_group_id`) REFERENCES `groups` (`id`) ON DELETE CASCADE;
+
+ALTER TABLE `adjectives_fun_users`
+  ADD FOREIGN KEY (`adjective_id`) REFERENCES `adjectives` (`id`) ON DELETE CASCADE;    
+
+  

data/test/fixtures/db_definitions/postgresql.drop.sql

@@ -0,0 +1,4 @@
+DROP TABLE fun_users;
+DROP TABLE groups;
+DROP TABLE group_memberships;
+DROP TABLE group_tag;

data/test/fixtures/db_definitions/postgresql.sql

@@ -0,0 +1,56 @@
+CREATE TABLE "fun_users" (
+  "id" SERIAL NOT NULL,
+  "type" varchar(255) NOT NULL,
+  "firstname" varchar(50) NOT NULL,
+  "lastname" varchar(50) NOT NULL,
+  "login" varchar(50) NOT NULL,
+  "email" varchar(50) NULL,  
+  PRIMARY KEY  ("id")
+);
+
+CREATE TABLE "groups" (
+  "id" SERIAL NOT NULL,
+  "name" varchar(50) NOT NULL UNIQUE,
+  "description" varchar(50) default NULL,
+  "some_int" integer default NULL,
+  "some_float" float default NULL,
+  "some_bool" boolean default NULL,
+  PRIMARY KEY  ("id")
+);
+
+CREATE TABLE "group_memberships" (
+  "id" SERIAL,
+  "fun_user_id" int NOT NULL,
+  "group_id" int NOT NULL,
+  PRIMARY KEY  ("id")
+);
+
+CREATE TABLE "adjectives" (
+  "id" SERIAL,
+  "name" varchar(255),
+  PRIMARY KEY  ("id")
+);
+
+CREATE TABLE "adjectives_fun_users" (
+  "fun_user_id" int NOT NULL,
+  "adjective_id" int NOT NULL,
+  PRIMARY KEY  ("fun_user_id","adjective_id")
+);
+
+CREATE TABLE "group_tag" (
+  "id" SERIAL NOT NULL,
+  "name" varchar(50) NOT NULL,
+  "group_id" int NOT NULL,
+  "referenced_group_id" int NULL UNIQUE,  
+  PRIMARY KEY  ("id")
+);
+
+ALTER TABLE "group_tag"
+  ADD FOREIGN KEY ("group_id") REFERENCES "groups" ("id") ON DELETE CASCADE;
+
+ALTER TABLE "group_tag"
+  ADD FOREIGN KEY ("referenced_group_id") REFERENCES "groups" ("id") ON DELETE CASCADE;  
+  
+ALTER TABLE "adjectives_fun_users"
+  ADD FOREIGN KEY ("adjective_id") REFERENCES "adjectives" ("id") ON DELETE CASCADE;    
+  

data/test/fixtures/fun_users.yml

@@ -4,4 +4,11 @@ first:
   lastname: Person
   login: first
   email: first@person.com
- 
+  type: FunUser
+second:
+  id: 2
+  firstname: Second
+  lastname: Person
+  login: sec
+  email: sec@person.com
+  type: FunUserPlus

data/test/fixtures/group_tag.yml

@@ -2,8 +2,10 @@ first:
   id: 1
   name: Test
   group_id: 1
+  referenced_group_id: 1
 second:
   id: 2
   name: Also Test
   group_id: 1
- 
+  referenced_group_id: NULL
+ 

data/test/fixtures/groups.yml

@@ -1,4 +1,12 @@
 first:
   id: 1
   name: Group One
-  description: First group
+  description: First group
+other:
+  id: 2
+  name: Group Plus
+  description: Extended Group
+other:
+  id: 2
+  name: Group Plus
+  description: Extended Group

data/test/fun_user_plus.rb

@@ -0,0 +1,2 @@
+class FunUserPlus < FunUser
+end

data/test/invisible_model_access_test.rb

@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'pp'
 
 class InvisibleModelAccessTest < Test::Unit::TestCase
   fixtures :fun_users, :groups, :group_memberships, :group_tag
@@ -15,14 +16,22 @@ class InvisibleModelAccessTest < Test::Unit::TestCase
     end
   end
   
-  def test_create
-    assert group = Group.create(:name => 'New Group')
+  def test_sti
+    x = FunUserPlus.find(:all)
+    assert x.inject {|n,v| n &= v.class == FunUserPlus}, "Wrong object class in FunUserPlus.find(:all)"
+    plus = x.first
+    assert_not_nil plus
+    assert plus.is_a?(FunUser)
+    assert plus.class == FunUserPlus
+  end
+  
+  def test_new
+    assert group = Group.new(:name => 'New Group')
     assert_equal Group, group.class
   end
   
   def test_update
-    assert @group.update_attributes(:name => 'Group 1')
-    assert_equal Group, @group.class
+    assert @group.update_attributes(:name => 'Group 1'), "Couldn't update:\n#{str=""; @group.errors.each_full { |msg| str += "#{msg}\n" }; str }"
   end
   
   def test_delete
@@ -31,7 +40,26 @@ class InvisibleModelAccessTest < Test::Unit::TestCase
   
   def test_validations
     group = Group.new
-    assert !group.valid?
-    assert_not_nil group.errors[:name]
+    group.description = "x"*100
+    group.some_int = 99.9
+    group.some_float = "bah"     
+    # Active record seems to interpolate booleans anyway to either true, false or nil...    
+    # group.some_bool = "xxx" => false (!)
+    
+    assert !group.valid?, "Group should not be valid"
+    [:name, :description, :some_int, :some_float].each do |x|
+      assert_not_nil group.errors[x], "Failed on #{x}=[#{group.send(x)}], it should be invalid"
+    end
+
+    group = Group.new
+    group.name = "name"
+    group.description = "x"*49
+    group.some_int = 99
+    group.some_float = 99.9
+    group.some_bool = true
+    assert group.valid?, "Group should be valid"
+    
+    group.name = @group.name
+    assert !group.valid?, "Groups should have unique names"
   end
-end
+end

data/test/invisible_model_assoc_test.rb

@@ -1,27 +1,52 @@
 require 'abstract_unit'
 
 class InvisibleModelAssocTest < Test::Unit::TestCase
-  fixtures :fun_users, :groups, :group_memberships
+  fixtures :fun_users, :groups, :group_memberships, :group_tag, :adjectives, :adjectives_fun_users
   
   def setup
     @group = groups(:first)
+    @group_tag = group_tag(:first)
     @user = fun_users(:first)
     @membership = group_memberships(:first_first)
   end
   
-  def test_has_some
-    assert_equal @membership, @user.group_membership
-    assert_equal [@membership], @user.group_memberships
-    assert_equal @membership, @group.group_membership
+  def test_hatbm  
+    assert @user.adjectives == [adjectives(:first)]
+  end
+    
+  def test_fk
+    
+    gt = GroupTag.find(1)
+
+    # Not using FKs
+    g = gt.group    
+    assert g.class == Group
+    assert g.id == 1
+    
+    # Using FKs
+    g = gt.referenced_group    
+    assert g.class == Group
+    assert g.id == 1
+    
+  end
+  
+  def test_has_many
     assert_equal [@membership], @group.group_memberships
+    assert_equal @group, @membership.group
+  end
+
+  def test_has_one
+    assert_equal @group, @group_tag.referenced_group
+    assert_equal @group_tag, @group.group_tag_as_referenced_group
   end
   
   def test_belongs_to
     assert_equal @user, @membership.fun_user
     assert_equal @group, @membership.group
-    GroupTag.find(:all, :conditions => ['group_id = ?', @group.id]).each do |group_tag|
-      assert_equal @group, group_tag.group
-    end
+    manual_result = GroupTag.find(:all, :conditions => ['group_tag.group_id = ?', @group.id]) #.sort{|a,b| a.id <=> b.id}
+    auto_result = @group.group_tags #.sort{|a,b| a.id <=> b.id}
+    assert manual_result == auto_result, "[#{manual_result.join(',')}] != [#{auto_result.join(',')}]"
+      
   end
   
   def test_indirect
@@ -29,14 +54,4 @@ class InvisibleModelAssocTest < Test::Unit::TestCase
     assert_equal [@group], @user.groups 
   end
   
-  # TODO - Support these
-  #def test_more_indirect
-  #  group_tags = GroupTag.find(:all, :conditions => ['group_id = ?', @group.id])
-  #  assert_equal group_tags, @user.group_tags
-  #end
-  
-  #def test_more_indirect_via_belongs_to
-  #  @group_tag = group_tag(:first)
-  #  assert_equal [@user], @group_tag.fun_users
-  #end
-end
+end

data/test/invisible_model_classes_test.rb

@@ -2,6 +2,10 @@ require 'abstract_unit'
 
 class InvisibleModelClassesTest < Test::Unit::TestCase
 
+  def setup
+
+  end
+      
   def test_available
     assert_not_nil Group
     assert_not_nil FunUser
@@ -16,4 +20,4 @@ class InvisibleModelClassesTest < Test::Unit::TestCase
     assert_equal 'group_tag', GroupTag.table_name
   end
   
-end
+end

data/website/index.html

@@ -11,6 +11,7 @@
 <style>
 
 </style>
+  <script type="text/javascript" src="version-raw.js"></script>
   <script type="text/javascript">
     window.onload = function() {
       settings = {
@@ -24,6 +25,8 @@
       }
       var versionBox = new curvyCorners(settings, document.getElementById("version"));
       versionBox.applyCornersToAll();
+
+      document.getElementById("version_num").innerHTML = version;
     }
   </script>
 </head>
@@ -33,9 +36,20 @@
     <h1>Dr Nic&#8217;s Magic Models</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/magicmodels"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/magicmodels" class="numbers">0.7.1</a>
+      <a id="version_num" href="http://rubyforge.org/projects/magicmodels" class="numbers"></a>
     </div>
-    <blockquote>
+    <h2>News alert</h2>
+
+
+	<p>Assocations now generated using <a href="foreignkeys.html">Foreign Keys</a> too!</p>
+
+
+	<p>Now&#8230; on with the magic show!
+<br />
+<br /></p>
+
+
+<blockquote>
 <strong>conjure</strong>  1. To create events that appear to be magical<br />
 - <a href="http://www.dcopperfield.com/">David Copperfield</a> website
 </blockquote>
@@ -155,7 +169,7 @@ with:
 <pre class="syntax">
     <span class="ident">create_table</span> <span class="symbol">:groups</span> <span class="keyword">do</span> <span class="punct">|</span><span class="ident">t</span><span class="punct">|</span>
       <span class="ident">t</span><span class="punct">.</span><span class="ident">column</span> <span class="symbol">:name</span><span class="punct">,</span> <span class="symbol">:string</span><span class="punct">,</span> <span class="symbol">:null</span> <span class="punct">=&gt;</span> <span class="constant">false</span>
-      <span class="ident">t</span><span class="punct">.</span><span class="ident">column</span> <span class="symbol">:description</span><span class="punct">,</span> <span class="symbol">:datetime</span>
+      <span class="ident">t</span><span class="punct">.</span><span class="ident">column</span> <span class="symbol">:description</span><span class="punct">,</span> <span class="symbol">:string</span>
     <span class="keyword">end</span>
 </pre></p>
 
@@ -357,9 +371,15 @@ 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>, 10th August 2006<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 20th September 2006<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-567811-3";
+urchinTracker();
+</script>
 </body>
 </html>

data/website/index.txt

@@ -1,5 +1,13 @@
 h1. Dr Nic's Magic Models
 
+h2. News alert
+
+Assocations now generated using "Foreign Keys":foreignkeys.html too!
+
+Now... on with the magic show!
+<br />
+<br />
+
 <blockquote>
 *conjure*  1. To create events that appear to be magical<br />
 - "David Copperfield":http://www.dcopperfield.com/ website
@@ -102,7 +110,7 @@ with:
 <pre syntax="ruby">
     create_table :groups do |t|
       t.column :name, :string, :null => false
-      t.column :description, :datetime
+      t.column :description, :string
     end
 </pre>
 

data/website/template.js

@@ -0,0 +1,3 @@
+// <%= title %>
+var version = <%= version.to_json %>;
+<%= body %>

data/website/template.rhtml

@@ -11,6 +11,7 @@
 <style>
 
 </style>
+  <script type="text/javascript" src="version-raw.js"></script>
   <script type="text/javascript">
     window.onload = function() {
       settings = {
@@ -24,6 +25,8 @@
       }
       var versionBox = new curvyCorners(settings, document.getElementById("version"));
       versionBox.applyCornersToAll();
+
+      document.getElementById("version_num").innerHTML = version;
     }
   </script>
 </head>
@@ -33,7 +36,7 @@
     <h1><%= title %></h1>
     <div id="version" class="clickable" onclick='document.location = "<%= download %>"; return false'>
       Get Version
-      <a href="<%= download %>" class="numbers"><%= version %></a>
+      <a id="version_num" href="<%= download %>" class="numbers"></a>
     </div>
     <%= body %>
     <p class="coda">
@@ -41,5 +44,11 @@
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-567811-3";
+urchinTracker();
+</script>
 </body>
 </html>

data/website/version-raw.js

@@ -0,0 +1,3 @@
+// Version JS file
+var version = "0.8.0";
+

data/website/version-raw.txt

@@ -0,0 +1 @@
+h1. Version JS file

data/website/version.js

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

data/website/version.txt

@@ -0,0 +1,3 @@
+h1. Version JS file
+
+document.write(" - " + version);