scales-core 0.0.1.beta.2 → 0.0.4

data/lib/scales-core.rb

@@ -4,8 +4,6 @@ module Scales
   autoload :Helper,   "scales-core/helper"
   autoload :Config,   "scales-core/config"
   autoload :Storage,  "scales-core/storage"
-  autoload :Queue,    "scales-core/queue"
-  autoload :PubSub,   "scales-core/pub_sub"
   autoload :Scalify,  "scales-core/scalify"
 end
 

data/lib/scales-core/config.rb

@@ -3,11 +3,12 @@ module Scales
     require 'ostruct'
     
     DEFAULTS = {
-      :host       => "localhost",
-      :port       => 6379,
-      :password   => nil,
-      :database   => 0,
-      :partials   => false
+      :host           => "localhost",
+      :port           => 6379,
+      :password       => nil,
+      :database       => 0,
+      :partials       => false,
+      :worker_threads => 30
     }
     
     @@pwd = "."

data/lib/scales-core/scalify/templates/cache.yml

@@ -4,6 +4,7 @@ development:
   password: 
   database: 1
   partials: false
+  worker_threads: 10
 
 test:
   host: localhost
@@ -11,10 +12,12 @@ test:
   password: 
   database: 2
   partials: false
+  worker_threads: 5
 
 production:
   host: localhost
   port: 6379
   password: 
   database: 0
-  partials: false
+  partials: false
+  worker_threads: 30

data/lib/scales-core/storage.rb

@@ -1,7 +1,9 @@
 module Scales
   module Storage
-    RESOURCE_PREFIX = "scales_resource_"
-    PARTIAL_PREFIX  = "scales_partial_"
+    REQUEST_QUEUE     = "scales_request_queue"
+    RESPONSE_CHANNEL  = "scales_response_channel"
+    RESOURCE_PREFIX   = "scales_resource_"
+    PARTIAL_PREFIX    = "scales_partial_"
 
     autoload :Sync,   "scales-core/storage/sync"
     autoload :Async,  "scales-core/storage/async"

data/lib/scales-core/storage/async.rb

@@ -2,6 +2,7 @@ module Scales
   module Storage
     module Async      
       @@redis = nil
+      @@pids = [Process.pid]
         
       class << self
         
@@ -69,6 +70,13 @@ module Scales
         private
         
         def with_connection
+          
+          # Reconnects forks
+          unless @@pids.include?(Process.pid)
+            force_reconnect!
+            @@pids << Process.pid
+          end
+          
           connect!
           yield
         end

data/lib/scales-core/storage/sync.rb

@@ -2,6 +2,7 @@ module Scales
   module Storage
     module Sync
       @@redis = nil
+      @@pids = [Process.pid]
       
       class << self
         
@@ -74,6 +75,13 @@ module Scales
         private
         
         def with_connection
+          
+          # Reconnects forks
+          unless @@pids.include?(Process.pid)
+            force_reconnect!
+            @@pids << Process.pid
+          end
+          
           connect!
           yield
         end

data/lib/scales-core/version.rb

@@ -1,5 +1,5 @@
 module Scales
   module Core
-    VERSION = "0.0.1.beta.2"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: scales-core
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta.2
-  prerelease: 6
+  version: 0.0.4
+  prerelease: 
 platform: ruby
 authors:
 - Thomas Fankhauser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70255207144860 !ruby/object:Gem::Requirement
+  requirement: &70234372078440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70255207144860
+  version_requirements: *70234372078440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70255207165340 !ruby/object:Gem::Requirement
+  requirement: &70234372077940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '2.11'
   type: :runtime
   prerelease: false
-  version_requirements: *70255207165340
+  version_requirements: *70234372077940
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70255207164180 !ruby/object:Gem::Requirement
+  requirement: &70234372077480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70255207164180
+  version_requirements: *70234372077480
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70255207162480 !ruby/object:Gem::Requirement
+  requirement: &70234372077020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *70255207162480
+  version_requirements: *70234372077020
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70255207159640 !ruby/object:Gem::Requirement
+  requirement: &70234372076560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70255207159640
+  version_requirements: *70234372076560
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70255207158940 !ruby/object:Gem::Requirement
+  requirement: &70234372076100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70255207158940
+  version_requirements: *70234372076100
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &70255207180260 !ruby/object:Gem::Requirement
+  requirement: &70234355518060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70255207180260
+  version_requirements: *70234355518060
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70255207179000 !ruby/object:Gem::Requirement
+  requirement: &70234355517600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.7.4
   type: :runtime
   prerelease: false
-  version_requirements: *70255207179000
+  version_requirements: *70234355517600
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70255207176620 !ruby/object:Gem::Requirement
+  requirement: &70234355517140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *70255207176620
+  version_requirements: *70234355517140
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70255207175620 !ruby/object:Gem::Requirement
+  requirement: &70234355516680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: 0.15.4
   type: :runtime
   prerelease: false
-  version_requirements: *70255207175620
+  version_requirements: *70234355516680
 description: Super Scale Caching Framework - Core
 email:
 - tommylefunk@googlemail.com
@@ -152,12 +152,6 @@ files:
 - lib/scales-core/helper.rb
 - lib/scales-core/helper/content_types.rb
 - lib/scales-core/helper/partial_resolver.rb
-- lib/scales-core/pub_sub.rb
-- lib/scales-core/pub_sub/async.rb
-- lib/scales-core/pub_sub/sync.rb
-- lib/scales-core/queue.rb
-- lib/scales-core/queue/async.rb
-- lib/scales-core/queue/sync.rb
 - lib/scales-core/scalify.rb
 - lib/scales-core/scalify/templates/cache.yml
 - lib/scales-core/scalify/templates/scaleup.rb
@@ -172,8 +166,6 @@ files:
 - spec/gem_spec.rb
 - spec/helper.rb
 - spec/partial_resolver_spec.rb
-- spec/pub_sub_spec.rb
-- spec/queue_spec.rb
 - spec/scalify_spec.rb
 - spec/storage_spec.rb
 homepage: http://itscales.org
@@ -191,9 +183,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -207,7 +199,5 @@ test_files:
 - spec/gem_spec.rb
 - spec/helper.rb
 - spec/partial_resolver_spec.rb
-- spec/pub_sub_spec.rb
-- spec/queue_spec.rb
 - spec/scalify_spec.rb
 - spec/storage_spec.rb

data/lib/scales-core/pub_sub.rb

@@ -1,6 +0,0 @@
-module Scales
-  module PubSub
-    autoload :Sync,   "scales-core/pub_sub/sync"
-    autoload :Async,  "scales-core/pub_sub/async"
-  end
-end

data/lib/scales-core/pub_sub/async.rb

@@ -1,19 +0,0 @@
-module Scales
-  module PubSub
-    module Async
-      class << self
-        
-        def publish(channel, message)
-          Storage::Async.publish(channel, message)
-        end
-        
-        def subscribe(channel)
-          out = Storage::Async.subscribe(channel)
-          Storage::Async.connection.del(channel)
-          out
-        end
-        
-      end
-    end
-  end
-end

data/lib/scales-core/pub_sub/sync.rb

@@ -1,17 +0,0 @@
-module Scales
-  module PubSub
-    module Sync
-      class << self
-        
-        def publish(channel, message)
-          Storage::Sync.publish(channel, message)
-        end
-        
-        def subscribe(channel)
-          Storage::Sync.subscribe(channel)
-        end
-        
-      end
-    end
-  end
-end

data/lib/scales-core/queue.rb

@@ -1,8 +0,0 @@
-module Scales
-  module Queue
-    NAME = "scales_request_queue"
-    
-    autoload :Sync,   "scales-core/queue/sync"
-    autoload :Async,  "scales-core/queue/async"
-  end
-end

data/lib/scales-core/queue/async.rb

@@ -1,18 +0,0 @@
-module Scales
-  module Queue
-    module Async
-      class << self
-        
-        def add(job)
-          Storage::Async.add(Queue::NAME, job)
-        end
-        
-        def pop
-          Storage::Async.pop(Queue::NAME)
-        end
-        
-      end
-      
-    end
-  end
-end

data/lib/scales-core/queue/sync.rb

@@ -1,18 +0,0 @@
-module Scales
-  module Queue
-    module Sync
-      class << self
-        
-        def add(job)
-          Storage::Sync.add(Queue::NAME, job)
-        end
-        
-        def pop
-          Storage::Sync.pop(Queue::NAME)
-        end
-        
-      end
-      
-    end
-  end
-end

data/spec/pub_sub_spec.rb

@@ -1,51 +0,0 @@
-require 'helper'
-
-describe Scales::PubSub::Async do
-  
-  it "should publish a few responses" do
-    async do
-      Scales::PubSub::Async.publish "channel1", "response 1"
-      Scales::PubSub::Async.publish "channel2", "response 2"
-      Scales::PubSub::Async.publish "channel3", "response 3"
-    end
-  end
-  
-  it "should subscribe to a few channels" do
-    async do
-      Scales::PubSub::Async.subscribe("channel1").should == "response 1"
-      Scales::PubSub::Async.subscribe("channel2").should == "response 2"
-      Scales::PubSub::Async.subscribe("channel3").should == "response 3"
-    end
-  end
-  
-end
-
-describe Scales::PubSub::Sync do
-  
-  it "should publish a few responses" do
-    Scales::PubSub::Sync.publish "channel1", "response 1"
-    Scales::PubSub::Sync.publish "channel2", "response 2"
-    Scales::PubSub::Sync.publish "channel3", "response 3"
-  end
-  
-  it "should subscribe to a few channels" do
-    Scales::PubSub::Sync.subscribe("channel1").should == "response 1"
-    Scales::PubSub::Sync.subscribe("channel2").should == "response 2"
-    Scales::PubSub::Sync.subscribe("channel3").should == "response 3"
-  end
-  
-end
-
-describe Scales::PubSub do
-  
-  it "subscribes async and pushes sync" do
-    Thread.new do
-      sleep 2
-      Scales::PubSub::Sync.publish "channel1", "response 1"
-    end
-    async do
-      Scales::PubSub::Async.subscribe("channel1").should == "response 1"
-    end
-  end
-  
-end

data/spec/queue_spec.rb

@@ -1,37 +0,0 @@
-require 'helper'
-
-describe Scales::Queue::Sync do
-  
-  it "should place a few jobs" do
-    Scales::Queue::Sync.add "job 1"
-    Scales::Queue::Sync.add "job 2"
-    Scales::Queue::Sync.add "job 3"
-  end
-
-  it "should take them out blocking" do
-    Scales::Queue::Sync.pop.should == "job 1"
-    Scales::Queue::Sync.pop.should == "job 2"
-    Scales::Queue::Sync.pop.should == "job 3"
-  end
-  
-end
-
-describe Scales::Queue::Async do
-  
-  it "should place a few jobs" do
-    async do
-      Scales::Queue::Async.add "job 1"
-      Scales::Queue::Async.add "job 2"
-      Scales::Queue::Async.add "job 3"
-    end
-  end
-
-  it "should take them out blocking" do
-    async do
-      Scales::Queue::Async.pop.should == "job 1"
-      Scales::Queue::Async.pop.should == "job 2"
-      Scales::Queue::Async.pop.should == "job 3"
-    end
-  end
-  
-end