redis-objects 0.6.1 → 0.7.0

data/spec/spec_helper.rb

@@ -9,6 +9,8 @@ if $0 =~ /\brspec$/
   raise "\n===\nThese tests are in bacon, not rspec.  Try: bacon #{ARGV * ' '}\n===\n"
 end
 
+REDIS_CLASS_NAMES = [:Counter, :HashKey, :List, :Lock, :Set, :SortedSet, :Value]
+
 UNIONSTORE_KEY = 'test:unionstore'
 INTERSTORE_KEY = 'test:interstore'
 DIFFSTORE_KEY  = 'test:diffstore'
@@ -19,10 +21,17 @@ REDIS_PORT = ENV['REDIS_PORT'] || 9212
 REDIS_HOST = ENV['REDIS_HOST'] || 'localhost'
 REDIS_PID  = File.expand_path 'redis.pid', File.dirname(__FILE__)
 REDIS_DUMP = File.expand_path 'redis.rdb', File.dirname(__FILE__)
-puts "=> Starting redis-server on #{REDIS_HOST}:#{REDIS_PORT}"
-fork_pid = fork do
-  system "(echo port #{REDIS_PORT}; echo logfile /dev/null; echo daemonize yes; echo pidfile #{REDIS_PID}; echo dbfilename #{REDIS_DUMP}) | #{REDIS_BIN} -"
+
+describe 'redis-server' do
+  it "starting redis-server on #{REDIS_HOST}:#{REDIS_PORT}" do
+    fork_pid = fork do
+      system "(echo port #{REDIS_PORT}; echo logfile /dev/null; echo daemonize yes; echo pidfile #{REDIS_PID}; echo dbfilename #{REDIS_DUMP}) | #{REDIS_BIN} -"
+    end
+    fork_pid.should > 0
+    sleep 2 
+  end
 end
+
 at_exit do
   pid = File.read(REDIS_PID).to_i
   puts "=> Killing #{REDIS_BIN} with pid #{pid}"
@@ -32,11 +41,22 @@ at_exit do
   File.unlink REDIS_DUMP if File.exists? REDIS_DUMP
 end
 
+def raises_exception(&block)
+  e = nil
+  begin
+    block.call
+  rescue => e
+  end
+  e.should.be.is_a?(StandardError)
+end
+
 # Grab a global handle
-$redis = Redis.new(:host => REDIS_HOST, :port => REDIS_PORT)
+REDIS_HANDLE = Redis.new(:host => REDIS_HOST, :port => REDIS_PORT)
+#$redis = REDIS_HANDLE
+Redis.current = REDIS_HANDLE
 
 SORT_ORDER = {:order => 'desc alpha'}
 SORT_LIMIT = {:limit => [2, 2]}
-SORT_BY = {:by => 'm_*'}
-SORT_GET = {:get => 'spec/*/sorted'}.merge!(SORT_LIMIT)
+SORT_BY    = {:by => 'm_*'}
+SORT_GET   = {:get => 'spec/*/sorted'}.merge!(SORT_LIMIT)
 SORT_STORE = {:store => "spec/aftersort"}.merge!(SORT_GET)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-objects
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -60,19 +60,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.0
 description: Map Redis types directly to Ruby objects. Works with any class or ORM.
-email: nate@wiger.org
+email: nwiger@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 files:
 - ATOMICITY.rdoc
 - CHANGELOG.rdoc
 - Gemfile
-- Gemfile.lock
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
+- lib/redis-objects.rb
 - lib/redis/base_object.rb
 - lib/redis/counter.rb
 - lib/redis/hash_key.rb
@@ -92,8 +92,10 @@ files:
 - lib/redis/sorted_set.rb
 - lib/redis/value.rb
 - redis-objects.gemspec
+- spec/redis_autoload_objects_spec.rb
 - spec/redis_namespace_compat_spec.rb
 - spec/redis_objects_active_record_spec.rb
+- spec/redis_objects_conn_spec.rb
 - spec/redis_objects_instance_spec.rb
 - spec/redis_objects_model_spec.rb
 - spec/spec_helper.rb
@@ -109,9 +111,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 212928099894229760
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/Gemfile.lock

@@ -1,43 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    bacon (1.1.0)
-    builder (3.0.4)
-    git (1.2.5)
-    i18n (0.6.1)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.5)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    redis (3.0.2)
-    redis-namespace (1.2.1)
-      redis (~> 3.0.0)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  bacon
-  jeweler
-  redis (>= 3.0.2)
-  redis-namespace