fish0 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d69c6b541aef5106bcbde90fe859d69b8de46c47
-  data.tar.gz: 65fd640653d559a41446a4e144eb15a60379b773
+  metadata.gz: f3a92eb890fe96399b8cac64c71cc331cfcc7c8a
+  data.tar.gz: 255f294586788edd53ac42f344357ebe5a8bbea3
 SHA512:
-  metadata.gz: ba6fb5b83e0b5453a80490d94b5dc1d3fece02daec600187cfd03227b4291d6c3c51d1f8b898ccf376cdead9d9e4cfcd04a6c25fc6d6776fc2991d67881aa2cd
-  data.tar.gz: 1a3801d5342555f6992d184a94272420bb377741473b8d9c955adf4c4f02b1913214ec437027e4070b62f93fe117dcd4285274163d4c0d66ff30525c9ca78b26
+  metadata.gz: 90ee304e16c7ab19a87ba1644fad131957a0fd616f1946b5786447e2afc5c07474c37773a732a6bfd993fb6e4e5accc013b56d898c85c5e627c29522fbe74774
+  data.tar.gz: 0d5ea327f589351e9cdb5f50bd34a55260aff18f482a2e5a93474815a80bc49a186ee460da6bc0e05e965ef42e1761de15876d8afca31b5e727644ba6e95125b

data/lib/fish0/concerns/base.rb

@@ -28,10 +28,19 @@ module Fish0
           end
 
           def scope(name, body)
+            scopes << [name, body]
+          end
+
+          def scopes
             @scopes ||= []
-            @scopes << [name, body]
           end
 
+          # rubocop:disable Style/TrivialAccessors
+          def default_scope(body)
+            @default_scope = body
+          end
+          # rubocop:enable Style/TrivialAccessors
+
           def method_missing(method_name, *arguments, &block)
             if repository.respond_to?(method_name)
               repository.send(method_name, *arguments, &block)
@@ -60,7 +69,8 @@ module Fish0
 
           def repository
             rep = repository_class.new(collection, entity)
-            @scopes.each { |s| rep.scope(*s) }
+            rep.instance_exec(&@default_scope) if @default_scope
+            scopes.each { |s| rep.scope(*s) }
             rep
           end
 

data/lib/fish0/version.rb

@@ -1,3 +1,3 @@
 module Fish0
-  VERSION = '0.0.17'.freeze
+  VERSION = '0.0.18'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fish0
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Dmitry Zuev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport