mongoid_userstamp 0.1.0 → 0.2.0

data/.rbenv-version

@@ -0,0 +1 @@
+1.9.3-p194

data/.travis.yml

@@ -1,2 +1,8 @@
-rvm: 
+language: ruby
+rvm:
+  - 2.0.0
   - 1.9.3
+  - jruby-19mode
+  - rbx-19mode
+  
+services: mongodb

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+## v0.2.0 (2013-03-24)
+
+* Added some specs for test coverage
+* Removed dependecy for `Mongoid::Timestamps`

data/Gemfile

@@ -1,10 +1,9 @@
 source 'http://rubygems.org'
 
-gem 'mongoid', '~> 2.4.7'
+gem 'mongoid', '>= 3.0.4'
 
 group :development do
-  gem 'redcarpet', '~> 2.1.0'
-  gem 'yard', '~> 0.7.5'
-  gem 'jeweler', '~> 1.8.3'
+  gem 'rspec', '>= 2.13.0'
+  gem 'yard', '>= 0.8.2.1'
+  gem 'jeweler', '>= 1.8.3'
 end
-

data/Gemfile.lock

@@ -1,41 +1,50 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activesupport (3.2.3)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    bson (1.6.2)
-    builder (3.0.0)
+    builder (3.0.4)
+    diff-lcs (1.2.1)
     git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.8.3)
+    i18n (0.6.1)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.6.6)
-    mongo (1.6.2)
-      bson (~> 1.6.2)
-    mongoid (2.4.8)
-      activemodel (~> 3.1)
-      mongo (~> 1.3)
+    json (1.7.7)
+    mongoid (3.1.2)
+      activemodel (~> 3.2)
+      moped (~> 1.4.2)
+      origin (~> 1.0)
       tzinfo (~> 0.3.22)
-    multi_json (1.2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    moped (1.4.3)
+    multi_json (1.7.1)
+    origin (1.0.11)
+    rake (10.0.3)
+    rdoc (4.0.0)
       json (~> 1.4)
-    redcarpet (2.1.1)
-    tzinfo (0.3.33)
-    yard (0.7.5)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    tzinfo (0.3.37)
+    yard (0.8.5.2)
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
-  jeweler (~> 1.8.3)
-  mongoid (~> 2.4.7)
-  redcarpet (~> 2.1.0)
-  yard (~> 0.7.5)
+  jeweler (>= 1.8.3)
+  mongoid (>= 3.0.4)
+  rspec (>= 2.13.0)
+  yard (>= 0.8.2.1)

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Langwhich GmbH <http://www.langwhich.com>
+Copyright (c) 2012 Thomas Boerger Programmierung <http://www.tbpro.de>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,7 +1,8 @@
-# MongoidUserstamp [![Build Status](https://secure.travis-ci.org/Langwhich/mongoid_userstamp.png)](https://secure.travis-ci.org/Langwhich/mongoid_userstamp)
+# MongoidUserstamp [![Build Status](https://secure.travis-ci.org/tbpro/mongoid_userstamp.png)](https://travis-ci.org/tbpro/mongoid_userstamp) [![Code Climate](https://codeclimate.com/github/tbpro/mongoid_userstamp.png)](https://codeclimate.com/github/tbpro/mongoid_userstamp)
 
 MongoidUserstamp adds stamp columns for created by and updated by
-informations within rails applications.
+informations within rails applications. Mongoid requires a ruby 
+version above 1.8, so i've written the gem on the new 1.9 hash syntax.
 
 ## Install
 
@@ -20,7 +21,7 @@ informations within rails applications.
    c.created_column = :created_by
    c.created_accessor = :creator
 
-   c.updated_column = :updator_by
+   c.updated_column = :updated_by
    c.updated_accessor = :updator
  end
 
@@ -52,4 +53,4 @@ informations within rails applications.
 
 ## Credits
 
-Copyright (c) 2012 Langwhich GmbH <http://www.langwhich.com>
+Copyright (c) 2012-2013 Thomas Boerger Programmierung <http://www.tbpro.de>

data/Rakefile

@@ -6,6 +6,7 @@ begin
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts 'Run `bundle install` to install missing gems'
+  
   exit e.status_code
 end
 
@@ -19,15 +20,22 @@ require 'mongoid/userstamp/version'
 Jeweler::Tasks.new do |gem|
   gem.name = 'mongoid_userstamp'
   gem.version = Mongoid::Userstamp::Version::STRING
-  gem.homepage = 'https://github.com/Langwhich/mongoid_userstamp'
+  gem.homepage = 'https://github.com/tbpro/mongoid_userstamp'
   gem.license = 'MIT'
   gem.summary = %Q{Userstamp for created and updated columns within mongoid}
-  gem.email = 'thomas.boerger@langwhich.com'
-  gem.authors = ['Thomas Boerger', 'Tim Rudat']
+  gem.email = 'tboerger@tbpro.de'
+  gem.authors = ['Thomas Boerger']
 end
 
 Jeweler::RubygemsDotOrgTasks.new
 YARD::Rake::YardocTask.new
 
-task :default => :version
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+  spec.rspec_opts = '--color --format progress'
+end
+
+task default: :spec

data/init.rb

@@ -1,3 +1,2 @@
 # -*- encoding : utf-8 -*-
 require 'mongoid_userstamp'
-

data/lib/mongoid/userstamp/config.rb

@@ -30,4 +30,3 @@ module Mongoid
     end
   end
 end
-

data/lib/mongoid/userstamp/railtie.rb

@@ -3,18 +3,17 @@ module Mongoid
   module Userstamp
     class Railtie < Rails::Railtie
       ActiveSupport.on_load :action_controller do
-        unless Mongoid::Userstamp.configuration.user_model.respond_to? :current
-          Mongoid::Userstamp.configuration.user_model.send(
-            :include,
-            Mongoid::Userstamp::User
-          )
-        end
-
         before_filter do |c|
+          unless Mongoid::Userstamp.configuration.user_model.respond_to? :current
+            Mongoid::Userstamp.configuration.user_model.send(
+              :include,
+              Mongoid::Userstamp::User
+            )
+          end
+
           Mongoid::Userstamp.configuration.user_model.current = c.send(Mongoid::Userstamp.configuration.user_reader)
         end
       end
     end
   end
 end
-

data/lib/mongoid/userstamp/user.rb

@@ -5,8 +5,6 @@ module Mongoid
       extend ActiveSupport::Concern
 
       included do
-        include Mongoid::Timestamps
-
         def current?
           !Thread.current[:user].nil? && self.id == Thread.current[:user].id
         end
@@ -37,4 +35,3 @@ module Mongoid
     end
   end
 end
-

data/lib/mongoid/userstamp/version.rb

@@ -3,7 +3,7 @@ module Mongoid
   module Userstamp
     module Version
       MAJOR = 0
-      MINOR = 1
+      MINOR = 2
       PATCH = 0
       BUILD = nil
 
@@ -11,4 +11,3 @@ module Mongoid
     end
   end
 end
-

data/lib/mongoid/userstamp.rb

@@ -9,8 +9,6 @@ module Mongoid
     autoload :User, 'mongoid/userstamp/user'
 
     included do
-      include Mongoid::Timestamps
-
       field Mongoid::Userstamp.configuration.updated_column, :type => Object
       field Mongoid::Userstamp.configuration.created_column, :type => Object
 
@@ -18,34 +16,35 @@ module Mongoid
       before_create :set_creator
 
       define_method Mongoid::Userstamp.configuration.updated_accessor do
-        Mongoid::Userstamp.configuration.user_model.find(self.send(Mongoid::Userstamp.configuration.updated_column))
+        updated_col = self.send(Mongoid::Userstamp.configuration.updated_column)
+        updated_col ? Mongoid::Userstamp.configuration.user_model.find(updated_col) : nil
       end
 
       define_method Mongoid::Userstamp.configuration.created_accessor do
-        Mongoid::Userstamp.configuration.user_model.find(self.send(Mongoid::Userstamp.configuration.created_column))
+        created_col = self.send(Mongoid::Userstamp.configuration.created_column)
+        created_col ? Mongoid::Userstamp.configuration.user_model.find(created_col) : nil
       end
 
       protected
         def set_updator
+          return unless Mongoid::Userstamp.configuration.user_model.respond_to? :current
           column = "#{Mongoid::Userstamp.configuration.updated_column.to_s}=".to_sym
+
           self.send(column, Mongoid::Userstamp.configuration.user_model.current.try(:id))
         end
 
         def set_creator
+          return unless Mongoid::Userstamp.configuration.user_model.respond_to? :current
           column = "#{Mongoid::Userstamp.configuration.created_column.to_s}=".to_sym
+
           self.send(column, Mongoid::Userstamp.configuration.user_model.current.try(:id))
         end
     end
 
     class << self
-      def configure(&block)
-        @configuration = Mongoid::Userstamp::Config.new(&block)
-      end
-
       def configuration
         @configuration ||= Mongoid::Userstamp::Config.new
-      end 
+      end
     end
   end
 end
-

data/lib/mongoid_userstamp.rb

@@ -1,4 +1,3 @@
 # -*- encoding : utf-8 -*-
 require 'mongoid/userstamp'
 require 'mongoid/userstamp/railtie' if defined? Rails
-

data/mongoid_userstamp.gemspec

@@ -5,19 +5,20 @@
 
 Gem::Specification.new do |s|
   s.name = "mongoid_userstamp"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Thomas Boerger", "Tim Rudat"]
-  s.date = "2012-04-11"
-  s.email = "thomas.boerger@langwhich.com"
+  s.authors = ["Thomas Boerger"]
+  s.date = "2013-03-24"
+  s.email = "tboerger@tbpro.de"
   s.extra_rdoc_files = [
     "LICENSE.md",
     "README.md"
   ]
   s.files = [
-    ".rvmrc",
+    ".rbenv-version",
     ".travis.yml",
+    "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.md",
@@ -30,33 +31,37 @@ Gem::Specification.new do |s|
     "lib/mongoid/userstamp/user.rb",
     "lib/mongoid/userstamp/version.rb",
     "lib/mongoid_userstamp.rb",
-    "mongoid_userstamp.gemspec"
+    "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/Langwhich/mongoid_userstamp"
+  s.homepage = "https://github.com/tbpro/mongoid_userstamp"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "Userstamp for created and updated columns within mongoid"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, ["~> 2.4.7"])
-      s.add_development_dependency(%q<redcarpet>, ["~> 2.1.0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.7.5"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      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>, ["~> 2.4.7"])
-      s.add_dependency(%q<redcarpet>, ["~> 2.1.0"])
-      s.add_dependency(%q<yard>, ["~> 0.7.5"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      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>, ["~> 2.4.7"])
-    s.add_dependency(%q<redcarpet>, ["~> 2.1.0"])
-    s.add_dependency(%q<yard>, ["~> 0.7.5"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    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
 

data/spec/mongoid/userstamp_spec.rb

@@ -0,0 +1,62 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe 'Mongoid::Userstamp' do
+  subject {
+    Book.new(
+      name: 'Crafting Rails Applications'
+    )
+  }
+
+  it { should respond_to :created_by }
+  it { should respond_to :creator }
+  it { should respond_to :updated_by }
+  it { should respond_to :updator }
+
+  context 'when created without a user' do
+    before {
+      subject.save!
+    }
+
+    it { subject.created_by.should be_nil }
+    it { subject.creator.should be_nil }
+    it { subject.updated_by.should be_nil }
+    it { subject.updator.should be_nil }
+  end
+
+  context 'when created by a user' do
+    let(:user_1) {
+      User.create!(
+        name: 'Charles Dikkens'
+      )
+    }
+
+    before {
+      User.current = user_1
+      subject.save
+    }
+
+    it { subject.created_by.should == user_1.id }
+    it { subject.creator.should == user_1 }
+    it { subject.updated_by.should == user_1.id }
+    it { subject.updator.should == user_1 }
+
+    context 'when updated by a user' do
+      let(:user_2) {
+        User.create!(
+          name: 'Edmund Wells'
+        )
+      }
+
+      before {
+        User.current = user_2
+        subject.save!
+      }
+
+      it { subject.created_by.should == user_1.id }
+      it { subject.creator.should == user_1 }
+      it { subject.updated_by.should == user_2.id }
+      it { subject.updator.should == user_2 }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,26 @@
+# -*- encoding : utf-8 -*-
+require 'rubygems'
+
+$:.push File.expand_path('../../lib', __FILE__)
+
+require 'active_support/all'
+require 'mongoid'
+require 'mongoid_userstamp'
+
+Mongoid.configure do |config|
+  config.connect_to(
+    'mongoid_userstamp_test'
+  )
+end
+
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |f|
+  require f
+end
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+  
+  config.after :suite do
+    Mongoid.purge!
+  end
+end

data/spec/support/book.rb

@@ -0,0 +1,7 @@
+# -*- encoding : utf-8 -*-
+class Book
+  include Mongoid::Document
+  include Mongoid::Userstamp
+
+  field :name
+end

data/spec/support/user.rb

@@ -0,0 +1,7 @@
+# -*- encoding : utf-8 -*-
+class User
+  include Mongoid::Document
+  include Mongoid::Userstamp::User
+
+  field :name
+end

metadata

@@ -1,71 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_userstamp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
 - Thomas Boerger
-- Tim Rudat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70241191732520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.7
+        version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70241191732520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.4
 - !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: &70241191731220 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: *70241191731220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70241191729080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.2.1
   type: :development
   prerelease: false
-  version_requirements: *70241191729080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.2.1
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70241191727440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70241191727440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 description: 
-email: thomas.boerger@langwhich.com
+email: tboerger@tbpro.de
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.md
 - README.md
 files:
-- .rvmrc
+- .rbenv-version
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.md
@@ -79,7 +99,11 @@ files:
 - lib/mongoid/userstamp/version.rb
 - lib/mongoid_userstamp.rb
 - mongoid_userstamp.gemspec
-homepage: https://github.com/Langwhich/mongoid_userstamp
+- spec/mongoid/userstamp_spec.rb
+- spec/spec_helper.rb
+- spec/support/book.rb
+- spec/support/user.rb
+homepage: https://github.com/tbpro/mongoid_userstamp
 licenses:
 - MIT
 post_install_message: 
@@ -94,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3961653981712842111
+      hash: 4199627598995250851
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -103,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Userstamp for created and updated columns within mongoid

data/.rvmrc

@@ -1 +0,0 @@
-rvm use ruby-1.9.3-head@mongoid_userstamp --create