cyrax 0.5.15 → 0.6.0.beta

data/lib/cyrax/serializers/scope.rb

@@ -5,7 +5,6 @@ module Cyrax::Serializers
       @dynamic_attrs = {}
       @relation_attrs = {}
       @namespace_attrs = {}
-      @assigned_attrs = {}
       @default_attributes = false
       instance_eval(&block) if block_given?
     end
@@ -14,10 +13,6 @@ module Cyrax::Serializers
       @namespace_attrs[name] = self.class.new(&block)
     end
 
-    def assigned(name, &block)
-      @assigned_attrs[name] = self.class.new(&block)
-    end
-
     def relation(attribute, &block)
       if block_given?
         @relation_attrs[attribute] = self.class.new(&block)
@@ -25,8 +20,6 @@ module Cyrax::Serializers
         @attrs[attribute] = attribute
       end
     end
-    alias_method :has_many, :relation
-    alias_method :has_one, :relation
 
     def default_attributes
       @default_attributes = true
@@ -47,9 +40,7 @@ module Cyrax::Serializers
     end
 
     def serialize(resource, options = {})
-      if resource.nil?
-        nil
-      elsif resource.respond_to?(:to_a)
+      if resource.respond_to?(:to_a)
         resource.to_a.map{ |r| serialize_one(r, options) }
       else
         serialize_one(resource, options)
@@ -62,19 +53,14 @@ module Cyrax::Serializers
         result = resource.attributes rescue {}
       end
       @dynamic_attrs.map do |attribute, block|
-        result[attribute] = options[:serializer].instance_exec(resource, options, &block)
+        result[attribute] = options[:serializer].instance_exec(resource, &block)
       end
       @relation_attrs.map do |attribute, scope|
         value = resource.send(attribute)
-        result[attribute] = scope.serialize(value, options)
-      end
-      @assigned_attrs.map do |attribute, scope|
-        assignments = options[:assignments] || {}
-        value = assignments[attribute]
-        result[attribute] = scope.serialize(value, options)
+        result[attribute] = scope.serialize(value)
       end
       @namespace_attrs.map do |attribute, scope|
-        result[attribute] = scope.serialize(resource, options)
+        result[attribute] = scope.serialize(resource)
       end
       @attrs.map do |attribute, options|
         result[attribute] = resource.send(attribute)

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.5.15"
+  VERSION = "0.6.0.beta"
 end

data/lib/cyrax.rb

@@ -6,6 +6,7 @@ require "cyrax/extensions/has_response.rb"
 require "cyrax/extensions/has_service.rb"
 require "cyrax/extensions/has_decorator.rb"
 require "cyrax/extensions/has_serializer.rb"
+require "cyrax/extensions/has_repository.rb"
 require "cyrax/presenters/base_collection.rb"
 require "cyrax/presenters/decorated_collection.rb"
 require "cyrax/serializers/scope.rb"
@@ -17,10 +18,10 @@ require "cyrax/presenter.rb"
 require "cyrax/response.rb"
 require "cyrax/decorator.rb"
 require "cyrax/serializer.rb"
+require "cyrax/repository.rb"
 
 module Cyrax
   @@strong_parameters = true
-  @@automatically_set_invalid_status = true
 
   def self.strong_parameters
     @@strong_parameters
@@ -29,12 +30,4 @@ module Cyrax
   def self.strong_parameters=(value)
     @@strong_parameters = value
   end
-
-  def self.automatically_set_invalid_status
-    @@automatically_set_invalid_status
-  end
-
-  def self.automatically_set_invalid_status=(value)
-    @@automatically_set_invalid_status = value
-  end
 end

data/spec/cyrax/extensions/has_decorator_spec.rb

@@ -20,26 +20,26 @@ module Cyrax
     subject { BaseWithDecorator.new }
 
     describe 'class attributes' do
-      its(:class) { should respond_to(:decorator_class_name) }
+      its(:class) { should respond_to(:_decorator_class) }
     end
 
     describe 'class methods' do
       describe '#decorator' do
-        before { subject.class.decorator(:foo) }
+        before { subject.class.decorator(Foo) }
 
-        its(:decorator_class_name) { should eq('foo') }
+        its(:decorator_class) { should eq(Foo) }
       end
     end
 
     describe 'instance methods' do
       describe '#decorator_class' do
-        before { subject.class.decorator(:foo) }
+        before { subject.class.decorator(Foo) }
         its(:decorator_class) { should eq(Foo) }
       end
 
       describe '#decorable?' do
         context 'when `decorator_class_name` present' do
-          before { subject.class.decorator(:foo) }
+          before { subject.class.decorator(Foo) }
           its(:decorable?) { should be_true }
         end
 

data/spec/cyrax/extensions/has_repository_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+class Bar; end
+class Foo; end
+
+module Cyrax
+  class BaseWithRepository < Cyrax::Base
+    include Cyrax::Extensions::HasRepository
+  end
+
+  describe Cyrax::Extensions::HasRepository do
+    subject { BaseWithRepository.new }
+
+    describe 'class attributes' do
+      its(:class) { should respond_to(:_repository_class) }
+    end
+
+    describe 'class methods' do
+      describe '#repository' do
+        context "define repository class" do
+          before { subject.class.repository(Foo) }
+          
+          its(:repository_class) { should eq(Foo) }
+        end
+      end
+    end
+  end
+end

data/spec/cyrax/extensions/has_resource_spec.rb

@@ -18,16 +18,17 @@ module Cyrax
     subject { BaseWithResource.new }
 
     describe 'class attributes' do
-      its(:class) { should respond_to(:resource_name) }
-      its(:class) { should respond_to(:resource_class_name) }
+      its(:class) { should respond_to(:_resource_name) }
+      its(:class) { should respond_to(:_collection_name) }
+      its(:class) { should respond_to(:_resource_class) }
     end
 
     describe 'class methods' do
       describe '#resource' do
-        before { subject.class.resource(:foo, class_name:'bar', name:'bazz') }
+        before { subject.class.resource(:foo, class: Bar, name:'bazz') }
 
         its(:resource_name) { should eq('foo') }
-        its(:resource_class_name) { should eq('bar') }
+        its(:resource_class) { should eq(Bar) }
       end
     end
 
@@ -45,7 +46,7 @@ module Cyrax
 
       describe '#resource_class' do
         context 'when `class_name` option is supplied' do
-          before { subject.class.resource(:foo, class_name:'Bar') }
+          before { subject.class.resource(:foo, class: Bar) }
           its(:resource_class) { should eq(Bar) }
         end
 
@@ -55,11 +56,6 @@ module Cyrax
         end
       end
 
-      describe '#resource_scope' do
-        before { subject.stub(:resource_class).and_return(Foo) }
-        its(:resource_scope) { should eq(Foo) }
-      end
-
       describe '#resource_attributes' do
         let(:dirty_resource_attributes) { double }
         before { subject.stub(:dirty_resource_attributes).and_return(dirty_resource_attributes)}
@@ -88,11 +84,6 @@ module Cyrax
           end
         end
       end
-      describe '#default_resource_attributes' do
-        it 'should return empty hash by default' do
-          subject.send(:default_resource_attributes).should eq({})
-        end
-      end
 
       describe '#filter_attributes' do
         it 'should return supplied attributes by default' do

data/spec/cyrax/extensions/has_response_spec.rb

@@ -59,7 +59,7 @@ module Cyrax
     describe '#respond_with' do
       before { subject.stub(:response_name).and_return(:foo) }
       it 'calls Cyrax::Response' do
-        Cyrax::Response.should_receive(:new).with(:foo, 'bar', {as: nil, assignments: nil}).and_return(double.as_null_object)
+        Cyrax::Response.should_receive(:new).with(:foo, 'bar', {as: nil}).and_return(double.as_null_object)
         subject.respond_with('bar')
       end
 

data/spec/cyrax/extensions/has_service_spec.rb

@@ -16,48 +16,5 @@ module Cyrax
 
   describe Cyrax::Extensions::HasResource do
     subject { BaseWithService.new }
-
-    describe 'instance methods' do
-      describe '#build_collection' do
-        before { subject.stub(:resource_scope).and_return(Foo) }
-        its(:build_collection) { should eq(Foo) }
-      end
-
-      describe '#find_resource' do
-        let(:resource_scope) { double }
-        before { subject.stub(:resource_scope).and_return(resource_scope) }
-        it 'finds resource by id' do
-          allow_message_expectations_on_nil
-          resource_scope.should_receive(:find).with(123)
-          subject.find_resource(123)
-        end
-      end
-
-      describe '#build_resource' do
-        context 'when id is nil' do
-          let(:resource_scope) { double }
-          before { subject.stub(:resource_scope).and_return(resource_scope) }
-          before { subject.stub(:default_resource_attributes).and_return({}) }
-          it 'initializes new object' do
-            allow_message_expectations_on_nil
-            resource_scope.should_receive(:new).with({foo: 'bar'})
-            subject.build_resource(nil, {foo: 'bar'})
-          end
-        end
-        context 'when id is present' do
-          let(:resource) { double.as_null_object }
-          it 'finds resource' do
-            subject.should_receive(:find_resource).with(123).and_return(resource)
-            subject.build_resource(123, {foo: 'bar'})
-          end
-
-          it 'assigns provided attributes' do
-            subject.stub(:find_resource).and_return(resource)
-            resource.should_receive(:attributes=).with({foo: 'bar'})
-            subject.build_resource(123, {foo: 'bar'})
-          end
-        end
-      end
-    end
   end
 end

data/spec/cyrax/repository_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+class Foo; end
+module Cyrax
+  describe Repository do
+    describe 'it should behave like repository' do
+      context 'instance methods' do
+        subject { Cyrax::Repository.new }
+        it{ should respond_to(:resource_class) }
+        it{ should respond_to(:scope) }
+        it{ should respond_to(:build) }
+        it{ should respond_to(:find_all) }
+        it{ should respond_to(:find) }
+        it{ should respond_to(:save) }
+        it{ should respond_to(:delete) }
+      end
+    end
+
+    describe 'instance methods' do
+      describe '#find_all' do
+        let(:scope) { double }
+        before { subject.stub(:scope).and_return(scope) }
+        it 'finds all objects by default' do
+          scope.should_receive(:all)
+          subject.find_all
+        end
+      end
+
+      describe '#find_resource' do
+        let(:scope) { double }
+        before { subject.stub(:scope).and_return(scope) }
+        it 'finds resource by id' do
+          allow_message_expectations_on_nil
+          scope.should_receive(:find).with(123)
+          subject.find(123)
+        end
+      end
+
+      describe '#build_resource' do
+        context 'when id is nil' do
+          let(:scope) { double }
+          before { subject.stub(:scope).and_return(scope) }
+          before { subject.stub(:default_attributes).and_return({}) }
+          it 'initializes new object' do
+            allow_message_expectations_on_nil
+            scope.should_receive(:new).with({foo: 'bar'})
+            subject.build(nil, {foo: 'bar'})
+          end
+        end
+        context 'when id is present' do
+          let(:resource) { double.as_null_object }
+          it 'finds resource' do
+            subject.should_receive(:find).with(123).and_return(resource)
+            subject.build(123, {foo: 'bar'})
+          end
+
+          it 'assigns provided attributes' do
+            subject.stub(:find).and_return(resource)
+            resource.should_receive(:attributes=).with({foo: 'bar'})
+            subject.build(123, {foo: 'bar'})
+          end
+        end
+      end
+
+      describe '#default_attributes' do
+        it 'should return empty hash by default' do
+          subject.send(:default_attributes).should eq({})
+        end
+      end
+    end
+  end
+end

data/spec/cyrax/resource_spec.rb

@@ -10,11 +10,7 @@ module Cyrax
         it{ should respond_to(:params) }
         it{ should respond_to(:resource_name) }
         it{ should respond_to(:resource_class) }
-        it{ should respond_to(:resource_scope) }
         it{ should respond_to(:resource_attributes) }
-        it{ should respond_to(:build_resource) }
-        it{ should respond_to(:build_collection) }
-        it{ should respond_to(:find_resource) }
         it{ should respond_to(:assign_resource) }
         it{ should respond_to(:respond_with) }
         it{ should respond_to(:set_message) }
@@ -25,17 +21,19 @@ module Cyrax
     end
 
     subject { Cyrax::Resource.new }
+    let(:repository) { double }
     let(:resource) { double.as_null_object }
     let(:collection) { [double] }
     before do
       subject.stub(:params).and_return({id:123})
-      subject.stub(:find_resource).and_return(resource)
+      subject.stub(:repository).and_return(repository)
+      repository.stub(:find).and_return(resource)
       subject.class.send :resource, :foo
     end
 
     describe '#read_all' do
       it 'responds with decorated collection' do
-        subject.should_receive(:build_collection).and_return(collection)
+        repository.should_receive(:find_all).and_return(collection)
         subject.should_receive(:respond_with).with(collection, name: 'foos', present: :collection)
         subject.read_all
       end
@@ -43,7 +41,7 @@ module Cyrax
 
     describe '#build' do
       it 'responds with resource' do
-        subject.should_receive(:build_resource).with(nil).and_return(resource)
+        repository.should_receive(:build).with(nil).and_return(resource)
         subject.should_receive(:respond_with).with(resource)
         subject.build
       end
@@ -51,7 +49,7 @@ module Cyrax
 
     describe '#edit' do
       it 'responds with resource' do
-        subject.should_receive(:find_resource)
+        repository.should_receive(:find)
         subject.should_receive(:respond_with).with(resource)
         subject.edit
       end
@@ -59,36 +57,33 @@ module Cyrax
 
     describe '#read' do
       it 'responds with resource' do
-        subject.should_receive(:find_resource)
+        repository.should_receive(:find)
         subject.should_receive(:respond_with).with(resource)
         subject.read
       end
     end
 
     describe '#destroy' do
-      it 'responds with resource' do
-        subject.should_receive(:find_resource)
+      it 'destroys resource and responds with resource' do
+        repository.should_receive(:find)
+        repository.should_receive(:delete)
         subject.should_receive(:respond_with).with(resource)
         subject.destroy
       end
-
-      it 'destroys resource' do
-        resource.should_receive(:destroy)
-        subject.destroy
-      end
     end
 
     describe '#create' do
       let(:params) { {foo: 'bar'} }
-      before { subject.stub(:build_resource).and_return(resource) }
+      before { repository.stub(:build).and_return(resource) }
       it 'responds with resource' do
-        subject.should_receive(:build_resource).with(nil, params)
+        repository.should_receive(:save).with(resource)
+        repository.should_receive(:build).with(nil, params)
         subject.should_receive(:respond_with).with(resource)
         subject.create(params)
       end
 
       context 'when resource successfully saved' do
-        before { resource.stub(:save).and_return(true) }
+        before { repository.stub(:save).and_return(true) }
 
         it 'sets message' do
           subject.should_receive(:set_message).with(:created)
@@ -97,31 +92,27 @@ module Cyrax
       end
 
       context 'when resource could not be saved' do
-        before { resource.stub(:save).and_return(false) }
+        before { repository.stub(:save).and_return(false) }
 
         it 'does not set message' do
           subject.should_not_receive(:set_message).with(:created)
           subject.create(params)
         end
-
-        it "sets 422 status" do
-          subject.should_receive(:set_status).with(422)
-          subject.create(params)
-        end
       end
     end
 
     describe '#update' do
       let(:params) { {foo: 'bar'} }
-      before { subject.stub(:build_resource).and_return(resource) }
+      before { repository.stub(:build).and_return(resource) }
       it 'responds with resource' do
-        subject.should_receive(:build_resource).with(123, params)
+        repository.should_receive(:build).with(123, params)
+        repository.should_receive(:save).with(resource)
         subject.should_receive(:respond_with).with(resource)
         subject.update(params)
       end
 
       context 'when resource successfully saved' do
-        before { resource.stub(:save).and_return(true) }
+        before { repository.stub(:save).and_return(true) }
 
         it 'sets message' do
           subject.should_receive(:set_message).with(:updated)
@@ -130,16 +121,11 @@ module Cyrax
       end
 
       context 'when resource could not be saved' do
-        before { resource.stub(:save).and_return(false) }
+        before { repository.stub(:save).and_return(false) }
 
         it 'does not set message' do
           subject.should_not_receive(:set_message).with(:created)
-          subject.update(params)
-        end
-
-        it "sets 422 status" do
-          subject.should_receive(:set_status).with(422)
-          subject.update(params)
+          subject.create(params)
         end
       end
     end

data/spec/cyrax/serializer_spec.rb

@@ -8,25 +8,16 @@ class FooSerializer < Cyrax::Serializer
   relation :another do
     attributes :another_foo, :another_bar
   end
-  relation :empty_relation_many do
-    attributes :another_foo, :another_bar
-  end
-  relation :empty_relation_one do
-    attributes :another_foo, :another_bar
-  end
 end
 
 module Cyrax
   describe FooSerializer do
-    let(:serializable) {
+    let(:serializable) { 
       double(
         name: 'me',
         foo: '2342',
         bar: '4223',
-        another: double(another_foo: '1234', another_bar: '1234'),
-        empty_relation_one: nil,
-        empty_relation_many: []
-      )
+        another: double(another_foo: '1234', another_bar: '1234')) 
     }
     subject { FooSerializer.new(serializable).serialize }
 
@@ -34,8 +25,6 @@ module Cyrax
       subject[:name].should eq('me')
       subject[:some][:foo].should eq('2342')
       subject[:another][:another_foo].should eq('1234')
-      subject[:empty_relation_one].should eq(nil)
-      subject[:empty_relation_many].should eq([])
     end
   end
 end