active_hash_relation 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb48b886a8ace57b0562d7e40bc60a10daf7fde3
-  data.tar.gz: 6576b638fc3f6c21e5a3abfaa3d6329c7be6f8cc
+  metadata.gz: 2b6475c5d16eab20007e41f124b9db329cc9788a
+  data.tar.gz: 256afb180075bb73703f59bd5496aa4af6225f0b
 SHA512:
-  metadata.gz: 626e25dd25e90c29a9360d986a8cfafa035ddc5822be42d38ada63ea61ab014b862f445db2ad68271cca1a2ecb2d8e519413a080b74bd2ecce8c12c772767bf9
-  data.tar.gz: 44c97841194c7df3b8e8bece218123b4f1e77db0edb42bd9d21a19269912e3f40c017734739271695f449166e8a63d5cb696b58166385f34bcc5d501b970815a
+  metadata.gz: 6edc4a82cbd60e9f459d6490d09086ec7f224f9bc346555972b848bb6b4a2417e181a9b136c21699bbe48d90ac7608f201d9f2e6bb7a31be5836fd03a477aec2
+  data.tar.gz: f9ed814d95540090b83f7aa744583ffd655884784587442f0fe691f2866503197c2da359f638130e129e9448c1a3948594284121749411f73f91543103926d8b

data/README.md

@@ -123,6 +123,22 @@ Scopes are supported via a tiny monkeypatch in the ActiveRecord's scope class me
 
 will run the `.planned` scope on the resource.
 
+### Unscoped assotiations
+If you have a default scope in your models and you have a good reason to keep that, `active_hash_relation` provides an option to override it when filtering associations:
+
+```ruby
+#config/initializers/active_hash_relation.rb
+ActiveHashRelation.configure do |config|
+  config.use_unscoped = true
+end
+```
+
+You still have to provide the main model `active_hash_relation` runs as unscoped though.
+```ruby
+apply_filters(Video.unscoped.all, {limit: 30, user: {country_code: 'SE'}})
+#"SELECT  \"videos\".* FROM \"videos\" INNER JOIN \"users\" ON \"users\".\"id\" = \"videos\".\"user_id\" WHERE (users.country_code ILIKE '%GR%') LIMIT 30"
+```
+
 ### Whitelisting
 If you don't want to allow a column/association/scope just remove it from the params hash.
 

data/lib/active_hash_relation/association_filters.rb

@@ -1,5 +1,5 @@
 module ActiveHashRelation::AssociationFilters
-  def filter_associations(resource, params, model: nil)
+  def filter_associations(resource, params, model = nil)
     unless model
       model = model_class_name(resource)
     end

data/lib/active_hash_relation/filter_applier.rb

@@ -58,8 +58,8 @@ module ActiveHashRelation
       end
 
 
-      @resource = filter_scopes(@resource, @params[:scopes]) if @params.include?(:scopes)
-      @resource = filter_associations(@resource, @params) if @include_associations
+      @resource = filter_scopes(@resource, @params[:scopes], @model) if @params.include?(:scopes)
+      @resource = filter_associations(@resource, @params, @model) if @include_associations
       @resource = apply_limit(@resource, @params[:limit]) if @params.include?(:limit)
       @resource = apply_sort(@resource, @params[:sort], @model) if @params.include?(:sort)
 

data/lib/active_hash_relation/scope_filters.rb

@@ -1,5 +1,5 @@
 module ActiveHashRelation::ScopeFilters
-  def filter_scopes(resource, params, model: nil)
+  def filter_scopes(resource, params, model = nil)
     unless model
       model = model_class_name(resource)
     end

data/lib/active_hash_relation/version.rb

@@ -1,3 +1,3 @@
 module ActiveHashRelation
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/lib/active_hash_relation.rb

@@ -35,8 +35,8 @@ module ActiveHashRelation
     ).apply_filters
   end
 
-  def aggregations(resource, params)
-    Aggregation.new(resource, params).apply
+  def aggregations(resource, params, model: nil)
+    Aggregation.new(resource, params, model: model).apply
   end
 
   class Configuration

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash_relation
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Filippos Vasilakis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler