updated the demo with the last version of joli.js

xavierlacot · Nov 28, 2011 · 51ad786 · 51ad786
1 parent c579a63
commit 51ad786
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.project
 build/android/*
 build/iphone/*
 tmp
diff --git a/Resources/app.js b/Resources/app.js
@@ -1,6 +1,14 @@
+var joli, joli2;
+
 (function() {
-  // load joli library and models definition file
+  // load joli library using Ti.include()
   Ti.include('/lib/vendor/joli.js/joli.js');
+  joli.connection = new joli.Connection('joli-js-demo');
+
+  // load joli library using Ti.include()
+  joli2 = require('lib/vendor/joli.js/joli').connect('joli-js-demo-2');
+
+  // load the models definition file
   Ti.include('/lib/model/models.js');
 
   // load jasmine library and adapter
@@ -9,6 +17,7 @@
 
   // initialize the model
   joli.models.initialize();
+  joli2.models.initialize();
 
   // load test facility functions
   Ti.include('/test/main.js');

diff --git a/Resources/lib/model/models.js b/Resources/lib/model/models.js
@@ -1,5 +1,3 @@
-joli.connection = new joli.Connection('joli-js-demo');
-
 var models = (function() {
   var m = {};
 
@@ -69,5 +67,46 @@ var models = (function() {
     }
   });
 
+  return m;
+})();
+
+
+
+/**
+ * These tables are created in the joli2 database.
+ * We do not name this bag of models, so the only way to access them will be
+ * joli2.models.get()
+ */
+(function() {
+  var m = {};
+
+  m.human = new joli2.model({
+    table:    'human',
+    columns:  {
+      id:                 'INTEGER PRIMARY KEY AUTOINCREMENT',
+      city_id:            'INTEGER',
+      first_name:         'TEXT',
+      last_name:          'TEXT'
+    }
+  });
+
+  m.city = new joli2.model({
+    table:    'city',
+    columns:  {
+      id:                 'INTEGER PRIMARY KEY AUTOINCREMENT',
+      country_id:         'INTEGER',
+      name:               'TEXT',
+      description:        'TEXT'
+    }
+  });
+
+  m.country = new joli2.model({
+    table:    'country',
+    columns:  {
+      id:                 'INTEGER PRIMARY KEY AUTOINCREMENT',
+      name:               'TEXT'
+    }
+  });
+
   return m;
 })();
diff --git a/Resources/test/main.js b/Resources/test/main.js
@@ -10,6 +10,11 @@ joliTest.prototype = {
     models.city.truncate();
     models.country.truncate();
     models.human.truncate();
+
+    // also clear the second database
+    joli2.models.get('city').truncate();
+    joli2.models.get('country').truncate();
+    joli2.models.get('human').truncate();
   },
 
   /**
@@ -33,6 +38,25 @@ joliTest.prototype = {
     this.sarah.save();
   },
 
+  /**
+   * Insert some human records in the joli2 database
+   */
+  createHumansInJoli2: function() {
+    // create a "human" record (persisted)
+    this.john2 = joli2.models.get('human').newRecord({
+      first_name: 'John',
+      last_name: 'Doe'
+    });
+    this.john2.save();
+
+    // create an other "human" record (persisted)
+    this.sarah2 = joli2.models.get('human').newRecord({
+      first_name: 'Sarah',
+      last_name: 'Sure'
+    });
+    this.sarah2.save();
+  },
+
   /**
    * Insert many human records
    */

diff --git a/Resources/test/model.js b/Resources/test/model.js
@@ -32,7 +32,12 @@
 
     it('joli.model.count()', function() {
       test.createHumans();
+      test.createHumansInJoli2();
       expect(models.human.count()).toBe(1);
+
+      // the same test, but accessing the model through joli.models.get()
+      expect(joli.models.get('human').count()).toBe(1);
+      expect(joli2.models.get('human').count()).toBe(2);
     });
 
     it('joli.model.deleteRecords()', function() {

diff --git a/bin/titanium.sh b/bin/titanium.sh
@@ -6,8 +6,8 @@
 PROJECT_NAME=${PROJECT_NAME}
 PROJECT_ROOT=${PROJECT_ROOT:-../}
 APP_DEVICE=${DEVICE_TYPE}
-IPHONE_SDK_VERSION="4.3"
-TI_SDK_VERSION="1.7.2"
+IPHONE_SDK_VERSION="5.0"
+TI_SDK_VERSION="1.7.5"
 TI_DIR="/Library/Application\ Support/Titanium"
 TI_ASSETS_DIR="${TI_DIR}/mobilesdk/osx/${TI_SDK_VERSION}"
 TI_IPHONE_DIR="${TI_ASSETS_DIR}/iphone"

diff --git a/tiapp.xml b/tiapp.xml
@@ -1,34 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ti:app xmlns:ti="http://ti.appcelerator.org">
-<id>com.jolijs.demo</id>
-<name>joliDemo</name>
-<version>1.0</version>
-<publisher>xavier</publisher>
-<url>http://lacot.org/</url>
-<description>No description provided</description>
-<copyright>2011 by xavier</copyright>
-<icon>default_app_logo.png</icon>
+    <deployment-targets>
+        <target device="mobileweb">true</target>
+        <target device="iphone">true</target>
+        <target device="ipad">true</target>
+        <target device="blackberry">false</target>
+        <target device="android">true</target>
+    </deployment-targets>
+    <id>com.jolijs.demo</id>
+    <name>joliDemo</name>
+    <version>1.0</version>
+    <publisher>xavier</publisher>
+    <url>http://lacot.org/</url>
+    <description>No description provided</description>
+    <copyright>2011 by xavier</copyright>
+    <icon>default_app_logo.png</icon>
     <persistent-wifi>false</persistent-wifi>
     <prerendered-icon>false</prerendered-icon>
     <statusbar-style>default</statusbar-style>
     <statusbar-hidden>false</statusbar-hidden>
     <fullscreen>false</fullscreen>
     <navbar-hidden>false</navbar-hidden>
     <analytics>true</analytics>
-<guid>53f55927-68cb-4e07-b056-83d5c7d04800</guid>
-	<iphone>
-		<orientations device="iphone">
-			<orientation>Ti.UI.PORTRAIT</orientation>
-		</orientations>
-		<orientations device="ipad">
-			<orientation>Ti.UI.PORTRAIT</orientation>
-			<orientation>Ti.UI.UPSIDE_PORTRAIT</orientation>
-			<orientation>Ti.UI.LANDSCAPE_LEFT</orientation>
-			<orientation>Ti.UI.LANDSCAPE_RIGHT</orientation>
-		</orientations>
-	</iphone>
-	<android xmlns:android="http://schemas.android.com/apk/res/android">
-	</android>
-	<modules>
-	</modules>
+    <guid>53f55927-68cb-4e07-b056-83d5c7d04800</guid>
+    <iphone>
+        <orientations device="iphone">
+            <orientation>Ti.UI.PORTRAIT</orientation>
+        </orientations>
+        <orientations device="ipad">
+            <orientation>Ti.UI.PORTRAIT</orientation>
+            <orientation>Ti.UI.UPSIDE_PORTRAIT</orientation>
+            <orientation>Ti.UI.LANDSCAPE_LEFT</orientation>
+            <orientation>Ti.UI.LANDSCAPE_RIGHT</orientation>
+        </orientations>
+    </iphone>
+    <android xmlns:android="http://schemas.android.com/apk/res/android"/>
+    <modules/>
 </ti:app>