mongodb_model 0.0.2 → 0.0.3

data/lib/{mongodb_model → mongo/model}/callbacks.rb

@@ -1,16 +1,6 @@
 module Mongo::Model::Callbacks
   inherit RubyExt::Callbacks
 
-  def _run_callbacks type, method_name
-    if type == :before
-      run_before_callbacks method_name, method: method_name
-    elsif type == :after
-      run_after_callbacks method_name, method: method_name
-    else
-      raise "invalid callback type (#{type})!"
-    end
-  end
-
   module ClassMethods
     [:validate, :update, :save, :destroy].each do |method_name|
       define_method "before_#{method_name}" do |*args, &block|

data/lib/{mongodb_model → mongo/model}/crud.rb

@@ -20,17 +20,17 @@ module Mongo::Model::Crud
   end
 
   module ClassMethods
-    def build attributes, opts = {}
+    def build attributes = {}, opts = {}
       self.new.set attributes, opts
     end
 
-    def create attributes, opts = {}
+    def create attributes = {}, opts = {}
       o = build attributes, opts
       o.save
       o
     end
 
-    def create! attributes, opts = {}
+    def create! attributes = {}, opts = {}
       o = create attributes
       raise(Mongo::Error, "can't create #{attributes.inspect}!") if o.new_record?
       o

data/lib/mongo/model/file_model.rb

@@ -0,0 +1,27 @@
+module Mongo::Model::FileModel
+  inherit ::FileModel::Helper
+
+  def attribute_get name
+    instance_variable_get :"@#{name}"
+  end
+
+  def attribute_set name, value
+    instance_variable_set :"@#{name}", value
+  end
+
+  module ClassMethods
+    def mount_file attr_name, file_model_class
+      super
+
+      before_validate do |model|
+        file_model = model.send(attr_name)
+        file_model.validate
+        model.errors[attr_name] = file_model.errors unless file_model.errors.empty?
+      end
+
+      after_save{|model| model.send(attr_name).save}
+
+      after_destroy{|model| model.send(attr_name).destroy}
+    end
+  end
+end

data/lib/{mongodb_model → mongo/model}/misc.rb

@@ -23,8 +23,12 @@ module Mongo::Model::Misc
     (_id || '').to_s
   end
 
+  delegate :t, to: I18n
+
 
   module ClassMethods
+    delegate :t, to: I18n
+
     def timestamps!
       attr_accessor :created_at, :updated_at
       before_save :update_timestamps

data/lib/{mongodb_model → mongo/model}/model.rb

@@ -1,4 +1,6 @@
 module Mongo::Model
+  include Mongo::Object
+
   attr_accessor :_id, :_class
 
   def _id?; !!_id end

data/lib/{mongodb_model → mongo/model}/spec.rb

@@ -1,4 +1,4 @@
-require 'mongodb/object/spec'
+require 'mongo/object/spec'
 
 rspec do
   class << self

data/lib/mongo/model/validation/uniqueness_validator.rb

@@ -0,0 +1,30 @@
+class Mongo::Model::UniquenessValidator < Validatable::ValidationBase
+  attr_accessor :scope, :case_sensitive
+
+  def initialize(klass, attribute, options={})
+    super
+    self.case_sensitive = false if case_sensitive == nil
+  end
+
+  def valid?(instance)
+    conditions = {}
+
+    conditions[scope] = instance.send scope if scope
+
+    value = instance.send attribute
+    if case_sensitive
+      conditions[attribute] = value
+    else
+      conditions[attribute] = /^#{Regexp.escape(value.to_s)}$/i
+    end
+
+    # Make sure we're not including the current document in the query
+    conditions[:_id] = {_ne: instance._id} if instance._id
+
+    !klass.exists?(conditions)
+  end
+
+  def message(instance)
+    super || "#{attribute} must be unique!"
+  end
+end

data/lib/mongo/model/validation.rb

@@ -0,0 +1,29 @@
+module Mongo::Model::Validation
+  def errors
+    @_errors ||= Validatable::Errors.new
+  end
+
+  def run_validations
+    self.class.validations.each{|v| v.validate self}
+    true
+  end
+
+  module ClassMethods
+    include ::Validatable::Macros
+
+    inheritable_accessor :validations, []
+
+    def validates_uniqueness_of *args
+      add_validations(args, Mongo::Model::UniquenessValidator)
+    end
+
+    protected
+      def add_validations(args, klass)
+        options = args.last.is_a?(Hash) ? args.pop : {}
+        args.each do |attribute|
+          new_validation = klass.new self, attribute, options
+          validations << new_validation
+        end
+      end
+  end
+end

data/lib/{mongodb_model.rb → mongo/model.rb}

@@ -1,9 +1,10 @@
-require 'mongodb_model/gems'
+require 'mongo_model/gems'
 
 require 'validatable'
+require 'file_model'
 require 'i18n'
 require 'ruby_ext'
-require 'mongodb/object'
+require 'mongo/object'
 
 module Mongo::Model; end
 
@@ -14,17 +15,29 @@ module Mongo::Model; end
   assignment
   callbacks
   validation
+  validation/uniqueness_validator
   crud
   query
   scope
   attribute_convertors
+  file_model
   misc
   model
-).each{|f| require "mongodb_model/#{f}"}
+).each{|f| require "mongo/model/#{f}"}
 
 module Mongo
   module Model
-    inherit Db, Assignment, Callbacks, Validation, Crud, Query, Scope, AttributeConvertors, Misc
+    inherit \
+      Db,
+      Assignment,
+      Callbacks,
+      Validation,
+      Crud,
+      Query,
+      Scope,
+      AttributeConvertors,
+      Mongo::Model::FileModel,
+      Misc
   end
 end
 

data/lib/{mongodb_model → mongo_model}/gems.rb

@@ -1,7 +1,8 @@
-gem 'i18n', '>= 0.5'
+gem 'i18n', '~> 0.5'
 
 if respond_to? :fake_gem
-  fake_gem 'validatable2'
   fake_gem 'mongodb'
+  fake_gem 'file_model'
+  fake_gem 'validatable2'
   fake_gem 'ruby_ext'
 end

data/readme.md

@@ -13,7 +13,7 @@ Other ODM usually try to cover simple but non-standard API of MongoDB behind com
 
 ``` ruby
 # Connecting to MongoDB.
-require 'mongodb/model'
+require 'mongo/model'
 Mongo.defaults.merge! symbolize: true, multi: true, safe: true
 connection = Mongo::Connection.new
 db = connection.db 'default_test'

data/spec/callbacks_spec.rb

@@ -5,17 +5,6 @@ describe 'Model callbacks' do
 
   after(:all){remove_constants :TheModel, :Player}
 
-  it "callback integration" do
-    class TheModel
-      inherit Mongo::Model
-    end
-
-    model = TheModel.new
-
-    model.should_receive(:run_before_callbacks).with(:save, {method: :save})
-    model._run_callbacks :before, :save
-  end
-
   it "integration smoke test" do
     class Player
       inherit Mongo::Model

data/spec/crud_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'mongodb/object/spec/crud_shared'
+require 'mongo/object/spec/crud_shared'
 
 describe "Model CRUD" do
   with_mongo_model

data/spec/file_model_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'file_model/spec/shared_crud'
+
+describe 'File Model' do
+  with_mongo_model
+  it_should_behave_like "file model crud"
+
+  before :all do
+    class ImageFile; end
+
+    class Unit
+      inherit Mongo::Model
+      collection :units
+
+      mount_file :image, ImageFile
+    end
+  end
+  after(:all){remove_constants :Unit}
+
+  before{@model_class = Unit}
+end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
-require 'mongodb_model'
+require 'mongo/model'
 
 require 'rspec_ext'
-require 'mongodb_model/spec'
+require 'mongo/model/spec'
 
 #
 # Handy spec helpers

data/spec/validation_spec.rb

@@ -3,35 +3,112 @@ require 'spec_helper'
 describe "Validations" do
   with_mongo_model
 
-  before do
-    class Unit
+  before :all do
+    class BaseUnit
       inherit Mongo::Model
       collection :units
 
-      attr_accessor :errors
-
       attr_accessor :name
     end
   end
   after{remove_constants :Unit}
+  after(:all){remove_constants :BaseUnit}
+
+  describe 'basics' do
+    it "before validation callback" do
+      class Unit < BaseUnit
+        before_validate :check_name
+        def check_name
+          errors[:name] = 'invalid name'
+        end
+      end
+
+      unit = Unit.new
+      unit.save.should be_false
+    end
+
+    it "should not save model with errors" do
+      unit = BaseUnit.build name: 'Zeratul'
+      unit.save.should be_true
+
+      unit.errors.clear
+      unit.save.should be_true
+
+      unit.errors[:name] = 'hairy error'
+      unit.save.should be_false
+
+      unit.errors.clear
+      unit.save.should be_true
+    end
+
+    # it "should check :errors only and ignore valid? method" do
+    #   unit = BaseUnit.build name: 'Zeratul'
+    #   unit.should_not_receive(:valid?)
+    #   unit.save.should be_true
+    # end
+  end
+
+  describe "validatable2" do
+    it "smoke test" do
+      class Unit < BaseUnit
+        validates_presence_of :name
+      end
 
-  it "should not save model with errors" do
-    unit = Unit.build name: 'Zeratul'
-    unit.save.should be_true
+      unit = Unit.new
+      unit.should_not be_valid
+      unit.errors.size.should == 1
+      unit.errors.first.first.should == :name
+      unit.save.should be_false
 
-    unit.errors = []
-    unit.save.should be_true
+      unit.errors.clear
+      unit.name = 'Zeratul'
+      unit.should be_valid
+      unit.errors.should be_empty
+      unit.save.should be_true
+    end
 
-    unit.errors = ['hairy error']
-    unit.save.should be_false
+    it "should validate before save" do
+      unit = BaseUnit.new
+      unit.should_receive(:run_validations)
+      unit.save
+    end
 
-    unit.errors = {name: 'hairy error'}
-    unit.save.should be_false
+    it "should not save errors as instance variables" do
+      unit = BaseUnit.new
+      unit.valid?
+      unit.instance_variables.select{|iv_name| iv_name !~ /^@_/}.should be_empty
+    end
   end
 
-  it "should check :errors only and ignore valid? method" do
-    unit = Unit.build name: 'Zeratul'
-    unit.should_not_receive(:valid?)
-    unit.save.should be_true
+  describe "special" do
+    it 'validates_uniqueness_of' do
+      class Unit < BaseUnit
+        validates_uniqueness_of :name
+      end
+
+      unit = Unit.build name: 'Zeratul'
+      unit.save.should be_true
+
+      unit = Unit.build name: 'Zeratul'
+      unit.save.should be_false
+      unit.errors[:name].first.should =~ /unique/
+    end
+
+    it 'validates_uniqueness_of with scope' do
+      class Unit < BaseUnit
+        attr_accessor :account_id
+
+        validates_uniqueness_of :name, scope: :account_id
+      end
+
+      unit = Unit.build name: 'Zeratul', account_id: '10'
+      unit.save.should be_true
+
+      unit = Unit.build name: 'Zeratul', account_id: '10'
+      unit.save.should be_false
+
+      unit = Unit.build name: 'Zeratul', account_id: '20'
+      unit.save.should be_true
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_model
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,52 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-28 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &2785140 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2785140
-- !ruby/object:Gem::Dependency
-  name: validatable2
-  requirement: &2784840 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2784840
-- !ruby/object:Gem::Dependency
-  name: mongodb
-  requirement: &2784550 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2784550
-- !ruby/object:Gem::Dependency
-  name: ruby_ext
-  requirement: &2784260 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2784260
+date: 2011-08-30 00:00:00.000000000Z
+dependencies: []
 description: 
 email: 
 executables: []
@@ -63,30 +19,32 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - readme.md
-- lib/mongodb_model/assignment.rb
-- lib/mongodb_model/attribute_convertors.rb
-- lib/mongodb_model/callbacks.rb
-- lib/mongodb_model/crud.rb
-- lib/mongodb_model/db.rb
-- lib/mongodb_model/gems.rb
-- lib/mongodb_model/misc.rb
-- lib/mongodb_model/model.rb
-- lib/mongodb_model/query.rb
-- lib/mongodb_model/scope.rb
-- lib/mongodb_model/spec.rb
-- lib/mongodb_model/support/types.rb
-- lib/mongodb_model/validation.rb
-- lib/mongodb_model.rb
+- lib/mongo/model/assignment.rb
+- lib/mongo/model/attribute_convertors.rb
+- lib/mongo/model/callbacks.rb
+- lib/mongo/model/crud.rb
+- lib/mongo/model/db.rb
+- lib/mongo/model/file_model.rb
+- lib/mongo/model/misc.rb
+- lib/mongo/model/model.rb
+- lib/mongo/model/query.rb
+- lib/mongo/model/scope.rb
+- lib/mongo/model/spec.rb
+- lib/mongo/model/support/types.rb
+- lib/mongo/model/validation/uniqueness_validator.rb
+- lib/mongo/model/validation.rb
+- lib/mongo/model.rb
+- lib/mongo_model/gems.rb
 - spec/assignment_spec.rb
 - spec/attribute_convertors_spec.rb
 - spec/callbacks_spec.rb
 - spec/crud_spec.rb
 - spec/db_spec.rb
+- spec/file_model_spec.rb
 - spec/misc_spec.rb
 - spec/query_spec.rb
 - spec/scope_spec.rb
 - spec/spec_helper.rb
-- spec/validatable2_spec.rb
 - spec/validation_spec.rb
 homepage: http://github.com/alexeypetrushin/mongodb_model
 licenses: []

data/lib/mongodb_model/validation.rb

@@ -1,5 +0,0 @@
-module Mongo::Model::Validation
-  def _valid?
-    !(respond_to?(:errors) and errors and !errors.empty?)
-  end
-end

data/spec/validatable2_spec.rb

@@ -1,40 +0,0 @@
-require 'spec_helper'
-require 'validatable'
-
-describe "Integration with validatable2" do
-  with_mongo_model
-
-  before do
-    class Unit
-      inherit Mongo::Model
-      collection :units
-
-      include Validatable
-
-      attr_accessor :name, :status
-
-      validates_presence_of :name
-    end
-  end
-
-  after{remove_constants :Unit}
-
-  it "ActiveModel integration smoke test" do
-    unit = Unit.new
-    unit.should_not be_valid
-    unit.errors.size.should == 1
-    unit.errors.first.first.should == :name
-    unit.save.should be_false
-
-    unit.name = 'Zeratul'
-    unit.should be_valid
-    unit.errors.should be_empty
-    unit.save.should be_true
-  end
-
-  it "should not save errors as instance variables" do
-    unit = Unit.new
-    unit.valid?
-    unit.instance_variables.select{|iv_name| iv_name !~ /^@_/}.should be_empty
-  end
-end