dm-redis-adapter 0.8.1 → 0.8.2

data/Gemfile

@@ -0,0 +1,13 @@
+source :gemcutter
+
+gem "dm-core", ">= 1.2.0"
+gem "dm-validations", ">= 1.2.0"
+gem "dm-types", ">= 1.2.0"
+gem "redis", ">= 2.2"
+gem "jeweler", ">= 1.4.0"
+gem "rspec", "~> 1.3.0"
+gem "rake", ">= 0.8.7"
+gem "hiredis", "~> 0.4.0"
+# gem "ruby-debug19"
+# gem "data_objects", ">= 0.10.1"
+# gem "do_postgres", ">= 0.10.1"

data/README.textile

@@ -14,6 +14,7 @@ Please note that as of version 0.5.3 of the gem, the key names that are used for
 
 h1. Changelog
 
+* v0.8.2  Updates to RedisAdapter#initialize to support URI. (thanks @thentenaar)
 * v0.8.1  Dependency updates by @jof to support newer versions of the redis gem.
 * v0.8.0  Updates by @sfeu to support composite natural keys.
 * v0.6.4  Adding the Gemfile so that rake commands work (thanks @kellydunn!)
@@ -104,6 +105,7 @@ Validations on unique fields are now supported through indices and dm-validation
 
 h1. Badass contributors
 
+* <a href="http://github.com/thentenaar">Tim Hentenaar (thentenaar)</a>
 * <a href="http://github.com/aeden">Anthony Eden (aeden)</a> Gem cleanup, update to jeweler
 * <a href="http://github.com/sr">Simon Roset (sr)</a> Fixes for edge dm-core
 * <a href="http://github.com/cehoffman">Chris Hoffman (cehoffman)</a> Fixes for Ruby 1.9, bundler for development deps, fixes for sorting

data/lib/dm-redis-adapter/adapter.rb

@@ -123,7 +123,6 @@ module DataMapper
           properties_to_set = []
           properties_to_del = []
 
-
           fields = model.properties(self.name).select {|property| attributes.key?(property)}
           fields.each do |property|
             value = attributes[property]
@@ -344,6 +343,19 @@ module DataMapper
       #
       # @api semipublic
       def initialize(name, uri_or_options)
+        uri_or_options.delete_if { |k,v| v.nil? || (v.is_a?(String) && v == '') }
+
+        # If the :path ends in '.sock' assume that this really is a path, otherwise assume it's a DB name
+        uri_or_options.delete(:path) if uri_or_options[:path] == '/'
+        uri_or_options[:db] = uri_or_options.delete(:path) if uri_or_options[:path] && uri_or_options[:path].match(/\.sock$/)  
+
+        # Parse options from the URI's query string
+        if uri_or_options[:query]
+          opts = uri_or_options[:query].split(/&/)
+          uri_or_options.merge!(Hash[opts.collect { |x| x.split(/=/) }])
+          uri_or_options.delete(:query)
+        end
+
         super
         @redis = Redis.new(@options)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-redis-adapter
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
@@ -64,7 +64,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
@@ -72,21 +72,12 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
 description: DataMapper adapter for the Redis key-value database
 email: whoahbot@gmail.com
-executables:
-- autospec
-- edit_json.rb
-- jeweler
-- minitar
-- prettify_json.rb
-- rake
-- rdebug
-- rubyforge
-- spec
+executables: []
 extensions: []
 extra_rdoc_files:
 - MIT-LICENSE
@@ -105,20 +96,11 @@ files:
 - spec/self_referential_spec.rb
 - spec/spec_helper.rb
 - spec/textual_keys_spec.rb
-- bin/autospec
-- bin/edit_json.rb
-- bin/jeweler
-- bin/minitar
-- bin/prettify_json.rb
-- bin/rake
-- bin/rdebug
-- bin/rubyforge
-- bin/spec
+- Gemfile
 homepage: http://github.com/whoahbot/dm-redis-adapter
 licenses: []
 post_install_message: 
-rdoc_options:
-- --charset=UTF-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -127,9 +109,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4366875247771912151
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,3 +130,4 @@ test_files:
 - spec/self_referential_spec.rb
 - spec/spec_helper.rb
 - spec/textual_keys_spec.rb
+has_rdoc: 

data/bin/autospec

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'autospec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rspec', 'autospec')

data/bin/edit_json.rb

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'edit_json.rb' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('json_pure', 'edit_json.rb')

data/bin/jeweler

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'jeweler' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('jeweler', 'jeweler')

data/bin/minitar

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'minitar' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('archive-tar-minitar', 'minitar')

data/bin/prettify_json.rb

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'prettify_json.rb' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('json_pure', 'prettify_json.rb')

data/bin/rake

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rake', 'rake')

data/bin/rdebug

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rdebug' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('ruby-debug19', 'rdebug')

data/bin/rubyforge

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rubyforge' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rubyforge', 'rubyforge')

data/bin/spec

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'spec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rspec', 'spec')