menilite 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 520189b4bc3d6aac748653931bd06f829f6f7087
-  data.tar.gz: fd65b49bbb321e07e8c3addd5e21d7d9c41ee3c2
+  metadata.gz: 27f419ef565f994b020d022eea673453e02a6c8a
+  data.tar.gz: b9da18be00c27e19fa8e4c214db72adfe145eb02
 SHA512:
-  metadata.gz: 52e8524e2ea17b3c76bbdb9e72c4671f6235ad644665f83597d0e065ff721d5b2d042dbe309a1037e5df13d4a4464a074928e1b48ef5fefbcd735f6e19de5a57
-  data.tar.gz: 645ba9b5abe73a3f6ff0cc009757bda2a26ac4ec2bd51abec0461758d308633b0d130aa5f9da4c6c7f64e2a74231368285ab5151758dff7355edac1cd2ccaa5b
+  metadata.gz: 8f5baa982958df003abfa0d738af9238d17e5127a01861f10588b2af58a71f561ba5ccc9a2e983972a963942eabfc4b06bf37e6c2a214b625cc5d334d23c800e
+  data.tar.gz: 08f91b60b5eb398a0878af9703be8b1bd3b1f71a1b481ea313d05deca78db52d4030159b09521f87508794493849223a4d901fd9f361dd906a1e7b22c5f28ef3

data/lib/menilite/model.rb

@@ -13,8 +13,16 @@ class String
 end
 
 module Menilite
-  class ValidationError < StandardError; end;
-  class TypeError < StandardError; end;
+  class ValidationError < StandardError
+    attr_reader :messages
+
+    def initialize(messages)
+      @messages = messages
+      super(messages.join(', '))
+    end
+  end
+
+  class TypeError < StandardError; end
 
   class Model
     include Menilite::Helper
@@ -246,7 +254,13 @@ module Menilite
               end
 
               on :failure do |res|
-                callback.call(:failure, res) if callback
+                if callback
+                  if res.json[:result] == 'validation_error'
+                    callback.call(:validation_error, Menilite::ValidationError.new(res.json[:messages]))
+                  else
+                    callback.call(:failure, res)
+                  end
+                end
               end
             end
           end
@@ -263,10 +277,10 @@ module Menilite
       def validation(field_name, params = {}, &block)
         params.each do |k, v|
           if validator = Validators[k, v]
-            (validators[field_name] ||= []) << validator.new(field_name)
+            (validators[field_name] ||= []) << validator.new(self, field_name)
           end
         end
-        (validators[field_name] ||= []) << Validator.new(field_name, &block) if block
+        (validators[field_name] ||= []) << Validator.new(self, field_name, &block) if block
       end
 
       def find(id)
@@ -364,18 +378,15 @@ module Menilite
     end
 
     def validate(name, value)
-      validator = self.class.validators[name]
-      if validator
-        messages = validator.map {|validator| validator.validate(value) }.compact
-        messages.empty? or raise ValidationError.new(messages.join(','))
+      validators = self.class.validators[name]
+      if validators
+        messages = validators.select(&:enabled?).map {|validator| validator.validate(value) }.compact
       end
     end
 
     def validate_all
-      self.fields.each do |k, v|
-        type_validate(k, v)
-        validate(k, v)
-      end
+      messages = self.class.field_info.flat_map {|k, info| validate(k, self.fields[k]) }.compact
+      messages.empty? or raise ValidationError.new(messages)
     end
 
     def to_h
@@ -419,17 +430,49 @@ module Menilite
     end
 
     class Validator
-      def initialize(name, &block)
+      include Menilite::Helper
+
+      def initialize(klass, name, &block)
+        @class = klass
         @proc = block
       end
 
       def validate(value)
         @proc.call(value)
       end
+
+      def enabled?
+        if server?
+          self.on_server
+        else
+          self.on_client
+        end
+      end
+
+      def on_server
+        true
+      end
+
+      def on_client
+        true
+      end
     end
+
     class PresenceValidator < Validator
-      def initialize(name)
-        super(name) {|value| "#{name} must not be empty" if value.nil? || value == "" }
+      def initialize(klass, name)
+        super(klass, name) {|value| "#{name} must not be empty" if value.nil? || value == "" }
+      end
+    end
+
+    class UniqueValidator < Validator
+      def initialize(klass, name)
+        super(klass, name) do |value|
+          "#{name}: '#{value}' already exist" unless klass.fetch(filter: { name => value }).empty?
+        end
+      end
+
+      def on_client
+        false
       end
     end
 
@@ -437,9 +480,9 @@ module Menilite
       def self.[](key, value)
         case key
         when :presence
-          if value == true
-            PresenceValidator
-          end
+          PresenceValidator if value == true
+        when :unique
+          UniqueValidator if value == true
         end
       end
     end

data/lib/menilite/server/router.rb

@@ -58,18 +58,15 @@ module Menilite
         rescue Menilite::ErrorWithStatusCode => e
           content_type :json
           status e.code
-
-          {:result => 'error', :message => e.message}.to_json
+          { result: 'error', message: e.message }.to_json
         rescue Menilite::ValidationError => e
           content_type :json
           status 403
-
-          {:result => 'error', :message => e.message}.to_json
+          { result: 'validation_error', message: e.message, messages: e.messages }.to_json
         rescue => e
           content_type :json
           status 500
-
-          {:result => 'error', :message => e.message}.to_json
+          { result: 'error', message: e.message }.to_json
         end
 
         enable :sessions
@@ -119,7 +116,10 @@ module Menilite
                   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
+                             klass.new(data["model"]).tap do |model|
+                               model.send(action.name, *data["args"])
+                               model.save
+                             end
                            elsif action.options[:class]
                              klass.send(action.name, *data["args"])
                            else

data/lib/menilite/version.rb

@@ -1,3 +1,3 @@
 module Menilite
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: menilite
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler