mongoid_alize 0.4.1 → 0.4.2

data/lib/mongoid/alize/callback.rb

@@ -2,7 +2,7 @@ module Mongoid
   module Alize
     class Callback
 
-      attr_accessor :fields
+      attr_accessor :denorm_attrs
 
       attr_accessor :klass
       attr_accessor :relation
@@ -14,12 +14,12 @@ module Mongoid
 
       attr_accessor :debug
 
-      def initialize(_klass, _relation, _fields)
+      def initialize(_klass, _relation, _denorm_attrs)
         self.debug = ENV["ALIZE_DEBUG"]
 
         self.klass = _klass
         self.relation = _relation
-        self.fields = _fields
+        self.denorm_attrs = _denorm_attrs
 
         self.metadata = _klass.relations[_relation.to_s]
         if !(self.metadata.polymorphic? &&
@@ -58,30 +58,31 @@ module Mongoid
         "denormalize_#{direction}_#{relation}"
       end
 
-      def define_fields_method
-        _fields = fields
-        if fields.is_a?(Proc)
-          klass.send(:define_method, fields_method_name) do |inverse|
-            _fields.bind(self).call(inverse).map(&:to_s)
+      def define_denorm_attrs
+        _denorm_attrs = denorm_attrs
+        if denorm_attrs.is_a?(Proc)
+          klass.send(:define_method, denorm_attrs_name) do |inverse|
+            _denorm_attrs.bind(self).call(inverse).map(&:to_s)
           end
         else
-          klass.send(:define_method, fields_method_name) do |inverse|
-            _fields.map(&:to_s)
+          klass.send(:define_method, denorm_attrs_name) do |inverse|
+            _denorm_attrs.map(&:to_s)
           end
         end
       end
 
-      def fields_method_name
-        "#{callback_name}_fields"
+      def denorm_attrs_name
+        "#{callback_name}_attrs"
       end
 
       def field_values(source, options={})
         extras = options[:id] ? "['_id']" : "[]"
         <<-RUBY
-          (#{fields_method_name}(#{source}) + #{extras}).inject({}) { |hash, name|
+          value = (#{denorm_attrs_name}(#{source}) + #{extras}).inject({}) do |hash, name|
             hash[name] = #{source}.send(name)
             hash
-          }
+          end
+          value.respond_to?(:mongoize) ? value.mongoize : value
         RUBY
       end
 

data/lib/mongoid/alize/callbacks/from/many.rb

@@ -19,13 +19,11 @@ module Mongoid
             CALLBACK
           end
 
-          def define_fields
+          def define_mongoid_field
             ensure_field_not_defined!(prefixed_name, klass)
             klass.class_eval <<-CALLBACK, __FILE__, __LINE__ + 1
               field :#{prefixed_name}, :type => Array, :default => []
             CALLBACK
-
-            define_fields_method
           end
         end
       end

data/lib/mongoid/alize/callbacks/from/one.rb

@@ -27,13 +27,11 @@ module Mongoid
             CALLBACK
           end
 
-          def define_fields
+          def define_mongoid_field
             ensure_field_not_defined!(prefixed_name, klass)
             klass.class_eval <<-CALLBACK, __FILE__, __LINE__ + 1
               field :#{prefixed_name}, :type => Hash, :default => {}
             CALLBACK
-
-            define_fields_method
           end
         end
       end

data/lib/mongoid/alize/from_callback.rb

@@ -3,7 +3,8 @@ module Mongoid
     class FromCallback < Callback
 
       def attach
-        define_fields
+        define_mongoid_field
+        define_denorm_attrs
 
         define_callback
         alias_callback

data/lib/mongoid/alize/to_callback.rb

@@ -3,7 +3,7 @@ module Mongoid
     class ToCallback < Callback
 
       def attach
-        define_fields
+        define_denorm_attrs
 
         define_callback
         alias_callback
@@ -112,10 +112,6 @@ module Mongoid
         "[self.#{relation}].flatten.compact"
       end
 
-      def define_fields
-        define_fields_method
-      end
-
       def set_callback
         unless callback_attached?("save", aliased_callback_name)
           klass.set_callback(:save, :after, aliased_callback_name)

data/spec/app/models/person.rb

@@ -5,6 +5,11 @@ class Person
   field :name, type: String
   field :created_at, type: Time
 
+  if SpecHelper.mongoid_3?
+    field :my_date, type: Date
+    field :my_datetime, type: DateTime
+  end
+
   # the attached head
   has_one :head
 

data/spec/mongoid/alize/callback_spec.rb

@@ -34,7 +34,7 @@ describe Mongoid::Alize::Callback do
       callback.inverse_klass = Person
       callback.inverse_relation = :head
       callback.inverse_metadata.should == Person.relations["head"]
-      callback.fields.should == [:name, :created_at]
+      callback.denorm_attrs.should == [:name, :created_at]
     end
 
     it "should not set inverses for the child in a polymorphic association" do
@@ -83,37 +83,37 @@ describe Mongoid::Alize::Callback do
       @callback.aliased_callback_name.should == "denormalize_spec_person"
     end
 
-    it "should add _fields to the callback name" do
-      @callback.fields_method_name.should == "_denormalize_spec_person_fields"
+    it "should add _attrs to the callback name" do
+      @callback.denorm_attrs_name.should == "_denormalize_spec_person_attrs"
     end
   end
 
-  describe "define fields method" do
-    def define_fields_method
-      @callback.send(:define_fields_method)
+  describe "#define_denorm_attrs" do
+    def define_denorm_attrs
+      @callback.send(:define_denorm_attrs)
     end
 
-    describe "when fields is an array" do
+    describe "when denorm_attrs is an array" do
       before do
         @callback = new_callback
       end
 
-      it "should return the fields w/ to_s applied" do
-        define_fields_method
+      it "should return the denorm_attrs w/ to_s applied" do
+        define_denorm_attrs
         @head = Head.new
-        @head.send("_denormalize_spec_person_fields", nil).should == ["name", "created_at"]
+        @head.send("_denormalize_spec_person_attrs", nil).should == ["name", "created_at"]
       end
     end
 
-    describe "when fields is a proc" do
+    describe "when denorm_attrs is a proc" do
       before do
         @callback = klass.new(Head, :person, lambda { |inverse| [:name, :created_at] })
       end
 
-      it "should return the fields w/ to_s applied" do
-        define_fields_method
+      it "should return the denorm_attrs w/ to_s applied" do
+        define_denorm_attrs
         @head = Head.new
-        @head.send("_denormalize_spec_person_fields", Person.new).should == ["name", "created_at"]
+        @head.send("_denormalize_spec_person_attrs", Person.new).should == ["name", "created_at"]
       end
     end
   end

data/spec/mongoid/alize/callbacks/from/many_spec.rb

@@ -13,16 +13,16 @@ describe Mongoid::Alize::Callbacks::From::Many do
     klass.new(*args)
   end
 
-  describe "#define_fields" do
+  describe "#define_mongoid_field" do
     it "should define an Array called {relation}_fields" do
       callback = new_callback
-      callback.send(:define_fields)
+      callback.send(:define_mongoid_field)
       Head.fields["wanted_by_fields"].type.should == Array
     end
 
     it "should default the field to empty" do
       callback = new_callback
-      callback.send(:define_fields)
+      callback.send(:define_mongoid_field)
       Head.new.wanted_by_fields.should == []
     end
 
@@ -32,7 +32,7 @@ describe Mongoid::Alize::Callbacks::From::Many do
       end
       callback = new_callback
       expect {
-        callback.send(:define_fields)
+        callback.send(:define_mongoid_field)
       }.to raise_error(Mongoid::Alize::Errors::AlreadyDefinedField,
                        "wanted_by_fields is already defined on the Head model.")
     end
@@ -62,13 +62,13 @@ describe Mongoid::Alize::Callbacks::From::Many do
     describe "valid fields" do
       before do
         @callback = new_callback
-        @callback.send(:define_fields)
+        @callback.send(:define_mongoid_field)
+        @callback.send(:define_denorm_attrs)
         @callback.send(:define_callback)
       end
 
       it "should set fields from a changed relation" do
-        @head.wanted_by_ids << @person.id
-        @head.should be_wanted_by_ids_changed
+        @head.wanted_by = [@person]
         run_callback
         @head.wanted_by_fields.should == [bob_fields]
       end
@@ -83,12 +83,12 @@ describe Mongoid::Alize::Callbacks::From::Many do
     describe "with a field that doesn't exist" do
       before do
         @callback = klass.new(Head, :wanted_by, [:notreal])
-        @callback.send(:define_fields)
+        @callback.send(:define_mongoid_field)
         @callback.send(:define_callback)
       end
 
       it "should raise a no method error" do
-        @head.wanted_by_ids << @person.id
+        @head.wanted_by = [@person]
         @head.wanted_by_fields.should be_nil
         expect {
           run_callback
@@ -109,7 +109,8 @@ describe Mongoid::Alize::Callbacks::From::Many do
       @person = Person.create(:name => "Bob")
 
       @callback = klass.new(Head, :sees, [:name])
-      @callback.send(:define_fields)
+      @callback.send(:define_mongoid_field)
+      @callback.send(:define_denorm_attrs)
       @callback.send(:define_callback)
 
       @head.relations["sees"].should_not be_stores_foreign_key

data/spec/mongoid/alize/callbacks/from/one_spec.rb

@@ -13,17 +13,17 @@ describe Mongoid::Alize::Callbacks::From::One do
     klass.new(*args)
   end
 
-  describe "#define_fields" do
+  describe "#define_mongoid_field" do
     describe "with an array of fields" do
       it "should add a field generated from %{relation}_fields" do
         callback = new_callback
-        callback.send(:define_fields)
+        callback.send(:define_mongoid_field)
         Head.fields["person_fields"].type.should == Hash
       end
 
       it "should default the field to empty" do
         callback = new_callback
-        callback.send(:define_fields)
+        callback.send(:define_mongoid_field)
         Head.new.person_fields.should == {}
       end
 
@@ -33,7 +33,7 @@ describe Mongoid::Alize::Callbacks::From::One do
         end
         callback = new_callback
         expect {
-          callback.send(:define_fields)
+          callback.send(:define_mongoid_field)
         }.to raise_error(Mongoid::Alize::Errors::AlreadyDefinedField,
                          "person_fields is already defined on the Head model.")
       end
@@ -58,7 +58,8 @@ describe Mongoid::Alize::Callbacks::From::One do
 
     before do
       @callback = new_callback
-      @callback.send(:define_fields)
+      @callback.send(:define_mongoid_field)
+      @callback.send(:define_denorm_attrs)
       create_models
       @callback.send(:define_callback)
     end
@@ -107,7 +108,8 @@ describe Mongoid::Alize::Callbacks::From::One do
 
     before do
       @callback = klass.new(Person, :head, [:size])
-      @callback.send(:define_fields)
+      @callback.send(:define_mongoid_field)
+      @callback.send(:define_denorm_attrs)
 
       @person = Person.create
       @head = Head.create(:size => 5)

data/spec/mongoid/alize/callbacks/to/many_from_many_spec.rb

@@ -43,7 +43,7 @@ describe Mongoid::Alize::ToCallback do
 
     before do
       @callback = new_callback
-      @callback.send(:define_fields)
+      @callback.send(:define_denorm_attrs)
       create_models
       @callback.send(:define_callback)
     end
@@ -75,7 +75,7 @@ describe Mongoid::Alize::ToCallback do
 
     before do
       @callback = new_callback
-      @callback.send(:define_fields)
+      @callback.send(:define_denorm_attrs)
       create_models
       @callback.send(:define_destroy_callback)
     end

data/spec/mongoid/alize/callbacks/to/many_from_one_spec.rb

@@ -11,7 +11,7 @@ describe Mongoid::Alize::ToCallback do
 
   def define_and_create(callback_name=:define_callback)
     @callback = new_callback
-    @callback.send(:define_fields)
+    @callback.send(:define_denorm_attrs)
     create_models
     @callback.send(callback_name)
   end

data/spec/mongoid/alize/callbacks/to/one_from_many_spec.rb

@@ -11,7 +11,7 @@ describe Mongoid::Alize::ToCallback do
 
   def define_and_create(callback_name=:define_callback)
     @callback = new_callback
-    @callback.send(:define_fields)
+    @callback.send(:define_denorm_attrs)
     create_models
     @callback.send(callback_name)
   end

data/spec/mongoid/alize/callbacks/to/one_from_one_spec.rb

@@ -11,7 +11,7 @@ describe Mongoid::Alize::ToCallback do
 
   def define_and_create(callback_name=:define_callback)
     @callback = new_callback
-    @callback.send(:define_fields)
+    @callback.send(:define_denorm_attrs)
     create_models
     @callback.send(callback_name)
   end

data/spec/mongoid/alize/from_callback_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 class Mongoid::Alize::SpecFromCallback < Mongoid::Alize::FromCallback
-  def define_fields
+  def define_mongoid_field
   end
 
   def define_callback

data/spec/mongoid/alize/mongoize_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe Mongoid::Alize::ToCallback do
+
+  before do
+    @now = Time.parse('2013-01-05T12:00:22-700')
+    stub(Time).now { @now }
+
+    Head.class_eval do
+      field :sees_fields, :type => Array, :default => []
+    end
+    Person.class_eval do
+      fields = [:name, :location, :created_at]
+      fields += [:my_date, :my_datetime] if SpecHelper.mongoid_3?
+      alize_to :seen_by, fields: fields
+    end
+
+    @head = Head.create(:sees => [@person = Person.create(sees_fields_without_id)])
+    @person.seen_by = @head
+  end
+
+  def sees_fields_without_id
+    fields = { "name"=> "Bob",
+               "location" => "Paris",
+               "created_at" => @now }
+
+    fields.merge!( "my_date" => @now.to_date,
+                   "my_datetime" => @now.to_datetime ) if SpecHelper.mongoid_3?
+
+    fields
+  end
+
+  def sees_fields_with_id
+    sees_fields_without_id.merge!( "_id" => @person.id )
+  end
+
+  def sees_fields_mongoized
+    fields = sees_fields_with_id.merge!( "created_at"  => @now.utc )
+
+    fields.merge!( "my_date"     => @now.utc.to_date,
+                   "my_datetime" => @now.utc ) if SpecHelper.mongoid_3?
+
+    fields
+  end
+
+  it "should push the mongoized values to the relation" do
+    @head.sees_fields.should == [sees_fields_mongoized]
+  end
+end

data/spec/mongoid/alize/to_callback_spec.rb

@@ -15,7 +15,7 @@ describe Mongoid::Alize::ToCallback do
 
   def define_and_create(callback_name=:define_callback)
     @callback = new_callback
-    @callback.send(:define_fields)
+    @callback.send(:define_denorm_attrs)
     create_models
     @callback.send(callback_name)
   end
@@ -47,10 +47,10 @@ describe Mongoid::Alize::ToCallback do
     end
   end
 
-  describe "#define_fields" do
-    it "should define the fields method" do
-      mock(@callback).define_fields_method
-      @callback.send(:define_fields)
+  describe "#define_denorm_attrs" do
+    it "should define the denorm attrs method" do
+      mock(@callback).define_denorm_attrs
+      @callback.send(:define_denorm_attrs)
     end
   end
 

data/spec/spec_helper.rb

@@ -1,21 +1,28 @@
 require 'rubygems'
-require 'looksee'
-require 'awesome_print'
-require 'wirble'
 require 'mongoid'
 
-def three?
-  Mongoid::VERSION =~ /^3/
+unless ENV['CI']
+  require 'looksee'
+  require 'awesome_print'
+  require 'wirble'
+end
+
+module SpecHelper
+  def self.mongoid_3?
+    defined?(Mongoid::VERSION) && Mongoid::VERSION =~ /^3/
+  end
 end
 
 Mongoid.configure do |config|
-  if three?
+  if SpecHelper.mongoid_3?
     config.connect_to("mongoid_alize_test")
-    Moped.logger = Logger.new("log/test.log")
-    Moped.logger.level = Logger::DEBUG
+    Moped.logger = Logger.new($stdout)
+    Moped.logger.level = Logger::INFO
   else
+    logger = Logger.new($stdout)
+    logger.level = Logger::INFO
     config.master = Mongo::Connection.new("localhost", 27017,
-                    :logger => Logger.new("log/test.log")).db("mongoid_alize_test")
+                    :logger => logger).db("mongoid_alize_test")
   end
 end
 
@@ -26,6 +33,8 @@ Dir["#{File.dirname(__FILE__)}/helpers/*.rb"].each { |f| require f }
 RSpec.configure do |config|
   config.include(MacrosHelper)
 
+  puts "MongoidVersion - #{Mongoid::VERSION}"
+
   config.mock_with :rr
   config.before :each do
     Mongoid.purge!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_alize
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -76,6 +76,7 @@ files:
 - spec/mongoid/alize/from_callback_spec.rb
 - spec/mongoid/alize/instance_helpers_spec.rb
 - spec/mongoid/alize/macros_spec.rb
+- spec/mongoid/alize/mongoize_spec.rb
 - spec/mongoid/alize/to_callback_spec.rb
 - spec/mongoid_alize_spec.rb
 - spec/spec_helper.rb