active_mongoid 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b8cce1050cca965bddc13456a3d61018d521e7e
-  data.tar.gz: 8b1a1aff092cfd640a731ef37b95d20ed532bd47
+  metadata.gz: a5bd42e8cd2f6ff10aa998ed7e3dd94a92829c6f
+  data.tar.gz: 4bb0e5b3309514f69bee4cf5620922154cb66159
 SHA512:
-  metadata.gz: 2d96b1ddec38049591130867e3377d74be2b369cb8b88bc7971cd950657bf9013e58cb7b6cfbccae2321e603ce6915615bdbfd6ede86337b2bc9d7410c6b1cc1
-  data.tar.gz: f59ad3ca18fa23cdd9b389633e025ec89c5d1a35576597e3399a796ce72bce81c0f223782548b96143edea0c2ee51b031268759ca456eec07ebda44312b7c687
+  metadata.gz: 165efcb720f10b7a646e863a074038546287bfaa410aa662b72b62f9b8256055d76ba13dbe58eb728df5afcd8a12ec912ad6374a0019ebeb6ae4c50feba0876d
+  data.tar.gz: 440c44e214a16195df803a1ce72da3ba87bb1d748eb4c726d643746fc276fdc4e98e61fcc09d71985cc2fbb6138c58099e829d57703b39836850c1780820453d

data/.travis.yml

@@ -3,9 +3,11 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0
 services:
   - mongodb
 script: bundle exec rspec
 gemfile:
   - gemfiles/mongoid_2.8.gemfile
   - gemfiles/mongoid_3.1.gemfile
+  - gemfiles/mongoid_4.0.gemfile

data/Appraisals

@@ -5,3 +5,7 @@ end
 appraise "mongoid-3.1" do
   gem "mongoid", "~> 3.1.0"
 end
+
+appraise "mongoid-4.0" do
+  gem "mongoid", "~> 4.0.0"
+end

data/README.md

@@ -159,6 +159,25 @@ end
 => BSON::ObjectId('545289a7b736b6586a000002')
 ```
 
+```ruby
+class Play < ActiveRecord::Base
+  include ActiveMongoid::Associations
+  include ActiveMongoid::Finders
+  include ActiveMongoid::BsonId
+
+  bsonify_attr :id, initialize: true, primary: true
+end
+```
+
+```ruby
+> play.id
+=> '545289a7b736b6586a000001' # An issue with ActiveRecord does not allow casting this particular accessor
+> play.id = BSON::ObjectId('545289a7b736b6586a000002')
+=> BSON::ObjectId('545289a7b736b6586a000002')
+> play._id = '545289a7b736b6586a000002'
+=> BSON::ObjectId('545289a7b736b6586a000002')
+```
+
 ### ActiveMongoid::Finders
 
 This module proxies the existing ActiveRecord `find` and `where` to perform casting of `BSON::ObjectId`'s to string for queries. Additionally it'll default to the `_id` field if the object is a valid `BSON::ObjectId` and the `_id` field is present on the model. 
@@ -173,17 +192,15 @@ end
 
 ```ruby
 > Division.find(1)
-=> #<Tournament id: 1, _id: "545289a7b736b6586a000001", name: "new tournament">
+=> #<Division id: 1, _id: "545289a7b736b6586a000001", name: "new">
 > Division.find(BSON::ObjectId('545289a7b736b6586a000001')
-=> #<Tournament id: 1, _id: "545289a7b736b6586a000001", name: "new tournament">
+=> #<Division id: 1, _id: "545289a7b736b6586a000001", name: "new">
 > Division.where(_id: BSON::ObjectId('545289a7b736b6586a000001')
-=> [#<Tournament id: 1, _id: "545289a7b736b6586a000001", name: "new tournament">]
+=> [#<Division id: 1, _id: "545289a7b736b6586a000001", name: "new">]
 > Division.where(id: BSON::ObjectId('545289a7b736b6586a000001')
-=> [#<Tournament id: 1, _id: "545289a7b736b6586a000001", name: "new tournament">]
+=> [#<Division id: 1, _id: "545289a7b736b6586a000001", name: "new">]
 ```
 
-
-
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/active_mongoid/fork )

data/active_mongoid.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport", "> 3.2.0"
   spec.add_dependency "activerecord", "> 3.2.0"
-  spec.add_dependency "mongo", "> 1.5.0"
   spec.add_dependency "bson_ext", "> 1.5.0"
   spec.add_dependency "mongoid", "> 2.8.0"
   spec.add_dependency "after_do", "~> 0.3.0"

data/gemfiles/mongoid_4.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mongoid", "~> 4.0.0"
+
+gemspec :path => "../"

data/lib/active_mongoid.rb

@@ -4,5 +4,9 @@ require "active_mongoid/finder_proxy"
 require "active_mongoid/finders"
 
 module ActiveMongoid
-  BSON = ::Gem::Version.new(Mongoid::VERSION) < ::Gem::Version.new("3.0.0") ? ::BSON : ::Moped::BSON
+  if ::Gem::Version.new(Mongoid::VERSION).between?(::Gem::Version.new("3.0.0"), ::Gem::Version.new("4.0.0"))
+    BSON = ::Moped::BSON
+  else
+    BSON = ::BSON
+  end
 end

data/lib/active_mongoid/bson_id.rb

@@ -2,12 +2,26 @@ module ActiveMongoid
   module BsonId
     extend ActiveSupport::Concern
 
+    included do
+      class_attribute :bson_attrs
+      class_attribute :primary_bson_key
+      self.bson_attrs = []
+    end
+
     module ClassMethods
 
       def bsonify_attr(name, options = {})
         bson_attr_setter(name)
-        bson_attr_getter(name)
+        bson_attr_getter(name) unless options[:primary]
+        bson_attrs << name
         bson_attr_init(name) if options[:initialize]
+        set_ar_primary_bson_id(name) if options[:primary]
+      end
+
+      def set_ar_primary_bson_id(name)
+        self.primary_key = name
+        self.primary_bson_key = name
+        alias_attribute "_#{name}".to_sym, name
       end
 
       private

data/lib/active_mongoid/finder_proxy.rb

@@ -16,7 +16,7 @@ module ActiveMongoid
     def find(*args)
       key = args.flatten.first
       if !key.is_a?(Fixnum) && (key.is_a?(::ActiveMongoid::BSON::ObjectId) || ::ActiveMongoid::BSON::ObjectId.legal?(key))
-        where({_id: key.to_s}).first.tap do |obj|
+        where({__am_primary_key => key.to_s}).first.tap do |obj|
           raise ActiveRecord::RecordNotFound unless obj
         end
       else
@@ -28,9 +28,12 @@ module ActiveMongoid
       if opts && opts.is_a?(Hash)
         bson_opts = opts.select{|k,v| v.is_a?(::ActiveMongoid::BSON::ObjectId)}
 
-        if bson_opts[:id]
+        if bson_opts[:id] && __am_primary_key != :id
           opts.delete(:id)
           bson_opts[:_id] = bson_opts.delete(:id)
+        elsif bson_opts[:_id] && __am_primary_key == :id
+          opts.delete(:_id)
+          bson_opts[:id] = bson_opts.delete(:_id)
         end
 
         bson_opts.each do |k,v|
@@ -51,5 +54,13 @@ module ActiveMongoid
       end
     end
 
+    def __am_primary_key
+      if __target_class.respond_to?(:__am_primary_key) && __target_class.__am_primary_key
+        __target_class.__am_primary_key
+      else
+        :_id
+      end
+    end
+
   end
 end

data/lib/active_mongoid/finders.rb

@@ -7,7 +7,7 @@ module ActiveMongoid
       def find(*args)
         key = args.flatten.first
         if !key.is_a?(Fixnum) && (key.is_a?(::ActiveMongoid::BSON::ObjectId) || ::ActiveMongoid::BSON::ObjectId.legal?(key))
-          where({_id: key.to_s}).first.tap do |obj|
+          where({__am_primary_key => key.to_s}).first.tap do |obj|
             raise ActiveRecord::RecordNotFound unless obj
           end
         else
@@ -19,9 +19,12 @@ module ActiveMongoid
         if opts && opts.respond_to?(:select)
           bson_opts = opts.select{|k,v| v.is_a?(::ActiveMongoid::BSON::ObjectId)}
 
-          if bson_opts[:id]
+          if bson_opts[:id] && __am_primary_key != :id
             opts.delete(:id)
             bson_opts[:_id] = bson_opts.delete(:id)
+          elsif bson_opts[:_id] && __am_primary_key == :id
+            opts.delete(:_id)
+            bson_opts[:id] = bson_opts.delete(:_id)
           end
 
           bson_opts.each do |k,v|
@@ -55,6 +58,14 @@ module ActiveMongoid
         )
       end
 
+      def __am_primary_key
+        if self.respond_to?(:primary_bson_key) && self.primary_bson_key
+          self.primary_bson_key
+        else
+          :_id
+        end
+      end
+
     end
   end
 end

data/lib/active_mongoid/version.rb

@@ -1,3 +1,3 @@
 module ActiveMongoid
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/spec/lib/finders_spec.rb

@@ -1,103 +1,212 @@
 require "spec_helper"
 
 describe ActiveMongoid::Finders do
-  let(:klass) { Division }
-  let(:division) { klass.create(name: 'foo') }
 
   describe ".find" do
 
-    describe "when not scoped" do
+    describe "when primary id is not bson_attr" do
+      let(:klass) { Division }
+      let(:subject) { klass.create(name: 'foo') }
 
-      it "returns object when request with object fixnum id" do
-        expect(klass.find(division.id)).to eq(division)
-      end
+      describe "when not scoped" do
 
-      it "returns object when request with object bson id" do
-        expect(klass.find(division._id)).to eq(division)
-      end
+        it "returns object when request with object fixnum id" do
+          expect(klass.find(subject.id)).to eq(subject)
+        end
+
+        it "returns object when request with object bson id" do
+          expect(klass.find(subject._id)).to eq(subject)
+        end
+
+        it "raises NotFound exception when request with fixnum id" do
+          expect{klass.find(-1)}.to raise_error(ActiveRecord::RecordNotFound)
+        end
+
+        it "raises NotFound exception when request with bson id" do
+          expect{klass.find(::ActiveMongoid::BSON::ObjectId.new)}.to raise_error(ActiveRecord::RecordNotFound)
+        end
 
-      it "raises NotFound exception when request with fixnum id" do
-        expect{klass.find(-1)}.to raise_error(ActiveRecord::RecordNotFound)
       end
 
-      it "raises NotFound exception when request with bson id" do
-        expect{klass.find(::ActiveMongoid::BSON::ObjectId.new)}.to raise_error(ActiveRecord::RecordNotFound)
+      describe "when scoped" do
+
+        let(:scoped_klass) { klass.by_name(subject.name) }
+
+        it "returns object when request with object fixnum id" do
+          expect(scoped_klass.find(subject.id)).to eq(subject)
+        end
+
+        it "returns object when request with object bson id" do
+          expect(scoped_klass.find(subject._id)).to eq(subject)
+        end
+
+        it "raises NotFound exception when request with fixnum id" do
+          expect{scoped_klass.find(-1)}.to raise_error(ActiveRecord::RecordNotFound)
+        end
+
+        it "raises NotFound exception when request with bson id" do
+          expect{scoped_klass.find(::ActiveMongoid::BSON::ObjectId.new)}.to raise_error(ActiveRecord::RecordNotFound)
+        end
+
       end
 
     end
 
-    describe "when scoped" do
+    describe "when primary id is bson_attr" do
+      let(:klass) { Play }
+      let(:subject) { klass.create(name: 'foo') }
 
-      let(:scoped_klass) { klass.by_name(division.name) }
+      describe "when not scoped" do
 
-      it "returns object when request with object fixnum id" do
-        expect(scoped_klass.find(division.id)).to eq(division)
-      end
+        it "returns object when request with object fixnum id" do
+          expect(klass.find(subject.id)).to eq(subject)
+        end
 
-      it "returns object when request with object bson id" do
-        expect(scoped_klass.find(division._id)).to eq(division)
-      end
+        it "returns object when request with object bson id" do
+          expect(klass.find(subject._id)).to eq(subject)
+        end
+
+        it "raises NotFound exception when request with fixnum id" do
+          expect{klass.find(-1)}.to raise_error(ActiveRecord::RecordNotFound)
+        end
+
+        it "raises NotFound exception when request with bson id" do
+          expect{klass.find(::ActiveMongoid::BSON::ObjectId.new)}.to raise_error(ActiveRecord::RecordNotFound)
+        end
 
-      it "raises NotFound exception when request with fixnum id" do
-        expect{scoped_klass.find(-1)}.to raise_error(ActiveRecord::RecordNotFound)
       end
 
-      it "raises NotFound exception when request with bson id" do
-        expect{scoped_klass.find(::ActiveMongoid::BSON::ObjectId.new)}.to raise_error(ActiveRecord::RecordNotFound)
+      describe "when scoped" do
+
+        let(:scoped_klass) { klass.by_name(subject.name) }
+
+        it "returns object when request with object fixnum id" do
+          expect(scoped_klass.find(subject.id)).to eq(subject)
+        end
+
+        it "returns object when request with object bson id" do
+          expect(scoped_klass.find(subject._id)).to eq(subject)
+        end
+
+        it "raises NotFound exception when request with fixnum id" do
+          expect{scoped_klass.find(-1)}.to raise_error(ActiveRecord::RecordNotFound)
+        end
+
+        it "raises NotFound exception when request with bson id" do
+          expect{scoped_klass.find(::ActiveMongoid::BSON::ObjectId.new)}.to raise_error(ActiveRecord::RecordNotFound)
+        end
+
       end
 
     end
 
-  end
+    end
 
   describe ".where" do
 
-    let(:bson_id) { ::ActiveMongoid::BSON::ObjectId.new }
+    describe "when primary_key is not bson_attr" do
+      let(:klass) { Division }
+      let(:subject) { klass.create(name: 'foo') }
+      let(:bson_id) { ::ActiveMongoid::BSON::ObjectId.new }
 
-    before do
-      division.update_attributes(sport_id: bson_id)
-    end
+      before do
+        subject.update_attributes(sport_id: bson_id)
+      end
 
-    describe "when not scoped" do
+      describe "when not scoped" do
 
-      it "returns relation by bson_id" do
-        expect(klass.where(sport_id: bson_id)).to eq([division])
-      end
+        it "returns relation by bson_id" do
+          expect(klass.where(sport_id: bson_id)).to eq([subject])
+        end
 
-      it "returns relation by bson_id string" do
-        expect(klass.where(sport_id: bson_id.to_s)).to eq([division])
-      end
+        it "returns relation by bson_id string" do
+          expect(klass.where(sport_id: bson_id.to_s)).to eq([subject])
+        end
 
-      it "return relation by primary key" do
-        expect(klass.where(id: division.id)).to eq([division])
-      end
+        it "return relation by primary key" do
+          expect(klass.where(id: subject.id)).to eq([subject])
+        end
+
+        it "return relation by bson primary key" do
+          expect(klass.where(id: subject._id)).to eq([subject])
+        end
 
-      it "return relation by bson primary key" do
-        expect(klass.where(id: division._id)).to eq([division])
       end
 
-    end
+      describe "when scoped" do
 
-    describe "when scoped" do
+        let(:scoped_klass) { klass.by_name(subject.name) }
 
-      let(:scoped_klass) { klass.by_name(division.name) }
+        it "returns relation by bson_id" do
+          expect(scoped_klass.where(sport_id: bson_id)).to eq([subject])
+        end
 
-      it "returns relation by bson_id" do
-        expect(scoped_klass.where(sport_id: bson_id)).to eq([division])
-      end
+        it "returns relation by bson_id string" do
+          expect(scoped_klass.where(sport_id: bson_id.to_s)).to eq([subject])
+        end
+
+        it "return relation by primary key" do
+          expect(scoped_klass.where(id: subject.id)).to eq([subject])
+        end
+
+        it "return relation by bson primary key" do
+          expect(scoped_klass.where(id: subject._id)).to eq([subject])
+        end
 
-      it "returns relation by bson_id string" do
-        expect(scoped_klass.where(sport_id: bson_id.to_s)).to eq([division])
       end
 
-      it "return relation by primary key" do
-        expect(scoped_klass.where(id: division.id)).to eq([division])
+    end
+
+    describe "when primary_key is not bson_attr" do
+      let(:klass) { Play }
+      let(:subject) { klass.create(name: 'foo') }
+      let(:bson_id) { ::ActiveMongoid::BSON::ObjectId.new }
+
+      before do
+        subject.update_attributes(sport_id: bson_id)
       end
 
-      it "return relation by bson primary key" do
-        expect(scoped_klass.where(id: division._id)).to eq([division])
+      describe "when not scoped" do
+
+        it "returns relation by bson_id" do
+          expect(klass.where(sport_id: bson_id)).to eq([subject])
+        end
+
+        it "returns relation by bson_id string" do
+          expect(klass.where(sport_id: bson_id.to_s)).to eq([subject])
+        end
+
+        it "return relation by primary key" do
+          expect(klass.where(id: subject.id)).to eq([subject])
+        end
+
+        it "return relation by bson primary key" do
+          expect(klass.where(id: subject._id)).to eq([subject])
+        end
+
       end
 
+      describe "when scoped" do
+
+        let(:scoped_klass) { klass.by_name(subject.name) }
+
+        it "returns relation by bson_id" do
+          expect(scoped_klass.where(sport_id: bson_id)).to eq([subject])
+        end
+
+        it "returns relation by bson_id string" do
+          expect(scoped_klass.where(sport_id: bson_id.to_s)).to eq([subject])
+        end
+
+        it "return relation by primary key" do
+          expect(scoped_klass.where(id: subject.id)).to eq([subject])
+        end
+
+        it "return relation by bson primary key" do
+          expect(scoped_klass.where(id: subject._id)).to eq([subject])
+        end
+
+      end
     end
 
   end

data/spec/spec_helper.rb

@@ -26,13 +26,20 @@ require 'pry'
 require 'rspec'
 
 Mongoid.configure do |config|
-  if Mongoid::VERSION >= "3"
-    config.connect_to('active_mongoid_test')
+  version = ::Gem::Version.new(Mongoid::VERSION)
+  if version >= ::Gem::Version.new("3.0.0")
+    config.sessions = {
+      default: {
+        database: 'active_mongoid_test',
+        hosts: [ (ENV['MONGO_HOST'] || 'localhost')+':27017' ],
+        options: { read: :primary }
+      }
+    }
   else
     config.master = Mongo::Connection.new.db('active_mongoid_test')
     config.allow_dynamic_fields = false
   end
-  config.identity_map_enabled = false
+  config.identity_map_enabled = false if config.respond_to?(:identity_map_enabled)
 end
 
 RSpec.configure do |config|
@@ -84,6 +91,12 @@ ActiveRecord::Schema.define do
     t.string :target_id
     t.string :target_type
   end
+
+  create_table :plays, :force => true, :id => false do |t|
+    t.string :id
+    t.string :name
+    t.string :sport_id
+  end
 end
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/spec/support/models/active_record/play.rb

@@ -0,0 +1,11 @@
+class Play < ActiveRecord::Base
+  include ActiveMongoid::Associations
+  include ActiveMongoid::Finders
+  include ActiveMongoid::BsonId
+
+  scope :by_name, ->(n){ where(name: n) }
+  scope :sport_id, ->(id){ where(sport_id: id) }
+
+  bsonify_attr :id, initialize: true, primary: true
+  bsonify_attr :sport_id
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_mongoid
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Bryce Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,20 +38,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
@@ -228,6 +214,7 @@ files:
 - active_mongoid.gemspec
 - gemfiles/mongoid_2.8.gemfile
 - gemfiles/mongoid_3.1.gemfile
+- gemfiles/mongoid_4.0.gemfile
 - lib/active_mongoid.rb
 - lib/active_mongoid/associations.rb
 - lib/active_mongoid/associations/binding.rb
@@ -297,6 +284,7 @@ files:
 - spec/support/models/active_record/address.rb
 - spec/support/models/active_record/division.rb
 - spec/support/models/active_record/division_setting.rb
+- spec/support/models/active_record/play.rb
 - spec/support/models/active_record/player.rb
 - spec/support/models/mongoid/league.rb
 - spec/support/models/mongoid/person.rb
@@ -324,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ActiveMongoid provides a relational interface between ActiveRecord and Mongoid
@@ -359,6 +347,7 @@ test_files:
 - spec/support/models/active_record/address.rb
 - spec/support/models/active_record/division.rb
 - spec/support/models/active_record/division_setting.rb
+- spec/support/models/active_record/play.rb
 - spec/support/models/active_record/player.rb
 - spec/support/models/mongoid/league.rb
 - spec/support/models/mongoid/person.rb