menilite 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ff9db82163232317d82fcbfe864f020e713e3dc
-  data.tar.gz: b4511f2ece8e027dd0f0cac02632e3676d1f1fe3
+  metadata.gz: dba2750ee3e0e16c13025d583535ed1197b59939
+  data.tar.gz: 3e0cbfa1fb5892f78627cec8318b6a5cd4cc0c36
 SHA512:
-  metadata.gz: b18f844aca4213efcd77f13c6598a5b2ed16326849221d221e177d668cd751a34054e358c6c7788c23a3ef484278c4326fefe3a3b29faec3d249e1718d9a7f6b
-  data.tar.gz: 004d4eaeceb5e821e0457aeb4416930cde8e769d04a0a33fe0f61b62919f82834927c2d03387cf787b333addf9e25f09cc4857132e36c0973aa2ef5975f4f639
+  metadata.gz: fd787757426405abf65e00c60627362518a2c396b031bb5eb18f91abef2d95d289a5f302b195675417b381c69174847e5b347b117fabcf2745417b9efdd4857a
+  data.tar.gz: b47e9ed1c085bb612f0c1c8214fcbb711a947f0052f44d297fbbe5d6c90f1ca9b55ee08726cb7b754127ba38f75ace9d45c2410a595d0f8af69989a7ffcbb5cb

data/README.md

@@ -51,9 +51,8 @@ You can specify another type by the following way, for example.
 
 ```ruby
 class User < Menilite::Model
-  action :signup, on_create: true do |password|
+  action :signup, save: true do |password|
     self.password = BCrypt::Password.create(password)
-    self.save
   end
 end
 ```

data/lib/menilite.rb

@@ -12,8 +12,9 @@ else
   require 'opal'
   require 'menilite/model'
   require 'menilite/controller'
-  require 'menilite/privilege'
-  require 'menilite/router'
+  require 'menilite/server/error_with_status_code'
+  require 'menilite/server/privilege'
+  require 'menilite/server/router'
   require 'menilite/server/activerecord_store'
 
   Opal.append_path File.expand_path('../', __FILE__).untaint

data/lib/menilite/model.rb

@@ -227,10 +227,19 @@ module Menilite
           end
         else
           method = Proc.new do |model, *args, &callback| # todo: should adopt keyword parameters
-            action_url = options[:on_create] || options[:class] ? "api/#{self}/#{name}" : "api/#{self}/#{model.id}/#{name}"
-            post_data = {}
-            post_data[:model] = model.to_h if options[:on_create]
-            post_data[:args] = args
+            action_url = options[:save] || options[:class] ? "api/#{self}/#{name}" : "api/#{self}/#{model.id}/#{name}"
+            post_data = { args: args }
+
+            if options[:save]
+              begin
+                model.validate_all
+              rescue => e
+                callback.call(:validation_error, e) if callback
+                return
+              end
+              post_data[:model] = model.to_h
+            end
+
             Browser::HTTP.post(action_url, post_data.to_json) do
               on :success do |res|
                 callback.call(:success, res) if callback

data/lib/menilite/server/error_with_status_code.rb

@@ -0,0 +1,22 @@
+module Menilite
+  class ErrorWithStatusCode < StandardError
+    def self.code(code)
+      klazz = Class.new(ErrorWithStatusCode)
+      klazz.instance_eval do
+        define_method(:code) { code }
+      end
+      klazz
+    end
+
+    def code
+      500
+    end
+  end
+
+  BadRequest = ErrorWithStatusCode.code(400)
+  Unauthorized = ErrorWithStatusCode.code(401)
+  PaymentRequired = ErrorWithStatusCode.code(402)
+  NotFound = ErrorWithStatusCode.code(404)
+  InternalServerError = ErrorWithStatusCode.code(500)
+  NotImplemented = ErrorWithStatusCode.code(501)
+end

data/lib/menilite/{router.rb → server/router.rb}

@@ -53,6 +53,25 @@ module Menilite
       classes = @classes
       router = self
       Sinatra.new do
+        def with_error_handler(&block)
+          block.call
+        rescue Menilite::ErrorWithStatusCode => e
+          content_type :json
+          status e.code
+
+          {:result => 'error', :message => e.message}.to_json
+        rescue Menilite::Model::ValidationError => e
+          content_type :json
+          status 403
+
+          {:result => 'error', :message => e.message}.to_json
+        rescue => e
+          content_type :json
+          status 500
+
+          {:result => 'error', :message => e.message}.to_json
+        end
+
         enable :sessions
 
         classes.each do |klass|
@@ -61,17 +80,21 @@ module Menilite
             klass.init
             resource_name = klass.name
             get "/#{resource_name}" do
-              PrivilegeService.init
-              router.before_action_handlers(klass, 'index').each {|h| self.instance_eval(&h[:proc]) }
-              order = params.delete('order')&.split(?,)
-              data = klass.fetch(filter: params, order: order)
-              json data.map(&:to_h)
+              with_error_handler do
+                PrivilegeService.init
+                router.before_action_handlers(klass, 'index').each {|h| self.instance_eval(&h[:proc]) }
+                order = params.delete('order')&.split(?,)
+                data = klass.fetch(filter: params, order: order)
+                json data.map(&:to_h)
+              end
             end
 
             get "/#{resource_name}/:id" do
-              PrivilegeService.init
-              router.before_action_handlers(klass, 'get').each {|h| self.instance_eval(&h[:proc]) }
-              json klass[params[:id]].to_h
+              with_error_handler do
+                PrivilegeService.init
+                router.before_action_handlers(klass, 'get').each {|h| self.instance_eval(&h[:proc]) }
+                json klass[params[:id]].to_h
+              end
             end
 
             post "/#{resource_name}" do
@@ -88,32 +111,36 @@ module Menilite
             end
 
             klass.action_info.each do |name, action|
-              path = action.options[:on_create] || action.options[:class] ? "/#{resource_name}/#{action.name}" : "/#{resource_name}/#{action.name}/:id"
+              path = action.options[:save] || action.options[:class] ? "/#{resource_name}/#{action.name}" : "/#{resource_name}/#{action.name}/:id"
 
               post path do
-                PrivilegeService.init
-                router.before_action_handlers(klass, action.name).each {|h| self.instance_eval(&h[:proc]) }
-                data = JSON.parse(request.body.read)
-                result = if action.options[:on_create]
-                           klass.new(data["model"]).send(action.name, *data["args"])
-                         elsif action.options[:class]
-                           klass.send(action.name, *data["args"])
-                         else
-                           klass[params[:id]].send(action.name, *data["args"])
-                         end
-                json result
+                with_error_handler do
+                  PrivilegeService.init
+                  router.before_action_handlers(klass, action.name).each {|h| self.instance_eval(&h[:proc]) }
+                  data = JSON.parse(request.body.read)
+                  result = if action.options[:save]
+                             klass.new(data["model"]).send(action.name, *data["args"]).save
+                           elsif action.options[:class]
+                             klass.send(action.name, *data["args"])
+                           else
+                             klass[params[:id]].send(action.name, *data["args"])
+                           end
+                  json result
+                end
               end
             end
           when klass.subclass_of?(Menilite::Controller)
             klass.action_info.each do |name, action|
               path = klass.respond_to?(:namespace) ? "/#{klass.namespace}/#{action.name}" : "/#{action.name}"
-              post path  do
-                PrivilegeService.init
-                router.before_action_handlers(klass, action.name).each {|h| self.instance_eval(&h[:proc]) }
-                data = JSON.parse(request.body.read)
-                controller = klass.new(session, settings)
-                result = controller.send(action.name, *data["args"])
-                json result
+              post path do
+                with_error_handler do
+                  PrivilegeService.init
+                  router.before_action_handlers(klass, action.name).each {|h| self.instance_eval(&h[:proc]) }
+                  data = JSON.parse(request.body.read)
+                  controller = klass.new(session, settings)
+                  result = controller.send(action.name, *data["args"])
+                  json result
+                end
               end
             end
           end

data/lib/menilite/version.rb

@@ -1,3 +1,3 @@
 module Menilite
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: menilite
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,9 +129,10 @@ files:
 - lib/menilite/controller.rb
 - lib/menilite/helper.rb
 - lib/menilite/model.rb
-- lib/menilite/privilege.rb
-- lib/menilite/router.rb
 - lib/menilite/server/activerecord_store.rb
+- lib/menilite/server/error_with_status_code.rb
+- lib/menilite/server/privilege.rb
+- lib/menilite/server/router.rb
 - lib/menilite/server/store.rb
 - lib/menilite/version.rb
 - menilite.gemspec