sumomo 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e272e7159b46a624aad9e1fd27d42206ff0089d
-  data.tar.gz: be5daaba9aa97814db24f976f6e0aa7f32496275
+  metadata.gz: b697bb92beda3ff58f8c91b086b5ee111e5a8e3d
+  data.tar.gz: 7dc99637fb60756dbe02b06bcbcd1784ca75eefb
 SHA512:
-  metadata.gz: 2b526710d8fb56ca84de1b0f7e7d8979534a82f8b7e8608428a804340d52e80bcf54eb7360488fdf1e33f03125b4ff45f9338319012fed37f5cfd168442387c4
-  data.tar.gz: 8c2e126517ea84d32df7b2ee77b99a7c5eba3f4d9fbfb8ac41b2cdf8e5102d952234357b22f943f7744ff0da2269856a8b0ea989071b0bb8f69a55d0e3067682
+  metadata.gz: 8b219359222421263e7d239005cf296cfc2843542868efd108678023e36ae4a07b47f45ca1e5f27a2293333c6f3bbefd71ab13d0aea1299c63be3378e4ce5f23
+  data.tar.gz: 3ed862487717d29ae36e7465ff58698388cf2111dfe52cd6aa27ce679d2a0fed4d6b2765bd32e4d199235e2a901e5763005d84ae003dc7e7950dcdc15872a398

data/lib/sumomo.rb

@@ -209,15 +209,15 @@ module Sumomo
 		if test_name
 			puts "Testing API #{test_name}"
 			apigen = Stack::APIGenerator.new(pretty_print: pretty_print, &tester.apis[test_name])
-
 		
 			script = File.read(File.join(Gem.loaded_specs['sumomo'].full_gem_path, "data", "sumomo", "api_modules", "test_script.js"))
         	script.sub!("// {{ ROUTES }}", apigen.generate);
         	script.gsub!("{{ SCRIPT }}", apigen.init_script);
 
 			File.write(".test.js", script)
+			Stack::APIGenerator.combine_modules(".test_modules")
 
-			exec "NODE_PATH=#{File.join(Gem.loaded_specs['sumomo'].full_gem_path, "data", "sumomo", "api_modules", "node_modules")} node .test.js"
+			exec "NODE_PATH=.test_modules node .test.js"
 		end
 	end
 

data/lib/sumomo/api.rb

@@ -9,7 +9,7 @@ module Sumomo
 
         def apply(&block)
             @allowed_origins = []
-            @allowed_headers = ['origin', 'content-type', 'accept', 'cache-control', 'x-requested-with', 'if-modified-since']
+            @allowed_headers = []
             instance_eval(&block) if block
         end
 
@@ -17,7 +17,7 @@ module Sumomo
             @allowed_origins << value
         end
 
-        def AllowHeaders(value)
+        def AllowHeader(value)
             @allowed_headers << value
         end
       end
@@ -29,6 +29,12 @@ module Sumomo
         # defaults
         @cors.apply do
             AllowOrigin "*"
+            AllowHeader 'origin'
+            AllowHeader 'content-type'
+            AllowHeader 'accept'
+            AllowHeader 'cache-control'
+            AllowHeader 'x-requested-with'
+            AllowHeader 'if-modified-since'
         end
         @pretty_print = pretty_print
         instance_eval(&block)
@@ -60,6 +66,13 @@ module Sumomo
           @script
       end
 
+      def self.combine_modules(dest)
+          orig_modules = File.join(Gem.loaded_specs['sumomo'].full_gem_path, "data", "sumomo", "api_modules", "node_modules")
+
+          `cp -Rad #{orig_modules}/ #{dest}/`
+          `cp -Rad node_modules/* #{dest}/`
+      end
+
       def generate
 
         if @pretty_print
@@ -161,7 +174,9 @@ module Sumomo
         script.gsub!("{{ BUCKET }}", @bucket_name);
         script.gsub!("{{ STORE_PREFIX }}", "functions/" + name);
 
-        module_dir = File.join(Gem.loaded_specs['sumomo'].full_gem_path, "data", "sumomo", "api_modules")
+        module_dir = ".build_modules"
+
+        APIGenerator.combine_modules(module_dir)
 
         files = Dir[File.join(module_dir, "**/*")].select{|x| File.file?(x)}.map do |x| 
             { name: x.sub(/^#{module_dir}\//, ""), code: File.read(x) } 
@@ -269,4 +284,4 @@ module Sumomo
     end
 
   end
-end
+end

data/lib/sumomo/version.rb

@@ -1,3 +1,3 @@
 module Sumomo
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumomo
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - David Siaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler