vorm 0.0.2.alpha → 0.0.3.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0226887b2444ffaa689f04548cdfc5365cfe4189
-  data.tar.gz: 6a8989a13c330ba6c213cfba69197b61127128da
+  metadata.gz: 8e049baeffcdf4458ff5c973dfcbb38ce7fb0301
+  data.tar.gz: b0dc12e80852cbe360a3487418c63ab247f4e9d1
 SHA512:
-  metadata.gz: 940b8ba11cc2b72732127c375e4ce761c830a8d96e053aa396e84c9e39d36fb5ad1ffc68428ea1f22aaadaca1e3ae8c00754726ae922916831789ebc53a97417
-  data.tar.gz: 1cd848b8b1b8dfc82706dc3d303ac0698309496a06e29368ef65c298fdb4d0943415b1ce278d84cd23569c83777013d404b0c18b9f51fbf84c0b77fadd766ec2
+  metadata.gz: 161b9f07774a7eddbcadc2e2fac3e45ea702be6bb6f294950fd7a19413b7392af33048d221aa69c5c219a822eeaf0acab2f33aae99a6931bfd199592157b9ebd
+  data.tar.gz: cd25a537c2f48f9543913320d83deb0c749ad65d846e5caa0a8608c81cd22fbd46f0e688b23106ecb1e5bf773797de42d38b4a3fef823e50a82dc5b9ff1be9ad

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
+group :development, :test do
+  gem "byebug", "~> 3.5"
+end
+

data/lib/vorm/validatable.rb

@@ -0,0 +1,23 @@
+module Vorm
+  module Validatable
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def validates(field, &validator)
+        raise(ArgumentError, "Field name must be a string") if field && !field.is_a?(String)
+        raise(ArgumentError, "You must provide a block") if !block_given?
+        _add_validator(field, validator)
+      end
+
+    private
+
+      def _add_validator(field, validator)
+        @validators ||= Hash.new { |k, v| k[v] = [] }
+        @validators[field] << validator
+      end
+    end
+  end
+end
+

data/lib/vorm/version.rb

@@ -1,4 +1,4 @@
 module Vorm
-  VERSION = "0.0.2.alpha"
+  VERSION = "0.0.3.alpha"
 end
 

data/lib/vorm.rb

@@ -1,4 +1,5 @@
 require 'vorm/version'
+require 'vorm/validatable'
 require 'vorm/persistable'
 require 'vorm/model'
 

data/spec/lib/vorm/model_spec.rb

@@ -1,81 +1,9 @@
-module Vorm
-  class Model
-    def self.reset
-      @table = nil
-      @fields = nil
-    end
-  end
-end
-
 describe Vorm::Model do
   context "class methods" do
     subject { Vorm::Model }
 
-    describe ".table" do
-      before { subject.reset }
-
-      it { is_expected.to respond_to(:table) }
-
-      it "raises when name is not string" do
-        expect { subject.table(:users) }
-        .to raise_error(ArgumentError, "Table name must be a string")
-      end
-
-      it "sets the table correctly" do
-        expect { subject.table('users') }
-        .to change(subject, :table).to('users')
-      end
-
-      it "gets the table" do
-        subject.table('users')
-        expect(subject.table).to eq('users')
-      end
-
-      it "setting the table again does not change it (cached)" do
-        subject.table('users')
-        expect { subject.table('another table') }
-        .not_to change(subject, :table)
-      end
-    end
-
-    describe ".field" do
-      before { subject.reset }
-
-      it { is_expected.to respond_to(:field) }
-
-      it "raises when name is not string" do
-        expect { subject.field(:email) }
-        .to raise_error(ArgumentError, "Field name must be a string")
-      end
-
-      it "sets the field correctly" do
-        expect { subject.field('email') }
-        .to change(subject, :fields)
-      end
-
-
-      it "ignores duplicates" do
-        subject.field('email')
-        subject.field('email')
-        expect(subject.fields).to eq(Set.new(['email']))
-      end
-    end
-
-    describe ".fields" do
-      before { subject.reset }
-
-      it { is_expected.to respond_to(:fields) }
-
-      it "gets fields when only one set" do
-        subject.field('email')
-        expect(subject.fields).to eq(Set.new(['email']))
-      end
-
-      it "gets the fields when multiple set" do
-        subject.field('email')
-        subject.field('dob')
-        expect(subject.fields).to eq(Set.new(['email', 'dob']))
-      end
+    it "should include Persistable" do
+      expect(subject.included_modules).to include(Vorm::Persistable)
     end
   end
 end

data/spec/lib/vorm/persistable_spec.rb

@@ -0,0 +1,82 @@
+class Model
+  include Vorm::Persistable
+
+  def self.reset
+    @table = nil
+    @fields = nil
+  end
+end
+
+describe Vorm::Persistable do
+  context "class methods" do
+    subject { Model }
+
+    describe ".table" do
+      before { subject.reset }
+
+      it { is_expected.to respond_to(:table) }
+
+      it "raises when name is not string" do
+        expect { subject.table(:users) }
+        .to raise_error(ArgumentError, "Table name must be a string")
+      end
+
+      it "sets the table correctly" do
+        expect { subject.table('users') }
+        .to change(subject, :table).to('users')
+      end
+
+      it "gets the table" do
+        subject.table('users')
+        expect(subject.table).to eq('users')
+      end
+
+      it "setting the table again does not change it (cached)" do
+        subject.table('users')
+        expect { subject.table('another table') }
+        .not_to change(subject, :table)
+      end
+    end
+
+    describe ".field" do
+      before { subject.reset }
+
+      it { is_expected.to respond_to(:field) }
+
+      it "raises when name is not string" do
+        expect { subject.field(:email) }
+        .to raise_error(ArgumentError, "Field name must be a string")
+      end
+
+      it "sets the field correctly" do
+        expect { subject.field('email') }
+        .to change(subject, :fields)
+      end
+
+
+      it "ignores duplicates" do
+        subject.field('email')
+        subject.field('email')
+        expect(subject.fields).to eq(Set.new(['email']))
+      end
+    end
+
+    describe ".fields" do
+      before { subject.reset }
+
+      it { is_expected.to respond_to(:fields) }
+
+      it "gets fields when only one set" do
+        subject.field('email')
+        expect(subject.fields).to eq(Set.new(['email']))
+      end
+
+      it "gets the fields when multiple set" do
+        subject.field('email')
+        subject.field('dob')
+        expect(subject.fields).to eq(Set.new(['email', 'dob']))
+      end
+    end
+  end
+end
+

data/spec/lib/vorm/validatable_spec.rb

@@ -0,0 +1,44 @@
+require 'byebug'
+class Valid
+  include Vorm::Validatable
+
+  def self.reset
+    @validators = nil
+  end
+end
+
+describe Vorm::Validatable do
+  context "class methods" do
+    subject { Valid }
+
+    describe ".validates" do
+      before { subject.reset }
+
+      it { is_expected.to respond_to(:validates) }
+
+      it "raises argument error when given arg is not string" do
+        expect { subject.validates(:email) }
+        .to raise_error(ArgumentError, "Field name must be a string")
+      end
+
+      it "raises argument error when no block given" do
+        expect { subject.validates("email") }
+        .to raise_error(ArgumentError, "You must provide a block")
+      end
+
+      it "stores a validator" do
+        subject.validates("email") { "required" }
+        expect(subject.instance_variable_get('@validators')["email"].length).to be(1)
+      end
+
+      it "stores multiple validators" do
+        subject.validates("email") { "required" }
+        subject.validates("email") { "not valid" }
+        subject.validates("password") { "required" }
+        expect(subject.instance_variable_get('@validators')["email"].length).to be(2)
+        expect(subject.instance_variable_get('@validators')["password"].length).to be(1)
+      end
+    end
+  end 
+end
+

data/vorm.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.3.2"
-  spec.add_development_dependency "rspec", "~> 3.1.7"
+  spec.add_development_dependency "rspec", "~> 3.1"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vorm
 version: !ruby/object:Gem::Version
-  version: 0.0.2.alpha
+  version: 0.0.3.alpha
 platform: ruby
 authors:
 - Juho Hautala
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.7
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.7
+        version: '3.1'
 description: Simple, pluggable (your own db adapter) ORM for those little projects.
 email:
 - juho.hautala@helsinki.fi
@@ -69,8 +69,11 @@ files:
 - lib/vorm.rb
 - lib/vorm/model.rb
 - lib/vorm/persistable.rb
+- lib/vorm/validatable.rb
 - lib/vorm/version.rb
 - spec/lib/vorm/model_spec.rb
+- spec/lib/vorm/persistable_spec.rb
+- spec/lib/vorm/validatable_spec.rb
 - spec/spec_helper.rb
 - vorm.gemspec
 homepage: https://github.com/vastus/vorm
@@ -99,5 +102,6 @@ specification_version: 4
 summary: Simple ORM.
 test_files:
 - spec/lib/vorm/model_spec.rb
+- spec/lib/vorm/persistable_spec.rb
+- spec/lib/vorm/validatable_spec.rb
 - spec/spec_helper.rb
-has_rdoc: