liferay_database_config_reader 0.1.0 → 0.1.1

data/README.rdoc

@@ -14,12 +14,13 @@ Create a preinitializer.rb in config/ if you do not have one, after add the snip
   end
   
 Change you config/database.yml
-  <% l = LiferayDatabaseConfigReader.attr %>
+  <% if RUBY_PLATFORM =~ /java/ and ENV['RAILS_ENV'] == 'production' %>               
   production:
-    adapter: <%= l[:adapter] %>
-    database: <%= l[:database] %>
-    username: <%= l[:username] %>
-    password: <%= l[:password] %>
+    adapter: <%= LiferayDatabaseConfigReader.attr[:adapter] %>
+    database: <%= LiferayDatabaseConfigReader.attr[:database] %>
+    username: <%= LiferayDatabaseConfigReader.attr[:username] %>
+    password: <%= LiferayDatabaseConfigReader.attr[:password] %>
     encoding: unicode
     pool: 5
     timeout: 5000
+  <% end %>

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/liferay_database_config_reader.rb

@@ -6,15 +6,13 @@ module LiferayDatabaseConfigReader
   
   @@properties ||= {}
   
-  CATALINA_HOME = java.lang.System.getProperty('catalina.home')
+  CATALINA_HOME = java.lang.System.getProperty('catalina.home') || ''
   PROPERTIES_EXT_FILE = 'portal-ext.properties'
   WEB_INF_CLASSES = CATALINA_HOME + '/webapps/ROOT/WEB-INF/classes/'
 
-  def self.init!
-    path = File.expand_path(WEB_INF_CLASSES + PROPERTIES_EXT_FILE)
-    
-    puts "\n[LiferayDatabaseReader] :: RAILS_ENV=#{ENV['RAILS_ENV']}"
-    puts "[LiferayDatabaseReader] :: reading #{path}"
+  def self.init! path = File.expand_path(WEB_INF_CLASSES + PROPERTIES_EXT_FILE)
+    log "RAILS_ENV=#{ENV['RAILS_ENV']}"
+    log "reading #{path}"
 
     properties = Properties.new
     properties.load(FileInputStream.new(path))
@@ -30,11 +28,44 @@ module LiferayDatabaseConfigReader
     @@properties[:host], @@properties[:port] = fragments[1].split(':')
     @@properties[:database] = fragments[2]
     
-    puts "[LiferayDatabaseReader] :: adapter: #{attr[:adapter]}, host: #{attr[:host]}:#{attr[:port]}, database: #{attr[:database]}\n\n"
+    log "adapter: #{attr[:adapter]}, host: #{attr[:host]}:#{attr[:port]}, database: #{attr[:database]}\n"
   end
 
   def self.attr; @@properties end
+  
+  def self.log msg
+    msg = "[LiferayDatabaseReader] :: #{msg}"
+    (defined? RAILS_DEFAULT_LOGGER) ? RAILS_DEFAULT_LOGGER.info(msg) : STDOUT.puts(msg)
+  end
 
 end
 
-require 'liferay_database_config_reader'
+require 'liferay_database_config_reader'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

data/spec/lib/liferay_database_config_reader_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'liferay_database_config_reader'
+
+describe LiferayDatabaseConfigReader do
+
+  before :each do
+    @properties_file_path = File.expand_path(File.dirname(__FILE__) + '/../resources/portal-ext.properties')
+  end
+  
+  it 'should load portal-ext properties' do
+    LiferayDatabaseConfigReader.init! @properties_file_path
+    att = LiferayDatabaseConfigReader.attr
+    att.should_not be_nil
+    att[:username].should == 'postgres'
+    att[:password].should == 'postgres'
+    att[:adapter].should == 'jdbcpostgresql'
+    att[:host].should == 'localhost'
+    att[:port].should == '5432'
+    att[:database].should == 'liferay6'
+  end
+
+end

data/spec/resources/portal-ext.properties

@@ -0,0 +1,6 @@
+#PostgreSQL
+#    
+jdbc.default.driverClassName=org.postgresql.Driver
+jdbc.default.url=jdbc:postgresql://localhost:5432/liferay6
+jdbc.default.username=postgres
+jdbc.default.password=postgres

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+ENV['RAILS_ENV'] ||= 'test'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: liferay_database_config_reader
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - "T\xC3\xBAlio Ornelas"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -02:00
+date: 2010-11-16 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,9 @@ files:
 - Rakefile
 - VERSION
 - lib/liferay_database_config_reader.rb
+- spec/lib/liferay_database_config_reader_spec.rb
+- spec/resources/portal-ext.properties
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/tulios/liferay_database_config_reader
 licenses: []