Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Version 1.1
  • Loading branch information
ginatrapani committed Sep 10, 2012
1 parent 1206690 commit 5df2f81
Show file tree
Hide file tree
Showing 13 changed files with 103 additions and 15 deletions.
23 changes: 23 additions & 0 deletions docs/source/changelog/1.1.rst
@@ -0,0 +1,23 @@
1.1 - 10 Sept 2012
==================

* New feature! The Foursquare plugin captures checkins, photos, and comments. The dashboard includes
a map of last week's checkins, the rate of checkins by hour over the last week compared to all time, pie charts
of the types of places you check into, and a list of checkins on this day in years past. You an also export your
checkins to a CSV file.
* New Twitter, Facebook, Google+ "Time Machine" dashboard module: Posts published on this day in years past.
* Bugfix: Fixed installation URL in Facebook reauthorization email notification text.
* Bugfix: Check if service user is marked as public in ThinkUp before displaying individual post page data.
* Bugfix: Improved error message when Twitter API endpoint is unreachable.
* Bugfix: All DAO queries function when MySQL strict mode is enabled (no more "General error: 1364 Field 'x' doesn't
have a default value" message).
* Bugfix: Fixed several bugs which resulted in PHP notices and errors.

Developers:

* All MySQL tables are now fully commented.
* Moved DAO files into dedicated folder.
* Added Polygon and Point support to FixtureBuilder library.
* Added Travis PHP 5.4 testing in addition to PHP 5.2 and 5.3.
* Fixed bug in the Plugin Maker which called deprecated code.
* Several code style fixes; added missing DAO profiler calls.
1 change: 1 addition & 0 deletions docs/source/changelog/index.rst
Expand Up @@ -6,6 +6,7 @@ Check out what's new, fixed, and updated in each version release of ThinkUp.
.. toctree::
:maxdepth: 1

1.1
1.0.8.1
1.0.7
1.0.6
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Expand Up @@ -48,9 +48,9 @@
# built documents.
#
# The short X.Y version.
version = '1.0.8.1'
version = '1.1'
# The full version, including alpha/beta/rc tags.
release = '1.0.8.1'
release = '1.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
6 changes: 3 additions & 3 deletions tests/WebTestOfUpgradeDatabase.php
Expand Up @@ -145,7 +145,7 @@ public function testFailAndRerunMigration() {

$stmt = $this->pdo->query("select * from " . $this->table_prefix . "completed_migrations");
$data = $stmt->fetchAll();
$this->assertEqual(count($data), 215);
$this->assertEqual(count($data), $TOTAL_MIGRATION_COUNT);
}

/**
Expand Down Expand Up @@ -296,14 +296,13 @@ private function runMigrations($TMIGRATIONS, $base_version, $fail = false) {
chdir(dirname(__FILE__) . '/../');
//Extract into test_installer directory and set necessary folder permissions
exec('cp ' . $zipfile . ' webapp/test_installer/.;cd webapp/test_installer/;'.
'rm -rf thinkup/_lib/view/compiled_view;unzip -o ' . $zipfile.';');
'rm -rf thinkup/_lib;unzip -o ' . $zipfile.';');
if (!file_exists($this->install_dir.'/thinkup/data/compiled_view')) {
if (!file_exists($this->install_dir.'/thinkup/data')) {
exec('mkdir thinkup/data;');
}
exec('mkdir thinkup/data/compiled_view;chmod -R 777 thinkup');
}

// run updates and migrations
require dirname(__FILE__) . '/migration-assertions.php';

Expand Down Expand Up @@ -336,6 +335,7 @@ private function runMigrations($TMIGRATIONS, $base_version, $fail = false) {
'INSERT INTO tu_follows_b10 (SELECT', $msql);
file_put_contents($migration_10, $msql);
}
//sleep(1000);
$this->get($this->url.'/test_installer/thinkup/');
$this->assertText("ThinkUp's database needs an upgrade");
// token could be in 1 of 2 places, depending on what version is running
Expand Down
74 changes: 69 additions & 5 deletions tests/migration-assertions.php
Expand Up @@ -29,8 +29,8 @@
*
* Database migration assertions to test during WebTestOfUpgradeDatabase
*/
$LATEST_VERSION = '1.0.8';
$TOTAL_MIGRATION_COUNT = 218;
$LATEST_VERSION = '1.1';
$TOTAL_MIGRATION_COUNT = 240;

$MIGRATIONS = array(
/* beta 0.1 */
Expand Down Expand Up @@ -826,9 +826,9 @@
'migrations' => 0,
),

/* 1.0.8 */
'1.0.8' => array(
'zip_url' => 'file://./build/thinkup.zip',
/* 1.0.8.1 */
'1.0.8.1' => array(
'zip_url' => 'https://github.com/downloads/ginatrapani/ThinkUp/thinkup_1.0.8.1.zip',
'migrations' => 1,
'migration_assertions' => array(
'sql' => array(
Expand All @@ -853,4 +853,68 @@
)
)
),

/* 1.1 */
'1.1' => array(
'zip_url' => 'file://./build/thinkup.zip',
'migrations' => 1,
'migration_assertions' => array(
'sql' => array(
array(
// Changed tu_insights.text to text
'query' => 'DESCRIBE tu_insights text;',
'match' => "/text/",
'column' => 'Type',
),
array(
// Added prefix field to tu_insights
'query' => 'DESCRIBE tu_insights prefix;',
'match' => "/varchar\(255\)/",
'column' => 'Type',
),
array(
// Added map image field to tu_places
'query' => 'DESCRIBE tu_places map_image;',
'match' => "/varchar\(255\)/",
'column' => 'Type',
),
array(
// Added icon field to tu_places
'query' => 'DESCRIBE tu_places icon;',
'match' => "/varchar\(255\)/",
'column' => 'Type',
),
array(
// Added is_archive_loaded_posts field to tu_instances
'query' => 'DESCRIBE tu_instances is_archive_loaded_posts;',
'match' => "/tinyint\(1\)/",
'column' => 'Type',
),
array(
// Default value for tu_links expanded_url
'query' => 'DESCRIBE tu_links expanded_url;',
'match' => "/^$/",
'column' => 'Default',
),
array(
// Default value for tu_users last_post_id
'query' => 'DESCRIBE tu_users last_post_id;',
'match' => "/^$/",
'column' => 'Default',
),
array(
// Default value for tu_links image_src
'query' => 'DESCRIBE tu_links image_src;',
'match' => "/^$/",
'column' => 'Default',
),
array(
// Created tu_insight_baselines table
'query' => 'DESCRIBE tu_insight_baselines instance_id;',
'match' => "/int\(11\)/",
'column' => 'Type',
),
)
)
),
);
6 changes: 3 additions & 3 deletions webapp/install/sql/build-db_mysql.sql
Expand Up @@ -183,7 +183,7 @@ CREATE TABLE tu_instances (
percentage_links decimal(4,2) DEFAULT NULL COMMENT 'Percent of an instance''s posts which contain links.',
earliest_post_in_system datetime DEFAULT NULL COMMENT 'Date and time of the earliest post authored by the instance in the datastore.',
earliest_reply_in_system datetime DEFAULT NULL COMMENT 'Date and time of the earliest reply authored by the instance in the datastore.',
is_archive_loaded_posts int(1) NOT NULL DEFAULT '0' COMMENT 'Whether or not all the instance''s posts have been backfilled.',
is_archive_loaded_posts tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Whether or not all the instance''s posts have been backfilled.',
is_archive_loaded_replies int(1) NOT NULL DEFAULT '0' COMMENT 'Whether or not all the instance''s replies have been backfilled.',
is_archive_loaded_follows int(1) NOT NULL DEFAULT '0' COMMENT 'Whether or not all the instance''s follows have been backfilled.',
is_public int(1) NOT NULL DEFAULT '0' COMMENT 'Whether or not instance is public in ThinkUp, that is, viewable when no ThinkUp user is logged in.',
Expand Down Expand Up @@ -517,13 +517,13 @@ CREATE TABLE tu_users (
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Service user details.';


-- Dump completed on 2012-09-06 22:35:57
-- Dump completed on 2012-09-06 23:52:08

--
-- Insert DB Version
--
INSERT INTO tu_options (namespace, option_name, option_value, last_updated, created)
VALUES ('application_options', 'database_version', '1.0.8.1', NOW(), NOW());
VALUES ('application_options', 'database_version', '1.1', NOW(), NOW());

--
-- Insert default plugin(s)
Expand Down
Expand Up @@ -7,4 +7,4 @@ ALTER TABLE tu_places ADD map_image VARCHAR( 255 ) COMMENT 'URL to an image of a
--
-- Add marker for whether or not a post archive has been loaded during a crawl.
--
ALTER TABLE tu_instances ADD is_archive_loaded_posts INT( 1 ) NOT NULL DEFAULT 0 COMMENT 'Whether or not all the instance''s posts have been backfilled.' AFTER earliest_reply_in_system;
ALTER TABLE tu_instances ADD is_archive_loaded_posts TINYINT( 1 ) NOT NULL DEFAULT 0 COMMENT 'Whether or not all the instance''s posts have been backfilled.' AFTER earliest_reply_in_system;
2 changes: 1 addition & 1 deletion webapp/install/version.php
Expand Up @@ -26,6 +26,6 @@
* @license http://www.gnu.org/licenses/gpl.html
* @copyright 2009-2012 Dwi Widiastuti, Gina Trapani, Guillaume Boudreau
*/
$THINKUP_VERSION = '1.0.8.1';
$THINKUP_VERSION = '1.1';
$THINKUP_VERSION_REQUIRED['php'] = '5.2';
$THINKUP_VERSION_REQUIRED['mysql'] = '5';

0 comments on commit 5df2f81

Please sign in to comment.