moneta 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e697b98dafd89667bc720317d1e740691f4504cf6b7a33939d14251f2841fe3
-  data.tar.gz: 13eede9fc91b2379921f28798b6bac79de69527682f208042345b5fe331bd32d
+  metadata.gz: 535578909c47f29047f67d577e053809a637f77ea8ba2dde7920198f8b08ac49
+  data.tar.gz: 275edd79995139f4918749d01ccdf8129748ea96e1ba4302716dd7cb1ed57bf9
 SHA512:
-  metadata.gz: c1c9acbe14d38a5a300a8eb478225c8da317f2c6596b51e2421d5243aa6cd13020639e31594f03a1c43b6c537603402983cd5ca2a6deb900ac34cf5db3b99992
-  data.tar.gz: 614bfcb466639b2d348e8f1bd29d732a1d57489e3a6e4d292ae2f4ab8e3f385c878b0c3f890ae1f2fb4f684e9c969e71ecd2a393d9e848345c63b7d9b0818f8b
+  metadata.gz: c07c093306f66138db9db041a15103420fdd0e5fef93ca429098de02a732055d441c0968570704ba39dcb08608b7dbfa12b5cd5797e257df1c8be28a7b3b028d
+  data.tar.gz: a654005281162398bf492fd7fa3e3c59ee40f675d6a187579d4cbfcb0bfbd14e0a78a9f9bb3227e5c64c02e4c97e60bb9b39075457803882aeaa3d585b0e9a51

data/CHANGES

@@ -1,3 +1,7 @@
+1.2.1
+
+* Transformer - fix :escape transformer deserialize implementation (#168)
+
 1.2.0
 
 * Adapters::Sequel - fix for compatibility with new version of JDBC SQLite

data/CONTRIBUTORS

@@ -1,5 +1,5 @@
 Adrian Madrid <aemadrid@gmail.com>
-Alastair Pharo <asppsa@gmail.com>
+Alastair Pharo <me@asph.dev>
 Alejandro Crosa <acrosa@sharing.local>
 Alessio Signorini <alessio@signorini.us>
 Anthony Eden <anthonyeden@gmail.com>
@@ -24,6 +24,7 @@ Marek Skrobacki <skrobul@skrobul.com>
 Mauro Asprea <mauroasprea@gmail.com>
 Nathaniel Bibler <git@nathanielbibler.com>
 Olle Jonsson <olle.jonsson@gmail.com>
+Orien Madgwick <_@orien.io>
 Patrik Rak <patrik@raxoft.cz>
 Piotr Murach <pmurach@gmail.com>
 Potapov Sergey <blake131313@gmail.com>

data/lib/moneta/transformer/helper.rb

@@ -5,11 +5,11 @@ module Moneta
       extend self
 
       def escape(value)
-        value.gsub(/[^a-zA-Z0-9_-]+/) { '%' + $&.unpack('H2' * $&.bytesize).join('%').upcase }
+        value.gsub(/[^a-zA-Z0-9_-]+/) { |match| '%' + match.unpack('H2' * match.bytesize).join('%').upcase }
       end
 
       def unescape(value)
-        value.gsub(/((?:%[0-9a-fA-F]{2})+)/) { |matches| [matches[1].delete('%')].pack('H*') }
+        value.gsub(/(?:%[0-9a-fA-F]{2})+/) { |match| [match.delete('%')].pack('H*') }
       end
 
       def hmacverify(value, secret)

data/lib/moneta/version.rb

@@ -1,5 +1,5 @@
 module Moneta
   # Moneta version number
   # @api public
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

data/moneta.gemspec

@@ -13,10 +13,18 @@ Gem::Specification.new do |s|
   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/moneta-rb/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.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.2.2'
 
   s.add_development_dependency 'rspec', '~> 3.0'

data/script/contributors

@@ -2,6 +2,7 @@
 git log --format='%aN <%aE>' |\
 sed -e 's/hiddenbek/Scott Wadden/g' |\
 sed -e 's/Asmod4n/Hendrik Beskow/' |\
+sed -e 's/asppsa@gmail.com/me@asph.dev/' |\
 grep -v 'hannes.georg@xing.com\|spotapov\|yehuda-katzs-mac\|wycats ' |\
 sort -u | sort > CONTRIBUTORS
 

data/spec/features/transform_value.rb

@@ -1,11 +1,26 @@
 shared_examples :transform_value do
-  it 'allows to bypass transformer with :raw' do
-    store['key'] = 'value'
-    load_value(store.load('key', raw: true)).should == 'value'
+  describe 'with the :raw option' do
+    it 'can load without transforming the value' do
+      moneta_property_of(values: 1).check do |values:|
+        store['key'] = values[0]
+        load_value(store.load('key', raw: true)).should == values[0]
+      end
+    end
+
+    it 'can store without transforming the value' do
+      moneta_property_of(values: 1).check do |values:|
+        store['key'] = values[0]
+        store.store('key', store.load('key', raw: true), raw: true)
+        store.load('key').should == values[0]
+      end
+    end
 
-    store.store('key', 'value', raw: true)
-    store.load('key', raw: true).should == 'value'
-    store.delete('key', raw: true).should == 'value'
+    it 'can delete without transforming the value' do
+      moneta_property_of(values: 1).check do |values:|
+        store['key'] = values[0]
+        load_value(store.delete('key', raw: true)).should == values[0]
+      end
+    end
   end
 
   it 'allows to bypass transformer with raw syntactic sugar' do
@@ -20,25 +35,4 @@ shared_examples :transform_value do
     store.raw['key'] = 'value2'
     store.raw['key'].should == 'value2'
   end
-
-  it 'returns unmarshalled value' do
-    store.store('key', 'unmarshalled value', raw: true)
-    store.load('key', raw: true).should == 'unmarshalled value'
-  end
-
-  it 'might raise exception on invalid value' do
-    store.store('key', 'unmarshalled value', raw: true)
-
-    begin
-      store['key'].should == load_value('unmarshalled value')
-      store.delete('key').should == load_value('unmarshalled value')
-    rescue Exception => ex
-      expect do
-        store['key']
-      end.to raise_error
-      expect do
-        store.delete('key')
-      end.to raise_error
-    end
-  end
 end

data/spec/helper.rb

@@ -13,7 +13,6 @@ require 'timecop'
 
 class MonetaParallelFormatter < RSpec::Core::Formatters::BaseTextFormatter
   def start(*args)
-
     output.puts colorise_summary("STARTING #{ARGV.join(' ')}")
     @stopped = false
     @passed_count = 0
@@ -59,12 +58,12 @@ class MonetaSpecs
     'integer' => :integer,
     'float' => :float,
     'boolean' => :boolean,
-    'string' => proc{ sized(range 5, 10){ string(:alnum) } },
-    'path' => proc{ array(range 2, 3){ sized(range 5, 10){ string(:alpha) } }.join('/') },
+    'string' => proc { sized(range(5, 10)) { string(:alnum) } },
+    'path' => proc { array(range(2, 3)) { sized(range(5, 10)) { string(:alpha) } }.join('/') },
     'binary' => [:string, :cntrl],
-    'object' => proc{ choose Value.new(:objkey1), Value.new(:objkey2) },
-    'hash' => proc{ dict(2){ sized(range 5, 10){ [string(:alnum), string(:alnum)] } } }
-  }
+    'object' => proc { choose Value.new(:objkey1), Value.new(:objkey2) },
+    'hash' => proc { dict(2) { sized(range(5, 10)) { [string(:alnum), string(:alnum)] } } }
+  }.freeze
 
   VALUES = {
     'nil' => [:literal, nil],
@@ -73,10 +72,10 @@ class MonetaSpecs
     'boolean' => :boolean,
     'string' => [:string, :alnum],
     'binary' => [:string, :cntrl],
-    'object' => proc{ choose Value.new(:objval1), Value.new(:objval2) },
-    'hash' => proc{ dict{ [string(:alnum), array(2){ choose(string(:alnum), integer, dict{ [string(:alnum), integer] }) }] } },
-    'smallhash' => proc{ dict(2){ sized(range 5, 10){ [string(:alnum), string(:alnum)] } } }
-  }
+    'object' => proc { choose Value.new(:objval1), Value.new(:objval2) },
+    'hash' => proc { dict { [string(:alnum), array(2) { choose(string(:alnum), integer, dict { [string(:alnum), integer] }) }] } },
+    'smallhash' => proc { dict(2) { sized(range(5, 10)) { [string(:alnum), string(:alnum)] } } }
+  }.freeze
 
   attr_reader :key, :value, :specs, :features
 
@@ -88,23 +87,23 @@ class MonetaSpecs
   end
 
   def new(options)
-    self.class.new({specs: specs, key: key, value: value}.merge(options))
+    self.class.new({ specs: specs, key: key, value: value }.merge(options))
   end
 
   def with_keys(*keys)
-    new(key: self.key | keys.map(&:to_s))
+    new(key: key | keys.map(&:to_s))
   end
 
   def without_keys(*keys)
-    new(key: self.key - keys.map(&:to_s))
+    new(key: key - keys.map(&:to_s))
   end
 
   def with_values(*values)
-    new(value: self.value | values.map(&:to_s))
+    new(value: value | values.map(&:to_s))
   end
 
   def without_values(*values)
-    new(value: self.value - values.map(&:to_s))
+    new(value: value - values.map(&:to_s))
   end
 
   def without_keys_or_values(*types)
@@ -209,53 +208,55 @@ end
 
 ADAPTER_SPECS = MonetaSpecs.new(
   specs: [:null, :store, :returndifferent,
-    :increment, :concurrent_increment, :concurrent_create, :persist, :multiprocess,
-    :create, :features, :store_large, :not_each_key],
+          :increment, :concurrent_increment, :concurrent_create, :persist, :multiprocess,
+          :create, :features, :store_large, :not_each_key],
   key: %w(string path),
-  value: %w(string path binary))
+  value: %w(string path binary)
+)
 STANDARD_SPECS = MonetaSpecs.new(
   specs: [:null, :store, :returndifferent,
-    :marshallable_key, :marshallable_value, :transform_value, :increment,
-    :concurrent_increment, :concurrent_create, :persist, :multiprocess, :create,
-    :features, :store_large, :not_each_key])
+          :marshallable_key, :marshallable_value, :transform_value, :increment,
+          :concurrent_increment, :concurrent_create, :persist, :multiprocess, :create,
+          :features, :store_large, :not_each_key]
+)
 TRANSFORMER_SPECS = MonetaSpecs.new(
   specs: [:null, :store, :returndifferent,
-    :transform_value, :increment, :create, :features, :store_large,
-    :not_each_key])
+          :transform_value, :increment, :create, :features, :store_large,
+          :not_each_key]
+)
 
 module MonetaHelpers
   module ClassMethods
-
-    def moneta_store store_name, options={}, &block
-      name = self.description
+    def moneta_store(store_name, options = {}, &block)
+      name = description
       builder = proc do
         if block
           options = instance_exec(&block)
         end
 
-        Moneta.new(store_name, options.merge(logger: {file: File.join(tempdir, "#{name}.log")}))
+        Moneta.new(store_name, options.merge(logger: { file: File.join(tempdir, "#{name}.log") }))
       end
 
       include_context :setup_moneta_store, builder
     end
 
-    def moneta_build &block
+    def moneta_build(&block)
       include_context :setup_moneta_store, block
     end
 
-    def moneta_loader &block
+    def moneta_loader(&block)
       before do
         @moneta_value_loader = block
       end
     end
 
-    def moneta_specs specs
-      let(:features){ specs.features }
+    def moneta_specs(specs)
+      let(:features) { specs.features }
       let(:keys_meta) do
-        [:branch, *specs.key.map{ |k| MonetaSpecs::KEYS[k] }.compact]
+        [:branch, *specs.key.map { |k| MonetaSpecs::KEYS[k] }.compact]
       end
       let(:values_meta) do
-        [:branch, *specs.value.map{ |k| MonetaSpecs::VALUES[k] }.compact]
+        [:branch, *specs.value.map { |k| MonetaSpecs::VALUES[k] }.compact]
       end
 
       # Used by tests that rely on MySQL.  These env vars can be used if you
@@ -298,7 +299,7 @@ module MonetaHelpers
     end
 
     def use_timecop
-      before{ @timecop = true }
+      before { @timecop = true }
     end
   end
 
