knjrbfw 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/knjrbfw.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]

data/lib/knj/objects/objects_sqlhelper.rb

@@ -141,7 +141,7 @@ class Knj::Objects
                 if table_data[:parent_table]
                   table_name_real = table_name
                 elsif table_data[:datarow]
-                  table_name_real = table_data[:datarow].classname
+                  table_name_real = self.datarow_from_datarow_argument(table_data[:datarow]).classname
                 else
                   table_name_real = @args[:module].const_get(table_name).classname
                 end
@@ -410,7 +410,7 @@ class Knj::Objects
         class_name = args[:table].to_sym
         
         if table_data[:datarow]
-          datarow = table_data[:datarow]
+          datarow = self.datarow_from_datarow_argument(table_data[:datarow])
         else
           self.requireclass(class_name) if @objects.key?(class_name)
           datarow = @args[:module].const_get(class_name)
@@ -463,7 +463,7 @@ class Knj::Objects
     
     args[:joined_tables].each do |table_name, table_data|
       next if table_name.to_sym != class_name
-      return table_data[:datarow] if table_data[:datarow]
+      return self.datarow_from_datarow_argument(table_data[:datarow]) if table_data[:datarow]
       
       self.requireclass(class_name) if @objects.key?(class_name)
       return @args[:module].const_get(class_name)
@@ -471,4 +471,12 @@ class Knj::Objects
     
     raise "Could not figure out datarow for: '#{class_name}'."
   end
+  
+  def datarow_from_datarow_argument(datarow_argument)
+    if datarow_argument.is_a?(String)
+      return Knj::Strings.const_get_full(datarow_argument)
+    end
+    
+    return datarow_argument
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjrbfw
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12468460 !ruby/object:Gem::Requirement
+  requirement: &16567460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *12468460
+  version_requirements: *16567460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &12467800 !ruby/object:Gem::Requirement
+  requirement: &16566720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *12467800
+  version_requirements: *16566720
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &12467120 !ruby/object:Gem::Requirement
+  requirement: &16566240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *12467120
+  version_requirements: *16566240
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &12466460 !ruby/object:Gem::Requirement
+  requirement: &16565520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12466460
+  version_requirements: *16565520
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &12378800 !ruby/object:Gem::Requirement
+  requirement: &16492160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12378800
+  version_requirements: *16492160
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &12378140 !ruby/object:Gem::Requirement
+  requirement: &16491540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12378140
+  version_requirements: *16491540
 description: Including stuff for HTTP, SSH and much more.
 email: k@spernj.org
 executables: []
@@ -339,7 +339,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3899539011112579633
+      hash: 3492311480685367613
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: