cyrax 0.6.1 → 0.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzIwOTAzYWY3MDAzOGIzMzgxYTNkNTAzNWQxYmIzZmVkZDZkYWVjYQ==
+    OGI2YjFjYzU3ZDA4OGJlOTNjMWQzNjcxMDMwMzYzODM3ZmRhNTVhNQ==
   data.tar.gz: !binary |-
-    ZGE0ZDNhZjAxYmU4MDIwNzhhOThiOWU1MzgwMmZhNmU2ZGRhYjI4NA==
+    ZDZjNzE5ZTM2NTAxMjI2MjllOWIyOWQ5NDk4NTQ5ZWNhYTBiYWRlZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDcyNDVjNzA1ZTQxNTExMTk3NTA4ZWViMGYyZDk1MTc2N2MzYTc3OTM0MWIy
-    YmM5MzQ1MGQ4ZjRjYTQyNmQyNmNkOGZjODhmNDQ3Y2JiM2Q0OGJkZmQxMWU4
-    NDkzYTk1ZTQyMGU1NWQzODA4OWQwZGJlNTdmODQ0ZmMxOWFjYTU=
+    YjZmOTc3OWE5MWExZmEyYmMyMTkwNGUxNDNmYzZmZjEzMTU0NWVjMTEyNTQ5
+    NmZkMDQxZDI1YWMxMTIyMjhhMTFlODZlZjJiYjhjMmFjYTc4YzNjZDE1MGNh
+    YjA4OWRiZDhiYWEzZGM0Mjc2NGVkYTNlNGM1ZjA4MjIxMWYyMDM=
   data.tar.gz: !binary |-
-    M2IxOTZkMWZhNjQ2M2EzNDEwMTFhNGY5NGMwY2NlZmFiNTI5ZThjZDc1MTU4
-    ZTAyNmY3MDg3OWQ1NTg4YThjMTE5ZjEzYTI1NWYyYTU3MzgzNGE0YThmZjQy
-    ZmZhNmIxN2E2NDJiNWQxNzRiNmNmYzg3ZTkwZTcwMzZhOGVmYTU=
+    ZTQ5YWM4NTczOTk2N2M0YzUzZDUwMWMyNWRjZmIxZDUwYWRiMzI2YzNmZjZi
+    Yzg4ZWNjYjVjYjA1YTE4NDY4OTk5YjZiMzk1NDczYWQ5ODc3NTJhY2I0YWRj
+    ZTZiNjAyMWYxOTRjNjE2MTIyOGIyNDIzMzg3NDYzYzNmNWFmOTM=

data/lib/cyrax/extensions/has_repository.rb

@@ -19,6 +19,10 @@ module Cyrax::Extensions
     end
 
     module ClassMethods
+      def inherited(subclass)
+        subclass._repository_options = self._repository_options.try(:clone)
+      end
+
       def repository(name = nil, &block)
         if name.is_a?(Symbol)
           klass, finder_name = nil, name
@@ -33,11 +37,7 @@ module Cyrax::Extensions
           self._repository_class = klass
         end
         if block_given?
-          # temporary workaround. we should not use one object hash for parent and childrens
-          if self._repository_options.present?
-            self._repository_options = self._repository_options.dup
-          end
-
+          self._repository_options = self._repository_options.try(:clone)
           self._repository_options ||= {}
           self._repository_options[:finders] ||= {}
           self._repository_options[:finders][finder_name || :scope] = block

data/lib/cyrax/extensions/has_service.rb

@@ -28,12 +28,14 @@ module Cyrax::Extensions
     # Used for :create action in controller
     # @return [Cyrax::Response] response
     def create(custom_attributes = nil, &block)
-      resource = repository.build(nil, custom_attributes||resource_attributes)
+      resource = repository.build(nil)
+      old_resource = resource.dup
+      set_resource_attributes(resource, custom_attributes||resource_attributes)
       authorize_resource!(:create, resource)
       transaction do
         if repository.save(resource)
           set_message(:created)
-          block.call(resource) if block_given?
+          block.call(resource, old_resource) if block_given?
         end
       end
       respond_with(resource)
@@ -56,12 +58,14 @@ module Cyrax::Extensions
     # Used for :update action in controller
     # @return [Cyrax::Response] response
     def update(custom_attributes = nil, &block)
-      resource = repository.build(resource_params_id, custom_attributes||resource_attributes)
+      resource = repository.build(resource_params_id)
+      old_resource = resource.dup
+      set_resource_attributes(resource, custom_attributes||resource_attributes)
       authorize_resource!(:update, resource)
       transaction do
         if repository.save(resource)
           set_message(:updated)
-          block.call(resource) if block_given?
+          block.call(resource, old_resource) if block_given?
         end
       end
       respond_with(resource)
@@ -105,26 +109,8 @@ module Cyrax::Extensions
       params[:id]
     end
 
-    # DEPRECATED METHODS
-    def resource_scope
-      ActiveSupport::Deprecation.warn "#resource_scope inside Resource deprecated. Use repository.scope instead."
-      repository.scope
-    end
-    def build_collection
-      ActiveSupport::Deprecation.warn "#build_collection inside Resource deprecated. Use repository.find_all instead."
-      repository.find_all
-    end
-    def find_resource(id)
-      ActiveSupport::Deprecation.warn "#find_resource inside Resource deprecated. Use repository.find instead."
-      repository.find(id)
-    end
-    def save_resource(resource)
-      ActiveSupport::Deprecation.warn "#save_resource inside Resource deprecated. Use repository.save instead."
-      repository.save(resource)
-    end
-    def delete_resource(resource)
-      ActiveSupport::Deprecation.warn "#delete_resource inside Resource deprecated. Use repository.delete instead."
-      repository.delete(resource)
+    def set_resource_attributes(resource, attributes = {})
+      resource.attributes = attributes
     end
   end
 end

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/spec/cyrax/resource_spec.rb

@@ -77,7 +77,8 @@ module Cyrax
       before { repository.stub(:build).and_return(resource) }
       it 'responds with resource' do
         repository.should_receive(:save).with(resource)
-        repository.should_receive(:build).with(nil, params)
+        repository.should_receive(:build).with(nil)
+        subject.should_receive(:set_resource_attributes).with(resource, params)
         subject.should_receive(:respond_with).with(resource)
         subject.create(params)
       end
@@ -105,8 +106,9 @@ module Cyrax
       let(:params) { {foo: 'bar'} }
       before { repository.stub(:build).and_return(resource) }
       it 'responds with resource' do
-        repository.should_receive(:build).with(123, params)
+        repository.should_receive(:build).with(123)
         repository.should_receive(:save).with(resource)
+        subject.should_receive(:set_resource_attributes).with(resource, params)
         subject.should_receive(:respond_with).with(resource)
         subject.update(params)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Droidlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -158,3 +158,4 @@ test_files:
 - spec/cyrax/response_spec.rb
 - spec/cyrax/serializer_spec.rb
 - spec/spec_helper.rb
+has_rdoc: