ocean-rails 2.10.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 199cd45800bf7316cb1bb1b79f622ee1c6a74556
-  data.tar.gz: 8865f5b42851598a6b02ae921e62e42487d6ce9b
+  metadata.gz: fbd8005493023e3421fad5e17b6f141bd484f249
+  data.tar.gz: 5103477f62b4d283d8d0db84948606a1e1b3d054
 SHA512:
-  metadata.gz: 7db74a25a4eeddb2b8ce989ab9725c211a272c4353aeabc4b3099ee55e7f7525a8af5f6b9abcd3f23164b549a1309163ddc829a572c10874c094ed1d0440a27d
-  data.tar.gz: 415353c47a9a3a8a09e4307262a1952f0dc7fcbf8a909145a1bd566bde5478c9500eea6ad6e43d689a0ed795ea2055376c682211e5b2923065c63a4e06ec7f55
+  metadata.gz: 28d40805d7d915875b4cb88834cbc9291c4488633a74f3581648ba4e395afbbd96c7254f7253b6d3883e8a0c3773bce2c93726123fd7b2e6a0ac91dc56af7d55
+  data.tar.gz: 07ac89cd9536620bc15441c1ad10d12e5ae70d63f1e3d4239977bab241853e4cc944ae2c2aa6ec02de45ee68c707e3a01c6c9647efb7230186c91da729e07a82

data/lib/ocean-rails.rb

@@ -68,10 +68,31 @@ end
 #
 def add_right_restrictions(rel, restrictions)
   return rel unless restrictions
-  # The below works only for a single restriction (multiple should be ORed)
-  restrictions.each do |rr|
-    rel = rel.where("app" => rr["app"]) if rr["app"] != "*"
-    rel = rel.where("context" => rr["context"]) if rr["context"] != "*"
+  # First get the table to use as a basis for the OR clauses
+  t = rel.arel_table
+  # Accumulating Arel AND clauses
+  cond = restrictions.inject([]) do |acc, rr|
+    app = rr['app']
+    context = rr['context']
+    if    app != '*' && context != '*'
+      acc << t[:app].eq(app).and(t[:context].eq(context))
+    elsif app != '*' && context == '*'
+      acc << t[:app].eq(app)
+    elsif app == '*' && context != '*'
+      acc << t[:context].eq(context)
+    end
+    acc
+  end
+  # Process the clauses. We might not need to OR anything.
+  case cond.length
+  when 0
+    return rel
+  when 1
+    return rel.where(cond.first)
+  else
+    # OR the multiple clauses together
+    cond = cond.inject { |a, b| a.or(b) }
+    # Return a relation built from the Arel condition we've constructed
+    rel.where(cond)
   end
-  rel
 end

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "2.10.0"
+  VERSION = "2.10.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus