excursion 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a338401c82ff6fa83f39996a473dd5f2b7fba259
-  data.tar.gz: 91e8a13deb73fde5d74ea5dd23aa08bda277ae83
+  metadata.gz: ee64e15f8d7724efbe4740ea2df2536c720a2865
+  data.tar.gz: 45927cde8ec41918fca4bcc1144075d0e40d0c4f
 SHA512:
-  metadata.gz: 6d9ed0f02c70a928a718d063cac0e1f75bff1830b3606cb5d0685de09282e1e230ed0f8742fa1ac9a9fd2ae2fc67eb7048d89e4be13b972344bdb1a75228f9c9
-  data.tar.gz: 1ba2d82ddc48b48d550eb6ed37ac3e5ca90782be1d37814c112d91ef4693b58e7be15fa950d00e352a728b8c9fa824f3a7ee35737ce16166b9e0a25da8a7a1fc
+  metadata.gz: 039ba40d1e6aa5f66f262a751f64b65a04f03eed7a0f3237d020850e942790826644d2d6d2453b20aa839e4c85a210e35f4016497b5c24ea7ce30052b6166955
+  data.tar.gz: 0d2ba1e113445f529f6c86e1a78b014eed8554987b524cb4142e08de997968caf20f13d4fb2401f59d2af978fe6b6045e5f6dc39874a2ac1ef83702a80bcc325

data/lib/excursion/datastores/active_record.rb

@@ -36,6 +36,12 @@ module Excursion
       end
       alias_method :unset, :delete
 
+      def all
+        hash = HashWithIndifferentAccess.new
+        @model.all.each { |m| hash[m.key.to_sym] = m.value }
+        hash
+      end
+
       protected
 
       def initialize

data/lib/excursion/datastores/active_record_with_memcache.rb

@@ -28,6 +28,14 @@ module Excursion
       end
       alias_method :unset, :delete
 
+      def all
+        hash = @cache.all
+        return hash unless hash.nil? || hash.empty?
+        @model.all
+      rescue Dalli::RingError => e
+        rescue_from_dalli_ring_error(e) && retry
+      end
+
       protected
 
       def initialize(server)

data/lib/excursion/datastores/datastore.rb

@@ -7,12 +7,20 @@ module Excursion
         Excursion::Pool::Application.from_cache(read(key))
       end
       
+      def all_apps
+        app_hash = HashWithIndifferentAccess.new
+        all.each do |k,v|
+          app_hash[k.to_sym] = Excursion::Pool::Application.from_cache(v)
+        end
+      end
+      
       def read(key); end
       alias_method :get, :read
       def write(key, value); end
       alias_method :set, :write
       def delete(key); end
       alias_method :unset, :delete
+      def all; end
 
     end
   end

data/lib/excursion/datastores/file.rb

@@ -26,6 +26,10 @@ module Excursion
       end
       alias_method :unset, :delete
 
+      def all
+        HashWithIndifferentAccess.new(read_file)
+      end
+
       protected
 
       def initialize(path)

data/lib/excursion/datastores/memcache.rb

@@ -5,6 +5,7 @@ require 'excursion/exceptions/memcache'
 module Excursion
   module Datastores
     class Memcache < Datastore
+      REGISTERED_KEYS = 'registered_keys'
 
       def read(key)
         @client.get(key.to_s)
@@ -14,20 +15,30 @@ module Excursion
       alias_method :get, :read
 
       def write(key, value)
-        value if @client.set(key.to_s, value)
+        value if @client.set(key.to_s, value) && @client.set(REGISTERED_KEYS, (registered_keys << key.to_s).join(','))
       rescue Dalli::RingError => e
         rescue_from_dalli_ring_error(e) && retry
       end
       alias_method :set, :write
 
       def delete(key)
-        value = @client.get(key)
-        value if @client.delete(key)
+        regd_keys = registered_keys
+        regd_keys.delete(key.to_s)
+        value = @client.get(key.to_s)
+        value if @client.delete(key.to_s) && @client.set(REGISTERED_KEYS, regd_keys.join(','))
       rescue Dalli::RingError => e
         rescue_from_dalli_ring_error(e) && retry
       end
       alias_method :unset, :delete
 
+      def all
+        hash = HashWithIndifferentAccess.new
+        registered_keys.each { |key| hash[key.to_s] = @client.get(key.to_s) }
+        hash
+      rescue Dalli::RingError => e
+        rescue_from_dalli_ring_error(e) && retry
+      end
+
       protected
 
       def initialize(server)
@@ -35,6 +46,12 @@ module Excursion
         @client = Dalli::Client.new(server, {namespace: "excursion"})
       end
 
+      def registered_keys
+        @client.get(REGISTERED_KEYS).split(',')
+      rescue
+        []
+      end
+
       # TODO if we're using memcache, and the server goes away, it might be a good idea
       # to make sure to re-register this app in the pool when it comes back, just in case
       # the server crashed and the pool is lost.

data/lib/excursion/datastores/test.rb

@@ -10,6 +10,13 @@ module Excursion
       def app(key)
         Excursion::Pool::DummyApplication.from_cache(read(key))
       end
+      
+      def all_apps
+        app_hash = HashWithIndifferentAccess.new
+        all.each do |k,v|
+          app_hash[k.to_sym] = Excursion::Pool::DummyApplication.from_cache(v)
+        end
+      end
 
       def read(key)
         return unless Excursion.configuration.test_providers.nil? || Excursion.configuration.test_providers.map(&:to_sym).include?(key.to_sym)
@@ -27,6 +34,10 @@ module Excursion
       end
       alias_method :unset, :delete
 
+      def all
+        HashWithIndifferentAccess.new(@pool)
+      end
+
       protected
 
       def initialize(pool=nil)

data/lib/excursion/helpers/javascript_helper.rb

@@ -0,0 +1,12 @@
+module Excursion
+  module Helpers
+    module JavascriptHelper
+      def render_excursion_javascript_helpers
+        content_tag :script, raw("Excursion.loadPool(#{raw Excursion::Pool.datastore.all.to_json});"), type: "text/javascript"
+      end
+
+    end
+  end
+end
+
+ActionController::Base.send :helper, Excursion::Helpers::JavascriptHelper

data/lib/excursion/helpers/url_helper.rb

@@ -12,10 +12,14 @@ module Excursion
         if route.nil?
           super
         else
-          url_opts = (@application.default_url_options || {}).clone
-          url_opts.merge!(args.slice!(args.length-1)) if args.last.is_a?(Hash) #&& args.last.has_key?(:host)
-            
-          ActionDispatch::Http::URL.url_for(url_opts.merge({path: replaced_path(route, args)}))
+          if meth.to_s.match(/_url\Z/)
+            url_opts = (@application.default_url_options || {}).clone
+            url_opts.merge!(args.slice!(args.length-1)) if args.last.is_a?(Hash) #&& args.last.has_key?(:host)
+              
+            ActionDispatch::Http::URL.url_for(url_opts.merge({path: replaced_path(route, args)}))
+          elsif meth.to_s.match(/_path\Z/)
+            replaced_path(route, args)
+          end
         end
       end
 

data/lib/excursion/helpers.rb

@@ -1,5 +1,6 @@
 require 'excursion/helpers/url_helper'
 require 'excursion/helpers/application_helper'
+require 'excursion/helpers/javascript_helper'
 
 module Excursion
   module Helpers

data/lib/excursion/pool.rb

@@ -6,6 +6,10 @@ module Excursion
   module Pool
     @@applications = {}
 
+    def self.all_applications
+      datastore.all_apps
+    end
+
     def self.application(name)
       return @@applications[name] if @@applications.has_key?(name) && !@@applications[name].nil?
       

data/lib/excursion/railtie.rb

@@ -1,4 +1,9 @@
 module Excursion
+  class Engine < Rails::Engine
+    # automatically registers excursion as an engine and allows
+    # using the javascript helpers
+  end
+
   class Railtie < Rails::Railtie
     config.after_initialize do |app|
       if Excursion.configuration.register_app == true && !Excursion.configuration.datastore.nil? && !defined?(Rails::Generators::Base) # HACK is there a better way to attempt to check if we're running a generator?

data/lib/excursion/version.rb

@@ -1,3 +1,3 @@
 module Excursion
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/spec/excursion/datastores/active_record_spec.rb

@@ -80,26 +80,38 @@ describe 'Excursion::Datastores::ActiveRecord' do
     end
   end
 
-  context '#delete' do
+  describe '#delete' do
     describe 'key' do
       it 'should be required' do
         expect { subject.delete }.to raise_exception(ArgumentError)
       end
     end
-    
-    it 'should remove the key from the datastore' do
-      subject.read('key1').should_not eql(nil)
-      subject.delete('key1')
-      subject.read('key1').should be(nil)
-    end
 
-    it 'should return the value of the deleted key if it exists' do
-      keyval = subject.read('key1')
-      subject.delete('key1').should eql(keyval)
+    context 'when the key exists' do
+      it 'should remove the key from the datastore' do
+        subject.read('key1').should_not eql(nil)
+        subject.delete('key1')
+        subject.read('key1').should be(nil)
+      end
+
+      it 'should return the value of the deleted key' do
+        keyval = subject.read('key1')
+        subject.delete('key1').should eql(keyval)
+      end
     end
 
-    it 'should return nil if the deleted key does not exist' do
-      subject.delete('non_existent_key').should eql(nil)
+    context 'when the key does not exist' do
+      it 'should return nil' do
+        subject.delete('non_existent_key').should eql(nil)
+      end
+    end
+  end
+  
+  describe '#all' do
+    it 'should return a hash of all the registered keys and their values' do
+      Excursion::Specs::Mocks::SIMPLE_VALUES.each do |k,v|
+        expect(subject.all[k.to_sym]).to eql(v)
+      end
     end
   end
 

data/spec/excursion/datastores/active_record_with_memcache_spec.rb

@@ -18,6 +18,7 @@ describe 'Excursion::Datastores::ActiveRecordWithMemcache' do
       dalli_client.set(key, val)
       Excursion::RoutePool.create key: key, value: val
     end
+    dalli_client.set(Excursion::Datastores::Memcache::REGISTERED_KEYS, Excursion::Specs::Mocks::SIMPLE_VALUES.keys.map(&:to_s).join(','))
   end
   
   subject do
@@ -114,7 +115,7 @@ describe 'Excursion::Datastores::ActiveRecordWithMemcache' do
     end
   end
 
-  context '#delete' do
+  describe '#delete' do
     before(:each) do
       fill_pool
     end
@@ -154,5 +155,13 @@ describe 'Excursion::Datastores::ActiveRecordWithMemcache' do
       subject.delete('non_existent_key').should eql(nil)
     end
   end
+  
+  describe '#all' do
+    it 'should return a hash of all the registered keys and their values' do
+      Excursion::Specs::Mocks::SIMPLE_VALUES.each do |k,v|
+        expect(subject.all[k.to_sym]).to eql(v)
+      end
+    end
+  end
 
 end

data/spec/excursion/datastores/file_spec.rb

@@ -93,26 +93,38 @@ describe 'Excursion::Datastores::File' do
     end
   end
 
-  context '#delete' do
+  describe '#delete' do
     describe 'key' do
       it 'should be required' do
         expect { subject.delete }.to raise_exception(ArgumentError)
       end
     end
-    
-    it 'should remove the key from the datastore' do
-      subject.read('key1').should_not eql(nil)
-      subject.delete('key1')
-      subject.read('key1').should be(nil)
+
+    context 'when the key exists' do
+      it 'should remove the key from the datastore' do
+        subject.read('key1').should_not eql(nil)
+        subject.delete('key1')
+        subject.read('key1').should be(nil)
+      end
+
+      it 'should return the value of the deleted key' do
+        keyval = subject.read('key1')
+        subject.delete('key1').should eql(keyval)
+      end
     end
 
-    it 'should return the value of the deleted key if it exists' do
-      keyval = subject.read('key1')
-      subject.delete('key1').should eql(keyval)
+    context 'when the key does not exist' do
+      it 'should return nil' do
+        subject.delete('non_existent_key').should eql(nil)
+      end
     end
+  end
 
-    it 'should return nil if the deleted key does not exist' do
-      subject.delete('non_existent_key').should eql(nil)
+  describe '#all' do
+    it 'should return a hash of all the registered keys and their values' do
+      Excursion::Specs::Mocks::SIMPLE_VALUES.each do |k,v|
+        expect(subject.all[k.to_sym]).to eql(v)
+      end
     end
   end
 

data/spec/excursion/datastores/memcache_spec.rb

@@ -13,6 +13,7 @@ describe 'Excursion::Datastores::Memcache' do
     Excursion::Specs::Mocks::SIMPLE_VALUES.each do |key,val|
       dc.set(key,val)
     end
+    dc.set(Excursion::Datastores::Memcache::REGISTERED_KEYS, Excursion::Specs::Mocks::SIMPLE_VALUES.keys.map(&:to_s).join(','))
   end
   
   subject do
@@ -94,26 +95,38 @@ describe 'Excursion::Datastores::Memcache' do
     end
   end
 
-  context '#delete' do
+  describe '#delete' do
     describe 'key' do
       it 'should be required' do
         expect { subject.delete }.to raise_exception(ArgumentError)
       end
     end
     
-    it 'should remove the key from the datastore' do
-      subject.read('key1').should_not eql(nil)
-      subject.delete('key1')
-      subject.read('key1').should be(nil)
-    end
+    context 'when the key exists' do
+      it 'should remove the key from the datastore' do
+        subject.read('key1').should_not eql(nil)
+        subject.delete('key1')
+        subject.read('key1').should be(nil)
+      end
 
-    it 'should return the value of the deleted key if it exists' do
-      keyval = subject.read('key1')
-      subject.delete('key1').should eql(keyval)
+      it 'should return the value of the deleted key' do
+        keyval = subject.read('key1')
+        subject.delete('key1').should eql(keyval)
+      end
     end
 
-    it 'should return nil if the deleted key does not exist' do
-      subject.delete('non_existent_key').should eql(nil)
+    context 'when the key does not exist' do
+      it 'should return nil' do
+        subject.delete('non_existent_key').should eql(nil)
+      end
+    end
+  end
+  
+  describe '#all' do
+    it 'should return a hash of all the registered keys and their values' do
+      Excursion::Specs::Mocks::SIMPLE_VALUES.each do |k,v|
+        expect(subject.all[k.to_sym]).to eql(v)
+      end
     end
   end
 

data/spec/excursion/datastores/test_spec.rb

@@ -85,27 +85,38 @@ describe 'Excursion::Datastores::Test' do
     end
   end
 
-  context '#delete' do
+  describe '#delete' do
     describe 'key' do
       it 'should be required' do
         expect { subject.delete }.to raise_exception(ArgumentError)
       end
     end
     
-    it 'should remove the key from the datastore' do
-      subject.write('key1', Excursion::Specs::Mocks::SIMPLE_VALUES['key1'])
-      subject.read('key1').should eql(Excursion::Specs::Mocks::SIMPLE_VALUES['key1'])
-      subject.delete('key1')
-      subject.read('key1').should_not eql(Excursion::Specs::Mocks::SIMPLE_VALUES['key1'])
-    end
+    context 'when the key exists' do
+      it 'should remove the key from the datastore' do
+        subject.write('key1', Excursion::Specs::Mocks::SIMPLE_VALUES['key1'])
+        subject.read('key1').should eql(Excursion::Specs::Mocks::SIMPLE_VALUES['key1'])
+        subject.delete('key1')
+        subject.read('key1').should_not eql(Excursion::Specs::Mocks::SIMPLE_VALUES['key1'])
+      end
 
-    it 'should return the value of the deleted key if it exists' do
-      keyval = subject.read('key1')
-      subject.delete('key1').should eql(keyval)
+      it 'should return the value of the deleted' do
+        keyval = subject.read('key1')
+        subject.delete('key1').should eql(keyval)
+      end
     end
 
-    it 'should return nil if the deleted key does not exist' do
-      subject.delete('non_existent_key').should eql(nil)
+    context 'when the key does not exist' do
+      it 'should return nil' do
+        subject.delete('non_existent_key').should eql(nil)
+      end
+    end
+  end
+  
+  describe '#all' do
+    it 'should return a hash of all the registered keys and their values' do
+      Excursion::Specs::Mocks::SIMPLE_VALUES.each { |k,v| subject.write(k.to_sym, v) }
+      Excursion::Specs::Mocks::SIMPLE_VALUES.each { |k,v| expect(subject.all[k.to_sym]).to eql(v) }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excursion
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -85,6 +85,7 @@ files:
 - lib/excursion/railtie.rb
 - lib/excursion/configuration.rb
 - lib/excursion/helpers/url_helper.rb
+- lib/excursion/helpers/javascript_helper.rb
 - lib/excursion/helpers/application_helper.rb
 - lib/excursion/exceptions.rb
 - lib/excursion/datastores/datastore.rb
@@ -129,7 +130,6 @@ files:
 - spec/dummy/db/schema.rb
 - spec/dummy/config.ru
 - spec/dummy/README.rdoc
-- spec/dummy/log/development.log
 - spec/dummy/script/rails
 - spec/dummy/doc/README_FOR_APP
 - spec/dummy/app/views/layouts/application.html.erb
@@ -208,7 +208,6 @@ test_files:
 - spec/dummy/db/schema.rb
 - spec/dummy/config.ru
 - spec/dummy/README.rdoc
-- spec/dummy/log/development.log
 - spec/dummy/script/rails
 - spec/dummy/doc/README_FOR_APP
 - spec/dummy/app/views/layouts/application.html.erb