cyrax 0.2.7 → 0.2.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmZkNDE0Yzk2N2ZjYWUyMDY0Y2MxNzIwNTBiZTBjODI4YTllM2MyMQ==
+    MDI3MGJhMmRlYWU5ZjNmNDQyNDFlNmZmODczMjQ4ZmQ5ODc3MmQ3Mg==
   data.tar.gz: !binary |-
-    OGM5ZjRlODcxOWI0OGIzNTUyOWY0MTAwYmZlOTI3NzMwM2IzM2Q2NA==
+    YjZkMWRiMDlmNTQ5YmNhZDk1MjI2NThiMGFkMGIwODBhOTljYjI4Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDYxODk5MWU5NTFhMzZlNmU4NDM3NzE1ZDBjZTJmY2I0MWI2MzM5NzJiNmE1
-    YTc0YTBjZTUzYjFmMjUwZGJmNjBkOThiOTVkNjUxMDcyOWViM2YzMDk5NDUy
-    MDlmNjhlMDg0M2Y4MmZmNmYzMDY4YjgwY2ZiMzZlNjQzNmY2MzQ=
+    ZTYwMWI1NTE4Y2M5NjkxMjA4OTI3ZDE4NzNjZDg4OTMxOTJlNjBkZjdiNTZl
+    M2Y5N2IwNmEyM2YxMmZhMTYzM2ZhMTRmMGMxMTVlYjI5OTI2MWQ0YmQ2ZjQ0
+    ODhmNWUzNTRlOWRjZGE3NDc3Njk2ZTA0YWRmYzEzMzQzNmE5NTk=
   data.tar.gz: !binary |-
-    Y2RiN2E1MTNkMDFhZGVkMjc0ZjAzNjRkMTM2Y2VjM2JmZjAzYzFlMGQ0ZTNi
-    MDM0YTM3Zjc0NDcxMzg1YjZhNWVjNjI4N2YxMjYyNjM4ODNlZjg3NjM3MzU5
-    YTFkNjdhYmY4MmE4MWYwMmUxMzI2MzdhOTAzZGM3NTNlYWNhY2Q=
+    NTc0ZDhkMmIyZDkzMDBhYWQ4NzI1ODkxNGE5ZDE0MTgzNTgzNmVlMGRjZGUy
+    YjRmYzhlMGIwMGQzNGE0Mjk2ZWY4OGFjMThhZGVjZjIwNDc1YTU2N2UzOTFj
+    ODA1OGQzOTU4YTE2MWM5N2YyNzBhZWIxYmQ5MDIzNzMzZGIxMjQ=

data/lib/cyrax.rb

@@ -9,7 +9,8 @@ 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/base_collection_presenter.rb"
+require "cyrax/decorated_collection_presenter.rb"
 require "cyrax/decorator.rb"
 
 module Cyrax

data/lib/cyrax/base_collection_presenter.rb

@@ -0,0 +1,15 @@
+class Cyrax::BaseCollectionPresenter
+  def initialize(collection, options = {})
+    @collection = collection
+  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
+end

data/lib/cyrax/base_presenter.rb

@@ -5,7 +5,7 @@ class Cyrax::BasePresenter
     if options[:decorable] && should_decorate
       present_with_decoration(object, options)
     else
-      object
+      present_without_decoration(object, options)
     end
   end
 
@@ -18,10 +18,18 @@ class Cyrax::BasePresenter
   private
 
   def present_with_decoration(object, options)
-    if options[:present] == :collection 
+    if options[:present] == :collection
       options[:decorator_class].decorate_collection(object)
     else
       options[:decorator_class].decorate(object)
     end
   end
+
+  def present_without_decoration(object, options)
+    if options[:present] == :collection
+      Cyrax::BaseCollectionPresenter.new(object).fetched_collection
+    else
+      object
+    end
+  end
 end

data/lib/cyrax/{collection_decorator.rb → decorated_collection_presenter.rb}

@@ -1,8 +1,8 @@
-class Cyrax::CollectionDecorator
-  attr_reader :decorator_class, :collection
+class Cyrax::DecoratedCollectionPresenter < Cyrax::BaseCollectionPresenter
+  attr_reader :decorator_class
 
   def initialize(collection, options = {})
-    @collection = collection
+    super
     @decorator_class = options[:decorator_class]
     raise "Decorator class is not defined! Please define it with option :decorator_class" unless decorator_class
   end
@@ -18,16 +18,6 @@ class Cyrax::CollectionDecorator
     @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)

data/lib/cyrax/decorator.rb

@@ -31,7 +31,7 @@ class Cyrax::Decorator
     alias_method :decorate, :new
 
     def decorate_collection(resource)
-      Cyrax::CollectionDecorator.decorate(resource, decorator_class: self)
+      Cyrax::DecoratedCollectionPresenter.decorate(resource, decorator_class: self)
     end
   end
 end

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

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