mongoid_auto_increment 0.0.7 → 0.0.8

data/Rakefile

@@ -27,13 +27,13 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-# require 'rspec/core/rake_task'
-#
-# RSpec::Core::RakeTask.new(:spec) do |spec|
-#   spec.pattern = 'spec/**/*_spec.rb'
-# end
-#
-# task :default => :spec
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+end
+
+task :default => :spec
 
 require 'rdoc/task'
 RDoc::Task.new do |rdoc|

data/lib/mongoid_auto_increment.rb

@@ -7,9 +7,9 @@ module MongoidAutoIncrement
     def auto_increment(name, options={})
       field name, :type => Integer
       seq_name = "#{self.name.downcase}_#{name}"
-      @@incrementor = MongoidAutoIncrement::Incrementor.new(options)
+      @@incrementor = MongoidAutoIncrement::Incrementor.new unless defined? @@incrementor
 
-      before_create { self.send("#{name}=", @@incrementor[seq_name].inc) }
+      before_create { self.send("#{name}=", @@incrementor.inc(seq_name, options)) }
     end
   end
 end

data/lib/mongoid_auto_increment/incrementor.rb

@@ -9,12 +9,17 @@ module MongoidAutoIncrement
         exists? || create(seed)
       end
 
-      def inc
-        update_number_with("$inc" => { "number" => 1 })
-      end
+       def inc
+        opts = {
+          "query"  => query,
+          "update" => {"$inc" => { "number" => 1 }},
+          "new"    => true # return the modified document
+        }
+        collection.find_and_modify(opts)["number"]
+       end
 
-      def set(number)
-        update_number_with("$set" => { "number" => number })
+      def current
+        collection.find_one(query)["number"]
       end
 
       private
@@ -23,7 +28,7 @@ module MongoidAutoIncrement
         collection.find(query).count > 0
       end
 
-      def create(number = 0)
+      def create(number)
         collection.insert(query.merge({ "number" => number }))
       end
 
@@ -34,33 +39,16 @@ module MongoidAutoIncrement
       def query
         { "seq_name" => @sequence }
       end
-
-      def current
-        collection.find_one(query)["number"]
-      end
-
-      def update_number_with(mongo_func)
-        opts = {
-          "query"  => query,
-          "update" => mongo_func,
-          "new"    => true # return the modified document
-        }
-        collection.find_and_modify(opts)["number"]
-      end
     end
 
     def initialize(options=nil)
-      options ||= {}
-      @collection = options[:collection] || "sequences"
-      @seed = options[:seed].to_i
     end
 
-    def [](sequence)
-      Sequence.new(sequence, @collection, @seed)
-    end
-
-    def []=(sequence, number)
-      Sequence.new(sequence, @collection, @seed).set(number)
+    def inc(sequence, options)
+      options ||= {}
+      collection = options[:collection] || "sequences"
+      seed = options[:seed].to_i
+      Sequence.new(sequence, collection, seed).inc
     end
   end
 end

data/mongoid_auto_increment.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_auto_increment}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Peter Savichev (proton)}]
@@ -27,7 +27,10 @@ Gem::Specification.new do |s|
     "lib/mongoid_auto_increment.rb",
     "lib/mongoid_auto_increment/incrementor.rb",
     "mongoid_auto_increment.gemspec",
-    "spec/mongoid_auto_increment_spec.rb"
+    "spec/models/book.rb",
+    "spec/models/order.rb",
+    "spec/mongoid_auto_increment_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/proton/mongoid_auto_increment}
   s.licenses = [%q{MIT}]

data/spec/models/book.rb

@@ -0,0 +1,7 @@
+class Book
+  include Mongoid::Document
+
+  field :title
+
+  auto_increment :sequence
+end

data/spec/models/order.rb

@@ -0,0 +1,7 @@
+class Order
+  include Mongoid::Document
+
+  field :title
+
+  auto_increment :num, :seed => 1000
+end

data/spec/mongoid_auto_increment_spec.rb

@@ -1,5 +1,37 @@
-require 'mongoid_auto_inc'
+require "spec_helper"
 
-describe MongoidAutoInc
-  pending "I should add some tests at some point."
-end
+describe "mongoid_auto_increment" do
+
+  before(:each) do
+    @book1 = Book.create :name => "The Rails Way"
+    @book2 = Book.create :name => "The Ruby Programming Language "
+    @book3 = Book.create :name => "Metaprogramming Ruby"
+    @order1 = Order.create :name => "First Order"
+    @order2 = Order.create :name => "Second Order"
+    @order3 = Order.create :name => "Last Order"
+  end
+
+  it "should have id 1" do
+    @book1.sequence.should eql 1
+  end
+
+  it "should have id 2" do
+    @book2.sequence.should eql 2
+  end
+
+  it "should have id 3" do
+    @book3.sequence.should eql 3
+  end
+
+  it "should have id 1001" do
+    @order1.num.should eql 1001
+  end
+
+  it "should have id 1002" do
+    @order2.num.should eql 1002
+  end
+
+  it "should have id 1003" do
+    @order3.num.should eql 1003
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,33 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+MODELS = File.join(File.dirname(__FILE__), "models")
+
+require "rubygems"
+require "mongoid"
+require "mongoid_auto_increment"
+require "database_cleaner"
+require "simplecov"
+
+SimpleCov.start
+
+Dir["#{MODELS}/*.rb"].each { |f| require f }
+
+Mongoid.config.master = Mongo::Connection.new.db("mongoid_auto_increment_test")
+Mongoid.logger = Logger.new($stdout)
+
+DatabaseCleaner.orm = "mongoid"
+
+RSpec.configure do |config|
+  config.before(:all) do
+    DatabaseCleaner.strategy = :truncation
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_auto_increment
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &82655910 !ruby/object:Gem::Requirement
+  requirement: &80637950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82655910
+  version_requirements: *80637950
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &82655650 !ruby/object:Gem::Requirement
+  requirement: &80553960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82655650
+  version_requirements: *80553960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &82655410 !ruby/object:Gem::Requirement
+  requirement: &80553650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *82655410
+  version_requirements: *80553650
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &82655170 !ruby/object:Gem::Requirement
+  requirement: &80553270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *82655170
+  version_requirements: *80553270
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &82654930 !ruby/object:Gem::Requirement
+  requirement: &80552910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *82654930
+  version_requirements: *80552910
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &82654650 !ruby/object:Gem::Requirement
+  requirement: &80552560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82654650
+  version_requirements: *80552560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &82654410 !ruby/object:Gem::Requirement
+  requirement: &80552090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *82654410
+  version_requirements: *80552090
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &82654170 !ruby/object:Gem::Requirement
+  requirement: &80551790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82654170
+  version_requirements: *80551790
 description: Add SQL like auto-incrementing fields to your Mongoid documents.
 email: psavichev@gmail.com
 executables: []
@@ -117,7 +117,10 @@ files:
 - lib/mongoid_auto_increment.rb
 - lib/mongoid_auto_increment/incrementor.rb
 - mongoid_auto_increment.gemspec
+- spec/models/book.rb
+- spec/models/order.rb
 - spec/mongoid_auto_increment_spec.rb
+- spec/spec_helper.rb
 - TODO
 homepage: http://github.com/proton/mongoid_auto_increment
 licenses:
@@ -134,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -875563985
+      hash: 1041976307
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: