blendris 0.6 → 1.0

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2010 Alex McHale (alexmchale@gmail.com)
+
+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/Manifest

@@ -1,4 +1,5 @@
 History.txt
+LICENSE
 Manifest
 PostInstall.txt
 README.markdown
@@ -18,6 +19,7 @@ lib/blendris/set.rb
 lib/blendris/string.rb
 lib/blendris/types.rb
 lib/blendris/utils.rb
+lib/blendris/zset.rb
 script/console
 script/destroy
 script/generate
@@ -27,6 +29,7 @@ spec/model_spec.rb
 spec/redis-tools_spec.rb
 spec/ref_spec.rb
 spec/set_spec.rb
-spec/spec.opts
 spec/spec_helper.rb
 spec/string_spec.rb
+spec/utils_spec.rb
+spec/zset_spec.rb

data/Rakefile

@@ -1,15 +1,13 @@
 require "rubygems"
 require "rubygems/commands/push_command"
-
-gem "echoe", ">= 4.1"
-gem "redis", ">= 0.1.2"
+require "rspec/core/rake_task"
 
 require "echoe"
 require "redis"
 require "fileutils"
 require "./lib/blendris"
 
-Echoe.new("blendris", "0.6") do |p|
+Echoe.new("blendris", Blendris::VERSION) do |p|
 
   p.description              = "A redis library for Ruby"
   p.url                      = "http://github.com/alexmchale/blendris"
@@ -17,7 +15,12 @@ Echoe.new("blendris", "0.6") do |p|
   p.email                    = "alexmchale@gmail.com"
   p.ignore_pattern           = [ "tmp", "pkg", "script" ]
   p.development_dependencies = []
+  p.runtime_dependencies     = [ "redis >=2.0.13" ]
+
+end
 
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = "spec/**/*_spec.rb"
 end
 
 Dir['tasks/**/*.rake'].each { |t| load t }

data/blendris.gemspec

@@ -2,31 +2,34 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blendris}
-  s.version = "0.6"
+  s.version = "1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex McHale"]
-  s.cert_chain = ["/Users/alexmchale/Dropbox/Security/gem-public_cert.pem"]
-  s.date = %q{2010-02-27}
+  s.cert_chain = ["/home/alexmchale/.ssh/gem-public_cert.pem"]
+  s.date = %q{2010-11-05}
   s.description = %q{A redis library for Ruby}
   s.email = %q{alexmchale@gmail.com}
-  s.extra_rdoc_files = ["README.markdown", "lib/blendris.rb", "lib/blendris/accessor.rb", "lib/blendris/errors.rb", "lib/blendris/integer.rb", "lib/blendris/list.rb", "lib/blendris/model.rb", "lib/blendris/node.rb", "lib/blendris/reference.rb", "lib/blendris/reference_base.rb", "lib/blendris/reference_set.rb", "lib/blendris/set.rb", "lib/blendris/string.rb", "lib/blendris/types.rb", "lib/blendris/utils.rb"]
-  s.files = ["History.txt", "Manifest", "PostInstall.txt", "README.markdown", "Rakefile", "autotest/discover.rb", "lib/blendris.rb", "lib/blendris/accessor.rb", "lib/blendris/errors.rb", "lib/blendris/integer.rb", "lib/blendris/list.rb", "lib/blendris/model.rb", "lib/blendris/node.rb", "lib/blendris/reference.rb", "lib/blendris/reference_base.rb", "lib/blendris/reference_set.rb", "lib/blendris/set.rb", "lib/blendris/string.rb", "lib/blendris/types.rb", "lib/blendris/utils.rb", "script/console", "script/destroy", "script/generate", "spec/integer_spec.rb", "spec/list_spec.rb", "spec/model_spec.rb", "spec/redis-tools_spec.rb", "spec/ref_spec.rb", "spec/set_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/string_spec.rb", "blendris.gemspec"]
+  s.extra_rdoc_files = ["LICENSE", "README.markdown", "lib/blendris.rb", "lib/blendris/accessor.rb", "lib/blendris/errors.rb", "lib/blendris/integer.rb", "lib/blendris/list.rb", "lib/blendris/model.rb", "lib/blendris/node.rb", "lib/blendris/reference.rb", "lib/blendris/reference_base.rb", "lib/blendris/reference_set.rb", "lib/blendris/set.rb", "lib/blendris/string.rb", "lib/blendris/types.rb", "lib/blendris/utils.rb", "lib/blendris/zset.rb"]
+  s.files = ["History.txt", "LICENSE", "Manifest", "PostInstall.txt", "README.markdown", "Rakefile", "autotest/discover.rb", "lib/blendris.rb", "lib/blendris/accessor.rb", "lib/blendris/errors.rb", "lib/blendris/integer.rb", "lib/blendris/list.rb", "lib/blendris/model.rb", "lib/blendris/node.rb", "lib/blendris/reference.rb", "lib/blendris/reference_base.rb", "lib/blendris/reference_set.rb", "lib/blendris/set.rb", "lib/blendris/string.rb", "lib/blendris/types.rb", "lib/blendris/utils.rb", "lib/blendris/zset.rb", "script/console", "script/destroy", "script/generate", "spec/integer_spec.rb", "spec/list_spec.rb", "spec/model_spec.rb", "spec/redis-tools_spec.rb", "spec/ref_spec.rb", "spec/set_spec.rb", "spec/spec_helper.rb", "spec/string_spec.rb", "spec/utils_spec.rb", "spec/zset_spec.rb", "blendris.gemspec"]
   s.homepage = %q{http://github.com/alexmchale/blendris}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Blendris", "--main", "README.markdown"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{blendris}
-  s.rubygems_version = %q{1.3.6}
-  s.signing_key = %q{/Users/alexmchale/Dropbox/Security/gem-private_key.pem}
+  s.rubygems_version = %q{1.3.7}
+  s.signing_key = %q{/home/alexmchale/.ssh/gem-private_key.pem}
   s.summary = %q{A redis library for Ruby}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<redis>, [">= 2.0.13"])
     else
+      s.add_dependency(%q<redis>, [">= 2.0.13"])
     end
   else
+    s.add_dependency(%q<redis>, [">= 2.0.13"])
   end
 end

data/lib/blendris.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Blendris
-  VERSION = '0.0.1'
+  VERSION = '1.0'
 end
 
 require "redis"
@@ -19,6 +19,7 @@ require "blendris/string"
 require "blendris/integer"
 require "blendris/list"
 require "blendris/set"
+require "blendris/zset"
 
 require "blendris/reference_base"
 require "blendris/reference"

data/lib/blendris/types.rb

@@ -7,6 +7,7 @@ module Blendris
     type :string, RedisString
     type :integer, RedisInteger
     type :set, RedisSet
+    type :zset, RedisSortedSet
     type :list, RedisList
     type :ref, RedisReference
     type :refs, RedisReferenceSet

data/lib/blendris/utils.rb

@@ -38,6 +38,12 @@ module Blendris
       key.to_s.gsub(/[\r\n\s]/, "_").gsub(/^:+|:+$/, "")
     end
 
+    # Take an array and turn it into a list of pairs.
+    def pairify(*arr)
+      arr = arr.flatten
+      (0 ... arr.length/2).map { |i| [ arr[2*i], arr[2*i + 1] ] }
+    end
+
   end
 
 end

data/lib/blendris/zset.rb

@@ -0,0 +1,90 @@
+module Blendris
+
+  # RedisSortedSet is a wrapper to the Redis ZSET data type.
+
+  class RedisSortedSet < RedisNode
+
+    include Enumerable
+
+    def initialize(key, options = {})
+      @key = key.to_s
+      @options = options
+      @on_change = options[:on_change]
+    end
+
+    def each(min = "-inf", max = "+inf", mode = :score)
+      case mode
+      when :rank  then redis.zrange key, min, max
+      when :score then redis.zrangebyscore key, min, max
+      else             raise "unknown zset mode #{mode}"
+      end.each do |value|
+        yield value
+      end
+
+      self
+    end
+
+    def set(*pairs)
+      tempkey = "#{key}:::TEMP:::#{rand}"
+      redis.del tempkey
+
+      pairify(pairs).each do |score, value|
+        redis.zadd tempkey, score, value
+      end
+
+      redis.rename tempkey, key
+
+      self
+    ensure
+      notify_changed
+    end
+
+    def <<(pairs)
+      tempkey = "#{key}:::TEMP:::#{rand}"
+      redis.del tempkey
+
+      pairify(pairs).each do |score, value|
+        redis.zadd tempkey, score, value
+      end
+
+      redis.zunionstore key, [ key, tempkey ]
+      redis.del tempkey
+
+      self
+    ensure
+      notify_changed
+    end
+
+    def get
+      self
+    end
+
+    def delete(value)
+      redis.zrem key, value
+    ensure
+      notify_changed
+    end
+
+    def delete_by_score(min, max)
+      redis.zremrangebyscore key, min, max
+    ensure
+      notify_changed
+    end
+
+    # Set this zset's members to the intersection of this set and the given set.
+    def intersect!(other)
+      redis.zinterstore key, [ key, other.key ]
+    ensure
+      notify_changed
+    end
+
+    # Set this zset's members to the union of this set and the given set.
+    def union!(other)
+      redis.zunionstore key, [ key, other.key ]
+    ensure
+      notify_changed
+    end
+
+  end
+
+end

data/spec/redis-tools_spec.rb

@@ -8,10 +8,10 @@ describe "redis connection accessor" do
     testkey = "test-string"
 
     redis.get(testkey).should == nil
-    redis.set(testkey, "foo").should == true
+    redis.set(testkey, "foo").should == "OK"
     redis.get(testkey).should == "foo"
-    redis.del(testkey).should == true
-    redis.del(testkey).should == false
+    redis.del(testkey).should == 1
+    redis.del(testkey).should == 0
   end
 
   it "should allow for keys to be renamed" do

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 begin
-  require 'spec'
+  require 'rspec'
 rescue LoadError
   require 'rubygems' unless ENV['NO_RUBYGEMS']
   gem 'rspec'
-  require 'spec'
+  require 'rspec'
 end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
@@ -86,7 +86,7 @@ module TestFixtures
 
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   include TestFixtures
 
   config.before(:each) do

data/spec/utils_spec.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "utility methods" do
+
+  include Blendris::Utils
+
+  it "should pairify an array" do
+    pairify(nil).should == []
+    pairify([]).should == []
+    pairify(1).should == []
+    pairify(1, 2).should == [ [1, 2] ]
+    pairify(1, 2, 3, [4, 5], 6, 7).should == [ [1, 2], [3, 4], [5, 6] ]
+  end
+
+end

data/spec/zset_spec.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "redis zsets" do
+
+  it "should compose correctly" do
+    z = RedisSortedSet.new("set1")
+
+    z << [ [2, "timothy"], [1, "alexander"], [3, "mchale"] ]
+    z.to_a.should == %w( alexander timothy mchale )
+
+    z.set 1, "cat", 0, "dog"
+    z.delete "cat"
+    z.to_a.should == %w( dog )
+  end
+
+end

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: blendris
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 6
-  version: "0.6"
+  version: "1.0"
 platform: ruby
 authors: 
 - Alex McHale
@@ -16,28 +17,43 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRMwEQYDVQQDDAphbGV4
   bWNoYWxlMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNj
-  b20wHhcNMTAwMjExMjEyNTU4WhcNMTEwMjExMjEyNTU4WjBBMRMwEQYDVQQDDAph
+  b20wHhcNMTAwODMxMTQ1NjExWhcNMTEwODMxMTQ1NjExWjBBMRMwEQYDVQQDDAph
   bGV4bWNoYWxlMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZ
-  FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9mTbsd+4JqyuW
-  z/J6OxXyyzb89ydr/wKmJZMyQmD7w/Qf3V8uGW9+NlYbRMJZYqY08QhTbSX3IW6c
-  6Hj4Xo0wqR0Fd6c0Vxdt9m5LZDEo2H+2jisgDBYFUN1itg+FGZtGczISlmG34tWN
-  efWA+DgtzKD9UG13AtzxoxfqeY03v0+/1/SCtpvbZrungWND8sg9sHSxsME0xB9d
-  u6BkunOrdy7iqd105MuPHL35SLhr57GKU/hjR2+FKAauT4eu7CeQXEWCBPXizknN
-  5w/HNs311sBJmzaZwDiX98e+/X10tMxJqWo4t4Us7Ke8b/0uYbuwWoaoKWjM3UYX
-  ppWhyNNFAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBQK0Aj0bDKnLJrVNjdgNAXnVaS1qDANBgkqhkiG9w0BAQUFAAOCAQEAU/1kVZUf
-  wjl9bhqLZXgcKgIkzgVYwDcqFE0OdBXFD/N+oNBfV80iN/R8iCf6y4dymYDzWalD
-  Rho49BN531OSYbWAD0lv5/MQYDpH8uHU4cDTzV1cYkOcjFVGsO26aPM7q1SoMhf+
-  8tCJEl/PSHrV6JmgGRDy6YTnbQGSKPNmykEZep8wWEFXMSW9OmwaeyZyEuWUZIS4
-  RtAGR/Bf1/mwYLD0ZZPvsgRy0yBrTeJoaRzJXCT08cN8xBX9sa+PFsjpc267TFsv
-  b0cDNnwAzS78yK9xMdpD5l7/mqtfdQPVLfvra4sMBknSW3ukOP3S/WUOfKOz7Ohf
-  V3OoCfxVK/4Dqg==
+  FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIUoy5sx2lmVzR
+  higIWdA6zFNSt1eibOVF0nCptQ2BejzefTmfhpgwWKDX9FvGdF213WBwxIGJFP0c
+  yOJTOoTgKQwQd6zCSoeNgNNHrXwbd42OKfHBTN1+DvNVoK9mLB659fUJ5CoCqNLU
+  FI6RtILyZVH/Hja8nnHJrfGjJ0aWSRueVuO/06QmKvm19EJEVbTSd/DwAbJTYrQD
+  6snqEY+64mcx8gvF2aCmGXKSpLqnTedsr3/16cd1rkHw7dZqbzyKc1uZaQL+giwp
+  Ijyn2SdMV+OKTf6xe/aL22aW/Z2b+tjQO8elB+/cz5kOlAkhtN3ENjf2e3H3UZSs
+  r+JQgRSdAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBS84ERhhfvntDfJzJe0/by+aeVeqDANBgkqhkiG9w0BAQUFAAOCAQEAFZRn7kGl
+  gvITFgcLlGAWNwYTfDiXm+8xjNXCyFLP2YgZvzNmP9HtzxnJHG9pk1tvAzKVgGQB
+  w+yPgHA9ASVnNP8/YifMVQtRkOYvmYiK+ynLTgqn3cCod0Q4mWcZ3mTsVfAqGxAZ
+  fyoyfn4C+7Ks6j3k7yXzcKoAi4w0RiHYUrNQAOFzkahHaovvophs88nIgq/HNSY6
+  tgs+JaGdLZUsgj0TZpzELi4d6iFDD44D/pAKN8VIpSlcbyKXkIyQa/NrKOTSie7u
+  AH5EvwIudku4RjdH363cTYX1xZ69LjcwrUpDrCJbG9jNK8icMoAOTEw0huZYvGRC
+  qyGdKMrvQEbACA==
   -----END CERTIFICATE-----
 
-date: 2010-02-27 00:00:00 -06:00
+date: 2010-11-05 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: redis
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 2
+        - 0
+        - 13
+        version: 2.0.13
+  type: :runtime
+  version_requirements: *id001
 description: A redis library for Ruby
 email: alexmchale@gmail.com
 executables: []
@@ -45,6 +61,7 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- LICENSE
 - README.markdown
 - lib/blendris.rb
 - lib/blendris/accessor.rb
@@ -60,8 +77,10 @@ extra_rdoc_files:
 - lib/blendris/string.rb
 - lib/blendris/types.rb
 - lib/blendris/utils.rb
+- lib/blendris/zset.rb
 files: 
 - History.txt
+- LICENSE
 - Manifest
 - PostInstall.txt
 - README.markdown
@@ -81,6 +100,7 @@ files:
 - lib/blendris/string.rb
 - lib/blendris/types.rb
 - lib/blendris/utils.rb
+- lib/blendris/zset.rb
 - script/console
 - script/destroy
 - script/generate
@@ -90,9 +110,10 @@ files:
 - spec/redis-tools_spec.rb
 - spec/ref_spec.rb
 - spec/set_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/string_spec.rb
+- spec/utils_spec.rb
+- spec/zset_spec.rb
 - blendris.gemspec
 has_rdoc: true
 homepage: http://github.com/alexmchale/blendris
@@ -109,16 +130,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
       segments: 
       - 1
       - 2
@@ -126,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: blendris
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A redis library for Ruby

metadata.gz.sig

@@ -1 +1 @@
-���C:��F�E�����8���t6?��9CI�������X=�4�ƨ�[i1b���no�X�������pE�`����C��2�aօ�N�P5�~xuX�M�n|8Qڷ��iR�G�ɕ�܋fD���󌇕���bq�A��������
����iB%�OV�ެ�0DF����-
J@�}�4�-�#ū�M�8l�;^���h�7b�_�5T6)����q������K�����q^�>n�����z{�S��r
JpK����
+��]td�0��$����Y��h�����'���YB�\�+���vo�w���_n]$���WȂ��o��"
�{~������u5�R�

data/spec/spec.opts

@@ -1,2 +0,0 @@
---colour
---backtrace