[Jifty-commit] r982 - in jifty/branches/jifty-jsan: . lib/Jifty share/web/templates/__jifty/online_docs

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Wed May 3 20:40:20 EDT 2006


Author: trs
Date: Wed May  3 20:40:17 2006
New Revision: 982

Modified:
   jifty/branches/jifty-jsan/   (props changed)
   jifty/branches/jifty-jsan/Makefile.PL
   jifty/branches/jifty-jsan/lib/Jifty/Manual/ObjectModel.pod
   jifty/branches/jifty-jsan/lib/Jifty/Manual/Tutorial.pod
   jifty/branches/jifty-jsan/lib/Jifty/Record.pm
   jifty/branches/jifty-jsan/share/web/templates/__jifty/online_docs/content.html

Log:
 r10265 at zot (orig r970):  ewilhelm | 2006-05-02 03:14:29 -0400
  r910 at mjolnir:  ewilhelm | 2006-05-02 00:05:43 -0700
  share/web/templates/__jifty/online_docs/content.html - disable magic schema quoting for core module docs
 
 r10266 at zot (orig r971):  ewilhelm | 2006-05-02 03:14:44 -0400
  r911 at mjolnir:  ewilhelm | 2006-05-02 00:14:10 -0700
  lib/Jifty/Manual/ObjectModel.pod - typo fixes
  lib/Jifty/Manual/Tutorial.pod - removed link in literal, added 'Online Help' section
 
 r10270 at zot (orig r975):  jesse | 2006-05-02 14:14:08 -0400
  r13155 at hualien:  jesse | 2006-05-02 14:13:50 -0400
  * Since we clear the cache on each http hit, hold onto cached records longer _within_ one http hit
 
 r10272 at zot (orig r977):  autrijus | 2006-05-03 14:06:52 -0400
 * Update Syck dep to 0.44/0.12, as it's thoroughly non-leaky
   and has fixes for alexmv's test cases.


Modified: jifty/branches/jifty-jsan/Makefile.PL
==============================================================================
--- jifty/branches/jifty-jsan/Makefile.PL	(original)
+++ jifty/branches/jifty-jsan/Makefile.PL	Wed May  3 20:40:17 2006
@@ -59,12 +59,12 @@
 
 if (can_cc()) {
     # Always require the Syck bindings if a C compiler is available
-    requires('YAML::Syck' => 0.43);
-    requires('JSON::Syck' => 0.11);
+    requires('YAML::Syck' => 0.44);
+    requires('JSON::Syck' => 0.12);
 }
 else {
-    requires('YAML' => 0.35) unless can_use('YAML::Syck' => 0.43);
-    requires('JSON' => 0.01) unless can_use('JSON::Syck' => 0.11);
+    requires('YAML' => 0.35) unless can_use('YAML::Syck' => 0.44);
+    requires('JSON' => 0.01) unless can_use('JSON::Syck' => 0.12);
 }
 
 version_from('lib/Jifty.pm');

Modified: jifty/branches/jifty-jsan/lib/Jifty/Manual/ObjectModel.pod
==============================================================================
--- jifty/branches/jifty-jsan/lib/Jifty/Manual/ObjectModel.pod	(original)
+++ jifty/branches/jifty-jsan/lib/Jifty/Manual/ObjectModel.pod	Wed May  3 20:40:17 2006
@@ -117,9 +117,9 @@
 class if you want to set an application-specific header or footer for
 all outgoing email.
 
-=item MyWeblog::Dispatcher>
+=item MyWeblog::Dispatcher
 
-C<MyWeblog::Dispatcher> is an application-speciific "dispatcher" class that
+C<MyWeblog::Dispatcher> is an application-specific "dispatcher" class that
 allows you to write code that runs when a client makes a request to the server
 I<before> Jifty runs I<actions> or renders I<templates>.  See L<Jifty::Dispatcher>
 for more information about the dispatcher.

Modified: jifty/branches/jifty-jsan/lib/Jifty/Manual/Tutorial.pod
==============================================================================
--- jifty/branches/jifty-jsan/lib/Jifty/Manual/Tutorial.pod	(original)
+++ jifty/branches/jifty-jsan/lib/Jifty/Manual/Tutorial.pod	Wed May  3 20:40:17 2006
@@ -194,7 +194,7 @@
   package MyWeblog::Model::Post::Schema;
   use Jifty::DBI::Schema;
 
-  # Your column definitions go here.  See L<Jifty::DBI::Schema> for
+  # Your column definitions go here.  See Jifty::DBI::Schema for
   # documentation about how to write column definitions.
 
   package MyWeblog::Model::Post;
@@ -403,6 +403,19 @@
 
 =head1 GETTING HELP
 
+=head2 Online Help
+
+The C<jifty> command-line application comes with builtin help.
+
+  jifty help
+
+  jifty help <command>
+
+If your server is running with administration mode enabled (the
+configuration file C<AdminMode> setting is missing or non-zero), you can
+click the "Online Docs" link in your browser for an extensive list of
+per-module Jifty documentation.
+
 =head2 Joining the mailing list
 
 C<jifty-devel at lists.jifty.org> is where we discuss how we're building Jifty,

Modified: jifty/branches/jifty-jsan/lib/Jifty/Record.pm
==============================================================================
--- jifty/branches/jifty-jsan/lib/Jifty/Record.pm	(original)
+++ jifty/branches/jifty-jsan/lib/Jifty/Record.pm	Wed May  3 20:40:17 2006
@@ -321,5 +321,11 @@
     Jifty->config->framework('Database')->{'Database'};
 }
 
+sub _cache_config {
+    {   'cache_p'       => 1,
+        'cache_for_sec' => 60,
+    };
+}
+
 1;
 

Modified: jifty/branches/jifty-jsan/share/web/templates/__jifty/online_docs/content.html
==============================================================================
--- jifty/branches/jifty-jsan/share/web/templates/__jifty/online_docs/content.html	(original)
+++ jifty/branches/jifty-jsan/share/web/templates/__jifty/online_docs/content.html	Wed May  3 20:40:17 2006
@@ -34,8 +34,10 @@
 my $body;
 my $schema;
 my $converter = Pod::Simple::HTML->new();
-if ($total_body =~ /package (.*?)::Schema;(.*)package/ismx) {
-     $schema = $2;
+if($n !~ /^Jifty\//) {
+    if ($total_body =~ /package (.*?)::Schema;(.*)package/ismx) {
+         $schema = $2;
+    }
 }
 
 


More information about the Jifty-commit mailing list