dynashard 0.1.0 → 0.2.0

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 gem 'activerecord', '>= 3.0'
+gem 'arel', '>= 2.0'
 
 group :development do
   gem "shoulda", ">= 0"

data/Gemfile.lock

@@ -2,95 +2,74 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.1)
-      actionpack (= 3.0.1)
-      mail (~> 2.2.5)
-    actionpack (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-    activesupport (3.0.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    activesupport (3.0.3)
+    arel (2.0.7)
     builder (2.1.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    factory_girl (1.3.2)
-    factory_girl_rails (1.0)
+    factory_girl (1.3.3)
+    factory_girl_rails (1.0.1)
       factory_girl (~> 1.3)
-      rails (>= 3.0.0.beta4)
+      railties (>= 3.0.0)
     git (1.2.5)
-    i18n (0.4.2)
+    i18n (0.5.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    mail (2.2.9)
-      activesupport (>= 2.3.6)
-      i18n (~> 0.4.1)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.1)
-      actionmailer (= 3.0.1)
-      actionpack (= 3.0.1)
-      activerecord (= 3.0.1)
-      activeresource (= 3.0.1)
-      activesupport (= 3.0.1)
-      bundler (~> 1.0.0)
-      railties (= 3.0.1)
-    railties (3.0.1)
-      actionpack (= 3.0.1)
-      activesupport (= 3.0.1)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
     rcov (0.9.9)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
+    rspec-mocks (2.4.0)
     shoulda (2.11.3)
-    sqlite3-ruby (1.3.2)
-    thor (0.14.4)
-    treetop (1.4.8)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    thor (0.14.6)
+    tzinfo (0.3.24)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord (>= 3.0)
+  arel (>= 2.0)
   bundler (~> 1.0.0)
   factory_girl_rails
   jeweler (~> 1.5.2)

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/dynashard.gemspec

@@ -0,0 +1,90 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{dynashard}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Nick Hengeveld"]
+  s.date = %q{2011-01-31}
+  s.description = %q{Dynashard allows you to shard your ActiveRecord models.  Models can be configured to shard based on context that can be defined dynamically.}
+  s.email = %q{nickh@verticalresponse.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "dynashard.gemspec",
+    "lib/dynashard.rb",
+    "lib/dynashard/associations.rb",
+    "lib/dynashard/connection_handler.rb",
+    "lib/dynashard/model.rb",
+    "lib/dynashard/validations.rb",
+    "spec/associations_spec.rb",
+    "spec/connection_handler_spec.rb",
+    "spec/dynashard_spec.rb",
+    "spec/model_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/factories.rb",
+    "spec/support/models.rb",
+    "spec/validation_spec.rb"
+  ]
+  s.homepage = %q{http://github.com/nickh/dynashard}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Dynamic sharding for ActiveRecord}
+  s.test_files = [
+    "spec/associations_spec.rb",
+    "spec/connection_handler_spec.rb",
+    "spec/db/schema.rb",
+    "spec/dynashard_spec.rb",
+    "spec/model_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/factories.rb",
+    "spec/support/models.rb",
+    "spec/validation_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0"])
+      s.add_runtime_dependency(%q<arel>, [">= 2.0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0"])
+    else
+      s.add_dependency(%q<activerecord>, [">= 3.0"])
+      s.add_dependency(%q<arel>, [">= 2.0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 3.0"])
+    end
+  else
+    s.add_dependency(%q<activerecord>, [">= 3.0"])
+    s.add_dependency(%q<arel>, [">= 2.0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 3.0"])
+  end
+end
+

data/lib/dynashard.rb

@@ -164,4 +164,3 @@ require 'dynashard/model'
 require 'dynashard/associations'
 require 'dynashard/connection_handler'
 require 'dynashard/validations'
-require 'dynashard/arel_sql_engine'

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dynashard
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Nick Hengeveld
@@ -19,95 +18,103 @@ date: 2011-01-31 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
   name: activerecord
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
         version: "3.0"
-  requirement: *id001
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: arel
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :runtime
   prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 5
         - 2
         version: 1.5.2
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  type: :runtime
+  type: :development
   prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
         version: "3.0"
-  requirement: *id006
+  type: :runtime
+  prerelease: false
+  version_requirements: *id007
 description: Dynashard allows you to shard your ActiveRecord models.  Models can be configured to shard based on context that can be defined dynamically.
 email: nickh@verticalresponse.com
 executables: []
@@ -125,13 +132,12 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- dynashard.gemspec
 - lib/dynashard.rb
-- lib/dynashard/arel_sql_engine.rb
 - lib/dynashard/associations.rb
 - lib/dynashard/connection_handler.rb
 - lib/dynashard/model.rb
 - lib/dynashard/validations.rb
-- spec/arel_sql_engine_spec.rb
 - spec/associations_spec.rb
 - spec/connection_handler_spec.rb
 - spec/dynashard_spec.rb
@@ -155,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -2881092534266890665
       segments: 
       - 0
       version: "0"
@@ -164,7 +170,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -176,7 +181,6 @@ signing_key:
 specification_version: 3
 summary: Dynamic sharding for ActiveRecord
 test_files: 
-- spec/arel_sql_engine_spec.rb
 - spec/associations_spec.rb
 - spec/connection_handler_spec.rb
 - spec/db/schema.rb

data/lib/dynashard/arel_sql_engine.rb

@@ -1,22 +0,0 @@
-module Dynashard
-  module ArelEngineExtensions
-    def self.included(base)
-      base.alias_method_chain :connection, :dynashard
-    end
-    
-    def connection_with_dynashard
-      if @ar && @ar.respond_to?(:dynashard_klass)
-        @ar.dynashard_klass.connection
-      elsif @ar && @ar.sharding_enabled?
-        spec = Dynashard.shard_context[@ar.dynashard_context]
-        raise "Missing #{@ar.dynashard_context} shard context" if spec.nil?
-        spec = spec.call if spec.respond_to?(:call)
-        Dynashard.class_for(spec).connection
-      else
-        connection_without_dynashard
-      end
-    end
-  end
-end
-
-Arel::Sql::Engine.send(:include, Dynashard::ArelEngineExtensions)

data/spec/arel_sql_engine_spec.rb

@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-describe 'Dynashard::ArelEngineExtensions' do
-  before(:each) do
-    @mock_record = mock()
-    @engine = Arel::Sql::Engine.new(@mock_record)
-  end
-
-  describe '#connection_with_dynashard' do
-    context 'with a sharding association owner' do
-      it "returns the generated model subclass connection" do
-        @mock_record.should_receive(:dynashard_klass).once.and_return(mock(:connection => :subclass_connection))
-        @engine.should_receive(:connection_without_dynashard).never
-        @engine.connection.should == :subclass_connection
-      end
-    end
-
-    context 'with a sharding model' do
-      before(:each) do
-        @mock_record.should_receive(:sharding_enabled?).and_return(true)
-        @mock_record.should_receive(:dynashard_context).at_least(:once).and_return(:dynashard_context)
-      end
-
-      context 'and no defined sharding context' do
-        it 'raises an exception' do
-          Dynashard.shard_context[:dynashard_context] = nil
-          lambda do
-            @engine.connection
-          end.should raise_error
-        end
-      end
-    
-      context 'and a defined sharding context' do
-        it 'returns the generated shard class connection' do
-          Dynashard.should_receive(:class_for).with(:shard_spec).and_return(mock(:connection => :shard_connection))
-          Dynashard.shard_context[:dynashard_context] = :shard_spec
-          @engine.should_receive(:connection_without_dynashard).never
-          @engine.connection.should == :shard_connection
-        end
-      end
-    end
-
-    context 'with a non-sharding model' do
-      it 'returns the default connection' do
-        @mock_record.should_receive(:sharding_enabled?).and_return(false)
-        @engine.should_receive(:connection_without_dynashard).and_return(:model_connection)
-        @engine.connection.should == :model_connection
-      end
-    end
-  end
-end