moneta 0.7.2 → 0.7.3

data/CHANGES

@@ -1,4 +1,10 @@
-master
+0.7.3
+
+* Added Adapters::RestClient
+* Added Rack::MonetaRest
+* Added Rack::MonetaStore
+
+0.7.2
 
 * Renamed WithOptions to OptionSupport
 * Refactored Base in Defaults mixin

data/Gemfile

@@ -44,6 +44,7 @@ gem 'sequel'
 gem 'dalli'
 gem 'riak-client'
 gem 'cassandra'
+gem 'httpi'
 #gem 'hbaserb'
 #gem 'localmemcache'
 alternatives :mri => 'leveldb-ruby'

data/README.md

@@ -12,7 +12,7 @@ Moneta provides a standard interface for interacting with various kinds of key/v
 * Expiration for all stores (Added via proxy `Moneta::Expires` if not supported natively)
 * Atomic incrementation and decrementation for most stores (Method `#increment` and `#decrement`)
 * Includes a very simple key/value server (`Moneta::Server`) and client (`Moneta::Adapters::Client`)
-* Integration with [Rails](http://rubyonrails.org/), [Rack](http://rack.github.com/) as cookie and session store and [Rack-Cache](https://github.com/rtomayko/rack-cache)
+* Integration with [Rails](http://rubyonrails.org/), [Rack](http://rack.github.com/), [Sinatra](http://sinatrarb.com/) and [Rack-Cache](https://github.com/rtomayko/rack-cache)
 
 Moneta is tested thoroughly using [Travis-CI](http://travis-ci.org/minad/moneta).
 
@@ -56,8 +56,10 @@ Out of the box, it supports the following backends:
 * Document databases:
     * CouchDB (`:Couch`)
     * MongoDB (`:Mongo`)
+* Moneta network protocols:
+    * Moneta key/value client (`:Client` works with `Moneta::Server`)
+    * Moneta HTTP/REST client (`:RestClient` works with `Rack::MonetaRest`)
 * Other
-    * Moneta key/value server client (`:Client` works with `Moneta::Server`)
     * Fog cloud storage which supports Amazon S3, Rackspace, etc. (`:Fog`)
     * Storage which doesn't store anything (`:Null`)
 
@@ -309,11 +311,21 @@ short_lived_store['key'] = 'value'
 
 ## Framework Integration
 
-Inspired by [redis-store](https://github.com/jodosha/redis-store) there exist integration classes for [Rails](http://rubyonrails.org/), [Rack](http://rack.github.com/) and [Rack-Cache](https://github.com/rtomayko/rack-cache).
+Inspired by [redis-store](https://github.com/jodosha/redis-store) there exist integration classes for [Rails](http://rubyonrails.org/), [Rack](http://rack.github.com/) and [Rack-Cache](https://github.com/rtomayko/rack-cache). You can also use all the Rack middlewares together with the [Sinatra](http://sinatrarb.com/) framework. There exist the following integration classes:
+
+* Rack and Sinatra
+    * `Rack::Session::Moneta` is a Rack middleware to use Moneta for storing sessions
+    * `Rack::MonetaStore` is a Rack middleware which places a Moneta store in the environment and enables per-request caching
+    * `Rack::MonetaCookies` is a Rack middleware which uses Moneta to store cookies
+    * `Rack::MonetaRest` is a Rack application which exposes a Moneta store via REST/HTTP
+    * `Rack::Cache::Moneta` provides meta and entity stores for Rack-Cache
+* Rails
+    * `ActionDispatch::Session::MonetaStore` is a Rails middleware to use Moneta for storing sessions
+    * `ActiveSupport::Cache::MonetaStore` is a Rails cache implementation which uses a Moneta store as backend
 
 ### Rack session store
 
-Use Moneta as a [Rack](http://rack.github.com/) session store:
+You can use Moneta as a [Rack](http://rack.github.com/) session store. Use it in your `config.ru` like this:
 
 ~~~ ruby
 require 'rack/session/moneta'
@@ -331,9 +343,51 @@ use Rack::Session::Moneta do
 end
 ~~~
 
+### Rack Moneta middleware
+
+There is a simple middleware which places a Moneta store in the Rack environment at `env['rack.moneta_store']`. It supports per-request
+caching if you add the option `:cache => true`. Use it in your `config.ru` like this:
+
+~~~ ruby
+# Add Rack::MonetaStore somewhere in your rack stack
+use Rack::MonetaStore, :Memory, :cache => true
+
+run lambda do |env|
+  env['rack.moneta_store'] # is a Moneta store with per-request caching
+end
+
+# Pass it a block like the one passed to Moneta.build
+use Rack::MonetaStore do
+  use :Transformer, :value => :zlib
+  adapter :Cookie
+end
+
+run lambda do |env|
+  env['rack.moneta_store'] # is a Moneta store without caching
+end
+~~~
+
+### Rack REST server
+
+If you want to expose your Moneta key/value store via HTTP, you can use the Rack/Moneta REST service. Use it in your `config.ru` like this:
+
+~~~ ruby
+require 'rack/moneta_rest'
+
+map '/moneta' do
+  run Rack::MonetaRest.new(:Memory)
+end
+
+# Or pass it a block like the one passed to Moneta.build
+run Rack::MonetaRest.new do
+  use :Transformer, :value => :zlib
+  adapter :Memory
+end
+~~~
+
 ### Rack cache
 
-Use Moneta as a [Rack-Cache](https://github.com/rtomayko/rack-cache) store:
+You can use Moneta as a [Rack-Cache](https://github.com/rtomayko/rack-cache) store. Use it in your `config.ru` like this:
 
 ~~~ ruby
 require 'rack/cache/moneta'

data/lib/moneta.rb

@@ -40,6 +40,7 @@ module Moneta
     autoload :Null,            'moneta/adapters/null'
     autoload :PStore,          'moneta/adapters/pstore'
     autoload :Redis,           'moneta/adapters/redis'
+    autoload :RestClient,      'moneta/adapters/restclient'
     autoload :Riak,            'moneta/adapters/riak'
     autoload :SDBM,            'moneta/adapters/sdbm'
     autoload :Sequel,          'moneta/adapters/sequel'
@@ -93,7 +94,7 @@ module Moneta
       # FIXME: Couch should work only with :marshal but this raises an error on 1.9
       transformer[:key] << :base64
       transformer[:value] << :base64
-    when :Riak
+    when :Riak, :RestClient
       # Riak accepts only utf-8 keys over the http interface
       # We use base64 encoding therefore.
       transformer[:key] << :base64
@@ -125,8 +126,9 @@ module Moneta
     end
   end
 
-  # Configure your own Moneta proxy stack!
+  # Configure your own Moneta proxy stack
   #
+  # @yieldparam Builder block
   # @return [Moneta store] newly created Moneta store
   #
   # @example Moneta builder

data/lib/moneta/adapters/cookie.rb

@@ -1,6 +1,6 @@
 module Moneta
   module Adapters
-    # Cookie backend used by `Rack::MonetaCookies`
+    # Cookie backend used by the middleware `Rack::MonetaCookies`
     # @api public
     class Cookie < Memory
       attr_reader :cookies
@@ -32,6 +32,8 @@ module Moneta
         self
       end
 
+      # Reset the cookie store
+      # This method is used by the middleware.
       def reset(cookies)
         @cookies, @hash = {}, cookies
       end

data/lib/moneta/adapters/couch.rb

@@ -17,14 +17,14 @@ module Moneta
       # (see Proxy#key?)
       def key?(key, options = {})
         @db.get(key) != nil
-      rescue RestClient::ResourceNotFound
+      rescue ::RestClient::ResourceNotFound
         false
       end
 
       # (see Proxy#load)
       def load(key, options = {})
         @db.get(key)['value']
-      rescue RestClient::ResourceNotFound
+      rescue ::RestClient::ResourceNotFound
         nil
       end
 
@@ -33,11 +33,11 @@ module Moneta
         doc = {'_id' => key, 'value' => value}
         begin
           doc['_rev'] = @db.get(key)['_rev']
-        rescue RestClient::ResourceNotFound
+        rescue ::RestClient::ResourceNotFound
         end
         @db.save_doc(doc)
         value
-      rescue RestClient::RequestFailed
+      rescue ::RestClient::RequestFailed
         value
       end
 
@@ -46,7 +46,7 @@ module Moneta
         value = @db.get(key)
         @db.delete_doc('_id' => value['_id'], '_rev' => value['_rev'])
         value['value']
-      rescue RestClient::ResourceNotFound
+      rescue ::RestClient::ResourceNotFound
         nil
       end
 

data/lib/moneta/adapters/memory.rb

@@ -7,6 +7,7 @@ module Moneta
       include HashAdapter
       include IncrementSupport
 
+      # @param [Hash] options Options hash
       def initialize(options = {})
         @hash = {}
       end

data/lib/moneta/adapters/null.rb

@@ -5,6 +5,7 @@ module Moneta
     class Null
       include Defaults
 
+      # @param [Hash] options Options hash
       def initialize(options = {})
       end
 

data/lib/moneta/adapters/restclient.rb

@@ -0,0 +1,47 @@
+require 'httpi'
+
+module Moneta
+  module Adapters
+    # Moneta rest client backend which works together with `Rack::MonetaRest`
+    # @api public
+    class RestClient
+      include Defaults
+
+      # @param [Hash] options
+      # @option options [String] :url URL
+      def initialize(options = {})
+        raise ArgumentError, 'Option :url is required' unless @url = options[:url]
+      end
+
+      # (see Proxy#key?)
+      def key?(key, options = {})
+        response = HTTPI.head(@url + key)
+        response.code == 200
+      end
+
+      # (see Proxy#load)
+      def load(key, options = {})
+        response = HTTPI.get(@url + key)
+        response.code == 200 ? response.body : nil
+      end
+
+      # (see Proxy#store)
+      def store(key, value, options = {})
+        HTTPI.post(@url + key, value)
+        value
+      end
+
+      # (see Proxy#delete)
+      def delete(key, options = {})
+        response = HTTPI.delete(@url + key)
+        response.code == 200 ? response.body : nil
+      end
+
+      # (see Proxy#clear)
+      def clear(options = {})
+        HTTPI.delete(@url)
+        self
+      end
+    end
+  end
+end

data/lib/moneta/builder.rb

@@ -2,6 +2,7 @@ module Moneta
   # Builder implements the DSL to build a stack of Moneta store proxies
   # @api private
   class Builder
+    # @yieldparam Builder dsl code block
     def initialize(&block)
       raise ArgumentError, 'No block given' unless block_given?
       @proxies = []
@@ -9,6 +10,7 @@ module Moneta
     end
 
     # Build proxy stack
+    #
     # @return [Object] Generated Moneta proxy stack
     # @api public
     def build

data/lib/moneta/cache.rb

@@ -15,34 +15,35 @@ module Moneta
 
     # @api private
     class DSL
-      def initialize(options, &block)
-        @cache, @backend = options[:cache], options[:backend]
+      def initialize(store, &block)
+        @store = store
         instance_eval(&block)
       end
 
       # @api public
       def backend(store = nil, &block)
-        raise 'Backend already set' if @backend
+        raise 'Backend already set' if @store.backend
         raise ArgumentError, 'Only argument or block allowed' if store && block
-        @backend = store || Moneta.build(&block)
+        @store.backend = store || Moneta.build(&block)
       end
 
       # @api public
       def cache(store = nil, &block)
-        raise 'Cache already set' if @cache
+        raise 'Cache already set' if @store.cache
         raise ArgumentError, 'Only argument or block allowed' if store && block
-        @cache = store || Moneta.build(&block)
-      end
-
-      def result
-        [@cache, @backend]
+        @store.cache = store || Moneta.build(&block)
       end
     end
 
-    attr_reader :cache, :backend
+    attr_accessor :cache, :backend
 
+    # @param [Hash] options Options hash
+    # @option options [Moneta store] :cache Moneta store used as cache
+    # @option options [Moneta store] :backend Moneta store used as backend
+    # @yieldparam Builder block
     def initialize(options = {}, &block)
-      @cache, @backend = DSL.new(options, &block).result
+      @cache, @backend = options[:cache], options[:backend]
+      DSL.new(self, &block) if block_given?
     end
 
     # (see Proxy#key?)

data/lib/moneta/expires.rb

@@ -14,6 +14,7 @@ module Moneta
       @expires = options[:expires]
     end
 
+    # (see Proxy#key?)
     def key?(key, options = {})
       # Transformer might raise exception
       load_entry(key, options) != nil
@@ -22,12 +23,14 @@ module Moneta
       super(key, options)
     end
 
+    # (see Proxy#load)
     def load(key, options = {})
       return super if options.include?(:raw)
       value, expires = load_entry(key, options)
       value
     end
 
+    # (see Proxy#store)
     def store(key, value, options = {})
       return super if options.include?(:raw)
       expires = options.include?(:expires) && (options = options.dup; options.delete(:expires))
@@ -41,6 +44,7 @@ module Moneta
       value
     end
 
+    # (see Proxy#delete)
     def delete(key, options = {})
       return super if options.include?(:raw)
       value, expires = super

data/lib/moneta/mixins.rb

@@ -1,11 +1,18 @@
 module Moneta
   # @api private
   module OptionSupport
+    # Return Moneta store with default options
+    #
+    # @param [Hash] options Options to merge
+    # @return [OptionMerger]
     # @api public
     def with(options)
       OptionMerger.new(self, options)
     end
 
+    # Return Moneta store with default option :raw => true
+    #
+    # @return [OptionMerger]
     # @api public
     def raw
       @raw_store ||=
@@ -16,11 +23,19 @@ module Moneta
         end
     end
 
+    # Return Moneta store with default prefix option
+    #
+    # @param [String] prefix Key prefix
+    # @return [OptionMerger]
     # @api public
     def prefix(prefix)
       with(:prefix => prefix, :except => :clear)
     end
 
+    # Return Moneta store with default expiration time
+    #
+    # @param [Integer] expires Default expiration time
+    # @return [OptionMerger]
     # @api public
     def expires(expires)
       with(:expires => expires, :only => [:store, :increment])
@@ -35,8 +50,8 @@ module Moneta
     # Exists the value with key
     #
     # @param [Object] key
-    # @return [Boolean]
     # @param [Hash] options
+    # @return [Boolean]
     # @api public
     def key?(key, options = {})
       load(key, options) != nil
@@ -44,11 +59,10 @@ module Moneta
 
     # Atomically increment integer value with key
     #
-    # Not every Moneta store implements this method,
-    # a NotImplementedError if it is not supported.
-    #
     # This method also accepts negative amounts.
     #
+    # @note Not every Moneta store implements this method,
+    #       a NotImplementedError is raised if it is not supported.
     # @param [Object] key
     # @param [Integer] amount
     # @param [Hash] options

data/lib/moneta/optionmerger.rb

@@ -5,6 +5,8 @@ module Moneta
 
     attr_reader :default_options
 
+    # @param [Moneta store] adapter underlying adapter
+    # @param [Hash] options
     def initialize(adapter, options = {})
       super(adapter, options)
 

data/lib/moneta/server.rb

@@ -19,10 +19,16 @@ module Moneta
       @running = false
     end
 
+    # Is the server running
+    #
+    # @return [Boolean] true if the server is running
     def running?
       @running
     end
 
+    # Run the server
+    #
+    # @note This method blocks!
     def run
       raise 'Already running' if @running
       @stop = false
@@ -36,6 +42,7 @@ module Moneta
       end
     end
 
+    # Stop the server
     def stop
       raise 'Not running' unless @running
       @stop = true

data/lib/moneta/shared.rb

@@ -20,6 +20,7 @@ module Moneta
       @builder = Builder.new(&block)
     end
 
+    # (see Proxy#close)
     def close
       if @server
         @server.stop

data/lib/moneta/stack.rb

@@ -17,10 +17,8 @@ module Moneta
 
     # @api private
     class DSL
-      attr_reader :stack
-
-      def initialize(options, &block)
-        @stack = options[:stack].to_a
+      def initialize(stack, &block)
+        @stack = stack
         instance_eval(&block)
       end
 
@@ -34,8 +32,12 @@ module Moneta
 
     attr_reader :stack
 
+    # @param [Hash] options Options hash
+    # @option options [Array] :stack Array of Moneta stores
+    # @yieldparam Builder block
     def initialize(options = {}, &block)
-      @stack = DSL.new(options, &block).stack
+      @stack = options[:stack].to_a
+      DSL.new(@stack, &block) if block_given?
     end
 
     # (see Proxy#key?)

data/lib/moneta/version.rb

@@ -1,5 +1,5 @@
 module Moneta
   # Moneta version number
   # @api public
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

data/lib/moneta/wrapper.rb

@@ -2,30 +2,37 @@ module Moneta
   # Wraps the calls to the adapter
   # @api public
   class Wrapper < Proxy
+    # (see Proxy#key?)
     def key?(key, options = {})
       wrap(:key?, key, options) { super }
     end
 
+    # (see Proxy#load)
     def load(key, options = {})
       wrap(:load, key, options) { super }
     end
 
+    # (see Proxy#store)
     def store(key, value, options = {})
       wrap(:store, key, value, options) { super }
     end
 
+    # (see Proxy#delete)
     def delete(key, options = {})
       wrap(:delete, key, options) { super }
     end
 
+    # (see Proxy#increment)
     def increment(key, amount = 1, options = {})
       wrap(:increment, key, amount, options) { super }
     end
 
+    # (see Proxy#clear)
     def clear(options = {})
       wrap(:clear, options) { super }
     end
 
+    # (see Proxy#close)
     def close
       wrap(:close) { super }
     end

data/lib/rack/moneta_cookies.rb

@@ -47,7 +47,7 @@ module Rack
 
     def call(env)
       stores = @pool.pop || @builder.build
-      env['rack.request.cookie_hash'] = stores.last
+      env['rack.moneta_cookies'] = env['rack.request.cookie_hash'] = stores.last
       env['rack.request.cookie_string'] = env['HTTP_COOKIE']
       stores.first.reset(Rack::Utils.parse_query(env['HTTP_COOKIE']))
       status, headers, body = @app.call(env)

data/lib/rack/moneta_rest.rb

@@ -1,13 +1,28 @@
 require 'moneta'
 
 module Rack
+  # A Rack application which provides a REST interface to a Moneta store.
+  #
+  # @example config.ru
+  #   map '/moneta' do
+  #     run Rack::MonetaRest.new(:Memory)
+  #   end
+  #
+  # @example config.ru
+  #   # Pass it a block like the one passed to Moneta.build
+  #   run Rack::MonetaRest.new do
+  #     use :Transformer, :value => :zlib
+  #     adapter :Memory
+  #   end
+  #
+  # @api public
   class MonetaRest
     def initialize(store = nil, options = {}, &block)
       if block
-        raise ArgumentError, 'Use either block or options' unless options.emtpy?
+        raise ArgumentError, 'Use either block or options' unless options.empty?
         @store = ::Moneta.build(&block)
       else
-        raise ArgumentError, 'Option :store is required' unless @store = store
+        raise ArgumentError, 'Block or argument store is required' unless @store = store
         @store = ::Moneta.new(@store, options) if Symbol === @store
       end
     end
@@ -16,19 +31,27 @@ module Rack
       key = env['PATH_INFO'][1..-1]
       case env['REQUEST_METHOD']
       when 'HEAD'
-        if @store.key?(key)
-          respond(200)
+        if key.empty?
+          respond(400, 'Empty key')
+        elsif @store.key?(key)
+          empty(200)
         else
           empty(404)
         end
       when 'GET'
-        if value = @store[key]
+        if key.empty?
+          respond(400, 'Empty key')
+        elsif value = @store[key]
           respond(200, value)
         else
           empty(404)
         end
       when 'POST', 'PUT'
-        respond(200, @store[key] = env['rack.input'].read)
+        if key.empty?
+          respond(400, 'Empty key')
+        else
+          respond(200, @store[key] = env['rack.input'].read)
+        end
       when 'DELETE'
         if key.empty?
           @store.clear
@@ -37,10 +60,10 @@ module Rack
           respond(200, @store.delete(key))
         end
       else
-        empty(400)
+        respond(400, 'Bad method')
       end
     rescue => ex
-      respond(500, ex.message)
+      respond(500, "Exception: #{ex.message}")
     end
 
     private

data/lib/rack/moneta_store.rb

@@ -0,0 +1,45 @@
+require 'moneta'
+
+module Rack
+  # A Rack middleware that inserts a Moneta store in the environment
+  # and supports per-request caching via the the option `:cache => true`.
+  #
+  # @example config.ru
+  #   # Add Rack::MonetaStore somewhere in your rack stack
+  #   use Rack::MonetaStore, :Memory, :cache => true
+  #
+  #   run lambda do |env|
+  #     env['rack.moneta_store'] # is a Moneta store with per-request caching
+  #   end
+  #
+  # @example config.ru
+  #   # Pass it a block like the one passed to Moneta.build
+  #   use Rack::MonetaStore do
+  #     use :Transformer, :value => :zlib
+  #     adapter :Cookie
+  #   end
+  #
+  #   run lambda do |env|
+  #     env['rack.moneta_store'] # is a Moneta store without caching
+  #   end
+  #
+  # @api public
+  class MonetaStore
+    def initialize(app, store = nil, options = {}, &block)
+      @app = app
+      @cache = options.delete(:cache)
+      if block
+        raise ArgumentError, 'Use either block or options' unless options.empty?
+        @store = ::Moneta.build(&block)
+      else
+        raise ArgumentError, 'Block or argument store is required' unless @store = store
+        @store = ::Moneta.new(@store, options) if Symbol === @store
+      end
+    end
+
+    def call(env)
+      env['rack.moneta_store'] = @cache ? ::Moneta::Cache.new(:cache => ::Moneta::Adapters::Memory.new, :backend => @store) : @store
+      @app.call(env)
+    end
+  end
+end

data/lib/rack/session/moneta.rb

@@ -14,7 +14,7 @@ module Rack
           raise ArgumentError, 'Use either block or option :store' if options[:store]
           @pool = ::Moneta.build(&block)
         else
-          raise ArgumentError, 'Option :store is required' unless @pool = options[:store]
+          raise ArgumentError, 'Block or option :store is required' unless @pool = options[:store]
           @pool = ::Moneta.new(@pool, :expires => true) if Symbol === @pool
         end
         @mutex = Mutex.new

data/spec/generate.rb

@@ -129,6 +129,12 @@ end
     :options => ":file => File.join(make_tempdir, 'simple_client_unix')",
     :specs => STANDARD_SPECS
   },
+  'simple_restclient' => {
+    :preamble => "start_restserver\n",
+    :store => :RestClient,
+    :options => ":url => 'http://localhost:8808/moneta/'",
+    :specs => STANDARD_SPECS.without_increment
+  },
   'simple_memory' => {
     :store => :Memory,
     :specs => STANDARD_SPECS.without_persist
@@ -844,6 +850,11 @@ end
     :build => "Moneta::Adapters::Client.new",
     :specs => ADAPTER_SPECS
   },
+  'adapter_restclient' => {
+    :preamble => "start_restserver\n",
+    :build => "Moneta::Adapters::RestClient.new(:url => 'http://localhost:8808/moneta/')",
+    :specs => ADAPTER_SPECS.without_increment
+  },
   'adapter_cassandra' => {
     :build => "Moneta::Adapters::Cassandra.new(:keyspace => 'adapter_cassandra')",
     :specs => ADAPTER_SPECS.without_increment.with_expires,

data/spec/helper.rb

@@ -9,19 +9,6 @@ RSpec::Core::Formatters::ProgressFormatter.class_eval do
   end
 end
 
-module Moneta
-  class Transformer < Proxy
-    class << self
-      alias_method :verbose_new, :new
-
-      def new(adapter, options = {})
-        options[:quiet] = true
-        verbose_new(adapter, options)
-      end
-    end
-  end
-end
-
 class Value
   attr_accessor :x
   def initialize(x)
@@ -41,6 +28,36 @@ class Value
   end
 end
 
+def start_restserver
+  require 'rack'
+  require 'webrick'
+  require 'httpi'
+  require 'rack/moneta_rest'
+
+  HTTPI.log = false
+
+  # Keep webrick quiet
+  ::WEBrick::HTTPServer.class_eval do
+    def access_log(config, req, res); end
+  end
+  ::WEBrick::BasicLog.class_eval do
+    def log(level, data); end
+  end
+
+  Thread.start do
+    Rack::Server.start(:app => Rack::Builder.app do
+                         use Rack::Lint
+                         map '/moneta' do
+                           run Rack::MonetaRest.new(:store => :Memory)
+                         end
+                       end,
+                       :environment => :none,
+                       :server => :webrick,
+                       :Port => 8808)
+  end
+  sleep 1
+end
+
 def start_server(*args)
   server = Moneta::Server.new(*args)
   Thread.new { server.run }

data/spec/moneta/adapter_restclient_spec.rb

@@ -0,0 +1,20 @@
+# Generated by generate.rb
+require 'helper'
+
+describe_moneta "adapter_restclient" do
+  start_restserver
+  def new_store
+    Moneta::Adapters::RestClient.new(:url => 'http://localhost:8808/moneta/')
+  end
+
+  def load_value(value)
+    Marshal.load(value)
+  end
+
+  include_context 'setup_store'
+  it_should_behave_like 'not_increment'
+  it_should_behave_like 'null_stringkey_stringvalue'
+  it_should_behave_like 'persist_stringkey_stringvalue'
+  it_should_behave_like 'returndifferent_stringkey_stringvalue'
+  it_should_behave_like 'store_stringkey_stringvalue'
+end

data/spec/moneta/simple_restclient_spec.rb

@@ -0,0 +1,145 @@
+# Generated by generate.rb
+require 'helper'
+
+describe_moneta "simple_restclient" do
+  start_restserver
+  def new_store
+    Moneta.new(:RestClient, :url => 'http://localhost:8808/moneta/', :logger => {:out => File.open(File.join(make_tempdir, 'simple_restclient.log'), 'a')})
+  end
+
+  def load_value(value)
+    Marshal.load(value)
+  end
+
+  include_context 'setup_store'
+  it_should_behave_like 'marshallable_key'
+  it_should_behave_like 'marshallable_value'
+  it_should_behave_like 'not_increment'
+  it_should_behave_like 'null_objectkey_objectvalue'
+  it_should_behave_like 'null_objectkey_stringvalue'
+  it_should_behave_like 'null_objectkey_hashvalue'
+  it_should_behave_like 'null_objectkey_booleanvalue'
+  it_should_behave_like 'null_objectkey_nilvalue'
+  it_should_behave_like 'null_objectkey_integervalue'
+  it_should_behave_like 'null_stringkey_objectvalue'
+  it_should_behave_like 'null_stringkey_stringvalue'
+  it_should_behave_like 'null_stringkey_hashvalue'
+  it_should_behave_like 'null_stringkey_booleanvalue'
+  it_should_behave_like 'null_stringkey_nilvalue'
+  it_should_behave_like 'null_stringkey_integervalue'
+  it_should_behave_like 'null_hashkey_objectvalue'
+  it_should_behave_like 'null_hashkey_stringvalue'
+  it_should_behave_like 'null_hashkey_hashvalue'
+  it_should_behave_like 'null_hashkey_booleanvalue'
+  it_should_behave_like 'null_hashkey_nilvalue'
+  it_should_behave_like 'null_hashkey_integervalue'
+  it_should_behave_like 'null_booleankey_objectvalue'
+  it_should_behave_like 'null_booleankey_stringvalue'
+  it_should_behave_like 'null_booleankey_hashvalue'
+  it_should_behave_like 'null_booleankey_booleanvalue'
+  it_should_behave_like 'null_booleankey_nilvalue'
+  it_should_behave_like 'null_booleankey_integervalue'
+  it_should_behave_like 'null_nilkey_objectvalue'
+  it_should_behave_like 'null_nilkey_stringvalue'
+  it_should_behave_like 'null_nilkey_hashvalue'
+  it_should_behave_like 'null_nilkey_booleanvalue'
+  it_should_behave_like 'null_nilkey_nilvalue'
+  it_should_behave_like 'null_nilkey_integervalue'
+  it_should_behave_like 'null_integerkey_objectvalue'
+  it_should_behave_like 'null_integerkey_stringvalue'
+  it_should_behave_like 'null_integerkey_hashvalue'
+  it_should_behave_like 'null_integerkey_booleanvalue'
+  it_should_behave_like 'null_integerkey_nilvalue'
+  it_should_behave_like 'null_integerkey_integervalue'
+  it_should_behave_like 'persist_objectkey_objectvalue'
+  it_should_behave_like 'persist_objectkey_stringvalue'
+  it_should_behave_like 'persist_objectkey_hashvalue'
+  it_should_behave_like 'persist_objectkey_booleanvalue'
+  it_should_behave_like 'persist_objectkey_nilvalue'
+  it_should_behave_like 'persist_objectkey_integervalue'
+  it_should_behave_like 'persist_stringkey_objectvalue'
+  it_should_behave_like 'persist_stringkey_stringvalue'
+  it_should_behave_like 'persist_stringkey_hashvalue'
+  it_should_behave_like 'persist_stringkey_booleanvalue'
+  it_should_behave_like 'persist_stringkey_nilvalue'
+  it_should_behave_like 'persist_stringkey_integervalue'
+  it_should_behave_like 'persist_hashkey_objectvalue'
+  it_should_behave_like 'persist_hashkey_stringvalue'
+  it_should_behave_like 'persist_hashkey_hashvalue'
+  it_should_behave_like 'persist_hashkey_booleanvalue'
+  it_should_behave_like 'persist_hashkey_nilvalue'
+  it_should_behave_like 'persist_hashkey_integervalue'
+  it_should_behave_like 'persist_booleankey_objectvalue'
+  it_should_behave_like 'persist_booleankey_stringvalue'
+  it_should_behave_like 'persist_booleankey_hashvalue'
+  it_should_behave_like 'persist_booleankey_booleanvalue'
+  it_should_behave_like 'persist_booleankey_nilvalue'
+  it_should_behave_like 'persist_booleankey_integervalue'
+  it_should_behave_like 'persist_nilkey_objectvalue'
+  it_should_behave_like 'persist_nilkey_stringvalue'
+  it_should_behave_like 'persist_nilkey_hashvalue'
+  it_should_behave_like 'persist_nilkey_booleanvalue'
+  it_should_behave_like 'persist_nilkey_nilvalue'
+  it_should_behave_like 'persist_nilkey_integervalue'
+  it_should_behave_like 'persist_integerkey_objectvalue'
+  it_should_behave_like 'persist_integerkey_stringvalue'
+  it_should_behave_like 'persist_integerkey_hashvalue'
+  it_should_behave_like 'persist_integerkey_booleanvalue'
+  it_should_behave_like 'persist_integerkey_nilvalue'
+  it_should_behave_like 'persist_integerkey_integervalue'
+  it_should_behave_like 'returndifferent_objectkey_objectvalue'
+  it_should_behave_like 'returndifferent_objectkey_stringvalue'
+  it_should_behave_like 'returndifferent_objectkey_hashvalue'
+  it_should_behave_like 'returndifferent_stringkey_objectvalue'
+  it_should_behave_like 'returndifferent_stringkey_stringvalue'
+  it_should_behave_like 'returndifferent_stringkey_hashvalue'
+  it_should_behave_like 'returndifferent_hashkey_objectvalue'
+  it_should_behave_like 'returndifferent_hashkey_stringvalue'
+  it_should_behave_like 'returndifferent_hashkey_hashvalue'
+  it_should_behave_like 'returndifferent_booleankey_objectvalue'
+  it_should_behave_like 'returndifferent_booleankey_stringvalue'
+  it_should_behave_like 'returndifferent_booleankey_hashvalue'
+  it_should_behave_like 'returndifferent_nilkey_objectvalue'
+  it_should_behave_like 'returndifferent_nilkey_stringvalue'
+  it_should_behave_like 'returndifferent_nilkey_hashvalue'
+  it_should_behave_like 'returndifferent_integerkey_objectvalue'
+  it_should_behave_like 'returndifferent_integerkey_stringvalue'
+  it_should_behave_like 'returndifferent_integerkey_hashvalue'
+  it_should_behave_like 'store_objectkey_objectvalue'
+  it_should_behave_like 'store_objectkey_stringvalue'
+  it_should_behave_like 'store_objectkey_hashvalue'
+  it_should_behave_like 'store_objectkey_booleanvalue'
+  it_should_behave_like 'store_objectkey_nilvalue'
+  it_should_behave_like 'store_objectkey_integervalue'
+  it_should_behave_like 'store_stringkey_objectvalue'
+  it_should_behave_like 'store_stringkey_stringvalue'
+  it_should_behave_like 'store_stringkey_hashvalue'
+  it_should_behave_like 'store_stringkey_booleanvalue'
+  it_should_behave_like 'store_stringkey_nilvalue'
+  it_should_behave_like 'store_stringkey_integervalue'
+  it_should_behave_like 'store_hashkey_objectvalue'
+  it_should_behave_like 'store_hashkey_stringvalue'
+  it_should_behave_like 'store_hashkey_hashvalue'
+  it_should_behave_like 'store_hashkey_booleanvalue'
+  it_should_behave_like 'store_hashkey_nilvalue'
+  it_should_behave_like 'store_hashkey_integervalue'
+  it_should_behave_like 'store_booleankey_objectvalue'
+  it_should_behave_like 'store_booleankey_stringvalue'
+  it_should_behave_like 'store_booleankey_hashvalue'
+  it_should_behave_like 'store_booleankey_booleanvalue'
+  it_should_behave_like 'store_booleankey_nilvalue'
+  it_should_behave_like 'store_booleankey_integervalue'
+  it_should_behave_like 'store_nilkey_objectvalue'
+  it_should_behave_like 'store_nilkey_stringvalue'
+  it_should_behave_like 'store_nilkey_hashvalue'
+  it_should_behave_like 'store_nilkey_booleanvalue'
+  it_should_behave_like 'store_nilkey_nilvalue'
+  it_should_behave_like 'store_nilkey_integervalue'
+  it_should_behave_like 'store_integerkey_objectvalue'
+  it_should_behave_like 'store_integerkey_stringvalue'
+  it_should_behave_like 'store_integerkey_hashvalue'
+  it_should_behave_like 'store_integerkey_booleanvalue'
+  it_should_behave_like 'store_integerkey_nilvalue'
+  it_should_behave_like 'store_integerkey_integervalue'
+  it_should_behave_like 'transform_value'
+end

data/spec/rack/moneta_cookies_spec.rb

@@ -13,11 +13,12 @@ describe Rack::MonetaCookies do
   end
 
   def backend
-    Rack::MockRequest.new(Rack::MonetaCookies.new(lambda{|env|
+    Rack::MockRequest.new(Rack::MonetaCookies.new(lambda do |env|
       @store = env['rack.request.cookie_hash']
+      expect(@store).to equal(env['rack.moneta_cookies'])
       app.call(env) if app
       [200,{},[]]
-    }, @options || {}, &@block))
+    end, @options || {}, &@block))
   end
 
   def get(cookies = {}, &block)
@@ -25,20 +26,20 @@ describe Rack::MonetaCookies do
     @response = backend.get('/','HTTP_COOKIE' => Rack::Utils.build_query(cookies))
   end
 
-  it 'should be able to read a simple key' do
+  it 'should be able to read a key' do
     get 'key' => 'value' do
       expect( @store['key'] ).to eql('value')
     end
   end
 
-  it 'should be able to set a simple key' do
+  it 'should be able to set a key' do
     get do
       @store['key'] = 'value'
     end
     expect( @response['Set-Cookie'] ).to eql('key=value')
   end
 
-  it 'should be able to remove a simple key' do
+  it 'should be able to remove a key' do
     get 'key' => 'value' do
       @store.delete('key')
     end

data/spec/rack/moneta_store_spec.rb

@@ -0,0 +1,83 @@
+require 'helper'
+require 'rack/mock'
+require 'rack/moneta_store'
+
+describe Rack::MonetaStore do
+  def config(store_arg = nil, options = nil, &block)
+    @store_arg = store_arg
+    @options = options
+    @block = block
+  end
+
+  def app(&block)
+    @app_block ||= block
+  end
+
+  def middleware
+    @middleware ||= Rack::MonetaStore.new(lambda do |env|
+      @store = env['rack.moneta_store']
+      app.call(env) if app
+      [200,{},[]]
+    end, @store_arg, @options || {}, &@block)
+  end
+
+  def backend
+    @backend ||= Rack::MockRequest.new(middleware)
+  end
+
+  def get(&block)
+    app(&block)
+    @response = backend.get('/')
+  end
+
+  def uncached_store
+    middleware.instance_variable_get(:@store)
+  end
+
+  it 'should be able to get a key without caching' do
+    config :Memory
+    uncached_store['key'] = 'value'
+    get do
+      expect(@store['key']).to eql('value')
+    end
+  end
+
+  it 'should be able to get a key with caching' do
+    config :Memory, :cache => true
+    uncached_store['key'] = 'value'
+    get do
+      expect(@store['key']).to eql('value')
+      expect(@store.backend).to equal(uncached_store)
+      expect(@store.cache['key']).to eql('value')
+    end
+  end
+
+  it 'should be able to set a key' do
+    config :Memory
+    get do
+      @store['key'] = 'value'
+    end
+    expect( @store['key'] ).to eql('value')
+    expect(uncached_store['key']).to eql('value')
+  end
+
+  it 'should be able to get a remove a key' do
+    config :Memory
+    uncached_store['key'] = 'value'
+    get do
+      expect(@store.delete('key')).to eql('value')
+    end
+    expect(uncached_store.key?('key')).to be_false
+  end
+
+  it 'should accept a config block' do
+    config do
+      use :Transformer, :key => :prefix, :prefix => 'moneta.'
+      adapter :Memory
+    end
+    uncached_store['key'] = 'value'
+    get do
+      expect(@store['key']).to eql('value')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moneta
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies: []
 description: A unified interface to key/value stores
 email:
@@ -60,6 +60,7 @@ files:
 - lib/moneta/adapters/null.rb
 - lib/moneta/adapters/pstore.rb
 - lib/moneta/adapters/redis.rb
+- lib/moneta/adapters/restclient.rb
 - lib/moneta/adapters/riak.rb
 - lib/moneta/adapters/sdbm.rb
 - lib/moneta/adapters/sequel.rb
@@ -85,6 +86,7 @@ files:
 - lib/rack/cache/moneta.rb
 - lib/rack/moneta_cookies.rb
 - lib/rack/moneta_rest.rb
+- lib/rack/moneta_store.rb
 - lib/rack/session/moneta.rb
 - moneta.gemspec
 - spec/action_dispatch/fixtures/session_autoload_test/foo.rb
@@ -113,6 +115,7 @@ files:
 - spec/moneta/adapter_mongo_spec.rb
 - spec/moneta/adapter_pstore_spec.rb
 - spec/moneta/adapter_redis_spec.rb
+- spec/moneta/adapter_restclient_spec.rb
 - spec/moneta/adapter_riak_spec.rb
 - spec/moneta/adapter_sdbm_spec.rb
 - spec/moneta/adapter_sequel_spec.rb
@@ -175,6 +178,7 @@ files:
 - spec/moneta/simple_pstore_spec.rb
 - spec/moneta/simple_pstore_with_expires_spec.rb
 - spec/moneta/simple_redis_spec.rb
+- spec/moneta/simple_restclient_spec.rb
 - spec/moneta/simple_riak_spec.rb
 - spec/moneta/simple_riak_with_expires_spec.rb
 - spec/moneta/simple_sdbm_spec.rb
@@ -224,6 +228,7 @@ files:
 - spec/monetaspecs.rb
 - spec/rack/cache_moneta_spec.rb
 - spec/rack/moneta_cookies_spec.rb
+- spec/rack/moneta_store_spec.rb
 - spec/rack/session_moneta_spec.rb
 homepage: http://github.com/minad/moneta
 licenses: []
@@ -277,6 +282,7 @@ test_files:
 - spec/moneta/adapter_mongo_spec.rb
 - spec/moneta/adapter_pstore_spec.rb
 - spec/moneta/adapter_redis_spec.rb
+- spec/moneta/adapter_restclient_spec.rb
 - spec/moneta/adapter_riak_spec.rb
 - spec/moneta/adapter_sdbm_spec.rb
 - spec/moneta/adapter_sequel_spec.rb
@@ -339,6 +345,7 @@ test_files:
 - spec/moneta/simple_pstore_spec.rb
 - spec/moneta/simple_pstore_with_expires_spec.rb
 - spec/moneta/simple_redis_spec.rb
+- spec/moneta/simple_restclient_spec.rb
 - spec/moneta/simple_riak_spec.rb
 - spec/moneta/simple_riak_with_expires_spec.rb
 - spec/moneta/simple_sdbm_spec.rb
@@ -388,5 +395,6 @@ test_files:
 - spec/monetaspecs.rb
 - spec/rack/cache_moneta_spec.rb
 - spec/rack/moneta_cookies_spec.rb
+- spec/rack/moneta_store_spec.rb
 - spec/rack/session_moneta_spec.rb
 has_rdoc: