webink 1.2.9 → 1.3.0

data/lib/webink/database.rb

@@ -153,7 +153,11 @@ module Ink
           re.each_hash do |row|
             result.push Hash.new
             row.each do |k,v|
-              v = $&.to_i if v =~ /^[0-9]+$/
+              if v =~ /^[0-9]+$/
+                v = $&.to_i
+              elsif v =~ /^[0-9]+\.[0-9]+$/
+                v = $&.to_f
+              end
               result[result.length-1][k] = v
             end
           end
@@ -163,7 +167,11 @@ module Ink
         re.each do |row|
           result.push Hash.new
           for i in 0...re.columns.length
-            row[i] = $&.to_i if row[i] =~ /^[0-9]+$/
+            if row[i] =~ /^[0-9]+$/
+              row[i] = $&.to_i
+            elsif row[i] =~ /^[0-9]+\.[0-9]+$/
+              row[i] = $&.to_f
+            end
             result[result.length-1][re.columns[i]] = row[i]
           end
         end
@@ -191,10 +199,12 @@ module Ink
     # Instance method
     # 
     # Attempts to fetch the last inserted primary key
+    # [param class_name:] Defines the __table__ name or class
     # [returns:] primary key or nil
     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]
+      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)
       response = self.query("SELECT MAX(#{pk_name}) as id FROM #{table_name};")
       return (response.length > 0) ? response[0]["id"] : nil
@@ -218,10 +228,10 @@ module Ink
     # Instance method
     # 
     # Delete something from the database.
-    # [param class_name:] Defines the table name
+    # [param class_name:] Defines the class name or class
     # [param params:] Additional SQL syntax like WHERE conditions (optional)
     def remove(class_name, params="")
-      table_name = Ink::Model.str_to_tablename(class_name)
+      table_name = (class_name.is_a? Class) ? class_name.table_name : Ink::Model.str_to_tablename(class_name)
       return if not table_name
       self.query("DELETE FROM #{table_name} #{params};")
     end
@@ -229,17 +239,18 @@ module Ink
     # Instance method
     # 
     # Retrieve class instances, that are loaded with the database result set.
-    # [param class_name:] Defines the table name and resulting Instance classnames
+    # [param class_name:] Defines the class name or class which should be queried
     # [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)
       result = Array.new
-      table_name = Ink::Model.str_to_tablename(class_name)
+      table_name = c.table_name
       return result if not table_name
       
       re = self.query("SELECT * FROM #{table_name} #{params};")
       re.each do |entry|
-        instance = Ink::Model.classname(class_name).new entry
+        instance = c.new entry
         result.push instance
       end
       result
@@ -250,27 +261,29 @@ module Ink
     # Retrieve class2 instances, that are related to the class1 instance with
     # primary key class1_id. This is done via an additional relationship table.
     # Only relevant for many_many relationships.
-    # [param class1:] Reference classname
+    # [param class1:] Reference classname or class
     # [param class1_id:] Primary key value of the reference classname
-    # [param class2:] Match classname
+    # [param class2:] Match classname or class
     # [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)
       result = Array.new
       relationship = nil
-      Ink::Model.classname(class1).foreign.each do |k,v|
-        relationship = v if k.downcase == class2.downcase
+      c1.foreign.each do |k,v|
+        relationship = v if k.downcase == c2.class_name.downcase
       end
       return result if relationship != "many_many"
-      fk1 = Ink::Model.classname(class1).foreign_key[0]
-      pk2 = Ink::Model.classname(class2).primary_key[0]
-      fk2 = Ink::Model.classname(class2).foreign_key[0]
-      tablename1 = Ink::Model.str_to_tablename(class1)
-      tablename2 = Ink::Model.str_to_tablename(class2)
-      union_class = ((class1.downcase <=> class2.downcase) < 0) ? "#{tablename1}_#{tablename2}" : "#{tablename2}_#{tablename1}"
+      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}"
       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 = Ink::Model.classname(tablename2).new entry
+        instance = c2.new entry
         result.push instance
       end
       result
@@ -280,33 +293,55 @@ module Ink
     # 
     # Retrieve class2 instances, that are related to the class1 instance with
     # primary key class1_id. Not relevant for many_many relationships
-    # [param class1:] Reference classname
+    # [param class1:] Reference classname or class
     # [param class1_id:] Primary key value of the reference classname
-    # [param class2:] Match classname
+    # [param class2:] Match classname or class
     # [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)
       result = Array.new
       relationship = nil
-      Ink::Model.classname(class1).foreign.each do |k,v|
-        relationship = v if k.downcase == class2.downcase
+      c1.foreign.each do |k,v|
+        relationship = v if k.downcase == c2.class_name.downcase
       end
       return result if relationship == "many_many"
       re = Array.new
-      fk1 = Ink::Model.classname(class1).foreign_key[0]
-      if ((class1.downcase <=> class2.downcase) < 0 and relationship == "one_one") or relationship == "one_many"
-        re = self.query "SELECT * FROM #{Ink::Model.str_to_tablename(class2)} WHERE #{Ink::Model.classname(class2).primary_key[0]}=(SELECT #{Ink::Model.classname(class2).foreign_key[0]} FROM #{Ink::Model.str_to_tablename(class1)} WHERE #{Ink::Model.classname(class1).primary_key[0]}=#{class1_id});"
+      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});"
       else
-        re = self.query "SELECT * FROM #{Ink::Model.str_to_tablename(class2)} WHERE #{fk1} = #{class1_id} #{params};"
+        re = self.query "SELECT * FROM #{tablename2} WHERE #{fk1} = #{class1_id} #{params};"
       end
       
       re.each do |entry|
-        instance = Ink::Model.classname(class2).new entry
+        instance = c2.new entry
         result.push instance
       end
       result
     end
     
+    # Instance method
+    # 
+    # Retrieve one class2 instance, that is related to the class1 instance with
+    # primary key class1_id. Only relevant for one_one and one_many relationships
+    # [param class1:] Reference classname or class
+    # [param class1_id:] Primary key value of the reference classname
+    # [param class2:] Match classname or class
+    # [param params:] Additional SQL syntax like GROUP BY (optional)
+    # [returns:] single class2 instance from the SQL result set
+    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]
+      else
+        nil
+      end
+    end
+    
     # Instance method
     # 
     # This method attempts to remove all existing relationship data
@@ -322,16 +357,16 @@ module Ink
         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 #{Ink::Model.str_to_tablename(firstclass.name)} SET #{secondclass.foreign_key[0]}=NULL WHERE #{key}=#{value};"
+        @db.query "UPDATE #{firstclass.table_name} SET #{secondclass.foreign_key[0]}=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 #{Ink::Model.str_to_tablename(firstclass.name)} SET #{secondclass.foreign_key[0]}=NULL WHERE #{key}=#{value};"
+        @db.query "UPDATE #{firstclass.table_name} SET #{secondclass.foreign_key[0]}=NULL WHERE #{key}=#{value};"
       elsif type == "many_many"
-        tablename1 = Ink::Model.str_to_tablename(instance.class.name)
-        tablename2 = Ink::Model.str_to_tablename(link.name)
+        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};"
@@ -390,7 +425,7 @@ module Ink
         value = instance.method(instance.class.primary_key[0]).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 #{Ink::Model.str_to_tablename(firstclass.name)} SET #{secondclass.foreign_key[0]}=#{fk} WHERE #{key}=#{value};"
+        @db.query "UPDATE #{firstclass.table_name} SET #{secondclass.foreign_key[0]}=#{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
@@ -398,10 +433,10 @@ module Ink
         value = instance.method(instance.class.primary_key[0]).call
         fk_set = (type == "one_many") ? fk : value
         value_set = (type == "one_many") ? value : fk
-        @db.query "UPDATE #{Ink::Model.str_to_tablename(firstclass.name)} SET #{secondclass.foreign_key[0]}=#{fk_set} WHERE #{key}=#{value_set};"
+        @db.query "UPDATE #{firstclass.table_name} SET #{secondclass.foreign_key[0]}=#{fk_set} WHERE #{key}=#{value_set};"
       elsif type == "many_many"
-        tablename1 = Ink::Model.str_to_tablename(instance.class.name)
-        tablename2 = Ink::Model.str_to_tablename(link.name)
+        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});"

data/lib/webink/model.rb

@@ -131,13 +131,14 @@ module Ink
         end
         if self.class.respond_to? :foreign
           self.class.foreign.each do |k,v|
-            raise NameError.new("Model cannot use #{k} as foreign, it already exists") if self.class.respond_to? k.to_sym or k.downcase == "pk"
-            instance_variable_set "@#{self.class.str_to_tablename(k)}", nil
-            self.class.send(:define_method, k.downcase) do
-              instance_variable_get "@#{k.downcase}"
+            k_table = self.class.str_to_tablename(k)
+            raise NameError.new("Model cannot use #{k_table} as foreign, it already exists") if self.class.respond_to? k_table.to_sym or k_table == "pk"
+            instance_variable_set("@#{k_table}", nil)
+            self.class.send(:define_method, k_table) do
+              instance_variable_get "@#{k_table}"
             end
-            self.class.send(:define_method, "#{k.downcase}=") do |val|
-              instance_variable_set "@#{k.downcase}", val
+            self.class.send(:define_method, "#{k_table}=") do |val|
+              instance_variable_set "@#{k_table}", val
             end
           end
         end
@@ -183,12 +184,12 @@ module Ink
         end
       end
       if pkvalue
-        response = Ink::Database.database.find self.class.name, pkvalue
+        response = Ink::Database.database.find self.class, pkvalue
         if response.length == 1
-          Ink::Database.database.query "UPDATE #{Ink::Model.str_to_tablename(self.class.name)} SET #{string * ","} #{pkvalue}"
+          Ink::Database.database.query "UPDATE #{self.class.table_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(self.class.name)
+          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
         end
       end
@@ -221,6 +222,23 @@ module Ink
       Ink::Database.database.remove self.class.name, "WHERE `#{self.class.primary_key[0]}`=#{(pkvalue.is_a?(Numeric)) ? pkvalue : "\'#{pkvalue}\'"};"
     end
     
+    # Instance method
+    #
+    # Queries the database for foreign keys and attaches them to the
+    # matching foreign accessor
+    # [param foreign_class:] Defines the foreign class name or class
+    def find_references(foreign_class)
+      c = (foreign_class.is_a? Class) ? foreign_class : Ink::Model.classname(foreign_class)
+      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)
+        true
+      else
+        false
+      end
+    end
+    
     # Class method
     # 
     # This will create SQL statements for creating the
@@ -231,7 +249,7 @@ module Ink
       result = Array.new
       raise NotImplementedError.new("Cannot create a Database without field definitions") if not self.respond_to? :fields
       
-      string = "CREATE TABLE #{Model::str_to_tablename(self.name)} ("
+      string = "CREATE TABLE #{self.table_name} ("
       mfk = self.foreign_key
       fields = self.fields
       for i in 0...fields.keys.length
@@ -246,11 +264,11 @@ module Ink
         for i in 0...foreign.keys.length
           k = foreign.keys[i]
           v = foreign[k]
-          fk = Model::classname(k).foreign_key
+          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 #{Model::str_to_tablename(self.name)}_#{Model::str_to_tablename(k)} (#{Ink::Database.database.primary_key_autoincrement*" "}, `#{mfk[0]}` #{mfk[1]}, `#{fk[0]}` #{fk[1]});"
+            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
       end
@@ -259,6 +277,22 @@ module Ink
       result
     end
     
+    # Class method
+    # 
+    # This will retrieve a string-representation of the model name
+    # [returns:] valid classname
+    def self.class_name
+      self.name
+    end
+    
+    # Class method
+    # 
+    # This will retrieve a tablename-representation of the model name
+    # [returns:] valid tablename
+    def self.table_name
+      self.str_to_tablename self.name
+    end
+    
     # Class method
     # 
     # This will check the parent module for existing classnames
@@ -266,7 +300,11 @@ module Ink
     # [param str:] some string
     # [returns:] valid classname or nil
     def self.str_to_classname(str)
-      ((Module.const_get str.capitalize).is_a? Class) ? str.capitalize : nil
+      res = []
+      str.scan(/((^|_)([a-z0-9]+))/) { |s|
+        res.push(s[2][0].upcase + ((s[2].length > 1) ? s[2][1,s[2].length] : "")) if s.length > 0
+      }
+      ((Module.const_get res.join).is_a? Class) ? res.join : nil
     end
     
     # Class method
@@ -277,7 +315,11 @@ module Ink
     # [param str:] some string
     # [returns:] valid tablename or nil
     def self.str_to_tablename(str)
-      ((Module.const_get str.capitalize).is_a? Class) ? str.downcase : nil
+      res = []
+      str.scan(/([A-Z][a-z0-9]*)/) { |s|
+        res.push (res.length>0) ? "_" + s.join.downcase : s.join.downcase
+      }
+      ((Module.const_get str).is_a? Class) ? res.join : nil
     end
     
     # Class method
@@ -288,7 +330,15 @@ module Ink
     # [param str:] some string
     # [returns:] valid class or nil
     def self.classname(str)
-      ((Module.const_get str.capitalize).is_a? Class) ? (Module.const_get str.capitalize) : nil
+      res = []
+      if str[0] =~ /^[a-z]/
+        str.scan(/((^|_)([a-z0-9]+))/) { |s|
+          res.push(s[2][0].upcase + ((s[2].length > 1) ? s[2][1,s[2].length] : "")) if s.length > 0
+        }
+      else
+        res.push str
+      end
+      ((Module.const_get res.join).is_a? Class) ? (Module.const_get res.join) : nil
     end
     
     # Class method
@@ -317,7 +367,7 @@ module Ink
     # [returns:] Array of the form: key name, key type or empty
     def self.foreign_key
       pk = self.primary_key
-      return (pk) ? ["#{self.str_to_tablename(self.name)}_#{pk[0]}", pk[1]] : []
+      return (pk) ? ["#{self.table_name}_#{pk[0]}", pk[1]] : []
     end
     
   end

metadata

@@ -2,7 +2,7 @@
 name: webink
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.9
+  version: 1.3.0
 platform: ruby
 authors: 
 - Matthias Geier
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-25 00:00:00 Z
+date: 2012-09-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fcgi
@@ -51,7 +51,7 @@ files:
 - lib/webink/controller.rb
 - bin/webink_database
 - bin/rfcgi
-homepage: http://powerpuff.net/
+homepage: https://github.com/matthias-geier/WebInk
 licenses: []
 
 post_install_message: