cyrax 0.4.0.beta → 0.4.0.beta2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTJkY2U0ODEzYTY3NzYzNGFjZWIwMWUwMDEwNDM1ZGY4MjBlZTZmYQ==
+    OGI4MjM2YWMwNDlmNGQwNzRiZjc3ZTJiMzdlNzBkNTc5NTEyZWFmNQ==
   data.tar.gz: !binary |-
-    ZmQwYzVlNWI1Y2RjYzAwNGQ1ZmJiYjYxZjk5NjI0ZmEyM2NlMTZjYw==
+    MjE0OGIwMTBjMGFjZjRjMjI5ZTJkNzg1MzdmYTQ0ZjZjMjBmYTcyZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGQyYWE3NzU4NjZkMTE3NzE4Mzc3Y2I0MDUxMTNmMGFiNjQzYTg1NGYzNTk1
-    OTQyNjNmZmM1Yzg4ZWJlY2I5NWNjNzYxZjc0OTFhNmRkYTRkYmFiODBkYWM3
-    MzU0OGI0YjUwMjU2OTk0ZjkzYmZiYzFiOTk1YWJiOWMzZTE4YzA=
+    MWE5ZmJlZWQ0ZGQyNDBjMDA2YzQwNDlmYjkwNDM2OTIyYjBjZTg3MjU5MWQ0
+    NmE3ZmY0M2Y0N2MwNzJjNDkyY2Q2N2NiNGY5OGQyMWQxYjRkZTNiYjcxZDU1
+    OWZjNjAxZjJmNjM3MDM3YmRiOWM0YzNkYTRlZTkxOGNhNzM0ZDI=
   data.tar.gz: !binary |-
-    ZTZiODY0ZDRkZTAxYTk2ZjcwNWI5YTBhNThkY2Q2MTQ5Njk1YjljMDgzN2Q2
-    ZmZlYjMzNjJiYmMyNDBmM2U1YThlMWQ0ZWY1MjAwNDlhYTg4MmJmYzgwNjk5
-    ZGMyODdhOTA1MTU5NTAwMmYwZmRmMWYyYzFmYmUxZDRmYTJhYjg=
+    N2U5ZTU5ZWQzNDc0YjMyMDMxZTQ3OGFhYzQyNTdiMzhkYWJiZDI4MTdlMTEx
+    NmVmYTk0N2M2MGFiYmU0N2I2MmQ5NWM3YzkzZDlmNWIwMjFkZGEzNTFmZTE5
+    OTU5YWUwNWE3NTEzMjBmODEyZGJiNmI1MDA3ZmI1Njc2YzZiZTc=

data/README.md

@@ -1,4 +1,4 @@
-# Cyrax
+# Cyrax [![Build Status](https://travis-ci.org/droidlabs/cyrax.png)](https://travis-ci.org/droidlabs/cyrax) [![Code Climate](https://codeclimate.com/github/droidlabs/cyrax.png)](https://codeclimate.com/github/droidlabs/cyrax) 
 ![Cyrax](http://images2.wikia.nocookie.net/__cb20121118042055/mk/images/thumb/4/44/CyraxMK9Render.png/322px-CyraxMK9Render.png)
 > Safeties disabled; combat mode engaged.
 
@@ -6,17 +6,15 @@ Cyrax is microframework to build layered architecture, one of the core concepts
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to your Gemfile.
 
-    gem 'cyrax'
+Rails 4:
 
-And then execute:
+    gem 'cyrax', '~> 0.4.0.beta2'
 
-    $ bundle
+Rails 3:
 
-Or install it yourself as:
-
-    $ gem install cyrax
+    gem 'cyrax', '~> 0.3.8'
 
 ## Usage
 
@@ -29,3 +27,9 @@ Look at `example` folder.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Thanks for using Cyrax!
+
+Hope, you'll enjoy Cyrax!
+
+Cheers, [Droid Labs](http://droidlabs.pro).

data/lib/cyrax/extensions/has_service.rb

@@ -44,8 +44,10 @@ module Cyrax::Extensions
     # Reads a single item from the DB
     # Used for :show action in controller
     # @return [Cyrax::Response] response
-    def read
-      respond_with find_resource(params[:id])
+    def read(&block)
+      resource = find_resource(params[:id])
+      block.call(resource) if block_given?
+      respond_with resource
     end
     alias_method :read!, :read
     alias_method :edit, :read

data/lib/cyrax/helpers/controller.rb

@@ -2,19 +2,22 @@ module Cyrax::ControllerHelper
   def respond_with(*args)
     if args.present? && args.first.is_a?(Cyrax::Response)
       response, options = *args
-      default_options = {
+      options = {
         notice: response.notice,
         error: response.error
-      }
+      }.merge(options || {})
+
       set_resource_from(response)
-      flash[:notice] = response.notice if response.notice.present?
-      flash[:error] = response.error if response.error.present?
+      
+      # set flashes
+      flash[:notice] = options[:notice] if options[:notice].present?
+      flash[:error] = options[:error] if options[:error].present?
 
       # convert result to model if possible
       result = response.result
       result = result.to_model if result.respond_to?(:to_model)
 
-      super(result, default_options.merge(options || {})) do |format|
+      super(result, options) do |format|
         format.json do
           if result.respond_to?(:errors) && result.errors.present?
             render json: { errors: result.errors }

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.4.0.beta"
+  VERSION = "0.4.0.beta2"
 end

data/spec/cyrax/extensions/has_resource_spec.rb

@@ -71,6 +71,7 @@ module Cyrax
     end
 
     describe 'private methods' do
+      before { Cyrax.strong_parameters = false }
       describe '#dirty_resource_attributes' do
         context 'when params are present' do
           it 'should return from params by resource_name' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta
+  version: 0.4.0.beta2
 platform: ruby
 authors:
 - Droidlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,34 +52,6 @@ dependencies:
     - - ! '>='
       - !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'
-- !ruby/object:Gem::Dependency
-  name: rails
-  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'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -95,49 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
-  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'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  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'
-- !ruby/object:Gem::Dependency
-  name: shoulda-matchers
-  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'
-- !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='