nakor 0.0.10 → 0.0.12

data/README.md

@@ -19,6 +19,13 @@ This will create the awesome_app directory in the current directory. To run it i
 
     /Applications/CoronaSDK/simulator awesome_app
 
+# Development
+
+To release a new version:
+
+    gem bump
+    gem release
+
 # Credits
 
 This code is MIT licensed, see http://developer.coronalabs.com/code/license

data/lib/nakor/generators/corona-game-template/scripts/lib/active_record.lua

@@ -79,12 +79,15 @@ end
 ------------------------------------------------------------------------------
 -- Returns all rows in the table that match the given filter
 ------------------------------------------------------------------------------
-function ActiveRecord.static:findAll( filter, orderBy )
+function ActiveRecord.static:findAll( klass, params )
   local result = nil
-  if filter == nil then
-    result = orm.selectAll( self.tableName, {order = orderBy} )
+  if params == nil then
+    params = {}
+  end
+  if params.where == nil then
+    result = orm.selectAll( klass.tableName, params )
   else
-    result = orm.selectWhere( self.tableName, {where = filter, order = orderBy} )
+    result = orm.selectWhere( klass.tableName, params )
   end
   return result
 end
@@ -92,11 +95,11 @@ end
 ------------------------------------------------------------------------------
 -- Updates all rows in the table that match the given filter
 ------------------------------------------------------------------------------
-function ActiveRecord.static:updateAll( updateSql, filter )
+function ActiveRecord.static:updateAll( klass, updateSql, filter )
   if filter == nil then
-    orm.updateAll( self.tableName, updateSql )
+    orm.updateAll( klass.tableName, updateSql )
   else
-    orm.updateWhere( self.tableName, updateSql, filter )
+    orm.updateWhere( klass.tableName, updateSql, filter )
   end
 end
 
@@ -114,8 +117,10 @@ end
 ------------------------------------------------------------------------------
 function ActiveRecord:reload()
   local updatedRecord = orm.selectOne( self.class.tableName, 'id', self.id )
-  for k,v in pairs(updatedRecord) do
-    self[k] = v
+  if updatedRecord ~= nil then
+    for k,v in pairs(updatedRecord) do
+      self[k] = v
+    end
   end
 end
 
@@ -144,7 +149,14 @@ end
 -- Updates an array of columns
 ------------------------------------------------------------------------------
 function ActiveRecord:updateAttributes( updateTable )
-  print("IMPLEMENTATION PENDING...")
+  local filter = "id = " .. self.id
+  local columns = {}
+  local columnValues = {}
+  for k,v in pairs(updateTable) do
+    table.insert( columns, k )
+    table.insert( columnValues, v )
+  end
+  orm.updateAttributes( self.class.tableName, filter, columns, columnValues )
 end
 
 ------------------------------------------------------------------------------

data/lib/nakor/generators/corona-game-template/scripts/lib/orm.lua

@@ -156,7 +156,11 @@ M.updateRow = updateRow
 -- otherwise do an insert
 ------------------------------------------------------------------------------
 local createOrUpdate = function( tableName, recordData )
-  local existingRecord = M.selectOne( tableName, 'id', recordData.id )
+  local existingRecord = nil
+  if recordData.id ~= nil then
+    existingRecord = M.selectOne( tableName, 'id', recordData.id )
+  end
+
   if existingRecord == nil then
     M.insertRow( tableName, recordData )
   else

data/lib/nakor/generators/corona-game-template/scripts/lib/table_ext.lua

@@ -1,5 +1,37 @@
 local M = {}
 
+------------------------------------------------------------------------------
+-- Return the number of instances of a value in a list
+-- Adapted from: http://snippets.luacode.org/?p=snippets/Count_Item_Occurances_in_Table_24
+------------------------------------------------------------------------------
+local itemCount = function(list, value)
+  local count = 0
+  for i,v in pairs(list) do
+    if v == value then count = count + 1 end
+  end
+  return count
+end
+M.itemCount = itemCount
+
+------------------------------------------------------------------------------
+-- Return true if the given list has duplicate entries for the given value
+-- This is a modified version of itemCount,
+-- optimized for checking for duplicates
+------------------------------------------------------------------------------
+local hasDuplicateValues = function(list, value)
+  local result = false
+  local count = 0
+  for i,v in pairs(list) do
+    if v == value then count = count + 1 end
+    if count > 1 then
+      result = true
+      break
+    end
+  end
+  return result
+end
+M.hasDuplicateValues = hasDuplicateValues
+
 ------------------------------------------------------------------------------
 -- Merge two tables
 -- From: http://stackoverflow.com/questions/1283388/lua-merge-tables

data/lib/nakor/version.rb

@@ -1,3 +1,3 @@
 module Nakor
-  VERSION = "0.0.10"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nakor
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nakor
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Nakor is a gem that encapsulates the corona-game-template project.