webink 2.0 → 2.0.1

data/bin/rfcgi

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require "fcgi"
 require "simple_mmap"
 require "webink/beauty"
@@ -43,7 +45,7 @@ FCGI.each_cgi do |cgi|
     control = eval fhandle.read_window_data(0,fhandle.size), getBinding(cgi,cgi.env_table,control) if fhandle
     fhandle.close
     raise StandardError.new("Routes not matched.") if control.keys.length <= 1
-    
+
     control[:get] = pram
     control[:config] = Ink::Beauty.load_config script
     control[:time] = time
@@ -70,13 +72,13 @@ FCGI.each_cgi do |cgi|
     else
       cgi.params = pram
     end
-    
+
     script = Ink::Beauty.load_init script
     fhandle = SimpleMmap::MappedFile.new(script)
     Dir.chdir( File.dirname(script) )
     eval fhandle.read_window_data(0,fhandle.size), getBinding(cgi,cgi.env_table,control) if fhandle
     fhandle.close
-    
+
   rescue LoadError => bang
     if is_production
       puts cgi.header({"Location" => "/status-404.html"}) if use_errors
@@ -85,7 +87,7 @@ FCGI.each_cgi do |cgi|
       puts cgi.header
       puts "<hr><b>LoadError:</b>", "<em><pre>", CGI::escapeHTML("#{bang}"), "</pre></em>\n", "<pre>", bang.backtrace.join("\n"), "</pre>"
     end
-    
+
   rescue NotImplementedError => bang
     if is_production
       puts cgi.header({"Location" => "/status-500.html"}) if use_errors
@@ -94,7 +96,7 @@ FCGI.each_cgi do |cgi|
       puts cgi.header
       puts "<hr><b>NotImplementedError:</b>", "<em><pre>", CGI::escapeHTML("#{bang}"), "</pre></em>\n", "<pre>", bang.backtrace.join("\n"), "</pre>"
     end
-    
+
   rescue ArgumentError => bang
     if is_production
       puts cgi.header({"Location" => "/status-500.html"}) if use_errors
@@ -103,7 +105,7 @@ FCGI.each_cgi do |cgi|
       puts cgi.header
       puts "<hr><b>ArgumentError:</b>", "<em><pre>", CGI::escapeHTML("#{bang}"), "</pre></em>\n", "<pre>", bang.backtrace.join("\n"), "</pre>"
     end
-    
+
   rescue RuntimeError => bang
     if is_production
       puts cgi.header({"Location" => "/status-500.html"}) if use_errors
@@ -112,7 +114,7 @@ FCGI.each_cgi do |cgi|
       puts cgi.header
       puts "<hr><b>RuntimeError:</b>", "<em><pre>", CGI::escapeHTML("#{bang}"), "</pre></em>\n", "<pre>", bang.backtrace.join("\n"), "</pre>"
     end
-  
+
   rescue NameError => bang
     if is_production
       puts cgi.header({"Location" => "/status-500.html"}) if use_errors
@@ -121,7 +123,7 @@ FCGI.each_cgi do |cgi|
       puts cgi.header
       puts "<hr><b>NameError:</b>", "<em><pre>", CGI::escapeHTML("#{bang}"), "</pre></em>\n", "<pre>", bang.backtrace.join("\n"), "</pre>"
     end
-    
+
   rescue Exception, StandardError => bang
     if is_production
       puts cgi.header({"Location" => "/status-500.html"}) if use_errors
@@ -131,7 +133,7 @@ FCGI.each_cgi do |cgi|
       puts "<hr><b>Exception:</b>", "<em><pre>", CGI::escapeHTML("#{bang}"), "</pre></em>\n", "<pre>", bang.backtrace.join("\n"), "</pre>"
     end
   end
-  
+
   script = nil
   fhandle = nil
   control = nil

data/bin/webink_database

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require 'simple_mmap'
 require 'webink/beauty'
 
@@ -23,7 +25,7 @@ begin
   Ink::Database.create config
   db = Ink::Database.database
   db_tables = db.tables
-  
+
   if ARGV[0] == "drop"
     puts "Dropping old tables..."
     db_tables.each do |t|
@@ -31,7 +33,7 @@ begin
       db.query "DROP TABLE #{t};"
     end
   end
-  
+
   puts "Creating new tables..."
   model_classes.each do |m|
     puts "...for class: #{m.name}:"

data/lib/webink/controller.rb

@@ -1,20 +1,20 @@
 module Ink
 
   # = Controller class
-  # 
+  #
   # == Usage
-  # 
+  #
   # Controllers handle incoming requests and decide what to do
   # with them. A controller has access to all incoming data, like
   # POST and GET (through @params[:get] and @params[:post] as
   # well as the config.
   #
   #   class App < Ink::Controller
-  #     
+  #
   #     def index
   #       redirect_to :controller => "my_app", :module => "feed", :id => 29382374
   #     end
-  #     
+  #
   #     def feed
   #       @arg = @params[:id]
   #       @users = []
@@ -25,14 +25,12 @@ module Ink
   #       @arg = "foo bar"
   #       render :partial => "part", :standalone => true
   #     end
-  #     
+  #
   #   end
   #
-  # A controller named App should have the filename app.rb (note
-  # that underscores are not allowed: "app".capitalize must be
-  # the loadable classname) and be placed inside the project
-  # controller folder. It can have instance methods that are
-  # usually refered to as modules.
+  # A controller named App should have the filename app.rb and be
+  # placed inside the project controller folder. It can have
+  # instance methods that are usually refered to as modules.
   # So a route should contain at least a :controller and a :module.
   #
   # In the sample above there are three modules, index redirects
@@ -51,7 +49,8 @@ module Ink
   # == Templates
   #
   # All templates are to be put into the project views folder, and are
-  # to be named name.html.erb, while partials are to be named _anothername.html.erb.
+  # to be named name.html.erb, while partials are to be named
+  # _anothername.html.erb.
   # It is possible to create subfolders and call the templates via
   # :template => "subfolder/template.html.erb".
   #
@@ -81,16 +80,19 @@ module Ink
   #     [ /^\/?$/, {:controller => "app", :module => "index"} ],
   #   ]
   #
-  # Routes are built as a priority list, the first match will be the route taken. All
-  # route configurations must include a variable named root, as it will help to create
-  # dynamic links within websites. Root is relative to the webserver root. Assume your
-  # webserver points to public_html, then routes can be "" for the public_html folder,
-  # or "/anysubfolder" which points to anysubfolder. Deeper structures work too.
+  # Routes are built as a priority list, the first match will be the
+  # route taken. All route configurations must include a variable
+  # named root, as it will help to create dynamic links within
+  # websites. Root is relative to the webserver root. Assume your
+  # webserver points to public_html, then routes can be "" for the
+  # public_html folder, or "/anysubfolder" which points to anysubfolder.
+  # Deeper structures work too.
   #
   # == Linking
   #
-  # A controller has the ability to create hyperlinks for you, that will dynamically match
-  # the project path etc. (and is also using the root variable from the routes.rb)
+  # A controller has the ability to create hyperlinks for you, that
+  # will dynamically match the project path etc. (and is also using
+  # the root variable from the routes.rb)
   #
   #   link_to "name", "controller", "module", "param1", "param2", {:class => "h1", :id => "14"}
   #
@@ -99,14 +101,15 @@ module Ink
   #   <a class="h1" id="14" href="/controller/module/param1/param2/">name</a>
   #
   # So the first entry of the argument array is the hyperlink name, then all
-  # following entries are connected as the href string, prefixed by the root variable
-  # that is set in the routes.rb. The hash includes the attributes for the <a>-tag.
+  # following entries are connected as the href string, prefixed by the root
+  # variable that is set in the routes.rb. The hash includes the attributes
+  # for the <a>-tag.
   #
   # == Pathing
   #
-  # A controller also constructs paths for you (and is also using the root variable
-  # from the routes.rb), which you can use to dynamically reroute forms, just to
-  # mention one example.
+  # A controller also constructs paths for you (and is also using the root
+  # variable from the routes.rb), which you can use to dynamically reroute
+  # forms, just to mention one example.
   #
   #   @my = "no"
   #   path_to "this", "is", @my, "path"
@@ -119,42 +122,44 @@ module Ink
   #
   # == Sessions
   #
-  # Usually very important in the development of websites are sessions. There is some
-  # basic support for it in webink, that will make certain bits easier. For more information
-  # have a look at the blog-demo.
+  # Usually very important in the development of websites are sessions.
+  # There is some basic support for it in webink, that will make certain
+  # bits easier. For more information have a look at the blog-demo.
+  #
+  # Each controller usually expects cookies to work, if you handle
+  # sessions via cgi. Whenever cookies do not work, or you do not
+  # intend to use them in the first place, path_to and link_to watch
+  # out for the instance variables @session_key and @session_id
+  # which are added via GET to the path/hyperlink, that they construct.
+  # Therefore the tools should not be used for external linking. The
+  # dispatcher automatically filters the GET session_id when using
+  # POST and adds it to the cgi.params, so sessions can be used confortably.
   #
-  # Each controller usually expects cookies to work, if you handle sessions via cgi.
-  # Whenever cookies do not work, or you do not intend to use them in the first place,
-  # path_to and link_to watch out for the instance variables @session_key and @session_id
-  # which are added via GET to the path/hyperlink, that they construct. Therefore the
-  # tools should not be used for external linking. The dispatcher automatically filters
-  # the GET session_id when using POST and adds it to the cgi.params, so sessions can
-  # be used confortably.
+  # Per default, the @session_key should be "_session_id" as specified
+  # in the cgi/session library from ruby core, but the controller offers
+  # some freedom, in case you may want a different key name for some reason.
   #
-  # Per default, the @session_key should be "_session_id" as specified in the cgi/session
-  # library from ruby core, but the controller offers some freedom, in case you may want
-  # a different key name for some reason.
   #
-  # 
   #
   class Controller
-    
+
     # Constructor
-    # 
-    # Creates a new controller of the derived class. params are the globals set
-    # by the dispatcher, and include keys like: :get, :post and :config. Also the
-    # matched routes are put there, :controller, :module and any parameters like
-    # :id or :page that were retrieved from the routes.
+    #
+    # Creates a new controller of the derived class. params are the globals
+    # set by the dispatcher, and include keys like: :get, :post and :config.
+    # Also the matched routes are put there, :controller, :module and any
+    # parameters like :id or :page that were retrieved from the routes.
     # [param params:] Hash of Symbol => Objects
     def initialize(params)
       @params = params
     end
-    
+
     # Instance method
-    # 
-    # Render a template or a partial that is located in the ./views/ folder of the
-    # project. Subfolders are allowed to be specified. All instance variables are
-    # accessible from within the template, as are any instance methods.
+    #
+    # Render a template or a partial that is located in the ./views/ folder
+    # of the project. Subfolders are allowed to be specified. All instance
+    # variables are accessible from within the template, as are any instance
+    # methods.
     # [param args:] Hash of arguments
     # [returns:] interpreted erb instance or nil
     def render(args)
@@ -180,9 +185,9 @@ module Ink
         nil
       end
     end
-    
+
     # Instance method
-    # 
+    #
     # Redirect to a controller and module. The new controller will
     # be instanciated with a copy of the current params.
     # [param args:] Hash of arguments
@@ -202,7 +207,7 @@ module Ink
         nil
       end
     end
-    
+
     # Instance method
     #
     # Creates a dynamic hyperlink
@@ -230,7 +235,7 @@ module Ink
       href += "?#{@session_key}=#{@session_id}" if @session_id and @session_key
       "#{a}href=\"#{href}\">#{name}</a>"
     end
-    
+
     # Instance method
     #
     # Creates a dynamic path
@@ -241,7 +246,7 @@ module Ink
     # [returns:] path
     def path_to(*args)
       href = (@params[:root].length == 0) ? "/" : "#{@params[:root]}#{(@params[:root][@params[:root].length-1].chr == "/") ? "" : "/"}"
-      
+
       if args.is_a? Array
         for i in 0...args.length
           arg = args[i]
@@ -253,18 +258,18 @@ module Ink
       href += "?#{@session_key}=#{@session_id}" if @session_id and @session_key
       href
     end
-    
+
     # Instance method
-    # 
+    #
     # Retrieve the current binding of the instance.
     # [param locals:] an Array of data for the template
     # [returns:] current binding
     def getBinding(locals)
       binding
     end
-    
+
     # Class method
-    # 
+    #
     # Retrieve the class of the name controller, that can be instanciated
     # by using new. Raises a NameError.
     # [param controller:] Controller name string
@@ -279,9 +284,9 @@ module Ink
       end
       ((Module.const_get controller.capitalize).is_a? Class) ? (Module.const_get controller.capitalize) : (raise NameError.new("Controller not found."))
     end
-    
+
     # Instance method
-    # 
+    #
     # Retrieve the method of name mod, that can be called by using the
     # call method. Raises a NameError.
     # [param mod:] Method name string
@@ -289,7 +294,7 @@ module Ink
     def verify(mod)
       self.method(mod)
     end
-    
+
   end
-  
+
 end

data/lib/webink/database.rb

@@ -188,6 +188,8 @@ module Ink
                 v = $&.to_i
               elsif v =~ /^[0-9]+\.[0-9]+$/
                 v = $&.to_f
+              elsif v =~ /^NULL$/
+                v = nil
               end
               if block_given?
                 yield(result[result.length-1], k, v)
@@ -206,6 +208,8 @@ module Ink
               row[i] = $&.to_i
             elsif row[i] =~ /^[0-9]+\.[0-9]+$/
               row[i] = $&.to_f
+            elsif row[i] =~ /^NULL$/
+              row[i] = nil
             end
             if block_given?
               yield(result[result.length-1], re.columns[i], row[i])
@@ -241,12 +245,12 @@ module Ink
     # [param class_name:] Defines the __table__ name or class
     # [returns:] primary key or nil
     def last_inserted_pk(class_name)
-      c = (class_name.is_a? Class) ? class_name : Ink::Model.classname(class_name)
-      table_name = c.table_name
-      pk_name = c.primary_key[0]
-      return if not (table_name and pk_name)
+      class_name = Ink::Model.classname(class_name) unless class_name.is_a? Class
+      table_name = class_name.table_name
+      pk_name = class_name.primary_key
+      return if table_name.nil? or pk_name.nil?
       response = self.query("SELECT MAX(#{pk_name}) as id FROM #{table_name};")
-      return (response.length > 0) ? response[0]["id"] : nil
+      return (response.empty?) ? nil : response.first["id"]
     end
 
     # Instance method
@@ -271,7 +275,7 @@ module Ink
     # [param params:] Additional SQL syntax like WHERE conditions (optional)
     def remove(class_name, params="")
       table_name = (class_name.is_a? Class) ? class_name.table_name : Ink::Model.str_to_tablename(class_name)
-      return if not table_name
+      return if table_name.nil?
       self.query("DELETE FROM #{table_name} #{params};")
     end
 
@@ -282,14 +286,14 @@ module Ink
     # [param params:] Additional SQL syntax like WHERE conditions (optional)
     # [returns:] Array of class_name instances from the SQL result set
     def find(class_name, params="")
-      c = (class_name.is_a? Class) ? class_name : Ink::Model.classname(class_name)
+      class_name = Ink::Model.classname(class_name) unless class_name.is_a? Class
       result = Array.new
-      table_name = c.table_name
-      return result if not table_name
+      table_name = class_name.table_name
+      return result if table_name.nil?
 
       re = self.query("SELECT * FROM #{table_name} #{params};")
       re.each do |entry|
-        instance = c.new entry
+        instance = class_name.new entry
         result.push instance
       end
       result
@@ -306,23 +310,25 @@ module Ink
     # [param params:] Additional SQL syntax like GROUP BY (optional)
     # [returns:] Array of class2 instances from the SQL result set
     def find_union(class1, class1_id, class2, params="")
-      c1 = (class1.is_a? Class) ? class1 : Ink::Model.classname(class1)
-      c2 = (class2.is_a? Class) ? class2 : Ink::Model.classname(class2)
+      class1 = Ink::Model.classname(class1) unless class1.is_a? Class
+      class2 = Ink::Model.classname(class2) unless class2.is_a? Class
       result = Array.new
       relationship = nil
-      c1.foreign.each do |k,v|
-        relationship = v if k.downcase == c2.class_name.downcase
+      class1.foreign.each do |k,v|
+        relationship = v if k == class2.class_name
       end
       return result if relationship != "many_many"
-      fk1 = c1.foreign_key[0]
-      pk2 = c2.primary_key[0]
-      fk2 = c2.foreign_key[0]
-      tablename1 = c1.table_name
-      tablename2 = c2.table_name
-      union_class = ((c1.class_name.downcase <=> c2.class_name.downcase) < 0) ? "#{tablename1}_#{tablename2}" : "#{tablename2}_#{tablename1}"
+      fk1 = class1.foreign_key
+      pk2 = class2.primary_key
+      fk2 = class2.foreign_key
+      tablename1 = class1.table_name
+      tablename2 = class2.table_name
+      union_class = ((class1.class_name <=> class2.class_name) < 0) ?
+        "#{tablename1}_#{tablename2}" :
+        "#{tablename2}_#{tablename1}"
       re = self.query("SELECT #{tablename2}.* FROM #{union_class}, #{tablename2} WHERE #{union_class}.#{fk1} = #{class1_id} AND #{union_class}.#{fk2} = #{tablename2}.#{pk2} #{params};")
       re.each do |entry|
-        instance = c2.new entry
+        instance = class2.new entry
         result.push instance
       end
       result
@@ -338,26 +344,26 @@ module Ink
     # [param params:] Additional SQL syntax like GROUP BY (optional)
     # [returns:] Array of class2 instances from the SQL result set
     def find_references(class1, class1_id, class2, params="")
-      c1 = (class1.is_a? Class) ? class1 : Ink::Model.classname(class1)
-      c2 = (class2.is_a? Class) ? class2 : Ink::Model.classname(class2)
+      class1 = Ink::Model.classname(class1) unless class1.is_a? Class
+      class2 = Ink::Model.classname(class2) unless class2.is_a? Class
       result = Array.new
       relationship = nil
-      c1.foreign.each do |k,v|
-        relationship = v if k.downcase == c2.class_name.downcase
+      class1.foreign.each do |k,v|
+        relationship = v if k == class2.class_name
       end
       return result if relationship == "many_many"
       re = Array.new
-      fk1 = c1.foreign_key[0]
-      tablename1 = c1.table_name
-      tablename2 = c2.table_name
-      if ((c1.class_name.downcase <=> c2.class_name.downcase) < 0 and relationship == "one_one") or relationship == "one_many"
-        re = self.query "SELECT * FROM #{tablename2} WHERE #{c2.primary_key[0]}=(SELECT #{c2.foreign_key[0]} FROM #{tablename1} WHERE #{c1.primary_key[0]}=#{class1_id});"
+      fk1 = class1.foreign_key
+      tablename1 = class1.table_name
+      tablename2 = class2.table_name
+      if ((class1.class_name <=> class2.class_name) < 0 and relationship == "one_one") or relationship == "one_many"
+        re = self.query "SELECT * FROM #{tablename2} WHERE #{class2.primary_key}=(SELECT #{class2.foreign_key} FROM #{tablename1} WHERE #{class1.primary_key}=#{class1_id});"
       else
         re = self.query "SELECT * FROM #{tablename2} WHERE #{fk1} = #{class1_id} #{params};"
       end
 
       re.each do |entry|
-        instance = c2.new entry
+        instance = class2.new entry
         result.push instance
       end
       result
@@ -375,7 +381,7 @@ module Ink
     def find_reference(class1, class1_id, class2, params="")
       result_array = self.find_references class1, class1_id, class2, params
       if result_array.length == 1
-        result_array[0]
+        result_array.first
       else
         nil
       end
@@ -394,21 +400,21 @@ module Ink
       if type == "one_one"
         firstclass = ((instance.class.name.downcase <=> link.name.downcase) < 0) ? instance.class : link
         secondclass = ((instance.class.name.downcase <=> link.name.downcase) < 0) ? link : instance.class
-        key = ((instance.class.name.downcase <=> link.name.downcase) < 0) ? instance.class.primary_key[0] : instance.class.foreign_key[0]
-        value = instance.method(instance.class.primary_key[0]).call
-        @db.query "UPDATE #{firstclass.table_name} SET #{secondclass.foreign_key[0]}=NULL WHERE #{key}=#{value};"
+        key = ((instance.class.name.downcase <=> link.name.downcase) < 0) ? instance.class.primary_key : instance.class.foreign_key
+        value = instance.method(instance.class.primary_key).call
+        @db.query "UPDATE #{firstclass.table_name} SET #{secondclass.foreign_key}=NULL WHERE #{key}=#{value};"
       elsif type == "one_many" or type == "many_one"
         firstclass = (type == "one_many") ? instance.class : link
         secondclass = (type == "one_many") ? link : instance.class
-        key = (type == "one_many") ? instance.class.primary_key[0] : instance.class.foreign_key[0]
-        value = instance.method(instance.class.primary_key[0]).call
-        @db.query "UPDATE #{firstclass.table_name} SET #{secondclass.foreign_key[0]}=NULL WHERE #{key}=#{value};"
+        key = (type == "one_many") ? instance.class.primary_key : instance.class.foreign_key
+        value = instance.method(instance.class.primary_key).call
+        @db.query "UPDATE #{firstclass.table_name} SET #{secondclass.foreign_key}=NULL WHERE #{key}=#{value};"
       elsif type == "many_many"
         tablename1 = instance.class.table_name
         tablename2 = link.table_name
         union_class = ((instance.class.name.downcase <=> link.name.downcase) < 0) ? "#{tablename1}_#{tablename2}" : "#{tablename2}_#{tablename1}"
-        value = instance.method(instance.class.primary_key[0]).call
-        @db.query "DELETE FROM #{union_class} WHERE #{instance.class.foreign_key[0]}=#{value};"
+        value = instance.method(instance.class.primary_key).call
+        @db.query "DELETE FROM #{union_class} WHERE #{instance.class.foreign_key}=#{value};"
       end
     end
 
@@ -427,13 +433,13 @@ module Ink
       if value.is_a? Array
         value.each do |v|
           if v.instance_of? link
-            to_add.push(v.method(link.primary_key[0]).call)
+            to_add.push(v.method(link.primary_key).call)
           else
             to_add.push v
           end
         end
       elsif value.instance_of? link
-        to_add.push(value.method(link.primary_key[0]).call)
+        to_add.push(value.method(link.primary_key).call)
       else
         to_add.push value
       end
@@ -455,30 +461,30 @@ module Ink
     def create_link(instance, link, type, fk)
       if type == "one_one"
         if (instance.class.name.downcase <=> link.name.downcase) < 0
-          re = self.find(link.name, "WHERE #{link.primary_key[0]}=#{fk};")[0]
+          re = self.find(link.name, "WHERE #{link.primary_key}=#{fk};").first
           self.delete_all_links re, instance.class, type
         end
         firstclass = ((instance.class.name.downcase <=> link.name.downcase) < 0) ? instance.class : link
         secondclass = ((instance.class.name.downcase <=> link.name.downcase) < 0) ? link : instance.class
-        key = ((instance.class.name.downcase <=> link.name.downcase) < 0) ? instance.class.primary_key[0] : link.primary_key[0]
-        value = instance.method(instance.class.primary_key[0]).call
+        key = ((instance.class.name.downcase <=> link.name.downcase) < 0) ? instance.class.primary_key : link.primary_key
+        value = instance.method(instance.class.primary_key).call
         fk_set = ((instance.class.name.downcase <=> link.name.downcase) < 0) ? fk : value
         value_set = ((instance.class.name.downcase <=> link.name.downcase) < 0) ? value : fk
-        @db.query "UPDATE #{firstclass.table_name} SET #{secondclass.foreign_key[0]}=#{fk} WHERE #{key}=#{value};"
+        @db.query "UPDATE #{firstclass.table_name} SET #{secondclass.foreign_key}=#{fk} WHERE #{key}=#{value};"
       elsif type == "one_many" or type == "many_one"
         firstclass = (type == "one_many") ? instance.class : link
         secondclass = (type == "one_many") ? link : instance.class
-        key = (type == "one_many") ? instance.class.primary_key[0] : link.primary_key[0]
-        value = instance.method(instance.class.primary_key[0]).call
+        key = (type == "one_many") ? instance.class.primary_key : link.primary_key
+        value = instance.method(instance.class.primary_key).call
         fk_set = (type == "one_many") ? fk : value
         value_set = (type == "one_many") ? value : fk
-        @db.query "UPDATE #{firstclass.table_name} SET #{secondclass.foreign_key[0]}=#{fk_set} WHERE #{key}=#{value_set};"
+        @db.query "UPDATE #{firstclass.table_name} SET #{secondclass.foreign_key}=#{fk_set} WHERE #{key}=#{value_set};"
       elsif type == "many_many"
         tablename1 = instance.class.table_name
         tablename2 = link.table_name
         union_class = ((instance.class.name.downcase <=> link.name.downcase) < 0) ? "#{tablename1}_#{tablename2}" : "#{tablename2}_#{tablename1}"
-        value = instance.method(instance.class.primary_key[0]).call
-        @db.query "INSERT INTO #{union_class} (#{instance.class.foreign_key[0]}, #{link.foreign_key[0]}) VALUES (#{value}, #{fk});"
+        value = instance.method(instance.class.primary_key).call
+        @db.query "INSERT INTO #{union_class} (#{instance.class.foreign_key}, #{link.foreign_key}) VALUES (#{value}, #{fk});"
       end
     end
 

data/lib/webink/model.rb

@@ -140,8 +140,12 @@ module Ink
         self.class.fields.each do |k,v|
           if data.is_a? Array
             raise LoadError.new("Model cannot be loaded, wrong number or arguments #{data.length} expected #{self.class.fields.length} or #{self.class.fields.length - 1}") if data.length < self.class.fields.length - 1 or data.length > self.class.fields.length
-            init_field k, data[i] if self.class.primary_key != k or data.length == self.class.fields.length
-            i += 1
+            if self.class.primary_key != k or data.length == self.class.fields.length
+              init_field k, data[i]
+              i += 1
+            else
+              init_field self.class.primary_key, nil
+            end
           else
             raise LoadError.new("Model cannot be loaded, argument missing: #{key}") if not data.key?(k.to_s) and self.class.primary_key != k
             init_field k, data[k.to_s]
@@ -258,28 +262,26 @@ module Ink
       string = Array.new
       keystring = Array.new
       valuestring = Array.new
-      fields = self.class.fields
       pkvalue = nil
-      for i in 0...fields.keys.length
-        k = fields.keys[i]
+      self.class.fields.each do |k,v|
         value = instance_variable_get "@#{k}"
-        value = "NULL" if not value
-        if k != self.class.primary_key[0]
+        value = "NULL" if value.nil?
+        if k != self.class.primary_key
           string.push "`#{k}`=#{(value.is_a?(Numeric)) ? value : "\'#{value}\'"}"
           keystring.push "`#{k}`"
           valuestring.push "#{(value.is_a?(Numeric)) ? value : "\'#{value}\'"}"
         else
-          pkvalue = "WHERE `#{self.class.primary_key[0]}`=#{(value.is_a?(Numeric)) ? value : "\'#{value}\'"}"
+          pkvalue = "WHERE `#{self.class.primary_key}`=#{(value.is_a?(Numeric)) ? value : "\'#{value}\'"}"
         end
       end
       if pkvalue
         response = Ink::Database.database.find self.class, pkvalue
-        if response.length == 1
-          Ink::Database.database.query "UPDATE #{self.class.table_name} SET #{string * ","} #{pkvalue};"
-        elsif response.length == 0
+        if response.empty?
           Ink::Database.database.query "INSERT INTO #{self.class.table_name} (#{keystring * ","}) VALUES (#{valuestring * ","});"
           pk = Ink::Database.database.last_inserted_pk(self.class)
-          instance_variable_set "@#{self.class.primary_key[0]}", pk.is_a?(Numeric) ? pk : "\'#{pk}\'" if pk
+          instance_variable_set "@#{self.class.primary_key}", pk.is_a?(Numeric) ? pk : "\'#{pk}\'" if pk
+        else
+          Ink::Database.database.query "UPDATE #{self.class.table_name} SET #{string * ","} #{pkvalue};"
         end
       end
 
@@ -321,7 +323,7 @@ module Ink
       relationship = self.class.foreign[c.class_name]
       if relationship
         result_array = (relationship == "many_many") ? Ink::Database.database.find_union(self.class, self.pk, c) : Ink::Database.database.find_references(self.class, self.pk, c)
-        instance_variable_set("@#{c.table_name}", (relationship =~ /^one_/) ? result_array[0] : result_array)
+        instance_variable_set("@#{c.table_name}", (relationship =~ /^one_/) ? result_array.first : result_array)
         true
       else
         false
@@ -340,26 +342,28 @@ module Ink
 
       string = "CREATE TABLE #{self.table_name} ("
       mfk = self.foreign_key
-      fields = self.fields
-      for i in 0...fields.keys.length
-        k = fields.keys[i]
-        string += "`#{k}` #{fields[k]*" "}" if k != self.primary_key[0]
-        string += "#{Ink::Database.database.primary_key_autoincrement(k)*" "}" if k == self.primary_key[0]
-        string += "," if i < fields.keys.length - 1
-      end
+      string += self.fields.map do |k,v|
+        if k != self.primary_key
+          "`#{k}` #{v*" "}"
+        else
+          "#{Ink::Database.database.primary_key_autoincrement(k)*" "}"
+        end
+      end.join(",")
 
       if self.respond_to? :foreign
-        foreign = self.foreign
-        for i in 0...foreign.keys.length
-          k = foreign.keys[i]
-          v = foreign[k]
-          fk = Ink::Model::classname(k).foreign_key
-          string += ",`#{fk[0]}` #{fk[1]}" if fk.length > 0 and (v == "one_many" or (v == "one_one" and (self.name <=> k) < 0))
-
-          if mfk.length > 0 and fk.length > 1 and v == "many_many" and (self.name <=> k) < 0
-            result.push "CREATE TABLE #{self.table_name}_#{Ink::Model::str_to_tablename(k)} (#{Ink::Database.database.primary_key_autoincrement*" "}, `#{mfk[0]}` #{mfk[1]}, `#{fk[0]}` #{fk[1]});"
-          end
-        end
+         tmp = self.foreign.map do |k,v|
+           f_class = Ink::Model::classname(k)
+           if v == "many_many" and (self.name <=> k) < 0
+             result.push "CREATE TABLE #{self.table_name}_#{Ink::Model::str_to_tablename(k)} (#{Ink::Database.database.primary_key_autoincrement*" "}, `#{self.foreign_key}` #{self.foreign_key_type}, `#{f_class.foreign_key}` #{f_class.foreign_key_type});"
+             nil
+           end
+           if v == "one_many" or (v == "one_one" and (self.name <=> k) < 0)
+             "`#{f_class.foreign_key}` #{f_class.foreign_key_type}"
+           else
+             nil
+           end
+         end.compact.join(",")
+         string += ",#{tmp}" if not tmp.empty?
       end
       string += ");"
       result.push string

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webink
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fcgi