mongoid_userstamp 0.3.0 → 0.3.2

data/lib/mongoid/userstamp/config.rb

@@ -1,30 +1,30 @@
-# -*- encoding : utf-8 -*-
-module Mongoid
-  module Userstamp
-    class Config
-      attr_writer :user_model
-      attr_accessor :user_reader
-      attr_accessor :created_column
-      attr_accessor :created_column_opts
-      attr_accessor :created_accessor
-      attr_accessor :updated_column
-      attr_accessor :updated_column_opts
-      attr_accessor :updated_accessor
-
-      def initialize(&block)
-        @user_model = :user
-        @user_reader = :current_user
-        @created_column = :created_by
-        @created_accessor = :creator
-        @updated_column = :updated_by
-        @updated_accessor = :updater
-
-        instance_eval(&block) if block_given?
-      end
-
-      def user_model
-        @user_model.to_s.classify.constantize
-      end
-    end
-  end
-end
+# -*- encoding : utf-8 -*-
+module Mongoid
+  module Userstamp
+    class Config
+      attr_writer :user_model
+      attr_accessor :user_reader
+      attr_accessor :created_column
+      attr_accessor :created_column_opts
+      attr_accessor :created_accessor
+      attr_accessor :updated_column
+      attr_accessor :updated_column_opts
+      attr_accessor :updated_accessor
+
+      def initialize(&block)
+        @user_model = :user
+        @user_reader = :current_user
+        @created_column = :created_by
+        @created_accessor = :creator
+        @updated_column = :updated_by
+        @updated_accessor = :updater
+
+        instance_eval(&block) if block_given?
+      end
+
+      def user_model
+        @user_model.to_s.classify.constantize
+      end
+    end
+  end
+end

data/lib/mongoid/userstamp/railtie.rb

@@ -1,19 +1,22 @@
-# -*- encoding : utf-8 -*-
-module Mongoid
-  module Userstamp
-    class Railtie < Rails::Railtie
-      ActiveSupport.on_load :action_controller do
-        before_filter do |c|
-          unless Mongoid::Userstamp.config.user_model.respond_to? :current
-            Mongoid::Userstamp.config.user_model.send(
-              :include,
-              Mongoid::Userstamp::User
-            )
-          end
-
-          Mongoid::Userstamp.config.user_model.current = c.send(Mongoid::Userstamp.config.user_reader)
-        end
-      end
-    end
-  end
-end
+# -*- encoding : utf-8 -*-
+module Mongoid
+  module Userstamp
+    class Railtie < Rails::Railtie
+      ActiveSupport.on_load :action_controller do
+        before_filter do |c|
+          unless Mongoid::Userstamp.config.user_model.respond_to? :current
+            Mongoid::Userstamp.config.user_model.send(
+              :include,
+              Mongoid::Userstamp::User
+            )
+          end
+
+          begin
+            Mongoid::Userstamp.config.user_model.current = c.send(Mongoid::Userstamp.config.user_reader)
+          rescue
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/userstamp/user.rb

@@ -1,37 +1,37 @@
-# -*- encoding : utf-8 -*-
-module Mongoid
-  module Userstamp
-    module User
-      extend ActiveSupport::Concern
-
-      included do
-        def current?
-          !Thread.current[:user].nil? && self._id == Thread.current[:user]._id
-        end
-      end
-
-      module ClassMethods
-        def current
-          Thread.current[:user]
-        end
-
-        def current=(value)
-          Thread.current[:user] = value
-        end
-
-        def do_as(user, &block)
-          old = self.current
-
-          begin
-            self.current = user
-            response = block.call unless block.nil?
-          ensure
-            self.current = old
-          end
-
-          response
-        end
-      end
-    end
-  end
-end
+# -*- encoding : utf-8 -*-
+module Mongoid
+  module Userstamp
+    module User
+      extend ActiveSupport::Concern
+
+      included do
+        def current?
+          !Thread.current[:user].nil? && self._id == Thread.current[:user]._id
+        end
+      end
+
+      module ClassMethods
+        def current
+          Thread.current[:user]
+        end
+
+        def current=(value)
+          Thread.current[:user] = value
+        end
+
+        def do_as(user, &block)
+          old = self.current
+
+          begin
+            self.current = user
+            response = block.call unless block.nil?
+          ensure
+            self.current = old
+          end
+
+          response
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/userstamp/version.rb

