active_geo_db 0.0.1 → 0.0.2

data/active_geo_db.gemspec

@@ -3,8 +3,8 @@ require File.expand_path("../lib/active_geo_db/version", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.add_dependency("activerecord")
+  gem.add_dependency("open_geo_db")
   gem.add_dependency("rails")
-  gem.add_development_dependency("open_geo_db")
   gem.authors = ["Kostiantyn Kahanskyi"]
   gem.description = %q{Rails (ActiveRecord) lib for accessing OpenGeoDb}
   gem.email = %w(kostiantyn.kahanskyi@googlemail.com)

data/lib/active_geo_db.rb

@@ -9,8 +9,8 @@ module ActiveGeoDb
   # * Establish connection to OpenGeoDb database
   def self.initialize(application)
     connection_configuration_path = application.paths["config/database"].first
-    connection_configuration = ConnectionConfiguration.load_file(connection_configuration_path)
-    ConnectionProvider.establish_connection(connection_configuration.to_hash)
+    ConnectionConfiguration.instance.load_file(connection_configuration_path)
+    ConnectionProvider.establish_connection(ConnectionConfiguration.instance.to_hash)
   end
 
   # Find coordinates for a specific location

data/lib/active_geo_db/active_geo_db.rake

@@ -0,0 +1,17 @@
+require "open_geo_db/database"
+
+namespace(:active_geo_db) do
+  def database
+    OpenGeoDb::Database.new(ActiveGeoDb::ConnectionConfiguration.instance.to_hash)
+  end
+
+  desc("Create and populate database")
+  task(:create => :environment) do
+    database.execute(:create)
+  end
+
+  desc("Destroy database")
+  task(:destroy => :environment) do
+    database.execute(:destroy)
+  end
+end

data/lib/active_geo_db/connection_configuration.rb

@@ -1,18 +1,17 @@
+require "singleton"
 require "yaml"
 
 module ActiveGeoDb
   class ConnectionConfiguration
+    include Singleton
+
     # Key in Rails database configuration under which the configuration for OpenGeoDb database
     # can be found
     CONFIGURATION_KEY = "open_geo_db"
 
-    class << self
-      # Read configuration file and load appropriate section
-      def load_file(path)
-        @configuration_data = YAML.load_file(path)[CONFIGURATION_KEY]
-      end
-
-      alias_method(:new, :load_file) # For convenience reasons only...
+    # Read configuration file and load appropriate section
+    def load_file(path)
+      @configuration_data = YAML.load_file(path)[CONFIGURATION_KEY]
     end
 
     # Return previously loaded configuration

data/lib/active_geo_db/railtie.rb

@@ -3,5 +3,9 @@ module ActiveGeoDb
     initializer("active_geo_db.initialize") do |application|
       ActiveGeoDb.initialize(application)
     end
+
+    rake_tasks do
+      load "active_geo_db/active_geo_db.rake"
+    end
   end
 end

data/lib/active_geo_db/version.rb

@@ -1,3 +1,3 @@
 module ActiveGeoDb
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_geo_db
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Kostiantyn Kahanskyi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-12 00:00:00 Z
+date: 2012-01-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -32,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: open_geo_db
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,7 +46,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: open_geo_db
+  name: rails
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -57,7 +57,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id003
 description: Rails (ActiveRecord) lib for accessing OpenGeoDb
 email: 
@@ -77,6 +77,7 @@ files:
 - Rakefile
 - active_geo_db.gemspec
 - lib/active_geo_db.rb
+- lib/active_geo_db/active_geo_db.rake
 - lib/active_geo_db/connection_configuration.rb
 - lib/active_geo_db/connection_provider.rb
 - lib/active_geo_db/railtie.rb