siringa 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56fef5bef124061ab3bac9a1beafbc3828ab62b2
-  data.tar.gz: b796d80e4f3d83d0fa78d01e30582ef598589bb9
+  metadata.gz: c5650e083c7d2cf88d4556847def7c3002429a25
+  data.tar.gz: cd8b73b2bccdc1f0fd5a294d19a4e62d3f801006
 SHA512:
-  metadata.gz: 1ab9793288d3af7d4fcae48224c7eb406bd7249b9722b1d0914a52597e2b5206707055491e9ccf597c0e0d1c9455f0b04a4d94163073dba3c7b3475ea85cda65
-  data.tar.gz: 675a854c035f548366636724203e834ea781e8dfefd5b77789fe27ddef7214e75204c5bffc355573b636169a736bd2fc929f9799dc9031f5b4e175128d817210
+  metadata.gz: e342b5a35cba7e7d07222c444903bc45ccc87a7739a190f5f6f5d53d028a40ca59b3af7521193de00525465873c279c6d40f3ed787da3ef3ee822d7cd08de9ec
+  data.tar.gz: f38a3dbde4ec18a9efbed51e0200effd47a54f72782274b3869d0d8655233d94e28d43249fd448e3874e5dfb3e9329a454a34a225ef4a7f0f9ebd3e05571d89f

data/app/controllers/siringa/siringa_controller.rb

@@ -2,14 +2,12 @@ module Siringa
   class SiringaController < ApplicationController
 
     def load
-      Siringa.load_definition(params['definition'].to_sym, options)
-      resp = { :text => "Definition #{params['definition']} loaded.", :status => :created }
+      result = Siringa.load_definition(params['definition'].to_sym, options)
+      render json: result, status: :created
     rescue ArgumentError => exception
-      resp = { :text => exception.to_s, :status => :method_not_allowed }
-    rescue => exception
-      resp = { :text => exception.to_s, :status => :internal_server_error }
-    ensure
-      render resp
+      render json: { error: exception.to_s }, status: :method_not_allowed
+    rescue StandardError => exception
+      render json: { error: exception.to_s }, status: :internal_server_error
     end
 
     def dump

data/lib/siringa/version.rb

@@ -1,3 +1,3 @@
 module Siringa
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/controllers/siringa_controller_test.rb

@@ -21,8 +21,22 @@ class SiringaControllerTest < ActionController::TestCase
   end
 
   test "load action passing arguments" do
-    get :load, { definition: "definition_with_arguments", siringa_args: { name: 'Robb Stark' }, use_route: "siringa" }
+    get :load, {
+      definition: "definition_with_arguments",
+      siringa_args: { name: 'Robb Stark' },
+      use_route: "siringa"
+    }
     assert_response :success
   end
 
+  test "load action returning JSON response" do
+    get :load, {
+      definition: "definition_with_return",
+      siringa_args: { name: 'Ned' },
+      use_route: "siringa"
+    }
+    assert body['id']
+    assert_equal 'Ned', body['name']
+    assert_equal 'Stark', body['surname']
+  end
 end

data/test/dummy/test/siringa/definitions.rb

@@ -8,3 +8,8 @@ end
 Siringa.add_definition :definition_with_arguments do |args|
   FactoryGirl.create :user, name: args[:name]
 end
+
+Siringa.add_definition :definition_with_return do |args|
+  user = FactoryGirl.create :user, name: args[:name]
+  { id: user.id, name: user.name, surname: 'Stark' }
+end

data/test/test_helper.rb

@@ -8,3 +8,8 @@ Rails.backtrace_cleaner.remove_silencers!
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+# Parse JSON response body
+def body
+  JSON.parse(@response.body)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: siringa
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Enrico Stano
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3