ocean-rails 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8d0e06a51eb9695e45cbd3117875807398ad746
-  data.tar.gz: bc840097a5de048b4b8256ad656b8618abb1a4b5
+  metadata.gz: 58b7c59491b48aac2169a883e6ce85cf34e74264
+  data.tar.gz: 31e64b09dd45ee2de000c966957f9f56c5ff7158
 SHA512:
-  metadata.gz: f72419c440325db8eb7d82f9d5f397c93e0c007c068738ab00842246a70a7619a7ca067f54b3d6f562bf25adc8a41685eec066a069a2e3dbc8ad130736f2d63d
-  data.tar.gz: dff353241989bd4c3bbb4a8ff65e6e93b5bb6640698d0cd808c6f5201a9cfc58e2a3067e7796394458a00b9bbf77754cb80e364ac05d611c58c4dbca051c622e
+  metadata.gz: f40db8a263bf19a89fd63f6dedc14ef833f735992bde8619cd089d7f6c6ad7c6b18a3a68c4877e9bddbc7c5928d8d85f7ab81b76f4e90374496a1cf517ea6270
+  data.tar.gz: f27fa478cac0e998a45388009de1a97f8546ed41d37c6f4f221067371a2c6661603ffbafe63725abb933bcfa6ec1042e592be24995f27032af6b16e61e1ca94a

data/lib/ocean/ocean_application_controller.rb

@@ -164,7 +164,7 @@ module OceanApplicationController
   # their standard position, begin with an underscore, etc. The +ocean+ gem generator
   # for resources creates a partial in the proper location.
   #
-  def api_render(x, new: false)
+  def api_render(x, new: false, href: url_for(params))
     if !x.is_a?(Array) && !(defined?(ActiveRecord) && x.is_a?(ActiveRecord::Relation))
       partial = x.to_partial_path
       if new
@@ -177,10 +177,15 @@ module OceanApplicationController
       resources = x.collect { |m| render_to_string(partial: m.to_partial_path, 
                                                    locals: {m.class.model_name.i18n_key => m}) }
       attrs = {count: resources.count,
-               total_count: x.unscope(:where, :order, :limit, :offset, :group, :having).count,
-               _links: {self: {href: request.url, type: 'application/json'}
-                       }
+               total_count: x.unscope(*ActiveRecord::QueryMethods::VALID_UNSCOPING_VALUES.to_a).count
               }
+      links = {}
+      if href
+        links['self'] =  {href: href, type: 'application/json'}
+      end
+      if links
+        attrs['_links'] = links
+      end
       render text: '{"_collection":{"resources":[' + resources.join(',') + ']' + 
         (attrs.collect do |k, v|
            ',"' + k.to_s + '":' + v.to_json

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Peter Bengtson