redshift-rails 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 426219faba780ae7ff3ff5966dff5dc9260787c8
-  data.tar.gz: 97339cc78b8c2dc94ae2319ad9399f1fc998b736
+  metadata.gz: 4f605674b0cf955d656884b736aab912821c54a6
+  data.tar.gz: 0398295b8ba3b00e8abb1a980ca3d52971b4ba59
 SHA512:
-  metadata.gz: cf4fd7dacd0eb0214ac79b326b8cdd79b6b474b824f1dd74ef3eee221654bdf33e6ebf887fcedbd2374cb1536783b98ecb36e23d2e75d956bdc97d5a285698fa
-  data.tar.gz: a003209fe8dc345467335df74d8476e08d352b63b9e0ee53bbb64f08dcfc7b3e31ae75a5c55ef1010a1864d6a0ef8758d6e02dd6fa4a575a1fe92040bb7737a3
+  metadata.gz: 223b29baa3675850303c8f33595b600ede517986d9cfc0f96ef7ca92e2cadc33afb9db56d90fdf3f6b24d391226bd03b1ff2fba471e92c2ce2ac111261002f0a
+  data.tar.gz: 3e8a04f951bc957eb751a6ccdcbd1c8a75c993147e9f00d0df00670348472e88ba2d71ae89bb38e124ab18781abd9c968eceb826b441d687a06375ca62b21dd9

data/README.md

@@ -1,6 +1,6 @@
 # Redshift::Rails [![Gem Version](https://badge.fury.io/rb/redshift-rails.svg)](https://badge.fury.io/rb/redshift-rails)
 
-The library provides the railtie that allows redshift-client into Rails.
+The library provides the railtie that allows redshift-client into Rails >= 4.
 
 ## Installation
 
@@ -20,7 +20,34 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Set your redshift url to `$REDSHIFT_URL`:
+
+```
+$ export REDSHIFT_URL="redshift://user:password@*****.region.redshift.amazonaws.com:5439/dbname"
+```
+
+or create `config/redshift.yml`:
+
+```yaml
+# config/redshift.yml
+
+development:
+  host: *****.region.redshift.amazonaws.com
+  port: 5439
+  user: user
+  password: password
+  dbname: dbname
+```
+
+You can call `Redshift::Client` at anywhere.
+
+```ruby
+class HealthController < ApplicationConttoller
+  def index
+    render json: Redshift::Client.connection.exec("SELECT NOW()").first
+  end
+end
+```
 
 ## Development
 
@@ -32,6 +59,9 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/dakatsuka/redshift-rails. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
+## TODO
+
+* Test
 
 ## License
 

data/lib/redshift/rails/configuration.rb

@@ -0,0 +1,55 @@
+require 'active_support/configurable'
+require 'yaml'
+require 'erb'
+require 'uri'
+
+module Redshift
+  module Rails
+    class << self
+      def config
+        Configuration.instance
+      end
+    end
+
+    class Configuration
+      include Singleton
+      include ActiveSupport::Configurable
+
+      config_accessor :host, :port, :user, :password, :dbname
+
+      def load!
+        resolve_config.each do |k, v|
+          send("#{k}=", v)
+        end
+      end
+
+      def database
+        {
+          host: host,
+          port: port,
+          user: user,
+          password: password,
+          dbname: dbname
+        }
+      end
+
+      private
+      def resolve_config
+        config_file = ::Rails.application.config.redshift.config_file
+
+        if File.exists?(config_file)
+          YAML.load(ERB.new(File.read(config_file)).result)[::Rails.env]
+        else
+          uri = URI.parse(ENV["REDSHIFT_URL"])
+          {
+            host: uri.host,
+            port: uri.port,
+            user: uri.user,
+            password: uri.password,
+            dbname: uri.path[1..-1]
+          }
+        end
+      end
+    end
+  end
+end

data/lib/redshift/rails/railtie.rb

@@ -3,11 +3,20 @@ module Redshift
     class Railtie < ::Rails::Railtie
       initializer "redshift_rails.initialize" do |app|
         ActiveSupport.on_load(:redshift_client_connection) do
-          Redshift::Client.establish_connection
+          Redshift::Client.establish_connection Redshift::Rails.config.database
         end
 
         app.middleware.use Redshift::Rails::Middleware
       end
+
+      config.before_configuration do
+        config.redshift = ActiveSupport::OrderedOptions.new
+        config.redshift.config_file = "#{::Rails.root}/config/redshift.yml"
+      end
+
+      config.after_initialize do
+        Redshift::Rails.config.load!
+      end
     end
   end
 end

data/lib/redshift/rails/version.rb

@@ -1,5 +1,5 @@
 module Redshift
   module Rails
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/redshift/rails.rb

@@ -1,5 +1,6 @@
 require "redshift/client"
 require "redshift/rails/version"
+require "redshift/rails/configuration"
 require "redshift/rails/middleware"
 require "redshift/rails/railtie" if defined? Rails
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redshift-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Dai Akatsuka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-10 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redshift-client
@@ -98,6 +98,7 @@ files:
 - bin/console
 - bin/setup
 - lib/redshift/rails.rb
+- lib/redshift/rails/configuration.rb
 - lib/redshift/rails/middleware.rb
 - lib/redshift/rails/railtie.rb
 - lib/redshift/rails/version.rb