vanity 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d7da7caf628667cd793e5a3191fa8f0975a7ae0
-  data.tar.gz: 9a538d9f392b717675079c8ea35cfaf8b8457733
+  metadata.gz: 99e7f2261835eee5e49f1a1286c134f5329586be
+  data.tar.gz: 4de7123ddf75a32cd6228552e853db0228e29f85
 SHA512:
-  metadata.gz: b8a5faf62c21f4562b5b4e17c78e340b53547e90d0a9b657c3fd8bc44b724fa813dc3a1e681e6fdf3617c9d70141819608e05f9c1221dc8ac137210d4d46dae5
-  data.tar.gz: c23d96c189bae198ba68c60f5ff7ba93cd0aef614b40b746a217979be6f6ebf66966217693a6c753e0e560921461711956b89712b7d5fc002037b4ac04a21ebb
+  metadata.gz: 4f2d1673cb4ee38a6ef9622d1413fcf404fb47f2acfe2fb115ba4f03c15586da19e86267ce76ef1a683e3e864cbb0b079a489850f0f5442146b05a83aea45e50
+  data.tar.gz: f524dd7f7c260a4dc4c511d62aa9ae8b284525cae92afb7daf3f16fe09868e843817bf740438ceffdecbbbddefeed3a5ac884c94dff1493f78931c91f989a966

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 2.0.0 (2016-01-18)
+
+Add back deprecated connection key for vanity.yml. (@phillbaker)
+
 == 2.0.0 (2015-12-14)
 
 Extract configuration from Vanity::Playground to Vanity::Configuration (@phillbaker)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vanity (2.0.0)
+    vanity (2.0.1)
       i18n
 
 GEM
@@ -136,3 +136,6 @@ DEPENDENCIES
   vanity!
   webmock
   yard
+
+BUNDLED WITH
+   1.11.2

data/README.rdoc

@@ -41,7 +41,7 @@ A sample <code>config/vanity.yml</code> might look like:
     collecting: false
   production:
     adapter: redis
-    connection: redis://<%= ENV["REDIS_USER"] %>:<%= ENV["REDIS_PASSWORD"] %>@<%= ENV["REDIS_HOST"] %>:<%= ENV["REDIS_PORT"] %>/0
+    url: redis://<%= ENV["REDIS_USER"] %>:<%= ENV["REDIS_PASSWORD"] %>@<%= ENV["REDIS_HOST"] %>:<%= ENV["REDIS_PORT"] %>/0
 
 If you want to use your test environment with RSpec you will need to add an adapter to test:
 

data/gemfiles/rails32.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.0.0)
+    vanity (2.0.1)
       i18n
 
 GEM
@@ -226,3 +226,6 @@ DEPENDENCIES
   vanity!
   webmock
   yard
+
+BUNDLED WITH
+   1.11.2

data/gemfiles/rails4.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.0.0)
+    vanity (2.0.1)
       i18n
 
 GEM
@@ -174,3 +174,6 @@ DEPENDENCIES
   vanity!
   webmock
   yard
+
+BUNDLED WITH
+   1.11.2

data/gemfiles/rails41.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .././
   specs:
-    vanity (2.0.0)
+    vanity (2.0.1)
       i18n
 
 GEM
@@ -222,3 +222,6 @@ DEPENDENCIES
   vanity!
   webmock
   yard
+
+BUNDLED WITH
+   1.11.2

data/gemfiles/rails42.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.0.0)
+    vanity (2.0.1)
       i18n
 
 GEM
@@ -248,3 +248,6 @@ DEPENDENCIES
   vanity!
   webmock
   yard
+
+BUNDLED WITH
+   1.11.2

data/lib/vanity/configuration.rb

@@ -4,6 +4,7 @@ module Vanity
   class Configuration
     class MissingEnvironment < StandardError; end
 
+    LEGACY_CONNECTION_KEY = :connection
     LEGACY_REDIS_CONFIG_FILE = "redis.yml"
 
     class<<self
@@ -193,6 +194,26 @@ module Vanity
       end
     end
 
+    # @deprecated
+    def connection_url
+      connection_config = connection_params
+
+      return unless connection_config && connection_config.respond_to?(:has_key?)
+
+      connection_url = connection_config[LEGACY_CONNECTION_KEY]
+
+      if connection_url
+        logger.warn(%q{Deprecated: Please specify connection urls using the `url` key with a protocol prefix instead of `connection`. This fallback will be removed in a future version.})
+
+        # Legacy lack of protocol handling
+        if connection_url =~ /^\w+:/
+          connection_url
+        else
+          "redis://" + connection_url
+        end
+      end
+    end
+
     # @deprecated
     def redis_url_from_file
       connection_url = connection_params(LEGACY_REDIS_CONFIG_FILE)
@@ -208,4 +229,4 @@ module Vanity
       end
     end
   end
-end
+end

data/lib/vanity/vanity.rb

@@ -79,17 +79,21 @@ module Vanity
   def self.connect!(spec_or_nil=nil)
     spec_or_nil ||= configuration.connection_params
 
+    # Legacy special config variables permitted in connection spec
+    update_configuration_from_connection_params(spec_or_nil)
+
     # Legacy redis.yml fallback
     if spec_or_nil.nil?
       redis_url = configuration.redis_url_from_file
-
       if redis_url
         spec_or_nil = redis_url
       end
     end
 
-    # Legacy special config variables permitted in connection spec
-    update_configuration_from_connection_params(spec_or_nil)
+    # Legacy connection url fallback
+    if configuration.connection_url
+      spec_or_nil = configuration.connection_url
+    end
 
     @connection = Connection.new(spec_or_nil)
   end
@@ -159,7 +163,7 @@ module Vanity
 
     private
 
-    def update_configuration_from_connection_params(spec_or_nil) # # :nodoc:
+    def update_configuration_from_connection_params(spec_or_nil) # :nodoc:
       return unless spec_or_nil.respond_to?(:has_key?)
 
       configuration.collecting = spec_or_nil[:collecting] if spec_or_nil.has_key?(:collecting)

data/lib/vanity/version.rb

@@ -1,5 +1,5 @@
 module Vanity
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 
   module Version
     version = VERSION.to_s.split(".").map { |i| i.to_i }

data/test/configuration_test.rb

@@ -1,7 +1,11 @@
 require "test_helper"
 
 describe Vanity::Configuration do
-  let(:config) { Vanity::Configuration.new }
+  let(:config) do
+    config = Vanity::Configuration.new
+    config.logger = $logger
+    config
+  end
 
   it "returns default values" do
     assert_equal Vanity::Configuration.new.collecting, Vanity::Configuration::DEFAULTS[:collecting]
@@ -56,6 +60,30 @@ describe Vanity::Configuration do
       assert_equal mock_connection_string, config.connection_params("redis.yml")
     end
 
+    it "pulls from the connection config key" do
+      connection_config = VanityTestHelpers::VANITY_CONFIGS["vanity.yml.redis"]
+
+      FileUtils.mkpath "./config"
+      File.open("./config/vanity.yml", "w") do |f|
+        f.write(connection_config)
+      end
+
+      assert_equal "redis://:p4ssw0rd@10.0.1.1:6380/15", config.connection_url
+    end
+
+    it "renders erb" do
+      connection_config = VanityTestHelpers::VANITY_CONFIGS["vanity.yml.redis-erb"]
+      ENV["VANITY_TEST_REDIS_URL"] = "redis://:p4ssw0rd@10.0.1.1:6380/15"
+
+      FileUtils.mkpath "./config"
+      File.open("./config/vanity.yml", "w") do |f|
+        f.write(connection_config)
+      end
+
+      connection_hash = { adapter: "redis", url: "redis://:p4ssw0rd@10.0.1.1:6380/15" }
+      assert_equal connection_hash, config.connection_params
+    end
+
     it "returns nil if the file doesn't exist" do
       FileUtils.mkpath "./config"
       assert_nil config.connection_params

data/test/data/vanity.yml.redis

@@ -1,5 +1,6 @@
 test:
   adapter: redis
   collecting: false
+  connection: "redis://:p4ssw0rd@10.0.1.1:6380/15"
 production:
   adapter: redis

data/test/data/vanity.yml.redis-erb

@@ -1,3 +1,3 @@
-production:
+test:
   adapter: redis
-  connection: redis://<%= ENV["REDIS_USER"] %>:<%= ENV["REDIS_PASSWORD"] %>@<%= ENV["REDIS_HOST"] %>:<%= ENV["REDIS_PORT"] %>/0
+  url: <%= ENV['VANITY_TEST_REDIS_URL'] %>

data/test/test_helper.rb

@@ -63,7 +63,7 @@ module VanityTestHelpers
   def teardown_after
     Vanity.context = nil
     FileUtils.rm_rf "tmp"
-    Vanity.connection.adapter.flushdb if Vanity.connection.connected?
+    Vanity.connection.adapter.flushdb if Vanity.connection(false) && Vanity.connection.connected?
     WebMock.reset!
   end
 

data/test/vanity_test.rb

@@ -65,6 +65,57 @@ describe Vanity do
     it "returns a new connection" do
       refute_same Vanity.connect!, Vanity.connect!
     end
+
+    describe "deprecated settings" do
+      before do
+        FakeFS.activate!
+      end
+
+      after do
+        FakeFS.deactivate!
+        FakeFS::FileSystem.clear
+      end
+
+      it "uses legacy connection key" do
+        connection_config = VanityTestHelpers::VANITY_CONFIGS["vanity.yml.redis"]
+
+        FileUtils.mkpath "./config"
+        File.open("./config/vanity.yml", "w") do |f|
+          f.write(connection_config)
+        end
+
+        Vanity::Connection.expects(:new).with("redis://:p4ssw0rd@10.0.1.1:6380/15")
+        Vanity.disconnect!
+        Vanity.connect!
+      end
+
+      it "uses redis.yml" do
+        FileUtils.mkpath "./config"
+        File.open("./config/redis.yml", "w") do |f|
+          f.write VanityTestHelpers::VANITY_CONFIGS["redis.yml.url"]
+        end
+
+        Vanity::Connection.expects(:new).with("localhost:6379/15")
+        Vanity.disconnect!
+        Vanity.connect!
+      end
+
+      it "uses legacy collecting key" do
+        connection_config = VanityTestHelpers::VANITY_CONFIGS["vanity.yml.redis"]
+
+        FileUtils.mkpath "./config"
+        File.open("./config/vanity.yml", "w") do |f|
+          f.write(connection_config)
+        end
+
+        Vanity.reset!
+        Vanity.disconnect!
+        Vanity::Connection.stubs(:new)
+        Vanity.connect!
+
+        assert_equal false, Vanity.configuration.collecting
+      end
+    end
   end
 
   describe "#disconnect!" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanity
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Assaf Arkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -211,7 +211,7 @@ metadata: {}
 post_install_message: To get started run vanity --help
 rdoc_options:
 - --title
-- Vanity 2.0.0
+- Vanity 2.0.1
 - --main
 - README.rdoc
 - --webcvs