mongodb_model 0.0.8 → 0.0.9

data/lib/mongo/model/assignment.rb

@@ -35,14 +35,10 @@ module Mongo::Model::Assignment
       force = options[:force]
       attributes.each do |n, v|
         n = n.to_sym
-        if rule = rules[n]
-          type, mass_assignment = rule
-          if mass_assignment or force
-            v = type.cast(v) if type
-            send "#{n}=", v
-          else
-            raise "mass assignment for :#{n} attribute not allowed!"
-          end
+        type, mass_assignment = rules[n]
+        if mass_assignment or force
+          v = type.cast(v) if type
+          send "#{n}=", v
         else
           raise "mass assignment for :#{n} attribute not allowed!"
         end

data/lib/mongo/model/attribute_convertors.rb

@@ -37,18 +37,6 @@ module Mongo::Model::AttributeConvertors
         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/model/callbacks.rb

@@ -22,5 +22,8 @@ module Mongo::Model::Callbacks
         end
       end
     end
+
+    alias_method :before_validation, :before_validate
+    alias_method :after_validation, :after_validate
   end
 end

data/lib/mongo/model/crud.rb

@@ -20,20 +20,23 @@ module Mongo::Model::Crud
   end
 
   module ClassMethods
-    def build attributes = {}, options = {}
-      self.new.set attributes, options
+    def build attributes = {}, options = {}, &block
+      model = self.new
+      model.set attributes, options
+      block.call model if block
+      model
     end
 
-    def create attributes = {}, options = {}
-      o = build attributes, options
-      o.save
-      o
+    def create attributes = {}, options = {}, &block
+      model = build attributes, options, &block
+      model.save
+      model
     end
 
-    def create! attributes = {}, options = {}
-      o = create attributes
-      raise(Mongo::Error, "can't create #{attributes.inspect}!") if o.new_record?
-      o
+    def create! attributes = {}, options = {}, &block
+      model = build attributes, options, &block
+      model.save || raise(Mongo::Error, "can't create #{attributes.inspect}!")
+      model
     end
 
     def destroy_all selector = {}, options = {}

data/lib/mongo/model/db.rb

@@ -5,7 +5,10 @@ module Mongo::Model::Db
       self._db = if v.is_a? ::Proc
         v
       elsif v.is_a? ::Symbol
-        -> {::Mongo::Model.connection.db v.to_s}
+        -> do
+          db_name = ::Mongo::Model.resolve_db_alias v
+          ::Mongo::Model.connection.db db_name
+        end
       else
         -> {v}
       end

data/lib/mongo/model/model.rb

@@ -28,5 +28,11 @@ module Mongo::Model
   class << self
     attr_accessor :db, :connection
     attr_required :db, :connection
+
+    # Override this method to provide custom alias to db name translation,
+    # for example db_name = my_config[alias_name]
+    def resolve_db_alias alias_name
+      alias_name.to_s
+    end
   end
 end

data/lib/mongo/model/query.rb

@@ -1,8 +1,8 @@
 class Mongo::Model::Query < Object
-  attr_reader :model, :selector, :options
+  attr_reader :model_class, :selector, :options
 
-  def initialize model, selector = {}, options = {} *args
-    @model, @selector, @options = model, selector, options
+  def initialize model_class, selector = {}, options = {} *args
+    @model_class, @selector, @options = model_class, selector, options
   end
 
   def class
@@ -10,35 +10,42 @@ class Mongo::Model::Query < Object
   end
 
   def merge query
-    raise "can't merge queries with different models!" unless model == query.model
-    self.class.new model, selector.merge(query.selector), options.merge(query.options)
+    raise "can't merge queries with different models!" unless model_class == query.model_class
+    self.class.new model_class, selector.merge(query.selector), options.merge(query.options)
   end
 
   def inspect
-    "#<Mongo::Model::Query: #{model} #{@selector.inspect} #{@options.inspect}>"
+    "#<Mongo::Model::Query: #{model_class} #{@selector.inspect} #{@options.inspect}>"
   end
   alias_method :to_s, :inspect
 
   def == o
-    self.class == o.class and ([model, selector, options] == [o.model, o.selector, o.options])
+    self.class == o.class and ([model_class, selector, options] == [o.model_class, o.selector, o.options])
   end
 
   def build attributes = {}, options = {}
-    model.build selector.merge(attributes), options
+    model_class.build attributes, options do |model|
+      model.set! selector
+    end
   end
 
   def create attributes = {}, options = {}
-    model.create selector.merge(attributes), options
+    model_class.create attributes, options do |model|
+      model.set! selector
+    end
   end
 
   def create! attributes = {}, options = {}
-    model.create! selector.merge(attributes), options
+    model_class.create! attributes, options do |model|
+      model.set! selector
+    end
   end
 
   protected
+
     def method_missing method, *args, &block
-      model.with_scope selector, options do
-        result = model.send method, *args, &block
+      model_class.with_scope selector, options do
+        result = model_class.send method, *args, &block
         result = self.merge result if result.is_a? self.class
         result
       end

data/spec/associations_spec.rb

@@ -24,7 +24,7 @@ describe 'Associations' do
       attr_accessor :text, :post_id
 
       def == o
-        [self.class, text, post_id] == [o.class, o.text, o.post_id]
+        self.class == o.class and [text, post_id] == [o.text, o.post_id]
       end
 
       timestamps!

data/spec/query_spec.rb

@@ -64,4 +64,18 @@ describe "Model Query" do
     u = SpecialUnit.first
     [u.name, u.age].should == ['Zeratul', 500]
   end
+
+  it "build should assign protected attributes" do
+    class SpecialUnit < Unit
+      attr_accessor :age, :status
+      assign do
+        name String, true
+        age  Integer, true
+      end
+    end
+
+    -> {SpecialUnit.query(name: 'Zeratul').build age: 500, status: 'active'}.should raise_error(/not allowed/)
+    u = SpecialUnit.query(name: 'Zeratul', status: 'active').build age: 500
+    u.status.should == 'active'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_model
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors: