almodovar 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec89a8d4e8dda44b8f6206718c1a93de272dd615
-  data.tar.gz: 6a88664bde0c5f00179d862bb3ea2d1bd72c8fdc
+  metadata.gz: 71f07634a67e62ee4456897e2480a0c69401acdd
+  data.tar.gz: 428137c90a12c326e0a9763fc529d51b72410690
 SHA512:
-  metadata.gz: 42245556fef229bc41adead830a4d4006d1b0e3b18af88351d08474b66e456d69e3118c2012ac0f38ccd646a47807a55ac979ae29826206532c36e825df3431e
-  data.tar.gz: ea8260f1b9b62b2a18d7dde1a6d258922d8c2677bb1a4ae48165d46cd5c9099c370d46953dab52d21b1255a6a4e32c2b5a28c1cdf0b889067a3ba0f9a8ad24c4
+  metadata.gz: 0ddcc8825b2c5b54ff4ed676a1eb9e9cca02c08f3e1dc8c86f45aa75f98dc7fa1460d3f57bac0224cdd2f7b0704c6864214b3a43d3a3362ce30de90094d39c1b
+  data.tar.gz: c95821c3ff07b2ad1dd080a8ca82f9649e5840fdca44922daced8152a8e1d80f306b3d0a4938dd0e370d551ff0947d9079d06511dd4785acb67231c96d52cc53

data/lib/almodovar/resource_presenter/collection.rb

@@ -28,17 +28,17 @@ module Almodovar
         xml.instruct! unless options[:skip_instruct]
         xml.tag! resource_type.pluralize.dasherize, :type => 'array' do
           xml.tag!('total-entries', @total) if @total
-          xml.link :rel => 'next', :href => @next if @next
-          xml.link :rel => 'prev', :href => @prev if @prev
+          next_link.to_xml(:builder => xml) if next_link
+          prev_link.to_xml(:builder => xml) if prev_link
           @resources.each { |value| value.to_xml(options.merge(:root => resource_type.singularize, :skip_instruct => true)) }
         end
       end
       
       def as_json(options = {})
-        ActiveSupport::OrderedHash.new.tap do |message|
+        message = ActiveSupport::OrderedHash.new.tap do |message|
           message[:total_entries] = @total if @total
-          message[:next_link] = @next if @next
-          message[:prev_link] = @prev if @prev
+          message.merge! next_link.as_json if next_link 
+          message.merge! prev_link.as_json if prev_link
           message[:entries] = @resources.map { |resource| resource.as_json(options) }
         end
       end
@@ -56,6 +56,14 @@ module Almodovar
         @resource_class.resource_type
       end
 
+      def next_link
+        Link.new(:next, @next) if @next
+      end
+
+      def prev_link
+        Link.new(:prev, @prev) if @prev
+      end
+
     end
   end  
 end

data/lib/almodovar/resource_presenter/link.rb

@@ -13,7 +13,7 @@ module Almodovar
         XmlSerializer.new(self, options.merge(:skip_instruct => true)).to_xml
       end
       
-      def as_json(options)
+      def as_json(options = {})
         JsonSerializer.new(self, options).as_json
       end
       

data/lib/almodovar/version.rb

@@ -1,3 +1,3 @@
 module Almodovar
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: almodovar
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - BeBanjo S.L.