zena 1.0.0.beta1 → 1.0.0.beta2

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.0.beta2 2010-07-24
+
+* major changes
+ * fixed connection timezone with PostgreSQL
+
 == 1.0.0.beta1 2010-07-23
 
 * major changes

data/lib/zena.rb

@@ -159,6 +159,7 @@ module Zena
       # do not change this !
       ActiveRecord::Base.default_timezone = :utc
       ENV['TZ'] = 'UTC'
+      Zena::Db.prepare_connection_for_timezone
     end
 
     def add_inflections

data/lib/zena/db.rb

@@ -404,6 +404,36 @@ module Zena
 
       tables
     end
+    
+    def prepare_connection_for_timezone
+      # Fixes #98
+      case ActiveRecord::Base.configurations[RAILS_ENV]['adapter']
+      when 'mysql'
+        # Fixes timezone to "+0:0"
+        raise "MySQL timezone UTC required too late, connection already active." if Class.new(ActiveRecord::Base).connected?
+
+        ActiveRecord::ConnectionAdapters::MysqlAdapter.class_eval do
+          def configure_connection_with_timezone
+            configure_connection_without_timezone
+            tz = ActiveRecord::Base.default_timezone == :utc ? "+0:0" : "SYSTEM"
+            execute("SET time_zone = '#{tz}'")
+          end
+          alias_method_chain :configure_connection, :timezone
+        end
+      when 'postgresql'
+        # Fixes timezone to "+0:0"
+        raise "PostgreSQL timezone UTC required too late, connection already active." if Class.new(ActiveRecord::Base).connected?
+
+        ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
+          def configure_connection_with_timezone
+            configure_connection_without_timezone
+            tz = ActiveRecord::Base.default_timezone == :utc ? "UTC" : "SYSTEM"
+            execute("SET TIMEZONE = '#{tz}'")
+          end
+          alias_method_chain :configure_connection, :timezone
+        end
+      end
+    end
 
     # Return true if we can load models because the database has the basic tables.
     def migrated_once?

data/lib/zena/info.rb

@@ -9,6 +9,6 @@ ZENA_CALENDAR_LANGS = ["en", "fr", "de"] # FIXME: build this dynamically from ex
 ENABLE_XSENDFILE = false
 
 module Zena
-  VERSION = '1.0.0.beta1'
+  VERSION = '1.0.0.beta2'
   ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/test/unit/zena/db_test.rb

@@ -27,7 +27,7 @@ class DbTest < Zena::Unit::TestCase
   def test_insensitive_find
     assert_equal nodes_zip(:status), secure(Node) { Zena::Db.insensitive_find(Node, :first, :node_name => 'sTatuS')}.zip
   end
-  
+
   def test_next_zip_rollback
     assert_raise(Zena::BadConfiguration) { Zena::Db.next_zip(88) }
     assert_equal zips_zip(:zena ) + 1, Zena::Db.next_zip(sites_id(:zena))
@@ -47,7 +47,7 @@ class DbTest < Zena::Unit::TestCase
      {"node_name"=>"skins", "zip"=>"51"},
      {"node_name"=>"style", "zip"=>"53"}], Zena::Db.fetch_attributes(['zip','node_name'], 'nodes', "node_name like 's%' and site_id = #{sites_id(:zena)} ORDER BY zip")
   end
-  
+
   def test_migrated_once
     assert Zena::Db.migrated_once?
   end

data/zena.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "1.0.0.beta1"
+  s.version = "1.0.0.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2010-07-23}
+  s.date = %q{2010-07-24}
   s.default_executable = %q{zena}
   s.description = %q{zena is a Ruby on Rails  CMS (content managment system) with a focus on usability, ease of customization and web 2.0 goodness (application like behaviour).}
   s.email = %q{gaspard@teti.ch}
@@ -2035,10 +2035,6 @@ Gem::Specification.new do |s|
      "vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/backend_spec.rb",
      "vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails_spec.rb",
      "vendor/plugins/gettext_i18n_rails/spec/spec_helper.rb",
-     "vendor/plugins/mysql_timezone_utc/init.rb",
-     "vendor/plugins/mysql_timezone_utc/lib/mysql_timezone_utc.rb",
-     "vendor/plugins/postgresql_timezone_utc/init.rb",
-     "vendor/plugins/postgresql_timezone_utc/lib/postgresql_timezone_utc.rb",
      "vendor/plugins/responds_to_parent/MIT-LICENSE",
      "vendor/plugins/responds_to_parent/README",
      "vendor/plugins/responds_to_parent/Rakefile",

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 0
-  - beta1
-  version: 1.0.0.beta1
+  - beta2
+  version: 1.0.0.beta2
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 +02:00
+date: 2010-07-24 00:00:00 +02:00
 default_executable: zena
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -2334,10 +2334,6 @@ files:
 - vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/backend_spec.rb
 - vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails_spec.rb
 - vendor/plugins/gettext_i18n_rails/spec/spec_helper.rb
-- vendor/plugins/mysql_timezone_utc/init.rb
-- vendor/plugins/mysql_timezone_utc/lib/mysql_timezone_utc.rb
-- vendor/plugins/postgresql_timezone_utc/init.rb
-- vendor/plugins/postgresql_timezone_utc/lib/postgresql_timezone_utc.rb
 - vendor/plugins/responds_to_parent/MIT-LICENSE
 - vendor/plugins/responds_to_parent/README
 - vendor/plugins/responds_to_parent/Rakefile

data/vendor/plugins/mysql_timezone_utc/init.rb

@@ -1 +0,0 @@
-require 'mysql_timezone_utc'

data/vendor/plugins/mysql_timezone_utc/lib/mysql_timezone_utc.rb

@@ -1,14 +0,0 @@
-# Fixes #98
-if ActiveRecord::Base.configurations[RAILS_ENV]['adapter'] == 'mysql'
-  # Fixes timezone to "+0:0"
-  raise "MySQL timezone UTC required too late, connection already active." if Class.new(ActiveRecord::Base).connected?
-
-  ActiveRecord::ConnectionAdapters::MysqlAdapter.class_eval do
-    def configure_connection_with_timezone
-      configure_connection_without_timezone
-      tz = ActiveRecord::Base.default_timezone == :utc ? "+0:0" : "SYSTEM"
-      execute("SET time_zone = '#{tz}'")
-    end
-    alias_method_chain :configure_connection, :timezone
-  end
-end

data/vendor/plugins/postgresql_timezone_utc/init.rb

@@ -1 +0,0 @@
-require 'postgresql_timezone_utc'

data/vendor/plugins/postgresql_timezone_utc/lib/postgresql_timezone_utc.rb

@@ -1,14 +0,0 @@
-# Fixes #98
-if ActiveRecord::Base.configurations[RAILS_ENV]['adapter'] == 'postgresql'
-  # Fixes timezone to "+0:0"
-  raise "PostgreSQL timezone UTC required too late, connection already active." if Class.new(ActiveRecord::Base).connected?
-
-  ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
-    def configure_connection_with_timezone
-      configure_connection_without_timezone
-      tz = ActiveRecord::Base.default_timezone == :utc ? "UTC" : "SYSTEM"
-      execute("SET TIMEZONE = '#{tz}'")
-    end
-    alias_method_chain :configure_connection, :timezone
-  end
-end