activefolder 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54a1d4226ad7639ff93a8a09e019c9e015d0ef95
-  data.tar.gz: 811f65cedf9285efda3f9014478223f800c28de0
+  metadata.gz: b8d5144e244c0cdbc5c878483014c7ad28202046
+  data.tar.gz: ee9952308d7f237e160f61e34141e6d9f3c24d96
 SHA512:
-  metadata.gz: db500b27f2ea1d858fddb93afee1944e368147233a803a0cc7f47e3d634f276f351d854fb34902ead9c90070bd16aeb18189a6ea90987d33f1b5ab2f81576ea8
-  data.tar.gz: da3743527ebff5aed791d3c759b8d735add0d56498c1509b0a3dc8c2f9367c6b1399f3b5e2bd2632c0a756713da9ea6b05a4140dd2fbea5872cf7ea5143e479b
+  metadata.gz: e388d519d6f6740cc21b2fbd01c31c96d51a7e1b7714071c8a6ea63b1470655a8315a049f74987e89e01a5d8d6560e038536ad1755f0282360bb242e9145b0af
+  data.tar.gz: e84bd1f8e413ee7042d2a5d7499074987c7a9abb22ab496ae0ad0c31d228f9a4241528e359df74b9bfd245fe4d99f90c475401c796dec92ebd4ce582ad4722e8

data/lib/activefolder/base.rb

@@ -1,28 +1,32 @@
+require 'hooks'
 require 'ostruct'
 
 require 'activefolder/model/traits/persistence'
 require 'activefolder/model/traits/relation'
 require 'activefolder/model/traits/collection'
+require 'activefolder/model/traits/validation'
 require 'activefolder/model/errors'
 
 module ActiveFolder
   class Base < OpenStruct
+    include Hooks
     include Model::Traits::Persistence
     include Model::Traits::Relation
     extend Model::Traits::Collection
+    extend Model::Traits::Validation
 
-    class << self
-      def model_name
-        model = name.demodulize
-        model.underscore.pluralize
-      end
+    define_hooks :before_save, :after_load
 
-      def model_class; self; end
-      def model_base_dir; '/' end
-    end
+    validate :name, /^(?!.*\/).*$/,
+      '"name" must not contain slashes'
+
+    validate :name, /.+/,
+      '"name" must not be empty'
+
+    validate :base_dir, /.+/,
+      '"base_dir" must not be empty'
 
     def path
-      required(:name); required(:base_dir)
       File.join(base_dir, name)
     end
 
@@ -30,11 +34,14 @@ module ActiveFolder
       self.to_h.except(:name, :base_dir)
     end
 
-    private
+    class << self
+      def model_name
+        model = name.to_s.demodulize
+        model.underscore.pluralize
+      end
 
-    def required(attr)
-      return unless send(attr).to_s.empty?
-      raise Model::AttributeError.new(attr)
+      def model_class; self; end
+      def model_base_dir; '/' end
     end
   end
 end

data/lib/activefolder/model/errors.rb

@@ -2,12 +2,6 @@ require 'activefolder/errors'
 
 module ActiveFolder
   module Model
-    class AttributeError < Error
-      def initialize(attr)
-        super("Missing attribute #{attr}")
-      end
-    end
-
     class DuplicateError < Error
       def initialize(name)
         super("Duplicate object #{name}")
@@ -19,5 +13,13 @@ module ActiveFolder
         super("Object not found #{name}")
       end
     end
+
+    class ValidationError < Error
+      def initialize(attr, schema, msg = nil)
+        if msg then super msg
+        else super("#{attr.inspect} does not match #{schema.inspect}")
+        end
+      end
+    end
   end
 end

data/lib/activefolder/model/traits/persistence.rb

@@ -10,16 +10,17 @@ module ActiveFolder
         included do
           def load
             attrs = attributes_file.load
+
             attrs.each_pair do |key,val|
               self[key] = val
             end
 
-            self
+            run_hook :after_load; self
           end
 
           def save
             attributes_file.save(attributes)
-            self
+            run_hook :before_save; self
           end
 
           def save!; self.save end

data/lib/activefolder/model/traits/relation.rb

@@ -1,4 +1,4 @@
-require 'activefolder/model/utilities/collection'
+require 'activefolder/model/utilities/folder'
 require 'activefolder/model/utilities/symbol'
 require 'activefolder/metal/files/text'
 require 'activefolder/model/traits/discovery'
@@ -14,7 +14,7 @@ module ActiveFolder
         class_methods do
           def has_many collection
             define_method collection do
-              Utilities::Collection.new(self, collection)
+              Utilities::Folder.new(self, collection)
             end
           end
 
@@ -25,11 +25,6 @@ module ActiveFolder
           end
 
           def has_one element
-            define_method :link_file do |name|
-              params = { dir: path, name: name.to_s }
-              Metal::Files::Text.new(**params)
-            end
-
             define_method element do
               begin
                 path = link_file(element).load
@@ -43,6 +38,13 @@ module ActiveFolder
             end
           end
         end
+
+        included do
+          def link_file name
+            params = { dir: path, name: name.to_s }
+            Metal::Files::Text.new(**params)
+          end
+        end
       end
     end
   end

data/lib/activefolder/model/traits/validation.rb

@@ -0,0 +1,25 @@
+require 'activefolder/model/utilities/match'
+
+module ActiveFolder
+  module Model
+    module Traits
+      module Validation
+        using Utilities::Match
+
+        def validate attribute, schema, message = nil
+          before_save do
+            unless schema.match(self.send attribute)
+              raise ValidationError.new(attribute, schema, message)
+            end
+          end
+
+          after_load do
+            unless schema.match(self.send attribute)
+              raise ValidationError.new(attribute, schema, message)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/activefolder/model/utilities/{collection.rb → folder.rb}

@@ -4,7 +4,7 @@ require 'activefolder/model/utilities/symbol'
 module ActiveFolder
   module Model
     module Utilities
-      class Collection
+      class Folder
         using Utilities::Symbol
         include Model::Traits::Collection
 

data/lib/activefolder/model/utilities/match.rb

@@ -1,5 +1,3 @@
-require 'activefolder/model/traits/enumeration'
-
 module ActiveFolder
   module Model
     module Utilities
@@ -8,6 +6,10 @@ module ActiveFolder
           def match(object); self == object end
         end
 
+        refine Class do
+          def match(object); object.is_a? self end
+        end
+
         refine Range do
           def match(object); member?(object) end
         end
@@ -27,12 +29,22 @@ module ActiveFolder
         refine Array do
           def match(object)
             any? do |condition|
-              object.to_a.any? do |element|
+              Array(object).any? do |element|
                 condition.match(element)
               end
             end
           end
         end
+
+        refine Regexp do
+          alias_method :match!, :match
+
+          def match(object)
+            match! object
+          rescue TypeError
+            false
+          end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefolder
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ben Thorner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-07 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,6 +30,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.5
+- !ruby/object:Gem::Dependency
+  name: hooks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 description: A file system ORM based on ActiveRecord. Objects are files, relations
   are folders.
 email: benthorner@outlook.com
@@ -53,7 +73,8 @@ files:
 - lib/activefolder/model/traits/enumeration.rb
 - lib/activefolder/model/traits/persistence.rb
 - lib/activefolder/model/traits/relation.rb
-- lib/activefolder/model/utilities/collection.rb
+- lib/activefolder/model/traits/validation.rb
+- lib/activefolder/model/utilities/folder.rb
 - lib/activefolder/model/utilities/match.rb
 - lib/activefolder/model/utilities/symbol.rb
 - lib/activefolder/rspec.rb