mongoid_alize 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8787d5a6ebd7c17e2619267de0cb2c3b536dad5b
-  data.tar.gz: 1953945ef586e4ab4d319a22cd9acc1abb58e5b1
+SHA256:
+  metadata.gz: b298e436dfc8fa64055e1a1fce7cff2b84d99e55fea84229872490669c6d1142
+  data.tar.gz: 12e69d1410466c984322d2029ff3a2900b19c0c74f7d2cf0cd7a4c141a105d13
 SHA512:
-  metadata.gz: 16a40f35a37a71b24f599f4acb73ebac65622e033ac1b1583b2a551c605690818b75fc422a7bae072cc3af4bd74d39e44360b285d972ad56eec563f491e58b3a
-  data.tar.gz: 0f6bb6a4efc21d697e723ab9ab5219dea616d4134bf9f80662beb1ddb0da97268ed85da0d9943d1961d770ebbc8817e24e7b763fb5b7eac12460a4e2f0d70010
+  metadata.gz: d07bf01de381cbd098c0bbd2525a229a55b8aa5545f33113039252a799735fc4d88449d292e89a53fb031c2a52e82eed2e542cd1d227d90984d092eb34f324ab
+  data.tar.gz: b5b9b581d68af949d0ba8feab28f670d003175f598afe23e0fef1ec857e4db11b75ac7192e990881b4223def3c74042cf464f63dc20fbbecf66cd7594b4e4f7b

data/lib/mongoid/alize/callback.rb

@@ -51,11 +51,11 @@ module Mongoid
       end
 
       def callback_name
-        "_#{aliased_callback_name}"
+        :"_#{aliased_callback_name}"
       end
 
       def aliased_callback_name
-        "denormalize_#{direction}_#{relation}"
+        :"denormalize_#{direction}_#{relation}"
       end
 
       def define_denorm_attrs
@@ -72,7 +72,7 @@ module Mongoid
       end
 
       def denorm_attrs_name
-        "#{callback_name}_attrs"
+        :"#{callback_name}_attrs"
       end
 
       def field_values(source, options={})

data/lib/mongoid/alize/macros.rb

@@ -79,7 +79,7 @@ module Mongoid
         one  = Mongoid::Relations::One
         many = Mongoid::Relations::Many
 
-        def (many = many.dup).==(klass)
+        def (many).==(klass)
           [Mongoid::Relations::Many,
            Mongoid::Relations::Referenced::Many].map(&:name).include?(klass.name)
         end

data/lib/mongoid/alize/to_callback.rb

@@ -1,3 +1,5 @@
+require 'mongoid/compatibility'
+
 module Mongoid
   module Alize
     class ToCallback < Callback
@@ -56,7 +58,7 @@ module Mongoid
               is_one = #{is_one?}
               prefixed_name = #{prefixed_name}
               if is_one
-                #{relation_set('prefixed_name', 'nil')}
+                #{relation_unset('prefixed_name')}
               else
                 #{pull_from_inverse}
               end
@@ -91,15 +93,19 @@ module Mongoid
       end
 
       def relation_set(field, value)
-        mongoid_four_or_newer? ? "relation.set(#{field} => #{value})" : "relation.set(#{field}, #{value})"
+        Mongoid::Compatibility::Version.mongoid4_or_newer? ? "relation.set(#{field}.to_sym => #{value})" : "relation.set(#{field}, #{value})"
+      end
+
+      def relation_unset(field)
+        "relation.unset(#{field}.to_sym)"
       end
 
       def relation_pull(field, value)
-        mongoid_four_or_newer? ? "relation.pull(#{field} => #{value})" : "relation.pull(#{field}, #{value})"
+        Mongoid::Compatibility::Version.mongoid4_or_newer? ? "relation.pull(#{field}.to_sym => #{value})" : "relation.pull(#{field}, #{value})"
       end
 
       def relation_push(field, value)
-        mongoid_four_or_newer? ? "relation.push(#{field} => #{value})" : "relation.push(#{field}, #{value})"
+        Mongoid::Compatibility::Version.mongoid4_or_newer? ? "relation.push(#{field}.to_sym => #{value})" : "relation.push(#{field}, #{value})"
       end
 
       def is_one?
@@ -144,21 +150,17 @@ module Mongoid
       end
 
       def aliased_destroy_callback_name
-        "denormalize_destroy_#{direction}_#{relation}"
+        :"denormalize_destroy_#{direction}_#{relation}"
       end
 
       def destroy_callback_name
-        "_#{aliased_destroy_callback_name}"
+        :"_#{aliased_destroy_callback_name}"
       end
 
       def direction
         "to"
       end
 
-      def mongoid_four_or_newer?
-        Mongoid::VERSION.split('.').first.to_i >= 4
-      end
-
     end
   end
 end

data/spec/app/models/head.rb

@@ -2,18 +2,26 @@ class Head
   include Mongoid::Document
   include Mongoid::Alize
 
-  if SpecHelper.mongoid_four_or_newer?
+  if Mongoid::Compatibility::Version.mongoid4_or_newer?
     include Mongoid::Attributes::Dynamic
   end
 
   field :size, type: Integer
   field :weight
 
-  # to whom it's attached
-  belongs_to :person
+  if Mongoid::Compatibility::Version.mongoid6_or_newer?
+    # to whom it's attached
+    belongs_to :person, optional: true
 
-  # in whose possession it is
-  belongs_to :captor, :class_name => "Person", :inverse_of => :heads
+    # in whose possession it is
+    belongs_to :captor, :class_name => "Person", :inverse_of => :heads, optional: true
+  else
+    # to whom it's attached
+    belongs_to :person
+
+    # in whose possession it is
+    belongs_to :captor, :class_name => "Person", :inverse_of => :heads
+  end
 
   # who'd otherwise like to possess it
   has_and_belongs_to_many :wanted_by, :class_name => "Person", :inverse_of => :wants
@@ -24,8 +32,13 @@ class Head
   # a relation with no inverse
   has_many :admirer, :class_name => "Person", :inverse_of => nil
 
-  # a polymorphic one-to-one relation
-  belongs_to :nearest, :polymorphic => true
+  if Mongoid::Compatibility::Version.mongoid6_or_newer?
+    # a polymorphic one-to-one relation
+    belongs_to :nearest, :polymorphic => true, optional: true
+  else
+    # a polymorphic one-to-one relation
+    belongs_to :nearest, :polymorphic => true
+  end
 
   # a polymorphic one-to-many relation
   has_many :below_people, :class_name => "Person", :as => :above

data/spec/app/models/person.rb

@@ -2,14 +2,14 @@ class Person
   include Mongoid::Document
   include Mongoid::Alize
 
-  if SpecHelper.mongoid_four_or_newer?
+  if Mongoid::Compatibility::Version.mongoid4_or_newer?
     include Mongoid::Attributes::Dynamic
   end
 
   field :name, type: String
   field :created_at, type: Time
 
-  if SpecHelper.mongoid_three_or_newer?
+  if Mongoid::Compatibility::Version.mongoid4_or_newer?
     field :my_date, type: Date
     field :my_datetime, type: DateTime
   end
@@ -23,14 +23,24 @@ class Person
   # the heads wanted from others
   has_and_belongs_to_many :wants, :class_name => "Head", :inverse_of => :wanted_by
 
-  # the only head that is watching
-  belongs_to :seen_by, :class_name => "Head", :inverse_of => :sees
+  if Mongoid::Compatibility::Version.mongoid6_or_newer?
+    # the only head that is watching
+    belongs_to :seen_by, :class_name => "Head", :inverse_of => :sees, optional: true
+  else
+    # the only head that is watching
+    belongs_to :seen_by, :class_name => "Head", :inverse_of => :sees
+  end
 
   # a polymorphic one-to-one relation
   has_one :nearest_head, :class_name => "Head", :as => :nearest
 
-  # a polymorphic one-to-many relation
-  belongs_to :above, :polymorphic => true
+  if Mongoid::Compatibility::Version.mongoid6_or_newer?
+    # a polymorphic one-to-many relation
+    belongs_to :above, :polymorphic => true, optional: true
+  else
+    # a polymorphic one-to-many relation
+    belongs_to :above, :polymorphic => true
+  end
 
   def location
     "Paris"

data/spec/mongoid/alize/callback_spec.rb

@@ -57,8 +57,8 @@ describe Mongoid::Alize::Callback do
 
     describe "#alias_callback" do
       it "should alias the callback on the klass and make it public" do
-        mock(@callback.klass).alias_method("denormalize_spec_person", "_denormalize_spec_person")
-        mock(@callback.klass).public("denormalize_spec_person")
+        mock(@callback.klass).alias_method(:denormalize_spec_person, :_denormalize_spec_person)
+        mock(@callback.klass).public(:denormalize_spec_person)
         @callback.send(:alias_callback)
       end
 
@@ -76,15 +76,15 @@ describe Mongoid::Alize::Callback do
     end
 
     it "should have a callback name" do
-      @callback.callback_name.should == "_denormalize_spec_person"
+      @callback.callback_name.should == :_denormalize_spec_person
     end
 
     it "should have aliased callback name" do
-      @callback.aliased_callback_name.should == "denormalize_spec_person"
+      @callback.aliased_callback_name.should == :denormalize_spec_person
     end
 
     it "should add _attrs to the callback name" do
-      @callback.denorm_attrs_name.should == "_denormalize_spec_person_attrs"
+      @callback.denorm_attrs_name.should == :_denormalize_spec_person_attrs
     end
   end
 
@@ -101,7 +101,7 @@ describe Mongoid::Alize::Callback do
       it "should return the denorm_attrs w/ to_s applied" do
         define_denorm_attrs
         @head = Head.new
-        @head.send("_denormalize_spec_person_attrs", nil).should == ["name", "created_at"]
+        @head.send(:_denormalize_spec_person_attrs, nil).should == ["name", "created_at"]
       end
     end
 
@@ -113,7 +113,7 @@ describe Mongoid::Alize::Callback do
       it "should return the denorm_attrs w/ to_s applied" do
         define_denorm_attrs
         @head = Head.new
-        @head.send("_denormalize_spec_person_attrs", 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

@@ -51,8 +51,6 @@ describe Mongoid::Alize::Callbacks::From::Many do
     end
 
     before do
-      now = Time.now
-      stub(Time).now { now }
       @head = Head.create
       @person = Person.create(:name => "Bob")
 
@@ -103,8 +101,6 @@ describe Mongoid::Alize::Callbacks::From::Many do
     end
 
     before do
-      now = Time.now
-      stub(Time).now { now }
       @head = Head.create
       @person = Person.create(:name => "Bob")
 

data/spec/mongoid/alize/from_callback_spec.rb

@@ -31,7 +31,7 @@ describe Mongoid::Alize::FromCallback do
 
   describe "#set_callback" do
     it "should set a callback on the klass" do
-      mock(@callback.klass).set_callback(:save, :before, "denormalize_from_person")
+      mock(@callback.klass).set_callback(:save, :before, :denormalize_from_person)
       @callback.send(:set_callback)
     end
 

data/spec/mongoid/alize/mongoize_spec.rb

@@ -4,14 +4,13 @@ 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?
+      fields += [:my_date, :my_datetime] if Mongoid::Compatibility::Version.mongoid4_or_newer?
       alize_to :seen_by, fields: fields
     end
 
@@ -25,7 +24,7 @@ describe Mongoid::Alize::ToCallback do
                "created_at" => @now }
 
     fields.merge!( "my_date" => @now.to_date,
-                   "my_datetime" => @now.to_datetime ) if SpecHelper.mongoid_3?
+                   "my_datetime" => @now.to_datetime ) if Mongoid::Compatibility::Version.mongoid4_or_newer?
 
     fields
   end
@@ -38,7 +37,7 @@ describe Mongoid::Alize::ToCallback do
     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?
+                   "my_datetime" => @now.utc ) if Mongoid::Compatibility::Version.mongoid4_or_newer?
 
     fields
   end

data/spec/mongoid/alize/to_callback_spec.rb

@@ -26,11 +26,11 @@ describe Mongoid::Alize::ToCallback do
 
   describe "names" do
     it "should assign a destroy callback name" do
-      @callback.destroy_callback_name.should == "_denormalize_destroy_to_head"
+      @callback.destroy_callback_name.should == :_denormalize_destroy_to_head
     end
 
     it "should assign an aliased destroy callback name" do
-      @callback.aliased_destroy_callback_name.should == "denormalize_destroy_to_head"
+      @callback.aliased_destroy_callback_name.should == :denormalize_destroy_to_head
     end
 
     it "should assign a prefixed name from the inverse if present" do
@@ -56,7 +56,7 @@ describe Mongoid::Alize::ToCallback do
 
   describe "#set_callback" do
     it "should set a callback on the klass" do
-      mock(@callback.klass).set_callback(:save, :after, "denormalize_to_head")
+      mock(@callback.klass).set_callback(:save, :after, :denormalize_to_head)
       @callback.send(:set_callback)
     end
 
@@ -69,7 +69,7 @@ describe Mongoid::Alize::ToCallback do
 
   describe "#set_destroy_callback" do
     it "should set a destroy callback on the klass" do
-      mock(@callback.klass).set_callback(:destroy, :after, "denormalize_destroy_to_head")
+      mock(@callback.klass).set_callback(:destroy, :after, :denormalize_destroy_to_head)
       @callback.send(:set_destroy_callback)
     end
 
@@ -82,8 +82,8 @@ describe Mongoid::Alize::ToCallback do
 
   describe "#alias_destroy_callback" do
     it "should alias the destroy callback on the klass" do
-      mock(@callback.klass).alias_method("denormalize_destroy_to_head", "_denormalize_destroy_to_head")
-      mock(@callback.klass).public("denormalize_destroy_to_head")
+      mock(@callback.klass).alias_method(:denormalize_destroy_to_head, :_denormalize_destroy_to_head)
+      mock(@callback.klass).public(:denormalize_destroy_to_head)
       @callback.send(:alias_destroy_callback)
     end
 

data/spec/mongoid_alize_spec.rb

@@ -11,7 +11,6 @@ describe Mongoid::Alize do
 
   before do
     @now = Time.now
-    stub(Time).now { @now }
     @head = Head.new(:size => @size = 10, created_at: @now)
     @person = Person.new(:name => @name = "Bob", created_at: @now)
   end

data/spec/spec_helper.rb

@@ -1,30 +1,13 @@
 require 'rubygems'
 require 'mongoid'
+require 'mongoid/compatibility'
+require 'rr'
 
 unless ENV['CI']
   require 'awesome_print'
   require 'wirble'
 end
 
-module SpecHelper
-
-  # for mongoize_spec
-  def self.mongoid_3?
-    defined?(Mongoid::VERSION) && Mongoid::VERSION.split('.').first.to_i == 3
-  end
-
-  # different connection scheme starting with three
-  def self.mongoid_three_or_newer?
-    defined?(Mongoid::VERSION) && Mongoid::VERSION.split('.').first.to_i >= 3
-  end
-
-  # dynamic attributes required starting with four
-  def self.mongoid_four_or_newer?
-    defined?(Mongoid::VERSION) && Mongoid::VERSION.split('.').first.to_i >= 4
-  end
-
-end
-
 Mongoid.configure do |config|
 
   if defined?(Moped)
@@ -35,12 +18,8 @@ Mongoid.configure do |config|
     logger.level = Logger::INFO
   end
 
-  if SpecHelper.mongoid_three_or_newer?
-    config.connect_to("mongoid_alize_test")
-  else
-    config.master = Mongo::Connection.new("localhost", 27017,
-                    :logger => logger).db("mongoid_alize_test")
-  end
+  name = "mongoid_alize_test"
+  config.respond_to?(:connect_to) ? config.connect_to(name) : config.master = Mongo::Connection.new.db(name)
 end
 
 require File.expand_path("../../lib/mongoid_alize", __FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_alize
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Josh Dzielak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-04 00:00:00.000000000 Z
+date: 2018-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: mongoid-compatibility
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.6.0
 description: Keep data in sync as you denormalize across any type of relation.
-email: github_public@dz.oib.com
+email: jdzielak@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -95,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Comprehensive field denormalization for Mongoid that stays in sync.