mongodb_model 0.0.10 → 0.0.11

data/lib/mongo/model.rb

@@ -2,7 +2,6 @@ require 'mongodb_model/gems'
 
 require 'validatable'
 require 'file_model'
-require 'i18n'
 require 'ruby_ext'
 require 'mongo/object'
 
@@ -12,6 +11,7 @@ module Mongo::Model; end
   support/types
 
   db
+  conversion
   assignment
   callbacks
   validation
@@ -30,6 +30,7 @@ module Mongo
   module Model
     inherit \
       Db,
+      Conversion,
       Assignment,
       Callbacks,
       Validation,

data/lib/mongo/model/assignment.rb

@@ -1,32 +1,13 @@
 module Mongo::Model::Assignment
   class Dsl < BasicObject
-    def initialize
-      @attributes = {}
+    def initialize model
+      @model = model
     end
 
-    def self.const_missing name
-      # BasicObject doesn't have access to any constants like String, Symbol, ...
-      ::Object.const_get name
-    end
-
-    def to_h; attributes end
-
     protected
-      attr_reader :attributes
-
-      def method_missing attribute_name, *args
-        attribute_name.must_be.a Symbol
-
-        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]
+      def method_missing m, *args
+        args.unshift m
+        @model.assign *args
       end
   end
 
@@ -61,10 +42,26 @@ module Mongo::Model::Assignment
   module ClassMethods
     inheritable_accessor :_assign, nil
 
-    def assign &block
-      dsl = ::Mongo::Model::Assignment::Dsl.new
-      dsl.instance_eval &block
-      self._assign = (_assign || {}).merge dsl.to_h
+    def assign *args, &block
+      if block
+        dsl = ::Mongo::Model::Assignment::Dsl.new self
+        dsl.instance_eval &block
+      else
+        args.size.must_be.in 2..3
+        attr_name = args.shift
+        attr_name.must_be.a Symbol
+
+        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
+
+        self._assign ||= {}
+        _assign[attr_name] = [type, mass_assignment]
+      end
     end
   end
 end

data/lib/mongo/model/conversion.rb

@@ -0,0 +1,67 @@
+module Mongo::Model::Conversion
+  def model_to_json *args, &block
+    to_rson(*args, &block).to_json
+  end
+
+  def model_to_xml *args, &block
+    to_rson(*args, &block).to_xml
+  end
+
+  alias_method :to_json, :model_to_json
+  alias_method :to_xml, :model_to_xml
+
+  inherited do
+    alias_method :to_json, :model_to_json
+    alias_method :to_xml, :model_to_xml
+
+    # hack to supress ActiveSupport as_json
+    alias_method :as_json, :model_to_json
+    alias_method :as_xml, :model_to_xml
+  end
+
+  def to_rson options = {}
+    # hack to suppress ActiveSupport as_json
+    options ||= {}
+
+    if profile = options[:profile]
+      raise "no other optins are allowed when using :profile option!" if options.size > 1
+      profile_options = self.class.profiles[profile] || raise("profile :#{profile} not defined for #{self.class}!")
+      to_rson profile_options.merge(_profile: profile)
+    else
+      options.validate_options! :only, :except, :methods, :_profile
+      child_options = options[:_profile] ? {profile: options[:_profile]} : {}
+
+      instance_variables = Mongo::Object.instance_variables(self)
+
+      if only = options[:only]
+        instance_variables &= Array(only).collect{|n| :"@#{n}"}
+      elsif except = options[:except]
+        instance_variables -= Array(except).collect{|n| :"@#{n}"}
+      end
+
+      result = {}
+      instance_variables.each do |iv_name|
+        value = instance_variable_get iv_name
+        value = Mongo::Object.convert value, :to_rson, child_options
+        result[iv_name[1.. -1]] = value
+      end
+
+      methods = options[:methods] ? Array(options[:methods]) : []
+
+      methods.each do |method|
+        value = send method
+        value = Mongo::Object.convert value, :to_rson, child_options
+        result[method.to_s] = value
+      end
+
+      result
+    end
+  end
+
+  module ClassMethods
+    inheritable_accessor :profiles, {}
+    def profile name, options = {}
+      profiles[name] = options
+    end
+  end
+end

data/lib/mongo/model/crud.rb

@@ -19,6 +19,10 @@ module Mongo::Model::Crud
     destroy(*args) || raise(Mongo::Error, "can't destroy invalid model #{self.errors}!")
   end
 
+  def update doc, options = {}
+    self.class.collection.update({_id: _id}, doc, options)
+  end
+
   module ClassMethods
     def build attributes = {}, options = {}, &block
       model = self.new
@@ -49,6 +53,10 @@ module Mongo::Model::Crud
     def destroy_all! selector = {}, options = {}
       destroy_all(selector, options) || raise(Mongo::Error, "can't destroy #{selector.inspect}!")
     end
+
+    def update selector, doc, options = {}
+      collection.update selector, doc, options
+    end
   end
 
   protected

data/lib/mongo/model/misc.rb

@@ -12,9 +12,6 @@ module Mongo::Model::Misc
   def _cache
     @_cache ||= {}
   end
-  # def _clear_cache
-  #   @_cache = {}
-  # end
 
   def dom_id
     # new_record? ? "new_#{self.class.name.underscore}" : to_param
@@ -25,8 +22,6 @@ module Mongo::Model::Misc
     (_id || '').to_s
   end
 
-  delegate :t, to: I18n
-
   def reload
     obj = self.class.by_id!(_id || raise("can't reload new document (#{self})!"))
     instance_variables.each{|n| remove_instance_variable n}
@@ -41,8 +36,6 @@ module Mongo::Model::Misc
   end
 
   module ClassMethods
-    delegate :t, to: I18n
-
     def timestamps!
       attr_accessor :created_at, :updated_at
       before_create :update_created_at

data/lib/mongo/model/model.rb

@@ -19,8 +19,8 @@ module Mongo::Model
   def model_eq? o
     return true if equal? o
 
-    variables = {}; ::Mongo::Object.each_object_instance_variable(self){|n, v| variables[n] = v}
-    o_variables = {}; ::Mongo::Object.each_object_instance_variable(o){|n, v| o_variables[n] = v}
+    variables = {}; ::Mongo::Object.each_instance_variable(self){|n, v| variables[n] = v}
+    o_variables = {}; ::Mongo::Object.each_instance_variable(o){|n, v| o_variables[n] = v}
 
     variables == o_variables
   end

data/lib/mongo/model/query_mixin.rb

@@ -2,7 +2,7 @@ module Mongo::Model::QueryMixin
   def exists? options = {}
     self.class.count({_id: _id}, options) > 0
   end
-  alias :exist? :exists?
+  alias_method :exist?, :exists?
 
   module ClassMethods
     include Mongo::DynamicFinders
@@ -36,7 +36,7 @@ module Mongo::Model::QueryMixin
     def exists? selector = {}, options = {}
       count(selector, options) > 0
     end
-    alias :exist? :exists?
+    alias_method :exist?, :exists?
 
     def query *args
       if args.first.is_a? Mongo::Model::Query
@@ -46,5 +46,6 @@ module Mongo::Model::QueryMixin
         Mongo::Model::Query.new self, (selector || {}), (options || {})
       end
     end
+    alias_method :where, :query
   end
 end

data/lib/mongo/model/scope.rb

@@ -81,6 +81,19 @@ module Mongo::Model::Scope
       end
     end
 
+
+    #
+    # Handy scopes
+    #
+    def limit n; query({}, limit: n) end
+    def skip n; query({}, skip: n) end
+    def sort *list; query({}, sort: list) end
+    def snapshot; query({}, snapshot: true) end
+
+    def paginate page, per_page
+      skip((page - 1) * per_page).limit(per_page)
+    end
+
     protected
       def scope_identifier
         @scope_identifier ||= :"mms_#{self.name}"

data/lib/mongodb_model/gems.rb

@@ -1,4 +1,4 @@
-gem 'i18n', '~> 0.5'
+# gem 'i18n', '~> 0.5'
 
 if respond_to? :fake_gem
   fake_gem 'mongodb'

data/spec/assignment_spec.rb

@@ -23,8 +23,9 @@ describe 'Model callbacks' do
 
       attr_accessor :name, :has_mail, :age, :position, :banned
 
+      assign :name, String, true
+
       assign do
-        name     String,  true
         has_mail Boolean, true
       end
 

data/spec/callbacks_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Model callbacks' do
   with_mongo_model
 
-  after(:all){remove_constants :TheModel, :Player}
+  after{remove_constants :TheModel, :Player}
 
   it "integration smoke test" do
     class Player

data/spec/conversion_spec.rb

@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+describe 'Model callbacks' do
+  with_mongo_model
+
+  before :all do
+    class BasePost
+      inherit Mongo::Model
+
+      attr_accessor :text, :token
+
+      attr_writer :comments
+      def comments; @comments ||= [] end
+
+      def teaser
+        @text && @text[0..10]
+      end
+    end
+
+    class BaseComment
+      inherit Mongo::Model
+
+      attr_accessor :text
+    end
+  end
+
+  before do
+    class Post < BasePost; end
+    class Comment < BaseComment; end
+  end
+
+  after{remove_constants :Post, :Comment}
+  after(:all){remove_constants :BasePost, :BaseComment}
+
+  def build_post_with_comment
+    post = Post.new text: 'StarCraft releasing soon!', token: 'secret'
+    post.comments << Comment.new(text: 'Cool!')
+    post
+  end
+
+  it "should work without arguments" do
+    post = build_post_with_comment
+    post.to_rson.should == {
+      'text' => 'StarCraft releasing soon!',
+      'token' => 'secret',
+      'comments' => [
+        {'text' => 'Cool!'}
+      ]
+    }
+  end
+
+  it "only, except, methods" do
+    post = build_post_with_comment
+    post.to_rson(only: :text).should == {'text' => 'StarCraft releasing soon!'}
+    post.to_rson(except: :token).should == {
+      'text' => 'StarCraft releasing soon!',
+      'comments' => [
+        {'text' => 'Cool!'}
+      ]
+    }
+    post.to_rson(only: [], methods: :teaser).should == {'teaser' => 'StarCraft r'}
+  end
+
+  it "profiles" do
+    Post.class_eval do
+      profile :public, only: [:text, :comments], methods: :teaser
+    end
+
+    post = build_post_with_comment
+
+    -> {post.to_rson(profile: :public)}.should raise_error(/profile :public not defined for Comment/)
+
+    Comment.class_eval do
+      profile :public
+    end
+
+    post.to_rson(profile: :public).should == {
+      'text' => 'StarCraft releasing soon!',
+      'teaser' => 'StarCraft r',
+      'comments' => [
+        {'text' => 'Cool!'}
+      ]
+    }
+  end
+
+  it "to_json" do
+    post = build_post_with_comment
+    rson = mock
+    rson.should_receive(:to_json).and_return(:ok)
+    post.should_receive(:to_rson).with(only: :text).and_return(rson)
+    post.to_json(only: :text).should == :ok
+  end
+
+  it "to_xml" do
+    post = build_post_with_comment
+    rson = mock
+    rson.should_receive(:to_xml).and_return(:ok)
+    post.should_receive(:to_rson).with(only: :text).and_return(rson)
+    post.to_xml(only: :text).should == :ok
+  end
+end

data/spec/crud_spec.rb

@@ -93,6 +93,18 @@ describe "Model CRUD" do
 
       Unit.destroy_all!
     end
+
+    it 'modifiers' do
+      unit = Unit.create! name: 'Zeratul'
+
+      Unit.update({_id: unit._id}, _set: {name: 'Tassadar'})
+      unit.reload
+      unit.name.should == 'Tassadar'
+
+      unit.update _set: {name: 'Fenix'}
+      unit.reload
+      unit.name.should == 'Fenix'
+    end
   end
 
   describe 'embedded' do

data/spec/scope_spec.rb

@@ -147,4 +147,18 @@ describe "Scope" do
       end
     end
   end
+
+  describe 'handy scopes' do
+    it "limit, skip, sort" do
+      query = Unit.skip(30).limit(10).sort([name: 1]).snapshot
+      query.selector.should == {}
+      query.options.should == {skip: 30, limit: 10, sort: [[name: 1]], snapshot: true}
+    end
+
+    it 'paginate' do
+      query = Unit.paginate(4, 10)
+      query.selector.should == {}
+      query.options.should == {skip: 30, limit: 10}
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_model
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-04 00:00:00.000000000Z
+date: 2011-09-06 00:00:00.000000000Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &2781050 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2781050
 - !ruby/object:Gem::Dependency
   name: mongodb
-  requirement: &2780760 !ruby/object:Gem::Requirement
+  requirement: &2839010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2780760
+  version_requirements: *2839010
 - !ruby/object:Gem::Dependency
   name: file_model
-  requirement: &2780460 !ruby/object:Gem::Requirement
+  requirement: &2845520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2780460
+  version_requirements: *2845520
 - !ruby/object:Gem::Dependency
   name: validatable2
-  requirement: &2780160 !ruby/object:Gem::Requirement
+  requirement: &2846710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2780160
+  version_requirements: *2846710
 - !ruby/object:Gem::Dependency
   name: ruby_ext
-  requirement: &2779870 !ruby/object:Gem::Requirement
+  requirement: &2847870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2779870
+  version_requirements: *2847870
 description: 
 email: 
 executables: []
@@ -77,6 +66,7 @@ files:
 - lib/mongo/model/assignment.rb
 - lib/mongo/model/attribute_convertors.rb
 - lib/mongo/model/callbacks.rb
+- lib/mongo/model/conversion.rb
 - lib/mongo/model/crud.rb
 - lib/mongo/model/db.rb
 - lib/mongo/model/file_model.rb
@@ -95,6 +85,7 @@ files:
 - spec/associations_spec.rb
 - spec/attribute_convertors_spec.rb
 - spec/callbacks_spec.rb
+- spec/conversion_spec.rb
 - spec/crud_spec.rb
 - spec/db_spec.rb
 - spec/equality_spec.rb