cyrax 0.2.9 → 0.2.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmJkNzJlODY4MTJkNDUyMDY2NDBjYTI4YzA5NmMyNGFmNmYzNWMxMQ==
+    ZDZiMThhZWY4ZDM0NGQ2ZWVjNzliZGVlMmQ3MmQ1MjVmODViOWZmZg==
   data.tar.gz: !binary |-
-    ZjEyY2ZkNTEyMmU3ZDY3Mjg1MTVlYmFhZWU0MDY5ZjI3YzM3NjE3YQ==
+    ZjU4ZWRmNWU3ODA1MTE4OTliMDhjMmU3ZjUxYjRmOWIzY2MwNjRjNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTIwZjAzNjJlYWI4OWEwYWEwZTk4OGNhMGU2MTg1NzIxNTJmNTI4NDhmNDQ0
-    ZmUxYWJjOTIxYTU0YzdjZDViNWZkNDRlOGEwZGMyZDU1ZWRmOWUxN2M4MmNh
-    ZTIzYzBkNTNiYTY5M2MxYTNmZWVkMTBmMWNlYzM3NWM4YjM3Nzg=
+    YzE1MmZiNzA2ZWE2NjhhOGU2Zjg4NWFiODE5ZTEyZGQ2MmM0MmZjZWZlZTA1
+    ZDJiOTNhZGU2OGJhMjYwZDAxZDA1ZGRiMTU0MzA4OWViZWZkNDFlZTg0ZDg3
+    ZjE4YzA1ZDMzMDk3NjhlMjZlMDM1NmMyMjU4YjQwYmZiOWI1NmY=
   data.tar.gz: !binary |-
-    MjUyNDA1Y2I1MjBjYWZhMWRhZDU1YWQ3Zjk1N2IzN2Q5MWVmY2Q0YjVkNzdl
-    NWE0YjJkNTEyYTcyYWQ0NmU0MmMxYTgxZjk2NTgzYmJiYzYyOWRmYjc5ZTQ2
-    ZDJjMTUxMTI1MzJmZWNhNTE1NjA5YjMzZDM4NWM0MDhmOTVkMGU=
+    MWIxODQ2ZDc4NTZkZGUyNjZkMTkyY2RmYzc5ZDE5MDMyMzU3NjcxMjEyMWNh
+    Mjc1YTk3MzljOGY5ZDRiMjc5ZDRkMDc2MjA3YTNmNWU4MmFiNjliODIzMGQz
+    YzU2Njg1MjNlNjQ1YWU1ODcwMzVkNmQ0YWE1ZGZhOGNiNWRjNzE=

data/lib/cyrax/base_presenter.rb

@@ -19,9 +19,9 @@ class Cyrax::BasePresenter
 
   def present_with_decoration(object, options)
     if options[:present] == :collection
-      options[:decorator_class].decorate_collection(object)
+      options[:decorator].decorate_collection(object)
     else
-      options[:decorator_class].decorate(object)
+      options[:decorator].decorate(object)
     end
   end
 

data/lib/cyrax/decorated_collection_presenter.rb

@@ -1,10 +1,10 @@
 class Cyrax::DecoratedCollectionPresenter < Cyrax::BaseCollectionPresenter
-  attr_reader :decorator_class
+  attr_reader :decorator
 
   def initialize(collection, options = {})
     super
-    @decorator_class = options[:decorator_class]
-    raise "Decorator class is not defined! Please define it with option :decorator_class" unless decorator_class
+    @decorator = options[:decorator]
+    raise "Decorator class is not defined! Please define it with option :decorator" unless decorator
   end
 
   class << self

data/lib/cyrax/extensions/has_response.rb

@@ -8,7 +8,10 @@ module Cyrax::Extensions
     end
 
     def assign_resource(resource_name, resource, options = {})
-      resource = options[:decorator].decorate(resource) if options[:decorator]
+      if options[:decorator]
+        options.merge!(decorable: true)
+        resource = Cyrax::BasePresenter.present(resource, options)
+      end
       @_assignments ||= {}
       @_assignments[resource_name.to_sym] = resource
     end
@@ -36,11 +39,12 @@ module Cyrax::Extensions
 
     def respond_with(result, options = {})
       name = options[:name] || response_name
+      result = result.result.to_model if result.is_a?(Cyrax::Response)
       if respond_to?(:decorable?)
-        options.merge!(decorable: decorable?, decorator_class: decorator_class)
+        options.merge!(decorable: decorable?, decorator: decorator_class)
         result = Cyrax::BasePresenter.present(result, options)
       end
-      response = result.is_a?(Cyrax::Response) ? result : Cyrax::Response.new(name, result)
+      response = Cyrax::Response.new(name, result)
       response.message = @_message
       response.errors = @_errors
       response.assignments = @_assignments

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Droidlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-29 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport