Merge branch 'master' of github.com:jshield/RubyGTS

Author: jshield

Diff for: .gitignore

@@ -1,2 +1,3 @@
 pokegts.db
-Gemfile.lock
+*.redcar
+*.lock

Diff for: lib/models.rb

@@ -442,13 +442,22 @@ def shuffle(words,reversed)
   end
 end
 
+class User
+  include DataMapper::Resource
+  property :id, Serial
+  property :fbid, Integer, :unique => true
+  property :name, String
+  property :pass, BCryptHash, :default => "default"
+  has n, :trainers
+end
+
 class Trainer
   include DataMapper::Resource
   property :id, Serial
   property :tid, Integer
   property :name, String
-  property :pass, BCryptHash, :default => "default"
   property :reg, Boolean, :default => false
   has n, :monsters
+  belongs_to :user
 end
 

Diff for: rubygts

@@ -8,7 +8,6 @@ require "extlib"
 require "digest/sha1"
 require "haml"
 require "sass"
-require "rio"
 require "base64"
 require "permutation"
 
@@ -75,12 +74,14 @@ before do
 end
 
 get "/system/initialize" do
-  promo = Trainer.first_or_create(:id=>1,:name=>"PROMO",:tid=>1)
-  promo.reg = true
+  promo = User.first_or_create(:id=>1,:name=>"PROMO")
   promo.save
+  trainer = promo.trainers.first_or_create(:id=>1,:name=>"PROMO")
+  trainer.reg = true
+  trainer.save
   rio('pkm').files('*.pkm') do |data|
     pkm = ""
-    monster = promo.monsters.new
+    monster = trainer.monsters.new
     data >> pkm
     pkm << open("./extra").read() if pkm.size == 236
     monster.blob = pkm