moonrope 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ca7d3b849626bd7477fd623f803efef91abf3a8
-  data.tar.gz: a448481684afb1dad860df02c8aac6f8419c9254
+  metadata.gz: 7a005ba55f00db5d481ac58a7160e591e993c39b
+  data.tar.gz: 0189df9139aa0bf21c6a991592632478a2dbd769
 SHA512:
-  metadata.gz: e4eaaf33ce1636336e0d3f4ab4a600dba3d73e63e1e46c8b420c3f576675ce7349b869805f6de11a8392cb4cd992755671a038da03cf8a88a4a8bcdb0645387f
-  data.tar.gz: d0f623ea767e7a2e5efdb52c8dd531ebf6e2a1170d42d1833443fb49d98034fa7a8d2f9a074759b3708e8750e4786a669b29bbe51123e9610e5262b462a1088b
+  metadata.gz: f6d0eb2be42d7b122abf4abc8bfbe7575523511bef0215c669f4455e44768273cc4744fddc5da475f521307e516e684e42ddab466b20014faa0d62bdd5a978ab
+  data.tar.gz: aa90abdd05744a1fd171a53f278d4b35bc5cdcbf647bfa343933538b7e2c4223617ad511a4bfbdcc5aa3aeb0ebc7a4a4da14be26f619b90317abb6e27a649557

data/lib/moonrope/rack_middleware.rb

@@ -33,15 +33,35 @@ module Moonrope
         #
         request = @base.request(env, $1)
         
+        #
+        # Set some global headers which are always returned
+        #
+        global_headers = {}
+        global_headers['Content-Type'] = 'text/plain'
+        global_headers['Access-Control-Allow-Origin'] = '*'
+        if env['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']
+          global_headers['Access-Control-Allow-Headers'] = env['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']
+        end
+        global_headers['Access-Control-Allow-Methods'] = '*'
+        
+        #
+        # Options always returns a 200
+        #
+        if env['REQUEST_METHOD'] == 'OPTIONS'
+          return [200, global_headers, ['OK']]
+        end
+        
+        #
+        # Responses are now in JSON
+        #
+        global_headers['Content-Type'] = 'application/json'
+        
         #
         # Check the request is valid
         #
         unless request.valid?
-          return [400, {}, ["Invalid API Request. Must provide a version, controller & action as /api/v1/controller/action."]]
+          return [400, global_headers, [{:status => 'invalid-controller-or-action'}.to_json]]
         end
-
-        global_headers = {}
-        global_headers['Content-Type'] = 'application/json'
         
         #
         # Execute the request

data/lib/moonrope/version.rb

@@ -1,3 +1,3 @@
 module Moonrope
-  VERSION = '1.2.3'
+  VERSION = '1.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonrope
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json