menilite 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fc23c86e73dc266b4778000012b7fac48fa54baa55634d2b2624d55d9087626
-  data.tar.gz: c9f3ed1dbf225c237364d3a4df99551eb4f4e82b0032f246a743e9e05a7b5c88
+  metadata.gz: 764faea5732c888bde98d4755617fdbc908f493bce35b3d2d5fca1fee388d8a6
+  data.tar.gz: 75a9e0e3ca6773ed3bc62e0d8e9433e91addffaa7cb1f37a19ed396fab5d1947
 SHA512:
-  metadata.gz: 5d038488bf0af42feddac643a53823cb1ea5ba9166d143ff919d2f5bba1aa8e2296fa18216a9b33bba8f23f0a7b8ce78ca89c8031f19d27082ef6d4ed736a6a7
-  data.tar.gz: 2baf9395816f90d34ac6ee43db0a6209c18ea65be726e704908bd3aa1a7e5d8cc1dfa0f19539dc85624399735ef5f62e7d350e44a4f5f67bdb52470759d935ad
+  metadata.gz: 130512b2b357eaae83cd8cc0dec07d0e74ec0353e1f289a20338bc1fce8e87106513dad1c10c458fd9e91fe702ecfb6e1843718f4500513cc1a1663acaceb204
+  data.tar.gz: '09602d8bfa2a2ae0482ad0edf6ce7657e0ce9cc44b8b82b781fbe9bf41db5372038880697c1abdac9880c4fdae016d023117a320ae6418def6c4f9b59db9cd4d'

data/docs/articles/controller.md

@@ -0,0 +1,5 @@
+# Controller
+
+## before action
+
+

data/lib/menilite/client/http.rb

@@ -73,7 +73,7 @@ module Menilite
         @listeners[:success].call(res)
       end
 
-      def failure
+      def failure(res)
         @listeners[:failure].call(res)
       end
     end

data/lib/menilite/controller.rb

@@ -5,20 +5,15 @@ end
 module Menilite
   class Controller
     unless RUBY_ENGINE == 'opal'
-      def initialize(session, settings)
+      attr_reader :settings, :session, :request
+
+      def initialize(session, settings, request)
         @settings = settings
         @session = session
+        @request = request
       end
     end
 
-    def session
-      @session
-    end
-
-    def settings
-      @settings
-    end
-
     class << self
       def action_info
         @action_info ||= {}

data/lib/menilite/model.rb

@@ -206,9 +206,9 @@ module Menilite
           return unless params[:server]
         end
 
-        field_info[name] = FieldInfo.new(name, type, params)
+        field_info[name] = FieldInfo.new(self, name, type, params)
         if type == :reference
-          field_info["#{name}_id".to_sym] = FieldInfo.new("#{name}_id", :id, {})
+          field_info["#{name}_id".to_sym] = FieldInfo.new(self, "#{name}_id", :id, {})
         end
 
         self.instance_eval do
@@ -258,7 +258,7 @@ module Menilite
           end
         else
           method = Proc.new do |model, *args, &callback| # todo: should adopt keyword parameters
-            action_url = options[:save] || options[:class] ? "api/#{self}/#{name}" : "api/#{self}/#{model.id}/#{name}"
+            action_url = options[:save] || options[:class] ? "/api/#{self}/#{name}" : "/api/#{self}/#{model.id}/#{name}"
             post_data = { args: args }
 
             if options[:save]
@@ -278,10 +278,13 @@ module Menilite
 
               on :failure do |res|
                 if callback
-                  if res.json[:result] == 'validation_error'
-                    callback.call(:validation_error, Menilite::ValidationError.new(res.json[:messages]))
-                  else
-                    callback.call(:failure, res)
+                  res.json.then do |json|
+                    json = JSON.from_object(json)
+                    if json[:result] == 'validation_error'
+                      callback.call(:validation_error, Menilite::ValidationError.new(json[:messages]))
+                    else
+                      callback.call(:failure, json)
+                    end
                   end
                 end
               end
@@ -300,10 +303,10 @@ module Menilite
       def validation(field_name, params = {}, &block)
         params.each do |k, v|
           if validator = Validators[k, v]
-            (validators[field_name] ||= []) << validator.new(self, field_name)
+            self.field_info[field_name].validators << validator.new(self, field_name)
           end
         end
-        (validators[field_name] ||= []) << Validator.new(self, field_name, &block) if block
+        self.field_info[field_name].validators << Validator.new(self, field_name, &block) if block
       end
 
       def permit(privileges)
@@ -406,14 +409,11 @@ module Menilite
     end
 
     def validate(name, value)
-      validators = self.class.validators[name]
-      if validators
-        messages = validators.select(&:enabled?).map {|validator| validator.validate(value) }.compact
-      end
+      self.class.field_info[name].valudate(self, value)
     end
 
     def validate_all
-      messages = self.class.field_info.flat_map {|k, info| validate(k, self.fields[k]) }.compact
+      messages = self.class.field_info.flat_map {|k, info| info.validate(self, self.fields[k]) }.compact
       messages.empty? or raise ValidationError.new(messages)
     end
 
@@ -472,7 +472,23 @@ module Menilite
       end
     end
 
-    class FieldInfo < Struct.new(:name, :type, :params)
+    class FieldInfo < Struct.new(:model_class, :name, :type, :params)
+      attr_reader :validators
+
+      def initialize(model_class, name, type, params)
+        @validators = []
+        params.each do |k, v|
+          if validator = Validators[k, v]
+            @validators << validator.new(model_class, name)
+          end
+        end
+        super
+      end
+
+      def validate(obj, value)
+        @validators.select(&:enabled?).map {|validator| validator.validate(obj, value) }.compact
+      end
+
       def default
         params[:default] if params.has_key?(:default)
       end
@@ -486,8 +502,8 @@ module Menilite
         @proc = block
       end
 
-      def validate(value)
-        @proc.call(value)
+      def validate(obj, value)
+        @proc.call(obj, value)
       end
 
       def enabled?
@@ -509,14 +525,15 @@ module Menilite
 
     class PresenceValidator < Validator
       def initialize(klass, name)
-        super(klass, name) {|value| "#{name} must not be empty" if value.nil? || value == "" }
+        super(klass, name) {|obj, 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?
+        super(klass, name) do |obj, value|
+          pp obj
+          "#{name}: '#{value}' already exist #{klass.fetch(filter: { name => value })}" unless klass.fetch(filter: { name => value }).reject{|x|  x.id == obj.id }.empty?
         end
       end
 

data/lib/menilite/model/association.rb

@@ -36,6 +36,8 @@ module Menilite
         if field
           raise UnacquiredDataAccess.new unless @model
           @model.send(method_sym, *args)
+        elsif @model && @model.respond_to?(method_sym)
+          @model.send(method_sym, *args)
         else
           super
         end

data/lib/menilite/server/router.rb

@@ -162,7 +162,7 @@ module Menilite
                   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)
+                  controller = klass.new(session, settings, request)
                   result = controller.send(action.name, *data["args"])
                   json result
                 end

data/lib/menilite/version.rb

@@ -1,3 +1,3 @@
 module Menilite
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: menilite
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-09 00:00:00.000000000 Z
+date: 2019-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docs/articles/controller.md
 - docs/articles/getting-started.md
 - docs/articles/list.yaml
 - docs/articles/model.md