moneta 1.0.0 → 1.5.1

data/lib/moneta/wrapper.rb

@@ -46,5 +46,35 @@ module Moneta
     def features
       wrap(:features) { super }
     end
+
+    # (see Proxy#each_key)
+    def each_key(&block)
+      wrap(:each_key) { super }
+    end
+
+    # (see Proxy#values_at)
+    def values_at(*keys, **options)
+      wrap(:values_at, keys, options) { super }
+    end
+
+    # (see Proxy#fetch_values)
+    def fetch_values(*keys, **options, &defaults)
+      wrap(:fetch_values, keys, options, defaults) { super }
+    end
+
+    # (see Proxy#slice)
+    def slice(*keys, **options)
+      wrap(:slice, keys, options) { super }
+    end
+
+    # (see Proxy#merge!)
+    def merge!(pairs, options = {})
+      wrap(:merge!, pairs, options) { super }
+    end
+
+    # (see Proxy#config)
+    def config
+      wrap(:config) { super }
+    end
   end
 end

data/lib/moneta.rb

@@ -1,17 +1,28 @@
+# Provides two methods for constructing stores:
+#
+# * {Moneta.new}
+# * {Moneta.build}
 module Moneta
+  autoload :Adapter,           'moneta/adapter'
   autoload :Builder,           'moneta/builder'
   autoload :Cache,             'moneta/cache'
-  autoload :CreateSupport,     'moneta/mixins'
-  autoload :Defaults,          'moneta/mixins'
-  autoload :ExpiresSupport,    'moneta/mixins'
+  autoload :CreateSupport,     'moneta/create_support'
+  autoload :Config,            'moneta/config'
+  autoload :DBMAdapter,        'moneta/dbm_adapter'
+  autoload :Defaults,          'moneta/defaults'
+  autoload :EachKeySupport,    'moneta/each_key_support'
+  autoload :Enumerable,        'moneta/enumerable'
+  autoload :ExpiresSupport,    'moneta/expires_support'
   autoload :Expires,           'moneta/expires'
-  autoload :HashAdapter,       'moneta/mixins'
-  autoload :IncrementSupport,  'moneta/mixins'
+  autoload :Fallback,          'moneta/fallback'
+  autoload :HashAdapter,       'moneta/hash_adapter'
+  autoload :IncrementSupport,  'moneta/increment_support'
   autoload :Lock,              'moneta/lock'
   autoload :Logger,            'moneta/logger'
   autoload :Mutex,             'moneta/synchronize'
+  autoload :NilValues,         'moneta/nil_values'
   autoload :OptionMerger,      'moneta/optionmerger'
-  autoload :OptionSupport,     'moneta/mixins'
+  autoload :OptionSupport,     'moneta/option_support'
   autoload :Pool,              'moneta/pool'
   autoload :Proxy,             'moneta/proxy'
   autoload :Semaphore,         'moneta/synchronize'
@@ -21,11 +32,15 @@ module Moneta
   autoload :Transformer,       'moneta/transformer'
   autoload :Utils,             'moneta/utils'
   autoload :WeakCreate,        'moneta/weak'
+  autoload :WeakEachKey,       'moneta/weak_each_key'
   autoload :WeakIncrement,     'moneta/weak'
   autoload :Wrapper,           'moneta/wrapper'
 
+  # Adapters are classes which wrap databases, services etc., as described in
+  # {file:SPEC.md The Moneta Specification}.
   module Adapters
     autoload :ActiveRecord,    'moneta/adapters/activerecord'
+    autoload :ActiveSupportCache, 'moneta/adapters/activesupportcache'
     autoload :Cassandra,       'moneta/adapters/cassandra'
     autoload :Client,          'moneta/adapters/client'
     autoload :Cookie,          'moneta/adapters/cookie'
@@ -47,8 +62,6 @@ module Moneta
     autoload :MemcachedNative, 'moneta/adapters/memcached/native'
     autoload :Memory,          'moneta/adapters/memory'
     autoload :Mongo,           'moneta/adapters/mongo'
-    autoload :MongoMoped,      'moneta/adapters/mongo/moped'
-    autoload :MongoOfficial,   'moneta/adapters/mongo/official'
     autoload :Null,            'moneta/adapters/null'
     autoload :PStore,          'moneta/adapters/pstore'
     autoload :Redis,           'moneta/adapters/redis'
@@ -93,7 +106,7 @@ module Moneta
   # @api public
   def self.new(name, options = {})
     expires = options[:expires]
-    options.delete(:expires) unless Integer === expires
+    options.delete(:expires) unless Numeric === expires
     logger = options.delete(:logger)
     threadsafe = options.delete(:threadsafe)
     compress = options.delete(:compress)
@@ -107,10 +120,16 @@ module Moneta
     when :Sequel
       # Sequel accept only base64 keys
       transformer[:key] << :base64
-    when :ActiveRecord, :DataMapper, :Couch
+      # If using HStore, binary data is not allowed
+      transformer[:value] << :base64 if options[:hstore]
+    when :ActiveRecord, :DataMapper
       # DataMapper and AR accept only base64 keys and values
       transformer[:key] << :base64
       transformer[:value] << :base64
+    when :Couch
+      # CouchDB needs to use URL-safe Base64 for its keys
+      transformer[:key] << :urlsafe_base64
+      transformer[:value] << :base64
     when :PStore, :YAML, :Null
       # For PStore and YAML only the key has to be a string
       transformer.delete(:value) if transformer[:value] == [:marshal]

data/lib/rack/cache/moneta.rb

@@ -15,16 +15,18 @@ module Rack
       def resolve(uri)
         cache = Rack::Cache::Moneta[uri.to_s.sub(%r{^moneta://}, '')] ||=
           begin
-            options = parse_query(uri.query)
-            options.keys.each do |key|
-            options[key.to_sym] =
-              case value = options.delete(key)
-              when 'true'; true
-              when 'false'; false
-              else value
-              end
-          end
-            ::Moneta.new(uri.host.to_sym, options)
+            options = parse_query(uri.query).map do |key, value|
+              [key.to_sym,
+               case value
+               when 'true'
+                 true
+               when 'false'
+                 false
+               else
+                 value
+               end]
+            end
+            ::Moneta.new(uri.host.to_sym, options.to_h)
           end
         new(cache)
       end
@@ -82,7 +84,7 @@ module Rack
         def write(body, ttl = 0)
           buf = StringIO.new
           key, size = slurp(body) { |part| buf.write(part) }
-          @cache.store(key, buf.string, ttl == 0 ? {} : {expires: ttl})
+          @cache.store(key, buf.string, ttl == 0 ? {} : { expires: ttl })
           [key, size]
         end
 

data/lib/rack/moneta_rest.rb

@@ -69,11 +69,11 @@ module Rack
     private
 
     def empty(status)
-      [status, {'Content-Type'=>'application/octet-stream', 'Content-Length' => '0'}, []]
+      [status, { 'Content-Type' => 'application/octet-stream', 'Content-Length' => '0' }, []]
     end
 
     def respond(status, value)
-      [status, {'Content-Type'=>'application/octet-stream', 'Content-Length' => value.bytesize.to_s}, [value]]
+      [status, { 'Content-Type' => 'application/octet-stream', 'Content-Length' => value.bytesize.to_s }, [value]]
     end
   end
 end

data/lib/rack/session/moneta.rb

@@ -1,6 +1,5 @@
 require 'moneta'
 require 'rack/session/abstract/id'
-require 'thread'
 
 module Rack
   module Session
@@ -44,9 +43,10 @@ module Rack
         with_lock(env) do
           unless sid && session = @pool[sid]
             session = {}
-            begin
+            loop do
               sid = generate_sid
-            end until @pool.create(sid, session)
+              break if @pool.create(sid, session)
+            end
           end
           [sid, session]
         end
@@ -76,4 +76,3 @@ module Rack
     end
   end
 end
-

data/moneta.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require File.dirname(__FILE__) + '/lib/moneta/version'
 require 'date'
 
@@ -7,15 +6,31 @@ Gem::Specification.new do |s|
   s.version          = Moneta::VERSION
   s.date             = Date.today.to_s
   s.authors          = ['Daniel Mendler', 'Yehuda Katz', 'Hannes Georg', 'Alastair Pharo']
-  s.email            = %w{mail@daniel-mendler.de wycats@gmail.com hannes.georg@googlemail.com asppsa@gmail.com}
+  s.email            = %w{mail@daniel-mendler.de wycats@gmail.com hannes.georg@googlemail.com me@asph.dev}
   s.description      = 'A unified interface to key/value stores'
   s.extra_rdoc_files = %w{README.md SPEC.md LICENSE}
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.homepage         = 'http://github.com/minad/moneta'
+  s.homepage         = 'https://github.com/moneta-rb/moneta'
   s.licenses         = %w(MIT)
   s.require_paths    = %w(lib)
   s.summary          = %{A unified interface to key/value stores, including Redis, Memcached, TokyoCabinet, ActiveRecord and many more}
-  s.required_ruby_version = '>= 1.9'
+
+  s.metadata = {
+    'bug_tracker_uri' => 'https://github.com/moneta-rb/moneta/issues',
+    'changelog_uri' => "https://github.com/moneta-rb/moneta/blob/v#{s.version}/CHANGES",
+    'documentation_uri' => "https://www.rubydoc.info/gems/moneta/#{s.version}",
+    'source_code_uri' => "https://github.com/moneta-rb/moneta/tree/v#{s.version}",
+  }
+
+  s.required_ruby_version = '>= 2.3.0'
+
+  s.add_development_dependency 'multi_json', '~> 1.15.0'
+  s.add_development_dependency 'parallel_tests', '~> 2.29.2'
+  s.add_development_dependency 'rantly', '~> 1.2.0'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'rspec-retry', '~> 0.6.1'
+  s.add_development_dependency 'rubocop', '~> 0.81.0'
+  s.add_development_dependency 'timecop', '~> 0.9.1'
 end