lemondrop 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5997d77f1b1d98604ffb647c26e4582da676a3a
-  data.tar.gz: fec5f195c1697ae8c52ab27f1e28b4c9fd67673b
+  metadata.gz: 4203f5666c419eb4c337a30279c52513480d3da9
+  data.tar.gz: 2ff81e90cf6b4ea73695bd8743f5b2325efd2088
 SHA512:
-  metadata.gz: ff30f6f96a44b7606af7117d20891a2a8c2b2854b0029e2b43609842923cd45886894f415ca46f1f3ce3e33ef6a825b72f441f6b30c1f7340ecb379f604f2ab7
-  data.tar.gz: de9126f978dcf3fa5dbbed92c3e6d5ae45d7bd15d92dd0c32341a74b577ac021dc2a08f7cbda83e046050dafe566a1dd6c2a24866577971a05620da1114b9da6
+  metadata.gz: fae63429ffe24e20663ae019deef6acf8ede47674821ef564092e4de18d3e3b437f9927ea13323cd30a42fe6515f677c9a6f741f1f29ce38a1783e282cbb0ce4
+  data.tar.gz: ce7654ab6940e8f9b5e4512461ac095d3302f90a81686e0f66abb97a00c2094a0d9a00afdad6ac179d441da29f7e125878cad01edb80e6e0bce7cce4bb1539fe

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# [0.1.2](https://github.com/bklang/lemondrop/compare/v0.1.1...v0.1.2) - [2014-01-06](https://rubygems.org/gems/lemondrop/versions/0.1.2)
+* Fix using Redis with no password set
+
 # [0.1.1](https://github.com/bklang/lemondrop/compare/v0.1.0...v0.1.1) - [2013-12-11](https://rubygems.org/gems/lemondrop/versions/0.1.1)
 * Fix Redis accessors on Lemondrop constant
 

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Mojo Lingo LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lemondrop.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = ""
   s.summary     = %q{Redis plugin for Adhearsion}
   s.description = %q{This gem provides a plugin for Adhearsion, allowing you to create and use Redis as a queue or data source in your Adhearsion application.}
+  s.license     = 'MIT'
 
   s.rubyforge_project = "lemondrop"
 

data/lib/lemondrop/plugin.rb

@@ -9,7 +9,7 @@ class Lemondrop::Plugin < Adhearsion::Plugin
   config :lemondrop do
     uri         ''         , :desc => 'URI to the Redis instance. Use this or specify each piece of connection information separately below.'
     username    ''         , :desc => 'valid database username'
-    password    ''         , :desc => 'valid database password'
+    password    nil        , :desc => 'valid database password'
     host        'localhost', :desc => 'host where the database is running'
     port        6379       , :desc => 'port where the database is listening'
     socket      ''         , :desc => 'path to Unix socket where Redis is listening (Optional; to use, set host and port to nil)'

data/lib/lemondrop/plugin/service.rb

@@ -10,11 +10,11 @@ class Lemondrop::Plugin::Service
     def start(config)
       params = config.to_hash.select { |k,v| !v.nil? }
       unless params[:uri].nil? || params[:uri].empty?
-        redis_uri = URI.parse params[:uri]
-        params[:user] = redis_uri.user
-        params[:password] = redis_uri.password
-        params[:host] = redis_uri.host
-        params[:port] = redis_uri.port || params[:port]
+        uri = URI.parse params[:uri]
+        params[:username] = uri.user
+        params[:password] = uri.password
+        params[:hostname] = uri.hostname
+        params[:port] = uri.port || params[:port]
         params.delete :uri
       end
 
@@ -32,8 +32,9 @@ class Lemondrop::Plugin::Service
     #
     # @param params [Hash] Options to establish the Redis connection
     def establish_connection(params)
+      connection = ::Redis.new params
       logger.info "Lemondrop connected to Redis at #{params[:host]}:#{params[:port]}"
-      ::Redis.new params
+      connection
     end
   end # class << self
 end # Service

data/lib/lemondrop/version.rb

@@ -1,3 +1,3 @@
 module Lemondrop
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/lemondrop/plugin/service_spec.rb

@@ -7,9 +7,9 @@ describe Lemondrop::Plugin::Service do
     it 'should allow specifying a URI for the connection information' do
       config = {uri: 'redis://redisuser:redispass@foo.bar.com:9530/'}
       expected_params = {
-        user: 'redisuser',
+        username: 'redisuser',
         password: 'redispass',
-        host: 'foo.bar.com',
+        hostname: 'foo.bar.com',
         port: 9530
       }
       subject.should_receive(:establish_connection).once.with(expected_params)
@@ -19,9 +19,9 @@ describe Lemondrop::Plugin::Service do
     it 'should default to the correct port if the URI does not specify one' do
       config = {uri: 'redis://redisuser:redispass@foo.bar.com/', port: 6379}
       expected_params = {
-        user: 'redisuser',
+        username: 'redisuser',
         password: 'redispass',
-        host: 'foo.bar.com',
+        hostname: 'foo.bar.com',
         port: 6379
       }
       subject.should_receive(:establish_connection).once.with(expected_params)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lemondrop
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ben Klang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
@@ -119,6 +119,7 @@ files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - lemondrop.gemspec
@@ -131,7 +132,8 @@ files:
 - spec/lemondrop/send_connection_spec.rb
 - spec/spec_helper.rb
 homepage: ''
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -157,4 +159,3 @@ test_files:
 - spec/lemondrop/plugin/service_spec.rb
 - spec/lemondrop/send_connection_spec.rb
 - spec/spec_helper.rb
-has_rdoc: