cyrax 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c6cb52988ca75e1ff0e42e4ead186b615bf182ee
-  data.tar.gz: fb57424b1ace91f230b73e1b2ff421ab26666120
-SHA512:
-  metadata.gz: 388e384b6b586fdbc4dfd55a8e9ae3380bad03b117a2242cce4828754bf63c3e3fa70a45f842900afda5f4efdaf869b25cd5ec7a5f71b1cdcc64797b10355b9f
-  data.tar.gz: cfc4d56f3c587efe4e25fda2616255c45b23ac84d67266a52f8ae4585fb2fb9311b7d9d5a33d2c12cabab3e16b8f4deaa255e08389c7003865ad3b257cb7d36c
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTk1NzA2YTkzMjQzMzQ4NTdlNzIxYWEzYzE3ZTFjY2Y3ZjIyNDE0NA==
+  data.tar.gz: !binary |-
+    MjA3NWY4YjNlMjRjNjU5Zjc2NDE2Zjc3MWRkZmRjMmMxNjUwNWU0Nw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MjlkNjFjMTRjYjVhMzVhYTk4OTNhNmIzMDQ4OTk2NDMyZDI0ZjQ2MzlkYWVj
+    ZmVmMWUxNThlMWVhMGFmNDBhN2M4NzFmYTU0Mjk5MTEwZmMyZTNiMWRiNGYy
+    YTE1OTgxMzNiOWRjN2Y0ZmZlMGMxZWViMTc5Yzg1YmRkOWQzMzA=
+  data.tar.gz: !binary |-
+    YzAwMjA4MWEwNzI3M2E1ZjgyNjllMGRlOWY3NWZkZjMwM2ViOWY5MDA2ZDZi
+    YmIxOGUwMWQ3NTc1Yjg2MjY2ZGY1YmZhOWMzNTljODI1NzlkZjI0MmEwOTI0
+    OGQwOWE2MzJiY2NlYjNhMDA1ZmQ5YjE2NDg4OWZjNzlkYzdhMzI=

data/lib/cyrax.rb

@@ -11,6 +11,7 @@ require "cyrax/serializers/scope.rb"
 require "cyrax/helpers/controller.rb"
 require "cyrax/base.rb"
 require "cyrax/resource.rb"
+require "cyrax/wrapper.rb"
 require "cyrax/presenter.rb"
 require "cyrax/response.rb"
 require "cyrax/callbacks.rb"

data/lib/cyrax/decorator.rb

@@ -1,15 +1,9 @@
 require 'active_model'
-class Cyrax::Decorator
+class Cyrax::Decorator < Cyrax::Wrapper
   include ActiveModel::Serialization
   include ActiveModel::Serializers::JSON
   include ActiveModel::Serializers::Xml
 
-  attr_accessor :resource
-
-  def initialize(resource)
-    @resource = resource
-  end
-
   def to_model
     resource
   end

data/lib/cyrax/extensions/has_response.rb

@@ -37,6 +37,7 @@ module Cyrax::Extensions
     end
 
     def respond_with(result, options = {})
+      options[:as] ||= accessor
       name = options[:name] || response_name
       result = result.result.to_model if result.is_a?(Cyrax::Response)
       if respond_to?(:decorable?) && decorable?

data/lib/cyrax/presenter.rb

@@ -1,34 +1,34 @@
-class Cyrax::Presenter
-  def present(object, options = {})
+class Cyrax::Presenter < Cyrax::Wrapper
+  def present
     should_decorate = options[:decorate].nil? || options[:decorate]
     if options[:decorator] && should_decorate
-      present_with_decoration(object, options)
+      present_with_decoration(resource, options)
     else
-      present_without_decoration(object, options)
+      present_without_decoration(resource, options)
     end
   end
 
   class << self
-    def present(object, options = {})
-      self.new.present(object, options)
+    def present(resource, options = {})
+      self.new(resource, options).present
     end
   end
 
   private
 
-  def present_with_decoration(object, options)
+  def present_with_decoration(resource, options)
     if options[:present] == :collection
-      Cyrax::Presenters::DecoratedCollection.new(object, options)
+      Cyrax::Presenters::DecoratedCollection.new(resource, options)
     else
-      options[:decorator].decorate(object)
+      options[:decorator].decorate(resource)
     end
   end
 
-  def present_without_decoration(object, options)
+  def present_without_decoration(resource, options)
     if options[:present] == :collection
-      Cyrax::Presenters::BaseCollection.new(object, options)
+      Cyrax::Presenters::BaseCollection.new(resource, options)
     else
-      object
+      resource
     end
   end
 end

data/lib/cyrax/serializer.rb

@@ -1,11 +1,7 @@
-class Cyrax::Serializer
-  attr_accessor :object
-  def initialize(object)
-    @object = object
-  end
-
+class Cyrax::Serializer < Cyrax::Wrapper
   def serialize
-    self.class.scope.serialize(object)
+    options[:serializer] = self
+    self.class.scope.serialize(resource, options)
   end
 
   class << self

data/lib/cyrax/serializers/scope.rb

@@ -2,6 +2,7 @@ module Cyrax::Serializers
   class Scope
     def initialize(&block)
       @attrs = {}
+      @dynamic_attrs = {}
       instance_eval(&block) if block_given?
     end
 
@@ -15,20 +16,26 @@ module Cyrax::Serializers
       end
     end
 
-    def attribute(attribute, options = {})
-      @attrs ||= {}
-      @attrs[attribute] ||= attribute
+    def attribute(attribute, options = {}, &block)
+      if block_given?
+        @dynamic_attrs[attribute] = block
+      else
+        @attrs[attribute] = attribute
+      end
     end
 
-    def serialize(object)
+    def serialize(resource, options = {})
       result = {}
       @attrs.map do |attribute, options|
-        value = object.send(attribute)
+        value = resource.send(attribute)
         if options.is_a?(Cyrax::Serializers::Scope)
           value = options.serialize(value)
         end
         result[attribute] = value
       end
+      @dynamic_attrs.map do |attribute, block|
+        result[attribute] = options[:serializer].instance_eval(&block)
+      end
       result
     end
   end

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/cyrax/wrapper.rb

@@ -0,0 +1,12 @@
+class Cyrax::Wrapper
+  include HasActiveLogger::Mixin
+  attr_accessor :resource
+  attr_accessor :options
+  attr_accessor :accessor
+
+  def initialize(resource = nil, options = {})
+    @resource = resource
+    @options = options
+    @accessor = options[:as]
+  end
+end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Droidlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: has_active_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Small library for adding service layer to Rails projects
@@ -90,6 +90,7 @@ files:
 - lib/cyrax/serializer.rb
 - lib/cyrax/serializers/scope.rb
 - lib/cyrax/version.rb
+- lib/cyrax/wrapper.rb
 - lib/cyrax.rb
 - LICENSE.txt
 - Rakefile
@@ -116,17 +117,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Small library for adding service layer to Rails projects