cyrax 0.5.0 → 0.5.1.beta1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTlmMTE4OTYxZTNlOGJjZWE5ZmY0NjNjNjZlNDRkZDY0YmFkZDY0ZA==
+    ZjFlMDA4MTNmMmFhOWI0NjZlMDI5NTQ5NGU4OTU3ODA0ZWM4MmMxNg==
   data.tar.gz: !binary |-
-    ODY3YmYxMWQ5NDY4NjAyNzRjYTdjM2Q4ZmFmZGU3YWQzODg1ZmRlZA==
+    ODVlNDdhM2I2ODk5NWI0MjlmYmYxOTBhYzc0ZGU5MTQyOGExNWRkNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzE5OGIzYzkxNGMzYTEzNmJjY2IxMWRiOTNlNWJiODdkOGFmZTYzYzFhZmQx
-    YmZjNTVlOTk3MzBkOTE4NTJjNmZhNGE4NzRhZDhhNzdiMTNmNjcwNGU4ZGU4
-    OWE3NmE3NmYxMTc3ZmNiMDhiOWZmZWZlZTNiZTI1NjE4NTk4Yjk=
+    MmM5ZmY0YTI5YmRkMWQ5MGNlZjkxM2JjM2RhNDhiZjg4YmU0MjEyMDZhZDYz
+    OWYxZjJjNTdmOGUwM2U2YzVkZGQ2N2NkY2JlZDQ2M2I0NmQzYTk4MDI3ODM5
+    MjcxMjYyZDgxZDE4ZTlmYWYwYTNlODJjMTYwOGJkMjM2Yjg3ZDM=
   data.tar.gz: !binary |-
-    ZGQ1MDhkZmFhZDJiN2FjYTQ0OWM0MDRjYzUzMmI1ZmFiZjViMzRiNzUxMTA1
-    OTYwNDI4NGJkYWNjMDQzMTYyZGRjODUxY2I0ZWYzMjcwYTVkZDk0YjBiN2I3
-    ODI4ZmUxMzk2NTEzYzQ5Njc5ZGEzZDJlMzQwYmY1NmFmZDdlMTQ=
+    OGIzNjMyMDRjN2YzOTQ4MjYwODYzN2ZhZWU4NWE3MzM0Yjc3OWViNTdhNjRi
+    ZjE5ZjgyMDdiNDcwMmUwNTFhMDQzOWE1ZmY0MjEwOWU4Y2E0YmIxZDljM2Fi
+    N2U3YWE5Y2JjZGVjOWQyNGY2YjBkZGRiNjMyYWM4OWM4OTM5MmM=

data/README.md

@@ -1,4 +1,4 @@
-# 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 [![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) [![Roadchange](http://roadchange.com/droidlabs/cyrax/badge.png)](http://roadchange.com/droidlabs/cyrax) 
 ![Cyrax](http://images2.wikia.nocookie.net/__cb20121118042055/mk/images/thumb/4/44/CyraxMK9Render.png/322px-CyraxMK9Render.png)
 > Safeties disabled; combat mode engaged.
 

data/lib/cyrax/helpers/controller.rb

@@ -1,5 +1,5 @@
 module Cyrax::ControllerHelper
-  def respond_with(*args)
+  def respond_with(*args, &block)
     if args.present? && args.first.is_a?(Cyrax::Response)
       response, options = *args
       options = {
@@ -14,12 +14,18 @@ module Cyrax::ControllerHelper
       result = response.result
       result = result.to_model if result.respond_to?(:to_model)
 
-      # set flashes
-      flash[:notice] = options[:notice] if options[:notice].present?
-      flash[:error] = options[:error] if options[:error].present?
-      set_resource_from(response)
-
-      super(result, options) do |format|
+      respond_to do |format|
+        format.html do
+          # set flashes
+          if response.success?
+            flash[:notice] = options[:notice] if options[:notice].present?
+          else
+            flash.now[:notice] = options[:notice] if options[:notice].present?
+            flash.now[:error] = options[:error] if options[:error].present?
+          end
+          set_resource_from(response)
+          super(result, options, &block)
+        end
         format.json do
           render json: response.as_json
         end

data/lib/cyrax/response.rb

@@ -41,7 +41,9 @@ class Cyrax::Response
   end
 
   def error
-    message || error_messages.first if failure?
+    if failure?
+      message || I18n.t("cyrax.errors.default", default: "There was appeared some errors.")
+    end
   end
 
   def has_error?(error)

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.5.0"
+  VERSION = "0.5.1.beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1.beta1
 platform: ruby
 authors:
 - Droidlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,9 +132,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.5