receptacle 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de42650ef4891b4f5cadb6a0ca4c357a8499b338
-  data.tar.gz: 9b266f6ed5637ae89aee2e5c9053ab0963015ca7
+  metadata.gz: c9fe755e41253d67a0be871fab1aebf01ed201ec
+  data.tar.gz: 246b2cb847fd611e9886c75992667dae615f6a84
 SHA512:
-  metadata.gz: 239ef17fba657fc3ccf5a87b01f840f8d6de7646bbee4daa3ca8e284c97137b7c348b7bc0069cd1e970df19062ccb13ff91b6922a02c6a763b434393b90e6187
-  data.tar.gz: d49b157c7427025e36aaf55ed1d0cbe878a6463723654b1de000c0272dfc72ecccaa61323b9907414a9b1811ee8ef9bfaa91c4dba345c6a2548440e0786112a4
+  metadata.gz: f6f2eb8a27fc37b7838c43c1cf2534415bbb76200f4db266cb5ceb4576f09f1f99250862ca8392463295b791a7b63792888b6a806971637b2beab306130ca81d
+  data.tar.gz: 69f486884c18e7eaf28ef651a15c007ac17dde96b4ce40eb99ea53dd06c0f9f162372c6fa2585fad03994f8a621b841bc10e0a07b7de3b27860b21d88f89838f

data/.travis.yml

@@ -3,9 +3,9 @@ cache: bundler
 rvm:
   - 2.1.10
   - 2.2.6
-  - 2.3.3
-  - 2.4.0
-  - jruby-9.1.7.0
+  - 2.3.4
+  - 2.4.1
+  - jruby-9.1.12.0
 jdk:
   - oraclejdk8
 env:
@@ -19,18 +19,18 @@ matrix:
     - rvm: 2.2.6
       jdk: oraclejdk8
       env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
-    - rvm: 2.3.3
+    - rvm: 2.3.4
       jdk: oraclejdk8
       env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
-    - rvm: 2.4.0
+    - rvm: 2.4.1
       jdk: oraclejdk8
       env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
   allow_failures:
-    - rvm: jruby-9.1.7.0
+    - rvm: jruby-9.1.12.0
       jdk: oraclejdk8
       env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
 before_install:
   - gem update --system
-  - gem install bundler -v 1.14.3
+  - gem install bundler -v 1.15.1
 before_script:
   - bundle exec danger

data/CHANGELOG.md

@@ -4,6 +4,12 @@ Changelog
 master
 ---
 
+
+0.3.1
+---
+
+* fix after wrapper ordering bug [PR#6](https://github.com/andreaseger/receptacle/pull/6)
+
 0.3.0
 ---
 

data/Dangerfile

@@ -23,4 +23,4 @@ warn("Big PR") if git.lines_of_code > 500
 commit_lint.check warn: :all, disable: [:subject_cap]
 
 # rubocop
-rubocop.lint "*"
+rubocop.lint

data/README.md

@@ -10,6 +10,8 @@
 Provides easy and fast means to use the repository pattern to create separation
 between your business logic and your data sources.
 
+Battle tested at [Runtastic](https://github.com/runtastic).
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/examples/simple_repo.rb

@@ -1,31 +1,25 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
-require 'bundler/inline'
 
+require 'bundler/inline'
 gemfile true do
   source 'https://rubygems.org'
-  gem 'receptacle', '../'
+  gem 'receptacle', '~>0.3'
   gem 'mongo'
 end
+require 'irb'
 
+# a simple struct to act as business entity
 User = Struct.new(:id, :name)
 
-# define our Repository
-module Repository
-  module User
-    include Receptacle::Repo
-    mediate :find
-    mediate :create
-  end
-end
-
-# we should have a global mongo connection which can be easily reused
+# we have a global mongo connection which can be easily reused
 module Connection
   class Mongo
     include Singleton
 
     def initialize
-      @client = ::Mongo::Client.new
+      ::Mongo::Logger.logger.level = Logger::INFO
+      @client = ::Mongo::Client.new(['127.0.0.1:27017'], database: 'receptacle')
+      client[:users].delete_many # empty collection
     end
     attr_reader :client
     def self.client
@@ -34,20 +28,34 @@ module Connection
   end
 end
 
+# define our Repository
+module Repository
+  module User
+    include Receptacle::Repo
+    mediate :find
+    mediate :create
+    mediate :clear
+  end
+end
+
 # some strategies
 module Repository
   module User
     module Strategy
       class Mongo
         def find(id:)
-          mongo_to_model(collection.find(_id: id))
+          mongo_to_model(collection.find(_id: id).first)
         rescue
           nil
         end
 
         def create(name:)
           ret = collection.insert_one(name: name)
-          find(id: ret['_id']) # TODO: check this
+          find(id: ret.inserted_id)
+        end
+
+        def clear
+          collection.delete_many
         end
 
         private
@@ -72,7 +80,11 @@ module Repository
 
         def create(name:)
           id = BSON::ObjectId.new
-          store[id] = User.new(id, name)
+          store[id] = ::User.new(id, name)
+        end
+
+        def clear
+          self.class.store = {}
         end
 
         private
@@ -89,15 +101,20 @@ end
 Repository::User.strategy Repository::User::Strategy::InMemory
 
 user = Repository::User.create(name: 'foo')
+print 'created user: '
 p user
+print 'find user by id: '
 p Repository::User.find(id: user.id)
 
 # switching to mongo and we see it's using a different store but keeps the same interface
 Repository::User.strategy Repository::User::Strategy::Mongo
 
+print 'search same user in other strategy: '
 p Repository::User.find(id: user.id)
 #-> nil
 
-user = Repository::User.create(name: 'foo')
+user = Repository::User.create(name: 'foo mongo')
+print 'create new user: '
 p user
+print 'find new user by id: '
 p Repository::User.find(id: user.id)

data/lib/receptacle/method_cache.rb

@@ -16,14 +16,14 @@ module Receptacle
     # @return [Integer] arity of strategy method according to https://ruby-doc.org/core-2.3.3/Method.html#method-i-arity
     attr_reader :arity
 
-    def initialize(method_name:, strategy:, before_wrappers:, after_wrappers:)
+    def initialize(method_name:, strategy:, wrappers:) # rubocop:disable Metrics/AbcSize
       @strategy = strategy
       @before_method_name = :"before_#{method_name}"
       @after_method_name = :"after_#{method_name}"
       @method_name = method_name.to_sym
-      before_wrappers ||= []
-      after_wrappers ||= []
-      @wrappers = before_wrappers | after_wrappers
+      before_wrappers = wrappers.select { |w| w.method_defined?(@before_method_name) }
+      after_wrappers = wrappers.select { |w| w.method_defined?(@after_method_name) }
+      @wrappers = wrappers & (before_wrappers | after_wrappers)
       @skip_before_wrappers = before_wrappers.empty?
       @skip_after_wrappers = after_wrappers.empty?
       @arity = strategy.new.method(method_name).arity

data/lib/receptacle/method_delegation.rb

@@ -38,14 +38,11 @@ module Receptacle
     # @return [MethodCache]
     def __build_method_call_cache(method_name)
       config = Registration.repositories[self]
-      before_method_name = :"before_#{method_name}"
-      after_method_name = :"after_#{method_name}"
 
       raise Errors::NotConfigured, repo: self if config.strategy.nil?
       MethodCache.new(
         strategy: config.strategy,
-        before_wrappers: config.wrappers.select { |w| w.method_defined?(before_method_name) },
-        after_wrappers: config.wrappers.select { |w| w.method_defined?(after_method_name) },
+        wrappers: config.wrappers,
         method_name: method_name
       )
     end

data/lib/receptacle/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Receptacle
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: receptacle
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andreas Eger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: repository pattern