stormpath-sdk 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23386924f0b6cb041d80e4900d5cba99cc93da80
-  data.tar.gz: 7e9d14180ef6f5e6fadfcb11836cf4e3ceca7ba5
+  metadata.gz: b3691a66f261c76c712cf287ab23eb915c8fbc9b
+  data.tar.gz: 23271526986e5b0ca026d6010f213c76534b88bd
 SHA512:
-  metadata.gz: 15039329aa8f769f5b73bd763e2bb29df905a26f06782f7dcaac8cc17a5140f5244e2fb42d66d19afb4613d4dc833536c1e55994bc1e545e003a8252a858ffea
-  data.tar.gz: be5240dbe085d0566b3a1e1fb4a8cc39c0b566d7b7958fa655b373834a7c98be4f4885d7cb74547e9f4158cccc595540d04bcf4859033d840e8186caa8638e5f
+  metadata.gz: 32a307a58bee08d85c5595e4d9889f2ff4d0dda416dc91f57c91edd7fa55655991805722a273064f0dad372c1d9cd4e073e436c9de1d41d7774e3737cbb50dd0
+  data.tar.gz: 7f0fe61d86c0d23a3f8c9c1888585b97a46f4494197121be2d0411e9476a3ccd398f53bc3d7b2bd45cba5bf44ce4596e0ac96b7662e08ea636042d7972d71f32

data/CHANGES.md

@@ -1,6 +1,14 @@
 stormpath-sdk-ruby Changelog
 ============================
 
+Version 1.2.1
+-------------
+
+Released on November 02, 2016
+
+- Fix bug with passing store options to cache store
+
+
 Version 1.2.0
 -------------
 

data/lib/stormpath-sdk/cache/memcached_store.rb

@@ -3,14 +3,17 @@ require 'memcached'
 module Stormpath
   module Cache
     class MemcachedStore
+      DEFAULT_SERVER_HOST = 'localhost:11211'.freeze
+      attr_reader :memcached, :options
+
       def initialize(opts = {})
-        options = nil if opts.blank?
-        @memcached = Memcached.new(options)
+        @options = opts.blank? ? { host: DEFAULT_SERVER_HOST } : opts
+        @memcached = Memcached.new(options[:host], options_without_host)
       end
 
       def get(key)
         begin
-          entry = @memcached.get(key)
+          entry = memcached.get(key)
           entry && Stormpath::Cache::CacheEntry.from_h(MultiJson.load(entry))
         rescue Memcached::NotFound
           nil
@@ -18,19 +21,23 @@ module Stormpath
       end
 
       def put(key, entry)
-        @memcached.set(key, MultiJson.dump(entry.to_h))
+        memcached.set(key, MultiJson.dump(entry.to_h))
       end
 
       def delete(key)
-        @memcached.delete(key)
+        memcached.delete(key)
       end
 
       def clear
-        @memcached.flush
+        memcached.flush
       end
 
       def size
-        @memcached.stats[:curr_items]
+        memcached.stats[:curr_items]
+      end
+
+      def options_without_host
+        options.tap { |hs| hs.delete(:host) }
       end
     end
   end

data/lib/stormpath-sdk/data_store.rb

@@ -42,6 +42,7 @@ class Stormpath::DataStore
     CACHE_REGIONS.each do |region|
       region_opts = regions_opts[region.to_sym] || {}
       region_opts[:store] ||= cache_opts[:store]
+      region_opts[:store_opts] ||= cache_opts[:store_opts]
       @cache_manager.create_cache region, region_opts
     end
   end

data/lib/stormpath-sdk/version.rb

@@ -14,6 +14,6 @@
 # limitations under the License.
 #
 module Stormpath
-  VERSION = '1.2.0'
-  VERSION_DATE = '2016-10-27'
+  VERSION = '1.2.1'
+  VERSION_DATE = '2016-11-02'
 end

data/spec/data_store_spec.rb

@@ -4,7 +4,7 @@ shared_examples 'a data store' do
   let(:factory)           { Stormpath::Test::ResourceFactory.new }
   let(:request_executor)  { Stormpath::Test::TestRequestExecutor.new }
   let(:data_store) do
-    Stormpath::DataStore.new(request_executor, test_api_key, { store: store }, nil)
+    Stormpath::DataStore.new(request_executor, test_api_key, store, nil)
   end
   let(:application_cache) { data_store.cache_manager.get_cache 'applications' }
   let(:tenant_cache)      { data_store.cache_manager.get_cache 'tenants' }
@@ -182,12 +182,12 @@ end
 
 describe Stormpath::DataStore do
   context 'redis store' do
-    let(:store) { Stormpath::Cache::RedisStore }
+    let(:store) { { store: Stormpath::Cache::RedisStore, store_opts: { read_timeout: 6.0 } } }
     it_should_behave_like 'a data store'
   end
 
   context 'memcached store' do
-    let(:store) { Stormpath::Cache::MemcachedStore }
+    let(:store) { { store: Stormpath::Cache::MemcachedStore, store_opts: { host: 'localhost:11211', prefix_key: 'mem' } } }
     it_should_behave_like 'a data store'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stormpath-sdk
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Stormpath, Inc
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json