menilite 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2228ad770fdb5fc5a5343e3c27644c350c623e86
-  data.tar.gz: 0cc3d1e02e37a9a080e639f83c0ada12a23d87e2
+  metadata.gz: 7ff9db82163232317d82fcbfe864f020e713e3dc
+  data.tar.gz: b4511f2ece8e027dd0f0cac02632e3676d1f1fe3
 SHA512:
-  metadata.gz: c3d37d812e06e8c8f34c6b728d145a1895722809981252a7e8f2f1f0f77b37aad4dda12176a5581d6506ac06ff538b8dbeff1b3c753f65e341e4c9800aec0804
-  data.tar.gz: cdda6647a91b84a2617df44ed5c85f1ca9d785e9402e15da7c95eb4e8477fba3d56350ab9e65e4f5b6339ee7c30097c532f714def55b53f5c6a8466f66547058
+  metadata.gz: b18f844aca4213efcd77f13c6598a5b2ed16326849221d221e177d668cd751a34054e358c6c7788c23a3ef484278c4326fefe3a3b29faec3d249e1718d9a7f6b
+  data.tar.gz: 004d4eaeceb5e821e0457aeb4416930cde8e769d04a0a33fe0f61b62919f82834927c2d03387cf787b333addf9e25f09cc4857132e36c0973aa2ef5975f4f639

data/README.md

@@ -1,5 +1,7 @@
 # Menilite
 
+[![Build Status](https://travis-ci.org/youchan/menilite.svg?branch=master)](https://travis-ci.org/youchan/menilite)
+
 An isomophic web programming framework in Ruby.  
 Ruby codes also run on the client side by using [Opalrb](http://opalrb.org).
 

data/Rakefile

@@ -1,6 +1,11 @@
+require 'opal'
+require 'opal-browser'
+require 'opal/rspec/rake_task'
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
+Opal::RSpec::RakeTask.new(:default) do |server, task|
+  task.pattern = 'spec/opal/**/*_spec.rb'
+  server.append_path File.expand_path('../lib', __FILE__)
+  server.source_map = true
+  server.debug = true
+end

data/lib/menilite.rb

@@ -3,6 +3,8 @@ require "menilite/version"
 require "menilite/helper"
 
 if RUBY_ENGINE == "opal"
+  require 'native'
+  require 'browser'
   require 'menilite/model'
   require 'menilite/controller'
   require 'menilite/client/store'

data/lib/menilite/model.rb

@@ -1,6 +1,6 @@
 require 'securerandom'
 
-Menilite.if_client do
+if RUBY_ENGINE == 'opal'
   require 'browser/http'
   require 'opal-parser'
 end
@@ -13,6 +13,9 @@ class String
 end
 
 module Menilite
+  class ValidationError < StandardError; end;
+  class TypeError < StandardError; end;
+
   class Model
     include Menilite::Helper
 
@@ -21,15 +24,25 @@ module Menilite
     def initialize(fields = {})
       self.class.init
 
-      if client?
-        fields = fields.clone
-      else
+      if server?
         fields = fields.map{|k,v| [k.to_sym, v] }.to_h
+      end
+
+      @guid = fields.delete(:id) || SecureRandom.uuid
+
+      self.class.field_info.select{|_, i| i.type == :reference}.each do |name, info|
+        fields[:"#{name}_id"] = fields[info.name] if fields.has_key?(info.name)
+      end
+
+      fields.each{|k, v| type_validate(k, v) }
+      fields = fields.map{|k,v| [k, convert_value(self.class.field_info[k].type, v)] }.to_h
+
+      if server?
         fields.merge!(self.class.privilege_fields)
       end
 
       defaults = self.class.field_info.map{|k, d| [d.name, d.params[:default]] if d.params.has_key?(:default) }.compact.to_h
-      @guid = fields.delete(:id) || SecureRandom.uuid
+      fields = defaults.merge(fields)
       @fields = defaults.merge(fields)
       @listeners = {}
     end
@@ -39,6 +52,7 @@ module Menilite
     end
 
     def save(&block)
+      self.validate_all
       self.class.store.save(self, &block)
       self
     end
@@ -88,8 +102,13 @@ module Menilite
         @action_info ||= {}
       end
 
+      def validators
+        @validators ||= {}
+      end
+
       def save(collection, &block)
         self.init
+        colection.each {|obj| obj.validate_all }
         self.store.save(collection, &block)
       end
 
@@ -105,7 +124,7 @@ module Menilite
 
       def fetch(filter: {}, order: nil)
         self.init
-        filter = filter.map{|k, v| type_convert(k, v)  }.to_h
+        filter = filter.map{|k, v| type_convert(k.to_sym, v) }.to_h
 
         if_server do
           filter.merge!(privilege_filter)
@@ -118,7 +137,7 @@ module Menilite
       end
 
       def type_convert(key, value)
-        field_info = self.field_info[key.to_s] || self.field_info[key.to_s.sub(/_id\z/,'')]
+        field_info = self.field_info[key] || self.field_info[key.to_s.sub(/_id\z/,'').to_sym]
         raise "no such field #{key} in #{self}" unless field_info
         converted = case field_info.type
                     when :boolean
@@ -152,7 +171,11 @@ module Menilite
           return unless params[:server]
         end
 
-        field_info[name.to_s] = FieldInfo.new(name, type, params)
+        if type == :reference
+          field_info[:"#{name}_id"] = FieldInfo.new(name, type, params)
+        else
+          field_info[name] = FieldInfo.new(name, type, params)
+        end
 
         self.instance_eval do
           if type == :reference
@@ -160,6 +183,7 @@ module Menilite
 
             define_method(name) do
               id = @fields[field_name.to_sym]
+              next nil unless id
               model_class = Object.const_get(name.to_s.camel_case)
               model_class[id]
             end
@@ -172,14 +196,18 @@ module Menilite
           end
 
           define_method(field_name) do
-            @fields[field_name.to_sym]
+            value = @fields[field_name.to_sym]
+            if type.is_a?(Hash) && type.keys.first == :enum
+              value = type[:enum][value]
+            end
+            value
           end
 
           define_method(field_name + "=") do |value|
             unless type_validator(type).call(value, name)
-              raise 'type error'
+              raise TypeError.new("type error: field_name: #{name}, value: #{value}")
             end
-            @fields[field_name.to_sym] = value
+            @fields[field_name.to_sym] = convert_value(type, value)
             handle_event(:change, field_name.to_sym, value)
           end
         end
@@ -223,6 +251,15 @@ module Menilite
         end
       end
 
+      def validation(field_name, params = {}, &block)
+        params.each do |k, v|
+          if validator = Validators[k, v]
+            (validators[field_name] ||= []) << validator.new(field_name)
+          end
+        end
+        (validators[field_name] ||= []) << Validator.new(field_name, &block) if block
+      end
+
       def find(id)
         self.init
 
@@ -280,27 +317,58 @@ module Menilite
     def type_validator(type)
       case type
         when :string
-          -> (value, name) { value.is_a? String }
+          -> (value, name) { value.nil? || value.is_a?(String) }
         when :int
-          -> (value, name) { value.is_a? Integer }
+          -> (value, name) { value.nil? || value.is_a?(Integer) }
         when :boolean
-          -> (value, name) { value == true || value == false }
+          -> (value, name) { value.nil? || value == true || value == false }
         when :date
-          -> (value, name) { value.is_a? Date }
+          -> (value, name) { value.nil? || value.is_a?(Date) || value.is_a?(String) }
         when :time
-          -> (value, name) { value.is_a? Time }
+          -> (value, name) { value.nil? || value.is_a?(Time) }
+        when Hash
+          if type.keys.first == :enum
+            -> (value, name) { value.nil? || value.is_a?(Integer) || type[:enum].include?(value) }
+          else
+            raise TypeError.new("type error")
+          end
         when :reference
-          -> (value, name) { valiedate_reference(value, name) }
+          -> (value, name) { value.nil? || validate_reference(value, name) }
+        else
+          raise TypeError.new("type error. type: #{type.inspect}")
       end
     end
 
-    def valiedate_reference(value, name)
-      return false unless value.is_a? String
+    def validate_reference(value, name)
+      return false unless value.is_a?(String) || value.is_a?(Menilite::Model)
 
-      model_class = Object.const_get(name.camel_case)
+      model_class = Object.const_get(name.to_s.camel_case)
       not model_class[value].nil?
     end
 
+    def type_validate(name, value)
+      field_info = self.class.field_info[name]
+      field_info or raise ArgumentError.new("field '#{name}' is not defind")
+
+      type_validator = type_validator(field_info.type)
+      type_validator.call(value, field_info.name) or raise TypeError.new("type error: field_name: #{field_info.name}, value: #{value}")
+    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(','))
+      end
+    end
+
+    def validate_all
+      self.fields.each do |k, v|
+        type_validate(k, v)
+        validate(k, v)
+      end
+    end
+
     def to_h
       @fields.merge(id: @guid)
     end
@@ -311,6 +379,18 @@ module Menilite
 
     private
 
+    def convert_value(type, value)
+      if type.is_a?(Hash) && type.keys.first == :enum
+        if value.is_a?(Integer)
+          value
+        else
+          type[:enum].index(value)
+        end
+      else
+        value
+      end
+    end
+
     def get_listeners(event, field_name)
       @listeners[event].try {|l1| l1[field_name] || [] } || []
     end
@@ -322,11 +402,37 @@ module Menilite
     end
 
     def resolve_references(key, value)
-      if self.class.field_info.has_key?(key.to_s) && self.class.field_info[key.to_s].type == :reference
+      if self.class.field_info.has_key?(key) && self.class.field_info[key].type == :reference
         ["#{key}_id".to_sym, value.id]
       else
         [key, value]
       end
     end
+
+    class Validator
+      def initialize(name, &block)
+        @proc = block
+      end
+
+      def validate(value)
+        @proc.call(value)
+      end
+    end
+    class PresenceValidator < Validator
+      def initialize(name)
+        super(name) {|value| "#{name} must not be empty" if value.nil? || value == "" }
+      end
+    end
+
+    class Validators
+      def self.[](key, value)
+        case key
+        when :presence
+          if value == true
+            PresenceValidator
+          end
+        end
+      end
+    end
   end
 end

data/lib/menilite/server/activerecord_store.rb

@@ -5,7 +5,7 @@ module Menilite
     def self.create_model(model_class)
       klass = Class.new(::ActiveRecord::Base) do
         model_class.field_info.select{|name, field| field.type == :reference }.each do |name, field|
-          belongs_to field.name, primary_key: 'guid', foreign_key: name + '_guid', class_name: name.capitalize
+          belongs_to name, primary_key: 'guid', foreign_key: "#{name}_guid", class_name: name.to_s.capitalize
           #klass.instance_eval { define_method(name + '_id') { send(name + '_guid') } }
         end
       end

data/lib/menilite/version.rb

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

data/menilite.gemspec

@@ -21,6 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'opal-rspec', '0.5.0'
 
+  spec.add_runtime_dependency "opal"
+  spec.add_runtime_dependency 'opal-browser'
   spec.add_runtime_dependency "sinatra-activerecord"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: menilite
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: opal-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: opal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: opal-browser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-activerecord
   requirement: !ruby/object:Gem::Requirement