webink 1.2.5 → 1.2.7

data/lib/webink/controller.rb

@@ -269,6 +269,13 @@ module Ink
     # [param controller:] Controller name string
     # [returns:] class or nil
     def self.verify(controller)
+      if not Module.const_defined? controller.capitalize
+        if File.exists? "./controllers/#{controller}.rb"
+          load "./controllers/#{controller}.rb"
+        else
+          raise NameError.new("Controller not found.")
+        end
+      end
       ((Module.const_get controller.capitalize).is_a? Class) ? (Module.const_get controller.capitalize) : (raise NameError.new("Controller not found."))
     end
     

data/lib/webink/database.rb

@@ -192,14 +192,11 @@ module Ink
     # 
     # Attempts to fetch the last inserted primary key
     # [returns:] primary key or nil
-    def last_inserted_pk
-      string = ""
-      if @type == "mysql"
-        string = "LAST_INSERT_ID()"
-      elsif @type == "sqlite3"
-        string = "last_insert_rowid()"
-      end
-      response = self.query "SELECT #{string} as id"
+    def last_inserted_pk(class_name)
+      table_name = Ink::Model.str_to_tablename(class_name)
+      pk_name = Ink::Model.classname(class_name).primary_key[0]
+      return if not (table_name and pk_name)
+      response = self.query("SELECT MAX(#{pk_name}) as id FROM #{table_name};")
       return (response.length > 0) ? response[0]["id"] : nil
     end
     

data/lib/webink/model.rb

@@ -174,7 +174,7 @@ module Ink
           Ink::Database.database.query "UPDATE #{Ink::Model.str_to_tablename(self.class.name)} SET #{string * ","} #{pkvalue}"
         elsif response.length == 0
           Ink::Database.database.query "INSERT INTO #{Ink::Model.str_to_tablename(self.class.name)} (#{keystring * ","}) VALUES (#{valuestring * ","});"
-          pk = Ink::Database.database.last_inserted_pk
+          pk = Ink::Database.database.last_inserted_pk(self.class.name)
           instance_variable_set "@#{self.class.primary_key[0]}", pk.is_a?(Numeric) ? pk : "\'#{pk}\'" if pk
         end
       end

metadata

@@ -2,7 +2,7 @@
 name: webink
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.5
+  version: 1.2.7
 platform: ruby
 authors: 
 - Matthias Geier
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-21 00:00:00 Z
+date: 2012-08-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fcgi