@@ -1,13 +1,6 @@
-# -*- encoding : utf-8 -*-
-module Mongoid
-  module Userstamp
-    module Version
-      MAJOR = 0
-      MINOR = 3
-      PATCH = 0
-      BUILD = nil
-
-      STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
-    end
-  end
-end
+# -*- encoding : utf-8 -*-
+module Mongoid
+  module Userstamp
+    VERSION = '0.3.2'
+  end
+end

data/lib/mongoid_userstamp.rb

@@ -1,6 +1,6 @@
-# -*- encoding : utf-8 -*-
-require 'mongoid/userstamp'
-require 'mongoid/userstamp/version'
-require 'mongoid/userstamp/config'
-require 'mongoid/userstamp/user'
-require 'mongoid/userstamp/railtie' if defined? Rails
+# -*- encoding : utf-8 -*-
+require 'mongoid/userstamp'
+require 'mongoid/userstamp/version'
+require 'mongoid/userstamp/config'
+require 'mongoid/userstamp/user'
+require 'mongoid/userstamp/railtie' if defined? Rails

data/mongoid_userstamp.gemspec

@@ -1,69 +1,26 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: mongoid_userstamp 0.3.0 ruby lib
-
-Gem::Specification.new do |s|
-  s.name = "mongoid_userstamp"
-  s.version = "0.3.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Thomas Boerger", "Johnny Shields"]
-  s.date = "2013-10-02"
-  s.description = "Userstamp for created and updated columns within mongoid"
-  s.email = "tboerger@tbpro.de"
-  s.extra_rdoc_files = [
-    "LICENSE.md",
-    "README.md"
-  ]
-  s.files = [
-    ".ruby-version",
-    ".travis.yml",
-    "CHANGELOG.md",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.md",
-    "README.md",
-    "Rakefile",
-    "init.rb",
-    "lib/mongoid/userstamp.rb",
-    "lib/mongoid/userstamp/config.rb",
-    "lib/mongoid/userstamp/railtie.rb",
-    "lib/mongoid/userstamp/user.rb",
-    "lib/mongoid/userstamp/version.rb",
-    "lib/mongoid_userstamp.rb",
-    "mongoid_userstamp.gemspec",
-    "spec/mongoid/userstamp_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/support/book.rb",
-    "spec/support/user.rb"
-  ]
-  s.homepage = "https://github.com/tbpro/mongoid_userstamp"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.5"
-  s.summary = "Userstamp for mongoid"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, [">= 3.0.4"])
-      s.add_development_dependency(%q<rspec>, [">= 2.13.0"])
-      s.add_development_dependency(%q<yard>, [">= 0.8.2.1"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.8.3"])
-    else
-      s.add_dependency(%q<mongoid>, [">= 3.0.4"])
-      s.add_dependency(%q<rspec>, [">= 2.13.0"])
-      s.add_dependency(%q<yard>, [">= 0.8.2.1"])
-      s.add_dependency(%q<jeweler>, [">= 1.8.3"])
-    end
-  else
-    s.add_dependency(%q<mongoid>, [">= 3.0.4"])
-    s.add_dependency(%q<rspec>, [">= 2.13.0"])
-    s.add_dependency(%q<yard>, [">= 0.8.2.1"])
-    s.add_dependency(%q<jeweler>, [">= 1.8.3"])
-  end
-end
-
+$:.push File.expand_path('../lib', __FILE__)
+require 'mongoid/userstamp/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'mongoid_userstamp'
+  s.version     = Mongoid::Userstamp::VERSION
+  s.authors     = ['Thomas Boerger', 'Johnny Shields']
+  s.homepage    = 'https://github.com/tbpro/mongoid_userstamp'
+  s.license     = 'MIT'
+  s.summary     = 'Userstamp for Mongoid'
+  s.description = 'Userstamp for creator and updater columns using Mongoid'
+  s.email       = 'tboerger@tbpro.de'
+
+  s.files         = `git ls-files`.split($/)
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ['lib']
+
+  s.post_install_message = File.read('UPGRADING') if File.exists?('UPGRADING')
+
+  s.add_runtime_dependency 'mongoid', '>= 3.0.4'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec', '>= 2.13.0'
+  s.add_development_dependency 'yard'
+  s.add_development_dependency 'gem-release'
+end

data/spec/mongoid/userstamp_spec.rb

@@ -1,163 +1,163 @@
-# -*- encoding : utf-8 -*-
-require 'spec_helper'
-
-describe Mongoid::Userstamp do
-  subject { Book.new(name: 'Crafting Rails Applications') }
-  let(:user_1) { User.create!(name: 'Charles Dikkens') }
-  let(:user_2) { User.create!(name: 'Edmund Wells') }
-
-  it { should respond_to :created_by }
-  it { should respond_to :creator }
-  it { should respond_to :updated_by }
-  it { should respond_to :updater }
-
-  describe '#current_user' do
-    subject{ Mongoid::Userstamp.current_user }
-
-    context 'when current user is not set' do
-      before { User.current = nil }
-      it { should be_nil }
-    end
-
-    context 'when current user is set' do
-      before{ User.current = user_1 }
-      it { should eq user_1 }
-    end
-  end
-
-  context 'when created without a user' do
-    before do
-      User.current = nil
-      subject.save!
-    end
-
-    it { subject.created_by.should be_nil }
-    it { subject.creator.should be_nil }
-    it { subject.updated_by.should be_nil }
-    it { subject.updater.should be_nil }
-  end
-
-  context 'when creator is manually set' do
-    before{ User.current = user_1 }
-
-    context 'set by id' do
-      before do
-        subject.created_by = user_2._id
-        subject.save!
-      end
-
-      it 'should not be overridden when saved' do
-        subject.created_by.should eq user_2.id
-        subject.creator.should eq user_2
-        subject.updated_by.should eq user_1.id
-        subject.updater.should eq user_1
-      end
-    end
-    context 'set by model' do
-      before do
-        subject.creator = user_2
-        subject.save!
-      end
-      
-      it 'should not be overridden when saved' do
-        subject.created_by.should eq user_2.id
-        subject.creator.should eq user_2
-        subject.updated_by.should eq user_1.id
-        subject.updater.should eq user_1
-      end
-    end
-  end
-
-  context 'when created by a user' do
-    before do
-      User.current = user_1
-      subject.save!
-    end
-
-    it { subject.created_by.should == user_1.id }
-    it { subject.creator.should == user_1 }
-    it { subject.updated_by.should == user_1.id }
-    it { subject.updater.should == user_1 }
-
-    context 'when updated by a user' do
-      before do
-        User.current = user_2
-        subject.save!
-      end
-
-      it { subject.created_by.should == user_1.id }
-      it { subject.creator.should == user_1 }
-      it { subject.updated_by.should == user_2.id }
-      it { subject.updater.should == user_2 }
-    end
-
-    context 'when user has been destroyed' do
-      before do
-        User.current = user_2
-        subject.save!
-        user_1.destroy
-        user_2.destroy
-      end
-
-      it { subject.created_by.should == user_1.id }
-      it { subject.creator.should == nil }
-      it { subject.updated_by.should == user_2.id }
-      it { subject.updater.should == nil }
-    end
-  end
-
-  describe '#config' do
-    before do
-      Mongoid::Userstamp.config do |c|
-        c.user_reader = :current_user
-        c.user_model  = :user
-
-        c.created_column   = :c_by
-        c.created_column_opts = {as: :created_by_id}
-        c.created_accessor = :created_by
-
-        c.updated_column   = :u_by
-        c.updated_column_opts = {as: :updated_by_id}
-        c.updated_accessor = :updated_by
-      end
-
-      # class definition must come after config
-      class Novel
-        include Mongoid::Document
-        include Mongoid::Userstamp
-
-        field :name
-      end
-    end
-    subject { Novel.new(name: 'Ethyl the Aardvark goes Quantity Surveying') }
-
-    context 'when created by a user' do
-      before do
-        User.current = user_1
-        subject.save!
-      end
-
-      it { subject.c_by.should == user_1.id }
-      it { subject.created_by_id.should == user_1.id }
-      it { subject.created_by.should == user_1 }
-      it { subject.u_by.should == user_1.id }
-      it { subject.updated_by_id.should == user_1.id }
-      it { subject.updated_by.should == user_1 }
-
-      context 'when updated by a user' do
-        before do
-          User.current = user_2
-          subject.save!
-        end
-
-        it { subject.c_by.should == user_1.id }
-        it { subject.created_by_id.should == user_1.id }
-        it { subject.created_by.should == user_1 }
-        it { subject.u_by.should == user_2.id }
-        it { subject.updated_by_id.should == user_2.id }
-        it { subject.updated_by.should == user_2 }
-      end
-    end
-  end
-
-end
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe Mongoid::Userstamp do
+  subject { Book.new(name: 'Crafting Rails Applications') }
+  let(:user_1) { User.create!(name: 'Charles Dikkens') }
+  let(:user_2) { User.create!(name: 'Edmund Wells') }
+
+  it { should respond_to :created_by }
+  it { should respond_to :creator }
+  it { should respond_to :updated_by }
+  it { should respond_to :updater }
+
+  describe '#current_user' do
+    subject{ Mongoid::Userstamp.current_user }
+
+    context 'when current user is not set' do
+      before { User.current = nil }
+      it { should be_nil }
+    end
+
+    context 'when current user is set' do
+      before{ User.current = user_1 }
+      it { should eq user_1 }
+    end
+  end
+
+  context 'when created without a user' do
+    before do
+      User.current = nil
+      subject.save!
+    end
+
+    it { subject.created_by.should be_nil }
+    it { subject.creator.should be_nil }
+    it { subject.updated_by.should be_nil }
+    it { subject.updater.should be_nil }
+  end
+
+  context 'when creator is manually set' do
+    before{ User.current = user_1 }
+
+    context 'set by id' do
+      before do
+        subject.created_by = user_2._id
+        subject.save!
+      end
+
+      it 'should not be overridden when saved' do
+        subject.created_by.should eq user_2.id
+        subject.creator.should eq user_2
+        subject.updated_by.should eq user_1.id
+        subject.updater.should eq user_1
+      end
+    end
+    context 'set by model' do
+      before do
+        subject.creator = user_2
+        subject.save!
+      end
+      
+      it 'should not be overridden when saved' do
+        subject.created_by.should eq user_2.id
+        subject.creator.should eq user_2
+        subject.updated_by.should eq user_1.id
+        subject.updater.should eq user_1
+      end
+    end
+  end
+
+  context 'when created by a user' do
+    before do
+      User.current = user_1
+      subject.save!
+    end
+
+    it { subject.created_by.should == user_1.id }
+    it { subject.creator.should == user_1 }
+    it { subject.updated_by.should == user_1.id }
+    it { subject.updater.should == user_1 }
+
+    context 'when updated by a user' do
+      before do
+        User.current = user_2
+        subject.save!
+      end
+
+      it { subject.created_by.should == user_1.id }
+      it { subject.creator.should == user_1 }
+      it { subject.updated_by.should == user_2.id }
+      it { subject.updater.should == user_2 }
+    end
+
+    context 'when user has been destroyed' do
+      before do
+        User.current = user_2
+        subject.save!
+        user_1.destroy
+        user_2.destroy
+      end
+
+      it { subject.created_by.should == user_1.id }
+      it { subject.creator.should == nil }
+      it { subject.updated_by.should == user_2.id }
+      it { subject.updater.should == nil }
+    end
+  end
+
+  describe '#config' do
+    before do
+      Mongoid::Userstamp.config do |c|
+        c.user_reader = :current_user
+        c.user_model  = :user
+
+        c.created_column   = :c_by
+        c.created_column_opts = {as: :created_by_id}
+        c.created_accessor = :created_by
+
+        c.updated_column   = :u_by
+        c.updated_column_opts = {as: :updated_by_id}
+        c.updated_accessor = :updated_by
+      end
+
+      # class definition must come after config
+      class Novel
+        include Mongoid::Document
+        include Mongoid::Userstamp
+
+        field :name
+      end
+    end
+    subject { Novel.new(name: 'Ethyl the Aardvark goes Quantity Surveying') }
+
+    context 'when created by a user' do
+      before do
+        User.current = user_1
+        subject.save!
+      end
+
+      it { subject.c_by.should == user_1.id }
+      it { subject.created_by_id.should == user_1.id }
+      it { subject.created_by.should == user_1 }
+      it { subject.u_by.should == user_1.id }
+      it { subject.updated_by_id.should == user_1.id }
+      it { subject.updated_by.should == user_1 }
+
+      context 'when updated by a user' do
+        before do
+          User.current = user_2
+          subject.save!
+        end
+
+        it { subject.c_by.should == user_1.id }
+        it { subject.created_by_id.should == user_1.id }
+        it { subject.created_by.should == user_1 }
+        it { subject.u_by.should == user_2.id }
+        it { subject.updated_by_id.should == user_2.id }
+        it { subject.updated_by.should == user_2 }
+      end
+    end
+  end
+
+end