cyrax 0.2.2 → 0.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjUxOTdlY2I2N2FkZmE0MDVhZWNlNjQwY2IxNTE5OTc4NGQ4MzYxMQ==
+    ZWUxYTQwNmI1YzlmOGRmZWE2OWIwNDMzY2QwYzc1ZWM0ODliYTI2OA==
   data.tar.gz: !binary |-
-    MDkyNWFmZDk2Y2NhYTQ3ZTYwZWE2MDAzYzM3NmIwZGI2YTE4ZjAxYg==
+    YTEzMGY5MjgxYjVmYzYwODYwZmRmNWJmYWI0NWQ3MjkzNzE2YjcyMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZThmZDE0ODA2MTc1YjRkZjRlMTQ5YTU1ODNjZmRiNDAxODc1MjhjYjA0ZDJj
-    YjgwNmNjZjI0MTdiMGM2N2IwY2JkMjg5YWU3NGQ3ZDQ4MDE4ZWUwOTA5Njhi
-    MWM5ODQwZGVjODU2ZThlMWZmZDMwMzZmOGI1NmI5M2JkMjZkYzQ=
+    MzgxYTRmODEwYzNiZjY1YWRhYTlkZDY3ZTdjNTBhY2M5ODY4MmJlOTdlNDAz
+    MDdkZTYyMDY4ZGQ2ZDg2NzI3MjBjMWE1MWFmNmUxMWZiZWI2ZTFlOWJhN2Yw
+    ZjhiOTk1NjhjOWRlMzg0MGE1NDE4YzUwNzIxMjExNTJhNDAwOGU=
   data.tar.gz: !binary |-
-    MmEzYTFhYzAwZWZlM2E2MzZjM2Q1YjM0MWRlY2YyMmQ5NmJjYzM5MTE4ODhl
-    ZjRmYzA0MDFmZDRiNzhlOWJiOGIwN2ZlM2Y5YmM4NWU4NDgxODE3MzIwN2Qy
-    MjdmZWUzMTY0ODU1ODc3NGZkNjMxYjllZTgxMDJlNWM2ZThhMWE=
+    MWVhYjc5MzIyMjQ0OWExMTE5MTQ4ZTAxMDVmYWZhZjg2NjNkZWZhN2YzMTQ5
+    MDdiNGJhN2ZmOGEwNzBhZjFmMjg0OWUxMDFlMmUxMWQzMzIwMWQwYzVlNDA1
+    YzM0ZGNlYmYzMjViODE3MmM1NjI4ZmRiZjA0MjFjYWY3ZGMzZmE=

data/lib/cyrax.rb

@@ -6,8 +6,10 @@ require "cyrax/extensions/has_service.rb"
 require "cyrax/extensions/has_decorator.rb"
 require "cyrax/base.rb"
 require "cyrax/base_resource.rb"
+require "cyrax/base_presenter.rb"
 require "cyrax/response.rb"
 require "cyrax/callbacks.rb"
+require "cyrax/collection_decorator.rb"
 require "cyrax/decorator.rb"
 
 module Cyrax

data/lib/cyrax/base_presenter.rb

@@ -0,0 +1,29 @@
+class Cyrax::BasePresenter
+
+  def present(object, options = {})
+    should_decorate = options[:decorate].nil? || options[:decorate]
+    if options[:decorable] && should_decorate
+      present_with_decoration(object, options)
+    else
+      object
+    end
+  end
+
+  class << self
+
+    def present(object, options = {})
+      self.new.present(object, options)
+    end
+
+  end
+
+  private
+
+  def present_with_decoration(object, options)
+    if options[:present] == :collection 
+      options[:decorator_class].decorate_collection(object)
+    else
+      options[:decorator_class].decorate(object)
+    end
+  end
+end

data/lib/cyrax/collection_decorator.rb

@@ -0,0 +1,41 @@
+class Cyrax::CollectionDecorator
+  attr_reader :decorator_class, :collection
+
+  def initialize(collection, options = {})
+    @collection = collection
+    @decorator_class = options[:decorator_class]
+    raise "Decorator class is not defined! Please define it with option :decorator_class" unless decorator_class
+  end
+
+  class << self
+    alias_method :decorate, :new
+  end
+
+  array_methods = Array.instance_methods - Object.instance_methods
+  delegate *array_methods, to: :decorated_collection
+
+  def decorated_collection
+    @decorated_collection ||= fetched_collection.map {|item| decorate_item(item)}
+  end
+
+  def fetched_collection
+    if collection.is_a?(ActiveRecord::Relation)
+      collection.to_a
+    elsif collection.respond_to?(:all)
+      collection.all
+    else
+      Array.wrap collection
+    end
+  end
+
+  def method_missing(method, *args, &block)
+    return super unless collection.respond_to?(method)
+    collection.send(method, *args, &block)
+  end
+
+  private
+
+  def decorate_item(item)
+    decorator_class.new(item)
+  end
+end

data/lib/cyrax/decorator.rb

@@ -24,30 +24,14 @@ class Cyrax::Decorator
 
   def method_missing(method, *args, &block)
     return super unless resource.respond_to?(method)
-
     resource.send(method, *args, &block)
   end
 
   class << self
-    def fetch(resource)
-      if resource.is_a?(ActiveRecord::Relation)
-        resource.to_a
-      elsif resource.respond_to?(:all)
-        resource.all
-      else
-        resource
-      end
-    end
+    alias_method :decorate, :new
 
-    def decorate(resource)
-      resource = fetch(resource)
-      if resource.is_a?(Array)
-        resource.map do |item|
-          self.new(item)
-        end
-      else
-        self.new(resource)
-      end
+    def decorate_collection(resource)
+      Cyrax::CollectionDecorator.decorate(resource, decorator_class: self)
     end
   end
 end

data/lib/cyrax/extensions/has_response.rb

@@ -32,8 +32,8 @@ 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.decorate(resource) : resource
+      presenter_options = options.merge(decorable: decorable?, decorator_class: decorator_class)
+      result = Cyrax::BasePresenter.present(resource, presenter_options)
       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 wrapped_collection, name: collection_name
+      respond_with build_collection, name: collection_name, present: :collection
     end
     alias_method :read_all, :collection
 

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/cyrax/base_resource_spec.rb

@@ -41,7 +41,7 @@ module Cyrax
     describe '#collection' do
       it 'responds with decorated collection' do
         subject.should_receive(:build_collection).and_return(collection)
-        subject.should_receive(:respond_with).with(collection, name: 'foos')
+        subject.should_receive(:respond_with).with(collection, name: 'foos', present: :collection)
         subject.collection
       end
     end

data/spec/cyrax/extensions/has_response_spec.rb

@@ -7,6 +7,7 @@ module Cyrax
     subject { self }
     before do
       subject.stub!(:decorable?).and_return(false)
+      subject.stub!(:decorator_class).and_return(nil)
     end
 
     describe '#set_message' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Droidlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -73,8 +73,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/cyrax/base.rb
+- lib/cyrax/base_presenter.rb
 - lib/cyrax/base_resource.rb
 - lib/cyrax/callbacks.rb
+- lib/cyrax/collection_decorator.rb
 - lib/cyrax/decorator.rb
 - lib/cyrax/extensions/has_callbacks.rb
 - lib/cyrax/extensions/has_decorator.rb