sequelizer 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 850cd00d16c6c1ffa076c95ac826cf48322ff678
-  data.tar.gz: fa352fe12ffb3d6affc33402ea40f3492af5349a
+  metadata.gz: c861615a451de131f3bc64e53d8c49ed94f28478
+  data.tar.gz: 6b8a256ee95cb64202a6be965f8a53ac254eb53a
 SHA512:
-  metadata.gz: 8401cda3328933d79d078bbc20143d9089db5faa638a476eae64ce3fc4bf50dfe7b08fe50c04de0e2e9cee4f0628f55371d4138d7d98dcaf9e816857c18a879d
-  data.tar.gz: 57a62e5da3227d41f3825e5ba75aad372b9ebd54d8fa72e798e0c7de9ee53e1568909863a9e15e0825373768043059e9ad4ca41bce729be39d1c049d2e9b7f9d
+  metadata.gz: fcf9bd9a65a46f889495ccaab52b4eeae644a005ddeb597329ceb7a37ca2d0184a6d4b0289957f0e8dba8b62f22c8dfbd9b87fd331a5bbc2f3ece7172f0384fa
+  data.tar.gz: b4e6facc90132c5d95f1a3c5863cbc207f7e448bf47f383df04d5b27471048e00be7dedb61df052fcc370cc99571673764afa8a80a47d79c20aa445e1dba1aac

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 0.0.4 - 2014-08-18
+
+### Added
+- `init_env` command to bin/sequelizer
+- Prefer `search_path` over `schema_search_path` option
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Nothing.
+
+### Fixed
+- Nothing.
+
 ## 0.0.3 - 2014-07-10
 
 ### Added

data/lib/sequelizer.rb

@@ -21,11 +21,6 @@ module Sequelizer
   #            If no options are provided, options are read from
   #            config/database.yml or from .env or from environment variables.
   def new_db(options = nil)
-    cm = ConnectionMaker.new(options)
-    conn = cm.connection
-    conn.define_singleton_method(:sequelizer_options) do
-      cm.options
-    end
-    conn
+    ConnectionMaker.new(options).connection
   end
 end

data/lib/sequelizer/cli.rb

@@ -11,9 +11,53 @@ module Sequelizer
       GemfileModifier.new(options).modify
     end
 
+    desc 'init_env', 'creates a .env file with the parameters listed'
+    option :adapter,
+      aliases: :a,
+      desc: 'adapter for database'
+    option :host,
+      aliases: :h,
+      banner: 'localhost',
+      desc: 'host for database'
+    option :username,
+      aliases: :u,
+      desc: 'username for database'
+    option :password,
+      aliases: :P,
+      desc: 'password for database'
+    option :port,
+      aliases: :p,
+      type: :numeric,
+      banner: '5432',
+      desc: 'port for database'
+    option :database,
+      aliases: :d,
+      desc: 'database for database'
+    option :search_path,
+      aliases: :s,
+      desc: 'schema for database (PostgreSQL only)'
+    def init_env
+      if File.exist?('.env')
+        puts ".env already exists!  I'm too cowardly to overwrite it!"
+        puts "Here's what I would have put in there:"
+        puts make_env(options)
+        exit(1)
+      end
+      File.open('.env', 'w') do |file|
+        file.puts make_env(options)
+      end
+    end
+
     desc 'config', 'prints out the connection parameters'
     def config
       pp Options.new.to_hash
     end
+
+    private
+    def make_env(options)
+      options.map do |key, value|
+        "SEQUELIZER_#{key.upcase}=#{value}"
+      end.join("\n")
+    end
   end
 end

data/lib/sequelizer/connection_maker.rb

@@ -22,7 +22,12 @@ module Sequelizer
 
     # Returns a Sequel connection to the database
     def connection
-      Sequel.connect(options.to_hash)
+      conn = Sequel.connect(options.to_hash)
+      cm = self
+      conn.define_singleton_method(:sequelizer_options) do
+        cm.options
+      end
+      conn
     end
   end
 end

data/lib/sequelizer/options.rb

@@ -31,7 +31,7 @@ module Sequelizer
 
       if sequelizer_options[:adapter] =~ /^postgres/
         sequelizer_options[:adapter] = 'postgres'
-        paths = %w(schema_search_path search_path schema).map { |key| sequelizer_options.delete(key) }.compact
+        paths = %w(search_path schema_search_path schema).map { |key| sequelizer_options.delete(key) }.compact
 
         unless paths.empty?
           sequelizer_options[:schema_search_path] = paths.first

data/lib/sequelizer/version.rb

@@ -1,4 +1,4 @@
 module Sequelizer
   # Version for the gem
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/sequelizer/test_options.rb

@@ -29,6 +29,12 @@ class TestOptions < Minitest::Test
     assert_equal('path', options.schema_search_path)
   end
 
+  def test_prefers_schema_path_over_schema_search_path
+    options = Sequelizer::Options.new(Sequelizer::OptionsHash.new(adapter: 'postgres', search_path: 'path', schema_search_path: 'path2'))
+
+    assert_equal('path', options.schema_search_path)
+  end
+
   def test_returns_a_hash_even_if_given_nil
     options = Sequelizer::Options.new
     assert_equal({}, options.to_hash)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequelizer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryan Duryea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler