mongo_db 0.1.10 → 0.1.11

data/lib/mongo_db/integration/locales/activemodel/ru.yml

@@ -0,0 +1,27 @@
+ru:
+  errors:
+    # The default format to use in full error messages.
+    format: "%{attribute} %{message}"
+
+    # The values :model, :attribute and :value are always available for interpolation
+    # The value :count is available when applicable. Can be used for pluralization.
+    messages:
+      inclusion: "недопустимое значение"
+      exclusion: "недопустимо"
+      invalid: "неверно"
+      confirmation: "не совпадает с подтверждением"
+      accepted: "долно быть принято"
+      empty: "не может быть пустым"
+      blank: "не может быть пустым"
+      too_long: "слишком длинно (максимально допустимо %{count})"
+      too_short: "слищком коротко (минимально допустимо %{count})"
+      wrong_length: "неверная длинна (должно быть %{count})"
+      not_a_number: "не номер"
+      not_an_integer: "долно быть целочисленно"
+      greater_than: "должно быть больше чем %{count}"
+      greater_than_or_equal_to: "должно быть больше чем или равно %{count}"
+      equal_to: "должно быть равно %{count}"
+      less_than: "должно быть меньше чем %{count}"
+      less_than_or_equal_to: "должно быть меньше чем или равно %{count}"
+      odd: "должно быть не четно"
+      even: "должно быть четно"

data/lib/mongo_db/integration/locales/mongo_mapper/en.yml

@@ -0,0 +1,4 @@
+en:
+  errors:
+    messages:
+      taken: "has already been taken"

data/lib/mongo_db/integration/locales/mongo_mapper/ru.yml

@@ -0,0 +1,4 @@
+ru:
+  errors:
+    messages:
+      taken: "уже занято"

data/lib/mongo_db/integration/locales.rb

@@ -0,0 +1,4 @@
+require 'i18n'
+
+dir = File.dirname __FILE__
+I18n.load_path += Dir["#{dir}/locales/**/*.{rb,yml}"]

data/lib/mongo_db/model/assignment.rb

@@ -14,22 +14,33 @@ module Mongo::Model::Assignment
     protected
       attr_reader :attributes
 
-      def method_missing attribute_name, type, mass_assignment = false
+      def method_missing attribute_name, *args
         attribute_name.must_be.a Symbol
-        type.must.respond_to :cast
+
+        args.size.must_be.in 1..2
+        if args.first.is_a? Class
+          type, mass_assignment = args
+          mass_assignment ||= false
+          type.must.respond_to :cast
+        else
+          type, mass_assignment = nil, args.first
+        end
+
         attributes[attribute_name] = [type, mass_assignment]
       end
   end
 
   def set attributes, options = {}
-    if rules = self.class._assignment
+    if rules = self.class._assign
       force = options[:force]
       attributes.each do |n, v|
         n = n.to_sym
-        type, mass_assignment = rules[n]
-        if type and (mass_assignment or force)
-          v = type.cast(v)
-          send "#{n}=", v
+        if rule = rules[n]
+          type, mass_assignment = rule
+          if mass_assignment or force
+            v = type.cast(v) if type
+            send "#{n}=", v
+          end
         end
       end
     else
@@ -43,12 +54,12 @@ module Mongo::Model::Assignment
   end
 
   module ClassMethods
-    inheritable_accessor :_assignment, nil
+    inheritable_accessor :_assign, nil
 
-    def assignment &block
+    def assign &block
       dsl = ::Mongo::Model::Assignment::Dsl.new
       dsl.instance_eval &block
-      self._assignment = (_assignment || {}).merge dsl.to_h
+      self._assign = (_assign || {}).merge dsl.to_h
     end
   end
 end

data/lib/mongo_db/model/attribute_convertors.rb

@@ -0,0 +1,54 @@
+require 'json'
+require 'yaml'
+
+module Mongo::Model::AttributeConvertors
+  CONVERTORS = {
+    line: {
+      from_string: -> s {(s || "").split(',').collect{|s| s.strip}},
+      to_string:   -> v {v.join(', ')}
+    },
+    column: {
+      from_string: -> s {(s || "").split("\n").collect{|s| s.strip}},
+      to_string:   -> v {v.join("\n")}
+    },
+    yaml: {
+      from_string: -> s {YAML.load s rescue {}},
+      to_string:   -> v {v.to_yaml.strip}
+    },
+    json: {
+      from_string: -> s {JSON.parse s rescue {}},
+      to_string:   -> v {v.to_json.strip}
+    }
+  }
+
+  module ClassMethods
+    def available_as_string name, converter_name
+      converter = CONVERTORS[converter_name]
+      raise "unknown converter name :#{converter_name} for :#{name} field!" unless converter
+
+      from_string, to_string = converter[:from_string], converter[:to_string]
+      name_as_string = "#{name}_as_string".to_sym
+      define_method name_as_string do
+        _cache[name_as_string] ||= to_string.call(send(name))
+      end
+
+      define_method "#{name_as_string}=" do |value|
+        _cache.delete name_as_string
+        self.send "#{name}=", from_string.call(value)
+      end
+    end
+
+    def available_as_yaml name
+      raise "delimiter not specified for :#{name} field!" unless delimiter
+      method = "#{name}_as_string"
+      define_method method do
+        self.send(name).join(delimiter)
+      end
+      define_method "#{method}=" do |value|
+        value = (value || "").split(delimiter.strip).collect{|s| s.strip}
+        self.send "#{name}=", value
+      end
+    end
+  end
+
+end

data/lib/mongo_db/model/crud.rb

@@ -16,7 +16,36 @@ module Mongo::Model::Crud
   end
 
   def destroy! *args
-    destroy(*args)|| raise(Mongo::Error, "can't destroy #{self.inspect}!")
+    destroy(*args) || raise(Mongo::Error, "can't destroy #{self.inspect}!")
+  end
+
+  module ClassMethods
+    def build attributes, opts = {}
+      self.new.set attributes, opts
+    end
+
+    def create attributes, opts = {}
+      o = build attributes, opts
+      o.save
+      o
+    end
+
+    def create! attributes, opts = {}
+      o = create attributes
+      raise(Mongo::Error, "can't create #{attributes.inspect}!") if o.new_record?
+      o
+    end
+
+    def destroy_all selector = {}, opts = {}
+      success = true
+      collection = opts[:collection] || self.collection
+      each(selector){|o| success = false unless o.destroy}
+      success
+    end
+
+    def destroy_all! selector = {}, opts = {}
+      destroy_all(selector, opts) || raise(Mongo::Error, "can't destroy #{selector.inspect}!")
+    end
   end
 
   protected

data/lib/mongo_db/model/misc.rb

@@ -5,6 +5,25 @@ module Mongo::Model::Misc
     self.updated_at = now
   end
 
+
+  def _cache
+    @_cache ||= {}
+  end
+  def _clear_cache
+    @_cache = {}
+  end
+
+
+  def dom_id
+    # new_record? ? "new_#{self.class.name.underscore}" : to_param
+    to_param
+  end
+
+  def to_param
+    (_id || '').to_s
+  end
+
+
   module ClassMethods
     def timestamps!
       attr_accessor :created_at, :updated_at

data/lib/mongo_db/model/model.rb

@@ -1,7 +1,8 @@
 module Mongo::Model
   attr_accessor :_id, :_class
 
-  def new_record?; !!_id end
+  def _id?; !!_id end
+  def new_record?; !_id end
 
   class << self
     attr_accessor :db, :connection

data/lib/mongo_db/model.rb

@@ -19,12 +19,13 @@ module Mongo::Model; end
   crud
   query
   scope
+  attribute_convertors
   misc
   model
 ).each{|f| require "mongo_db/model/#{f}"}
 
 module Mongo
   module Model
-    inherit Db, Assignment, Callbacks, Validation, Crud, Query, Scope, Misc
+    inherit Db, Assignment, Callbacks, Validation, Crud, Query, Scope, AttributeConvertors, Misc
   end
 end

data/readme.md

@@ -2,7 +2,7 @@ Object Model & Ruby driver enhancements for MongoDB.
 
 1. Driver enchancements & Migrations.
 2. Persistence for any Ruby object.
-3. Object Model (callbacks, validations, mass-assignment, finders, ...) (work in progress).
+3. Object Model (callbacks, validations, mass-assignment, finders, ...).
 
 Lower layers are independent from upper, use only what You need.
 
@@ -124,11 +124,8 @@ db.units.all name: {_gt: 'Z'}                      # => [zeratul]
 
 Source: examples/object.rb
 
-# Object Model (work in progress)
+# Object Model
 
-Model designed after the excellent "Domain-Driven Design" book by Eric Evans.
-
-- Very small, see [code stats][:code_stats].
 - The same API for pure driver and Models.
 - Minimum extra abstractions, trying to keep things as close to the MongoDB semantic as possible.
 - Schema-less, dynamic (with ability to specify types for mass-assignment).
@@ -136,9 +133,9 @@ Model designed after the excellent "Domain-Driven Design" book by Eric Evans.
 - Full support for embedded objects (validations, callbacks, ...).
 - Scope, default_scope
 - Doesn't try to mimic ActiveRecord, MongoDB is differrent and this tool designed to get most of it.
+- Very small, see [code stats][code_stats].
 
-Existing ODM like MongoMapper and Mongoid are trying to hide simple but non-standard API of MongoDB by covering it with complicated but familiar API.
-This ODM exposes simplicity of MongoDB and leverages it's differences.
+Other ODM usually try to cover simple but non-standard API of MongoDB behind complex ORM-like abstractions. This tool **exposes simplicity and power of MongoDB and leverages it's differences**.
 
 ``` ruby
 # Connecting to MongoDB.
@@ -153,11 +150,11 @@ Mongo::Model.db = db
 class Unit
   inherit Mongo::Model
   collection :units
-  
+
   attr_accessor :name, :status, :stats
-  
+
   scope :alive, status: 'alive'
-  
+
   class Stats
     inherit Mongo::Model
     attr_accessor :attack, :life, :shield
@@ -165,8 +162,8 @@ class Unit
 end
 
 # Create.
-zeratul  = Unit.new.set(name: 'Zeratul',  status: 'alive', stats: Unit::Stats.new.set(attack: 85, life: 300, shield: 100))
-tassadar = Unit.new.set(name: 'Tassadar', status: 'dead',  stats: Unit::Stats.new.set(attack: 0,  life: 80,  shield: 300))
+zeratul  = Unit.build(name: 'Zeratul',  status: 'alive', stats: Unit::Stats.build(attack: 85, life: 300, shield: 100))
+tassadar = Unit.build(name: 'Tassadar', status: 'dead',  stats: Unit::Stats.build(attack: 0,  life: 80,  shield: 300))
 
 zeratul.save
 tassadar.save
@@ -264,4 +261,4 @@ Copyright (c) Alexey Petrushin, http://petrush.in, released under the MIT licens
 
 [mongo_mapper_ext]: https://github.com/alexeypetrushin/mongo_mapper_ext
 [mongoid_misc]: https://github.com/alexeypetrushin/mongoid_misc
-[code_stats]: https://raw.github.com/alexeypetrushin/mongo_db/master/doc/code_stats.png
+[code_stats]: https://github.com/alexeypetrushin/mongo_db/raw/master/docs/code_stats.png

data/spec/integration/am_conversion_spec.rb

@@ -0,0 +1 @@
+# to_json, to_xml

data/spec/integration/am_validation_spec.rb

@@ -1,40 +1,34 @@
 require 'model/spec_helper'
+require 'active_model'
 
-begin
-  require 'active_model'
+describe "Validations" do
+  with_mongo_model
 
-  describe "Validations" do
-    with_mongo_model
+  before do
+    class Unit
+      inherit Mongo::Model
+      collection :units
 
-    before do
-      class Unit
-        inherit Mongo::Model
-        collection :units
+      include ActiveModel::Validations
 
-        include ActiveModel::Validations
+      attr_accessor :name, :status
 
-        attr_accessor :name, :status
-
-        validates_presence_of :name
-      end
+      validates_presence_of :name
     end
+  end
 
-    after{remove_constants :Unit}
+  after{remove_constants :Unit}
 
-    it "ActiveModel integration smoke test" do
-      unit = Unit.new
-      unit.should be_invalid
-      unit.errors.size.should == 1
-      unit.errors.first.first.should == :name
-      unit.save.should be_false
+  it "ActiveModel integration smoke test" do
+    unit = Unit.new
+    unit.should be_invalid
+    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
+    unit.name = 'Zeratul'
+    unit.should be_valid
+    unit.errors.should be_empty
+    unit.save.should be_true
   end
-
-rescue LoadError => e
-  warn 'No ActiveModel, integration with ActiveModel::Validations spec will be skipped.'
 end

data/spec/model/assignment_spec.rb

@@ -9,31 +9,32 @@ describe 'Model callbacks' do
     class User
       inherit Mongo::Model
 
-      attr_accessor :name, :active, :age, :banned
+      attr_accessor :name, :has_mail, :age, :banned
     end
 
     u = User.new
-    u.set name: 'Alex', active: '1', age: '31', banned: '0'
-    [u.name, u.active, u.age, u.banned].should == ['Alex', '1', '31', '0']
+    u.set name: 'Alex', has_mail: '1', age: '31', banned: '0'
+    [u.name, u.has_mail, u.age, u.banned].should == ['Alex', '1', '31', '0']
   end
 
   it "should update only specified attributes" do
     class User
       inherit Mongo::Model
 
-      attr_accessor :name, :active, :age, :banned
+      attr_accessor :name, :has_mail, :age, :position, :banned
 
-      assignment do
+      assign do
         name     String,  true
-        active   Boolean, true
+        has_mail Boolean, true
         age      Integer, true
+        position true
         banned   Boolean
       end
     end
 
     u = User.new
-    u.set name: 'Alex', active: '1', age: '31', password: 'fake'
-    [u.name, u.active, u.age, u.banned].should == ['Alex', true, 31, nil]
+    u.set name: 'Alex', has_mail: '1', age: '31', position: [11, 34] ,banned: '0'
+    [u.name, u.has_mail, u.age, u.position, u.banned].should == ['Alex', true, 31, [11, 34], nil]
 
     # should allow to forcefully cast and update any attribute
     u.set! banned: '0'
@@ -46,7 +47,7 @@ describe 'Model callbacks' do
 
       attr_accessor :age
 
-      assignment do
+      assign do
         age Integer,  true
       end
     end
@@ -54,7 +55,7 @@ describe 'Model callbacks' do
     class Writer < User
       attr_accessor :posts
 
-      assignment do
+      assign do
         posts Integer, true
       end
     end

data/spec/model/attribute_convertors_spec.rb

@@ -0,0 +1,73 @@
+require 'model/spec_helper'
+
+describe "Attribute Convertors" do
+  with_mongo_model
+
+  after(:all){remove_constants :TheSample}
+
+  convertors = Mongo::Model::AttributeConvertors::CONVERTORS
+
+  it ":line convertor" do
+    v = ['a', 'b']
+    str_v = 'a, b'
+    convertors[:line][:from_string].call(str_v).should == v
+    convertors[:line][:to_string].call(v).should == str_v
+  end
+
+  it ":yaml convertor" do
+    v = {'a' => 'b'}
+    str_v = v.to_yaml.strip
+
+    convertors[:yaml][:from_string].call(str_v).should == v
+    convertors[:yaml][:to_string].call(v).should == str_v
+  end
+
+  it ":json convertor" do
+    v = {'a' => 'b'}
+    str_v = v.to_json.strip
+    convertors[:json][:from_string].call(str_v).should == v
+    convertors[:json][:to_string].call(v).should == str_v
+  end
+
+  it ":field should generate helper methods if :as_string option provided" do
+    class ::TheSample
+      inherit Mongo::Model
+
+      attr_accessor :tags, :protected_tags
+      available_as_string :tags, :line
+      available_as_string :protected_tags, :line
+
+      def initialize
+        @tags, @protected_tags = [], []
+      end
+
+      assign do
+        tags_as_string true
+      end
+    end
+
+    o = TheSample.new
+
+    # get
+    o.tags_as_string.should == ''
+    o.tags = %w(Java Ruby)
+    o._clear_cache
+    o.tags_as_string.should == 'Java, Ruby'
+
+    # set
+    o.tags_as_string = ''
+    o.tags.should == []
+    o.tags_as_string = 'Java, Ruby'
+    o.tags.should == %w(Java Ruby)
+
+    # mass assignment
+    o.tags = []
+    o.set tags_as_string: 'Java, Ruby'
+    o.tags.should == %w(Java Ruby)
+
+    # # protection
+    o.protected_tags = []
+    o.set protected_tags_as_string: 'Java, Ruby'
+    o.protected_tags.should == []
+  end
+end

data/spec/model/crud_spec.rb

@@ -17,7 +17,7 @@ describe "Model CRUD" do
     after(:all){remove_constants :Unit}
 
     before do
-      @zeratul = Unit.new.set name: 'Zeratul', info: 'Dark Templar'
+      @zeratul = Unit.build name: 'Zeratul', info: 'Dark Templar'
     end
 
     it_should_behave_like "object CRUD"
@@ -72,9 +72,27 @@ describe "Model CRUD" do
       db.heroes.count.should == 0
     end
 
-    it 'create'
+    it 'build' do
+      u = Unit.build name: 'Zeratul'
+      u.name.should == 'Zeratul'
+    end
+
+    it 'create' do
+      u = Unit.create(name: 'Zeratul')
+      u.new_record?.should be_false
+
+      u = Unit.create!(name: 'Zeratul')
+      u.new_record?.should be_false
+    end
 
-    it 'destroy_all'
+    it 'destroy_all' do
+      Unit.create(name: 'Zeratul')
+      Unit.count.should == 1
+      Unit.destroy_all
+      Unit.count.should == 0
+
+      Unit.destroy_all!
+    end
   end
 
   describe 'embedded' do
@@ -100,8 +118,8 @@ describe "Model CRUD" do
       @mission_class = Player::Mission
       @player = Player.new
       @player.missions = [
-        Player::Mission.new.set(name: 'Wasteland',         stats: {buildings: 5, units: 10}),
-        Player::Mission.new.set(name: 'Backwater Station', stats: {buildings: 8, units: 25}),
+        Player::Mission.build(name: 'Wasteland',         stats: {buildings: 5, units: 10}),
+        Player::Mission.build(name: 'Backwater Station', stats: {buildings: 8, units: 25}),
       ]
     end
 
@@ -119,7 +137,7 @@ describe "Model CRUD" do
 
       # update
       @player.missions.first.stats[:units] = 9
-      @player.missions << Player::Mission.new.set(name: 'Desperate Alliance', stats: {buildings: 11, units: 40})
+      @player.missions << Player::Mission.build(name: 'Desperate Alliance', stats: {buildings: 11, units: 40})
       @player.save.should be_true
       Player.count.should == 1
       Player.first.should == @player

data/spec/model/misc_spec.rb

@@ -3,7 +3,13 @@ require 'model/spec_helper'
 describe 'Model Miscellaneous' do
   with_mongo_model
 
-  after{remove_constants :Unit}
+  before do
+    class User
+      inherit Mongo::Model
+      collection :users
+    end
+  end
+  after{remove_constants :Unit3, :User}
 
   it "timestamps" do
     class Unit3
@@ -15,7 +21,7 @@ describe 'Model Miscellaneous' do
       timestamps!
     end
 
-    unit = Unit3.new.set name: 'Zeratul'
+    unit = Unit3.build name: 'Zeratul'
     unit.save!
 
     unit = Unit3.first
@@ -28,5 +34,25 @@ describe 'Model Miscellaneous' do
     unit.updated_at.should >  updated_at
   end
 
+  it 'cache' do
+    class Unit3
+      inherit Mongo::Model
+    end
+    u = Unit3.new
+    u._cache.should == {}
+  end
+
+  it "to_param" do
+    u = User.new
+    u.to_param.should == ''
+    u.save!
+    u.to_param.should_not be_empty
+  end
 
+  it "dom_id" do
+    u = User.new
+    u.dom_id.should == ''
+    u.save!
+    u.dom_id.should_not be_empty
+  end
 end

data/spec/model/query_spec.rb

@@ -14,7 +14,7 @@ describe "Model Query" do
   end
   after(:all){remove_constants :Unit}
 
-  before{@zeratul = Unit.new.set name: 'Zeratul'}
+  before{@zeratul = Unit.build name: 'Zeratul'}
 
   it 'exist?' do
     Unit.should_not exist(name: 'Zeratul')
@@ -41,7 +41,7 @@ describe "Model Query" do
 
   it 'dynamic finders integration' do
     Unit.first_by_name('Zeratul').should be_nil
-    Unit.new.set(name: 'Zeratul').save!
+    Unit.build(name: 'Zeratul').save!
     Unit.first_by_name('Zeratul').name.should == 'Zeratul'
   end
 end

data/spec/model/scope_spec.rb

@@ -16,9 +16,9 @@ describe "Scope" do
 
   describe 'current scope' do
     it "should affect finders" do
-      Unit.new.set(name: 'Zeratul',  status: 'alive').save!
-      Unit.new.set(name: 'Jim',      status: 'alive').save!
-      Unit.new.set(name: 'Tassadar', status: 'dead').save!
+      Unit.build(name: 'Zeratul',  status: 'alive').save!
+      Unit.build(name: 'Jim',      status: 'alive').save!
+      Unit.build(name: 'Tassadar', status: 'dead').save!
 
       Unit.count.should == 3
       Unit.all.size.should == 3

data/spec/model/validation_spec.rb

@@ -16,7 +16,7 @@ describe "Validations" do
   after{remove_constants :Unit}
 
   it "should not save model with errors" do
-    unit = Unit.new.set name: 'Zeratul'
+    unit = Unit.build name: 'Zeratul'
     unit.save.should be_true
 
     unit.errors = []
@@ -30,7 +30,7 @@ describe "Validations" do
   end
 
   it "should check :errors only and ignore valid? method" do
-    unit = Unit.new.set name: 'Zeratul'
+    unit = Unit.build name: 'Zeratul'
     unit.should_not_receive(:valid?)
     unit.save.should be_true
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_db
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -36,11 +36,16 @@ files:
 - lib/mongo_db/driver/spec.rb
 - lib/mongo_db/driver.rb
 - lib/mongo_db/gems.rb
+- lib/mongo_db/integration/locales/activemodel/ru.yml
+- lib/mongo_db/integration/locales/mongo_mapper/en.yml
+- lib/mongo_db/integration/locales/mongo_mapper/ru.yml
+- lib/mongo_db/integration/locales.rb
 - lib/mongo_db/migration/definition.rb
 - lib/mongo_db/migration/migration.rb
 - lib/mongo_db/migration/tasks.rb
 - lib/mongo_db/migration.rb
 - lib/mongo_db/model/assignment.rb
+- lib/mongo_db/model/attribute_convertors.rb
 - lib/mongo_db/model/callbacks.rb
 - lib/mongo_db/model/crud.rb
 - lib/mongo_db/model/db.rb
@@ -66,6 +71,7 @@ files:
 - spec/integration/am_validation_spec.rb
 - spec/migration/migration_spec.rb
 - spec/model/assignment_spec.rb
+- spec/model/attribute_convertors_spec.rb
 - spec/model/callbacks_spec.rb
 - spec/model/crud_spec.rb
 - spec/model/db_spec.rb