@@ -315,7 +316,7 @@ module MonetaHelpers
       @store ||= new_store
     end
 
-    def load_value value
+    def load_value(value)
       if @moneta_value_loader
         @moneta_value_loader.call value
       else
@@ -341,9 +342,9 @@ module MonetaHelpers
         value_values = values.times.map { call(values_meta) }
         guard value_values.uniq.length == value_values.length
 
-        [[:keys, key_values], [:values, value_values]].
-          reject { |key, value| value.empty? }.
-          to_h
+        [[:keys, key_values], [:values, value_values]]
+          .reject { |_key, value| value.empty? }
+          .to_h
       end
     end
 
@@ -361,8 +362,8 @@ end
 RSpec.configure do |config|
   config.verbose_retry = true
   config.color = true
-  #config.tty = true
-  #config.formatter = ENV['PARALLEL_TESTS'] ? MonetaParallelFormatter : :progress
+  # config.tty = true
+  # config.formatter = ENV['PARALLEL_TESTS'] ? MonetaParallelFormatter : :progress
   config.silence_filter_announcements = true if ENV['PARALLEL_TESTS']
 
   # Allow "should" syntax as well as "expect"
@@ -379,9 +380,9 @@ RSpec::Expectations.configuration.on_potential_false_positives = :nothing
 # Disable jruby stdout pollution by memcached
 if defined?(JRUBY_VERSION)
   require 'java'
-  properties = java.lang.System.getProperties();
-  properties.put('net.spy.log.LoggerImpl', 'net.spy.memcached.compat.log.SunLogger');
-  java.lang.System.setProperties(properties);
+  properties = java.lang.System.getProperties
+  properties.put('net.spy.log.LoggerImpl', 'net.spy.memcached.compat.log.SunLogger')
+  java.lang.System.setProperties(properties)
   java.util.logging.Logger.getLogger('').setLevel(java.util.logging.Level::OFF)
 end
 
@@ -404,7 +405,6 @@ class Value
   end
 end
 
-
 def marshal_error
   # HACK: Marshalling structs in rubinius without class name throws
   # NoMethodError (to_sym). TODO: Create an issue for rubinius!
@@ -415,7 +415,6 @@ def marshal_error
   end
 end
 
-
 RSpec.shared_context :setup_moneta_store do |builder|
   before do
     @moneta_store_builder = builder
@@ -451,4 +450,4 @@ RSpec.shared_examples :at_usec do |usec|
   end
 end
 
-Dir['./spec/features/*.rb'].each{ |rb| require rb }
+Dir['./spec/features/*.rb'].each { |rb| require rb }

data/spec/moneta/proxies/transformer/transformer_marshal_escape_spec.rb

@@ -1,15 +1,19 @@
 describe 'transformer_marshal_escape', proxy: :Transformer do
   moneta_build do
     Moneta.build do
-      use :Transformer, key: [:marshal, :escape], value: :marshal
+      use :Transformer, key: [:marshal, :escape], value: [:marshal, :escape]
       adapter :Memory
     end
   end
 
+  moneta_loader do |value|
+    ::Marshal.load(::URI.decode_www_form_component(value))
+  end
+
   moneta_specs STANDARD_SPECS.without_persist
 
-  it 'compile transformer class' do
+  it 'compiles the transformer class' do
     store.should_not be_nil
-    Moneta::Transformer::MarshalEscapeKeyMarshalValue.should_not be_nil
+    Moneta::Transformer::MarshalEscapeKeyMarshalEscapeValue.should_not be_nil
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moneta
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Daniel Mendler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2019-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -438,10 +438,14 @@ files:
 - spec/restserver.rb
 - test/action_dispatch/fixtures/session_autoload_test/foo.rb
 - test/action_dispatch/session_moneta_store_test.rb
-homepage: http://github.com/moneta-rb/moneta
+homepage: https://github.com/moneta-rb/moneta
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/moneta-rb/moneta/issues
+  changelog_uri: https://github.com/moneta-rb/moneta/blob/v1.2.1/CHANGES
+  documentation_uri: https://www.rubydoc.info/gems/moneta/1.2.1
+  source_code_uri: https://github.com/moneta-rb/moneta/tree/v1.2.1
 post_install_message: 
 rdoc_options: []
 require_paths: