cyrax 0.1.2 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTI5NjkzYjE1MjUwZTQzZDVjYzBjZDJmMTc4MWQ4N2Y3NTk0YzNkNA==
+    ZmYzYjFhZDU3NzM5ZTA5MjI4YThiN2Q5ZWRjZGEyYmQ4OGY2MTdlZQ==
   data.tar.gz: !binary |-
-    YmQ4YWUwYjIwMTFjZDdkNTQyOTljYWJiMjQ0MmExYTVkNjg1OTE3Nw==
+    OWIxZTMxOTI2MjI0ZWE4ZTFjNzI1ZGQ0NjE5M2VhMGU4MGE4NGI1ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2E0NmE3MmExMjc5M2Y3MTg3NDZmNzI3MDljYzhkZDY2NmE2MDVmMmZhODc0
-    Nzc3YmNhYmMzNGVlNjk4NDQ5ZTYxNmJiYmY1Yjg2NTgzNmVkZDU1Zjc4ZDI5
-    MDdhMDVjZWIyMDkwMjQ2M2VmZGEyN2EyNWZmY2FjMzE4NmZiNGU=
+    YzQzY2IxNWJhYThmNDEzMWE5NGRkZTMzYmNlYzY1N2I4MDYzNGYzMzRjZjI1
+    Mzg2NGMzOWI5NTYyYjc1Zjk5MDhiM2NlNzc2OTRkMDYwYTNhM2M3M2Q0OWNm
+    ZmYwZWEzM2Q5ZDk5MjFmMGViOTUzNDdkZjNlNTgyOGJkZWM4NTE=
   data.tar.gz: !binary |-
-    N2YyNDI2NDgzYzRkNmM1NWQzM2VkOTNhOWM3NjIyODAzZDQ1YTgyNjYyYTk5
-    MGIyODZhOGViNTliMmQyOWIxZDc5ZjJjNzQxNmMxYzI3ZWEyY2E0MjRjMTNh
-    NmEwMDc1NjA2ZTc1ZGUwYzA4MTQ3NmVhYjc2M2U0NTRhMmE0OWQ=
+    MGM4NGI3YmFjZjM4MWZhMTYyNjdmMTNmODc1NGJmNTcwODg1NjFjODRjZWQ4
+    N2ZmMDVmOGNlZDgzZjI4ZDc0ZDg2ZTkxODA4Zjc4ZDZkNzVhMThkZDc5MmVh
+    NTE1ZGJlYjVmNTU0YzkwYTJlNGQ3MmQ0MzdiNjE2ZWU3YWI0NWY=

data/lib/cyrax/decorator.rb

@@ -22,4 +22,21 @@ class Cyrax::Decorator
 
     resource.send(method, *args, &block)
   end
+
+  class << self
+    def fetch(resource)
+      resource.respond_to?(:all) ? resource.all : resource
+    end
+
+    def decorate(resource)
+      resource = fetch(resource)
+      if resource.is_a?(Array)
+        resource.map do |item|
+          self.new(item)
+        end
+      else
+        self.new(resource)
+      end
+    end
+  end
 end

data/lib/cyrax/extensions/has_decorator.rb

@@ -12,10 +12,6 @@ module Cyrax::Extensions
       end
     end
 
-    def decorated_collection
-      decorable? ? build_decorated_collection : wrapped_collection
-    end
-
     private
 
     def decorable?
@@ -25,21 +21,5 @@ module Cyrax::Extensions
     def decorator_class
       self.class.decorator_class_name.to_s.classify.constantize
     end
-
-    def wrapped_collection
-      collection = build_collection
-
-      if collection.kind_of?(Array)
-        return collection
-      elsif collection.respond_to?(:all)
-        return collection.all
-      else
-        return Array.wrap(collection)
-      end
-    end
-
-    def build_decorated_collection
-      wrapped_collection.map{|i| decorator_class.new(i)}
-    end
   end
 end

data/lib/cyrax/extensions/has_resource.rb

@@ -46,6 +46,18 @@ module Cyrax::Extensions
       resource_scope.find(id)
     end
 
+    def wrapped_collection
+      collection = build_collection
+
+      if collection.kind_of?(Array)
+        return collection
+      elsif collection.respond_to?(:all)
+        return collection.all
+      else
+        return Array.wrap(collection)
+      end
+    end
+
     module ClassMethods
       def accessible_attributes(*attrs)
         if attrs.blank?

data/lib/cyrax/extensions/has_response.rb

@@ -8,8 +8,8 @@ module Cyrax::Extensions
     end
 
     def assign_resource(resource_name, resource, options = {})
+      resource = options[:decorator].decorate(resource) if options[:decorator]
       @_assignments ||= {}
-      resource = options[:decorator].new(resource) if options[:decorator]
       @_assignments[resource_name.to_sym] = resource
     end
 
@@ -33,7 +33,7 @@ module Cyrax::Extensions
     def respond_with(resource, options = {})
       name = options[:name] || resource_name
       should_decorate = options[:decorate].nil? || options[:decorate]
-      result = decorable? && should_decorate ? decorator_class.new(resource) : resource
+      result = decorable? && should_decorate ? decorator_class.decorate(resource) : resource
       response = Cyrax::Response.new(name, result)
       response.message = @_message
       response.errors = @_errors

data/lib/cyrax/extensions/has_service.rb

@@ -3,7 +3,7 @@ module Cyrax::Extensions
     extend ActiveSupport::Concern
 
     def collection
-      respond_with decorated_collection, name: collection_name
+      respond_with wrapped_collection, name: collection_name
     end
 
     def build

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/cyrax/extensions/has_decorator_spec.rb

@@ -47,56 +47,6 @@ module Cyrax
           its(:decorable?) { should be_false }
         end
       end
-
-      describe '#decorated_collection' do
-        context 'when `decorable?`' do
-          before { subject.stub!(:decorable?).and_return(true) }
-          it 'should return decorated result' do
-            subject.should_receive(:build_decorated_collection)
-            subject.decorated_collection
-          end
-        end
-        context 'when not `decorable?`' do
-          before { subject.stub!(:decorable?).and_return(false) }
-          it 'should return raw result' do
-            subject.should_not_receive(:build_decorated_collection)
-            subject.should_receive(:build_collection)
-            subject.decorated_collection
-          end
-        end
-      end
-
-      describe '#build_decorated_collection' do
-        before do
-          self.class.decorator(:foo)
-          subject.stub!(:wrapped_collection).and_return([:bar])
-        end
-
-        it 'returns array of decorator instances' do
-          subject.send(:build_decorated_collection).should eq([Foo.new(:bar)])
-        end
-      end
-
-      describe '#prepare_collection_for_decorate' do
-        subject { self.send(:wrapped_collection) }
-
-        context 'when #build_collection returns array' do
-          before { self.stub!(:build_collection).and_return([:bar]) }
-          it { should eq([:bar]) }
-        end
-
-        context 'when #build_collection returns any object except array' do
-          before { self.stub!(:build_collection).and_return(:bar) }
-          it { should eq([:bar]) }
-        end
-
-        context 'when #build_collection returns any object which responds to #all method' do
-          let(:obj) { mock(:all => [:bar] ) }
-          before { self.stub!(:build_collection).and_return(obj) }
-
-          it { should eq([:bar]) }
-        end
-      end
     end
   end
 end

data/spec/cyrax/extensions/has_resource_spec.rb

@@ -74,6 +74,27 @@ module Cyrax
         end
       end
 
+      describe '#wrapped_collection' do
+        subject { self.send(:wrapped_collection) }
+
+        context 'when #build_collection returns array' do
+          before { self.stub!(:build_collection).and_return([:bar]) }
+          it { should eq([:bar]) }
+        end
+
+        context 'when #build_collection returns any object except array' do
+          before { self.stub!(:build_collection).and_return(:bar) }
+          it { should eq([:bar]) }
+        end
+
+        context 'when #build_collection returns any object which responds to #all method' do
+          let(:obj) { mock(:all => [:bar] ) }
+          before { self.stub!(:build_collection).and_return(obj) }
+
+          it { should eq([:bar]) }
+        end
+      end
+
       describe '#build_resource' do
         context 'when id is nil' do
           let(:resource_scope) { mock }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Droidlabs