roulette 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/roulette/transaction.rb

@@ -0,0 +1,13 @@
+class Roulette::Transaction
+  attr_accessor :args, :store, :method
+
+  def initialize(options = {})
+    self.store = options[:store]
+    self.args = *options[:args]
+    self.method = options[:method]
+  end
+
+  def fire(method_name = nil )
+    store.send (method_name||method).to_sym, *args
+  end
+end

data/lib/roulette.rb

@@ -19,36 +19,23 @@ class Roulette
   end
 
   def method_missing(method_name, *args, &blk)
-    Transaction.new(@stores, *args).fire(method_name)
+    Transaction.new(:args => args, :store => select_store(args), :method => method_name).fire
   end
 
-  class Transaction
-    attr_accessor :key, :args, :stores
-
-
-    def initialize(stores, *args)
-      self.stores = stores
-      self.args = *args
-      extract_key
-    end
-
-    def extract_key
-      # there is a 'bug' with something in the rails library that when loaded will
-      # produce Roulette::Transaction.new([], "key") # => "k" instead of "key"
-      # this is a fix for that, but i don't know what in rails env causes this discrepency
-      self.key = args.is_a?(Array) ? args.first.to_s : args.to_s
-    end
-
-    def fire(method)
-      select_store.send method.to_sym, *args
-    end
-
-    private
-    def select_store
-      val = Digest::SHA1.hexdigest(self.key).unpack('Q').join.to_i
-      store_index = val % stores.count
-      @stores[store_index]
-    end
+  def extract_key(*args)
+    args.flatten.first.to_s
   end
 
-end
+  def select_store(*args)
+    key = extract_key(*args)
+    store_for_key(key)
+  end
+
+  def store_for_key(key)
+    val = Digest::SHA1.hexdigest(key).unpack('Q').join.to_i
+    store_index = val % stores.count
+    self.stores[store_index]
+  end
+end
+
+require 'roulette/transaction'

data/roulette.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roulette}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Schneems"]
-  s.date = %q{2011-07-11}
+  s.date = %q{2011-07-14}
   s.description = %q{
    Super easy pre-sharding for your ruby NOSQL store. Presharding is used to naively scale your data-stores horizontally. 
   }
@@ -26,12 +26,14 @@ Gem::Specification.new do |s|
     "VERSION",
     "autotest/discover.rb",
     "lib/roulette.rb",
+    "lib/roulette/transaction.rb",
     "license.txt",
     "pkg/roulette-.gem",
     "pkg/roulette-0.0.1.gem",
+    "pkg/roulette-0.0.2.gem",
     "roulette.gemspec",
-    "spec/roulette/roulette_spec.rb",
     "spec/roulette/transaction_spec.rb",
+    "spec/roulette_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/Schnems/roulette}
@@ -40,8 +42,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{Pre-Sharding so simple you'll shoot yourself :p}
   s.test_files = [
-    "spec/roulette/roulette_spec.rb",
     "spec/roulette/transaction_spec.rb",
+    "spec/roulette_spec.rb",
     "spec/spec_helper.rb"
   ]
 

data/spec/roulette/transaction_spec.rb

@@ -13,46 +13,17 @@ describe Roulette::Transaction do
 
     describe '#new' do
       it "keeps args, stores, and key" do
-        transaction = Roulette::Transaction.new([@kv_store], *@args)
-        transaction.stores.should eq([@kv_store])
-        transaction.key.should eq(@key)
+        transaction = Roulette::Transaction.new(:store => @kv_store, :args => @args)
+        transaction.store.should eq(@kv_store)
         transaction.args.should eq(@args)
       end
     end
 
-    describe '#extract_key' do
-      it "pulls out the key even if there is only one arg" do
-        key = "foo"
-        transaction = Roulette::Transaction.new([], key)
-        transaction.extract_key.should eq(key)
-      end
-
-      it "pulls out the key" do
-        transaction = Roulette::Transaction.new([], *@args)
-        transaction.extract_key.should eq(@key)
-      end
-    end
-
-    describe '#select_store' do
-      it "picks a store" do
-        transaction = Roulette::Transaction.new([@kv_store], *@args)
-        store = transaction.send :select_store
-        store.should eq(@kv_store)
-      end
-
-      it "selects different stores for different keys" do
-        @kv_store_deux = FakeKeyValueStore.new
-        store = Roulette::Transaction.new([@kv_store, @kv_store_deux], "key").send :select_store
-        store_deux = Roulette::Transaction.new([@kv_store, @kv_store_deux], "different_key").send :select_store
-        store.should_not eq(store_deux)
-      end
-    end
-
     describe "#fire" do
       it "sends a method to a kv_store" do
         fired_method = :sadd
         @kv_store.should_receive(fired_method)
-        transaction = Roulette::Transaction.new([@kv_store], *@args)
+        transaction = Roulette::Transaction.new(:store => @kv_store, :args => @args)
         transaction.fire(fired_method)
       end
     end

data/spec/{roulette/roulette_spec.rb → roulette_spec.rb}

@@ -43,4 +43,42 @@ describe Roulette do
         @roulette.stores.should eq(store_array)
       end
     end
+    
+
+     describe '#extract_key' do
+       before do
+         @kv_store = FakeKeyValueStore.new
+         @roulette = Roulette.new(@kv_store)
+       end
+
+       it "pulls out the key even if there is only one arg" do
+         key = "foo"
+         @roulette.extract_key(key).should eq(key)
+       end
+     
+       it "pulls out the key" do
+         key = "foo"
+         @roulette.extract_key([key, "some", "other", "stuff"]).should eq(key)
+       end
+     end
+     
+     describe '#select_store' do
+       before do
+         @kv_store = FakeKeyValueStore.new
+         @roulette = Roulette.new(@kv_store)
+       end
+       
+       it "picks a store" do
+         @roulette.select_store("key").should eq(@kv_store)
+       end
+     
+       it "selects different stores for different keys" do
+         @kv_store_deux = FakeKeyValueStore.new
+         multiple_store_roulette = Roulette.new([@kv_store, @kv_store_deux])
+         store = multiple_store_roulette.select_store("key")
+         store_deux = multiple_store_roulette.select_store("different_key")
+         store.should_not eq(store_deux)
+       end
+     end
+    
 end

metadata

@@ -2,7 +2,7 @@
 name: roulette
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Schneems
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 -05:00
+date: 2011-07-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,12 +85,14 @@ files:
 - VERSION
 - autotest/discover.rb
 - lib/roulette.rb
+- lib/roulette/transaction.rb
 - license.txt
 - pkg/roulette-.gem
 - pkg/roulette-0.0.1.gem
+- pkg/roulette-0.0.2.gem
 - roulette.gemspec
-- spec/roulette/roulette_spec.rb
 - spec/roulette/transaction_spec.rb
+- spec/roulette_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/Schnems/roulette
@@ -106,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2757344494909302037
+      hash: -4581068164256372196
       segments: 
       - 0
       version: "0"
@@ -124,6 +126,6 @@ signing_key:
 specification_version: 3
 summary: Pre-Sharding so simple you'll shoot yourself :p
 test_files: 
-- spec/roulette/roulette_spec.rb
 - spec/roulette/transaction_spec.rb
+- spec/roulette_spec.rb
 - spec/spec_helper.rb