DimaD-daylite-models 0.1.0 → 0.1.1

data/Manifest.txt

@@ -15,10 +15,10 @@ app/models/daylite/task.rb
 app/models/daylite/user.rb
 config/database.yml.exmp
 daylite_models.gemspec
-daylite_models.rb
 init.rb
 install.rb
 lib/active_record/connection_adapters/openbase_adapter.rb
+lib/daylite_models.rb
 tasks/users_plugin_tasks.rake
 test/daylite_models_plugin_test.rb
 test/test_helper.rb

data/README.markdown

@@ -30,18 +30,27 @@ Add _daylite_ section to you database.yml
         password: my_password
 
 
-Add the following line to you environment.rb
+Add the following line to you environment.rb:
 
-Daylite::Base.establish_connection(:daylite)
+    Daylite::Base.establish_connection(:daylite)
 
 You are ready to rock! Now you can use Daylite classes in you application as usual Rails models.
 
 Usage as a standalone library
 -----------------------------
-The easiest way is to create file config/database.yml relative to you running script and place _daylite_ config in it (see Usage as Rails plugin for example). After this you need to place
+Place
 
     require 'daylite_models'
 
-somewhere in you initialization code and you are done.
+somewhere in you initialization code and provide connection info through Daylite::Base.establish_connection call. You will need to provide adapter, database, host, username and password params. See ActiveRecord::Base.establish_connection and Openbase documentation for more info. You may use the following piece of code:
 
-Another way is to provide connection info directly through Daylite::Base.establish_connection call. You will need to provide adapter, database, host, username and password params. See ActiveRecord::Base.establish_connection and Openbase documentation for more info.
+    DAYLITE_DATABASE_CONFIG = 'config/database.yml'
+    DAYLITE_CONFIG_SECTION = 'daylite'
+
+    if File.exist?(DAYLITE_DATABASE_CONFIG)
+      yaml = YAML::load(File.read(DAYLITE_DATABASE_CONFIG))
+
+      if yaml[DAYLITE_CONFIG_SECTION]
+        Daylite::Base.establish_connection( yaml[DAYLITE_CONFIG_SECTION] )
+      end
+    end

data/Rakefile

@@ -13,7 +13,7 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
 end
 
 begin
-  require 'daylite_models'
+  require 'lib/daylite_models'
   require 'hoe'
 
   #oh, shit
@@ -27,7 +27,6 @@ begin
 
   Hoe.new('daylite-models', DayliteModels::VERSION) do |s|
     s.name = "daylite-models"
-    s.version = "0.1.0"
     s.author = "Dmitriy Dzema"
     s.email = "dimad.ag@gmail.com"
     s.summary = "Set of ActiveRecord classes to work with the Daylite 3 database"
@@ -38,5 +37,5 @@ begin
     s.extra_deps = [ ["activesupport", ">= 2.0.0"], ["activerecord", ">= 2.0.0"], ["activerecord", ">= 0.8.3"]]
   end
 rescue LoadError => e
-  
+
 end

data/daylite_models.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name = %q{daylite-models}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dmitriy Dzema"]
   s.date = %q{2009-02-11}
   s.email = %q{dimad.ag@gmail.com}
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = ["History.txt", "LICENSE", "Manifest.txt", "README.markdown", "Rakefile", "app/models/daylite.rb", "app/models/daylite/contact.rb", "app/models/daylite/organization.rb", "app/models/daylite/organization_task_join.rb", "app/models/daylite/project.rb", "app/models/daylite/project_task_join.rb", "app/models/daylite/role.rb", "app/models/daylite/role_type.rb", "app/models/daylite/task.rb", "app/models/daylite/user.rb", "config/database.yml.exmp", "daylite_models.gemspec", "daylite_models.rb", "init.rb", "install.rb", "lib/active_record/connection_adapters/openbase_adapter.rb", "tasks/users_plugin_tasks.rake", "test/daylite_models_plugin_test.rb", "test/test_helper.rb", "uninstall.rb"]
+  s.files = ["History.txt", "LICENSE", "Manifest.txt", "README.markdown", "Rakefile", "app/models/daylite.rb", "app/models/daylite/contact.rb", "app/models/daylite/organization.rb", "app/models/daylite/organization_task_join.rb", "app/models/daylite/project.rb", "app/models/daylite/project_task_join.rb", "app/models/daylite/role.rb", "app/models/daylite/role_type.rb", "app/models/daylite/task.rb", "app/models/daylite/user.rb", "config/database.yml.exmp", "daylite_models.gemspec", "init.rb", "install.rb", "lib/active_record/connection_adapters/openbase_adapter.rb", "lib/daylite_models.rb", "tasks/users_plugin_tasks.rake", "test/daylite_models_plugin_test.rb", "test/test_helper.rb", "uninstall.rb"]
   s.has_rdoc = true
   s.rdoc_options = ["--main", "README.markdown"]
   s.require_paths = ["lib"]
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 2.0.0"])
       s.add_runtime_dependency(%q<activerecord>, [">= 2.0.0"])
       s.add_runtime_dependency(%q<activerecord>, [">= 0.8.3"])
-      s.add_development_dependency(%q<hoe>, [">= 1.8.3"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.0.0"])
       s.add_dependency(%q<activerecord>, [">= 2.0.0"])

data/lib/daylite_models.rb

@@ -0,0 +1,6 @@
+$: << File.join(File.dirname(__FILE__), '../')
+require 'init'
+
+module DayliteModels
+  VERSION = '0.1.1'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: DimaD-daylite-models
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Dmitriy Dzema
@@ -66,10 +66,10 @@ files:
 - app/models/daylite/user.rb
 - config/database.yml.exmp
 - daylite_models.gemspec
-- daylite_models.rb
 - init.rb
 - install.rb
 - lib/active_record/connection_adapters/openbase_adapter.rb
+- lib/daylite_models.rb
 - tasks/users_plugin_tasks.rake
 - test/daylite_models_plugin_test.rb
 - test/test_helper.rb

data/daylite_models.rb

@@ -1,17 +0,0 @@
-$: << File.join(File.dirname(__FILE__), 'lib')
-require 'init'
-
-module DayliteModels
-  VERSION = '0.1.1'
-end
-
-DAYLITE_DATABASE_CONFIG = 'config/database.yml'
-DAYLITE_CONFIG_SECTION = 'daylite'
-
-if File.exist?(DAYLITE_DATABASE_CONFIG)
-  yaml = YAML::load(File.read(DAYLITE_DATABASE_CONFIG))
-
-  if yaml[DAYLITE_CONFIG_SECTION]
-    Daylite::Base.establish_connection( yaml[DAYLITE_CONFIG_SECTION] )
-  end
-end