mongoid-sequence2 0.2.0 → 0.2.3

data/Changelogs.md

@@ -1,3 +1,8 @@
+## 0.2.3
+
+* allow configuring Mongoid::Sequence2, now provide the specific custom default storage options for `Mongoid::Sequences`
+* some mistake amend
+
 ## 0.2.0
 
 * support to mongoid 3.0 - 4.0. and unit-test is passed

data/Gemfile

@@ -1,3 +1,4 @@
+#source "https://rubygems.org"
 source 'http://ruby.taobao.org'
 
 gemspec

data/README.md

@@ -12,6 +12,17 @@ https://github.com/agile42/mongoid_sequence2/ **from francis**
 
 ## Usage
 
+### setup
+
+since `v0.2.3` you can specific custom default storage options for `Mongoid::Sequences`, eg:
+
+    #config/initializers/sequence2.rb
+    Mongoid::Sequence2.setup do |config|
+     config.collection_name = :__sequences
+     config.session = :default
+    end
+
+
 Include `Mongoid::Sequence` in your class and call `sequence(:field)`.
 
 Like this:

data/lib/mongoid-sequence2/sequence.rb

@@ -0,0 +1,29 @@
+module Mongoid
+  module Sequence
+    extend ActiveSupport::Concern
+
+    included do
+      set_callback :validate, :before, :set_sequence, :unless => :persisted?
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      attr_accessor :sequence_fields
+
+      def sequence(fieldname)
+        self.sequence_fields ||= []
+        self.sequence_fields << fieldname
+      end
+    end
+
+    def set_sequence
+      self.class.sequence_fields.each do |f|
+        self[f] = Sequences.get_next_sequence(self.class.name.underscore, f)
+      end
+    end
+
+  end
+end

data/lib/mongoid-sequence2/sequences.rb

@@ -0,0 +1,15 @@
+module Mongoid
+  class Sequences
+    include Mongoid::Document
+    store_in session: "#{Mongoid::Sequence2.session}",
+             collection: "#{Mongoid::Sequence2.collection_name}"
+
+    field :fieldname
+    field :seq, type: Integer
+
+    def self.get_next_sequence(collection, fieldname)
+      #Sequences.where(fieldname: "#{collection}_#{fieldname}").find_and_modify({'$inc' => {'seq' => 1}}, {'upsert' => 'true', :new => true}).seq
+      self.where(fieldname: "#{collection}_#{fieldname}").find_and_modify({'$inc' => {'seq' => 1}}, {'upsert' => 'true', :new => true}).seq
+    end
+  end
+end

data/lib/mongoid-sequence2/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
-  module Sequence
-    VERSION = "0.2.0"
+  module Sequence2
+    VERSION = "0.2.3"
   end
 end

data/lib/mongoid-sequence2.rb

@@ -1,44 +1,32 @@
-require "mongoid-sequence2/version"
 require "active_support/concern"
 
-module Mongoid
-  module Sequence
-    extend ActiveSupport::Concern
-
-    included do
-      set_callback :validate, :before, :set_sequence, :unless => :persisted?
-    end
-
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-      attr_accessor :sequence_fields
-
-      def sequence(fieldname)
-        self.sequence_fields ||= []
-        self.sequence_fields << fieldname
-      end
-    end
-
-    class Sequences
-      include Mongoid::Document
-      store_in collection: "__sequences"
-
-      field :fieldname
-      field :seq, type: Integer
-
-      def self.get_next_sequence(collection, fieldname)
-        Sequences.where(fieldname: "#{collection}_#{fieldname}").find_and_modify({'$inc' => {'seq' => 1}}, {'upsert' => 'true', :new => true}).seq
-      end
-    end
+require "mongoid-sequence2/version"
+# require "mongoid-sequence2/sequences"
+# require "mongoid-sequence2/sequence"
 
-    def set_sequence
-      self.class.sequence_fields.each do |f|
-        self[f] = Sequences.get_next_sequence(self.class.name.underscore, f)
-      end
+module Mongoid
+  autoload :Sequence,  "mongoid-sequence2/sequence"
+  autoload :Sequences,  "mongoid-sequence2/sequences"
+  
+  module Sequence2
+    # Defines the collection in which the `Mongoid::Sequences` store_in.
+    mattr_accessor :collection_name
+    @@collection_name = :__sequences
+
+    # Defines the session in which the `Mongoid::Sequences` store_in.
+    mattr_accessor :session
+    @@session = :default
+    # Allow configuring Mongoid::Sequence2 with a block
+    # now provide the specific custom default storage options for `Mongoid::Sequences`
+    #
+    # Example:
+    #
+    #     Mongoid::Sequence2.setup do |config|
+    #       config.session = :default
+    #       config.collection   = :__sequences
+    #     end
+    def self.setup
+      yield self
     end
-
   end
 end

data/mongoid-sequence2.gemspec

@@ -12,10 +12,11 @@ Gem::Specification.new do |gem|
   gem.add_dependency("activesupport", "~> 3.1")
   gem.add_development_dependency("rake", "~> 0.9")
   gem.add_development_dependency "database_cleaner", "~> 0.9.1"
+  gem.add_development_dependency "test-unit", "~> 2.5.5"
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "mongoid-sequence2"
   gem.require_paths = ["lib"]
-  gem.version       = Mongoid::Sequence::VERSION
+  gem.version       = Mongoid::Sequence2::VERSION
 end

data/test/config/mongoid.yml

@@ -78,3 +78,13 @@ test:
         # low amounts for fast failures.
         max_retries: 1
         retry_interval: 0
+    custom_session:
+      database: mongoid-sequence_test
+      hosts:
+        - localhost:27017
+      options:
+        consistency: :strong
+        # In the test environment we lower the retries and retry interval to
+        # low amounts for fast failures.
+        max_retries: 1
+        retry_interval: 0

data/test/setup_test.rb

@@ -0,0 +1,83 @@
+require "test_helper"
+
+class SetupSessionTest < BaseTest
+  self.test_order = :defined
+  # http://stackoverflow.com/questions/11185517/why-does-testunit-test-order-not-working-as-expected
+
+
+  def reload_sequences
+    Mongoid::Sequences.store_in session: "#{Mongoid::Sequence2.session}",
+                                collection: "#{Mongoid::Sequence2.collection_name}"
+  end
+  
+  def reset_setup
+    Mongoid::Sequence2.setup do |config|
+     config.collection_name = :__sequences
+     config.session = :default
+    end
+  end
+  
+  def reset_sequences
+    reset_setup
+    reload_sequences
+  end
+  
+  ######test session
+  def test_default_session
+    reset_setup
+    
+    assert_equal Mongoid::Sequence2.session, :default
+  end
+  
+  def test_sequences_default_session
+    reset_sequences
+    
+    assert_equal Mongoid::Sequences.mongo_session, Mongoid::Sessions.default
+  end
+  
+  def test_custom_session
+    Mongoid::Sequence2.setup do |config|
+     config.session = :custom_session
+    end
+    assert_equal Mongoid::Sequence2.session, :custom_session
+  end
+
+  def test_sequences_custom_session
+    Mongoid::Sequence2.setup do |config|
+     config.session = :custom_session
+    end
+    
+    reload_sequences
+    
+    assert_equal Mongoid::Sequences.mongo_session, Mongoid::Sessions.with_name(:custom_session)
+  end
+
+  ######test collection_name
+
+  def test_default_collection_name
+    reset_setup
+    assert_equal Mongoid::Sequence2.collection_name, :__sequences
+  end
+  
+  def test_sequences_default_collection_name
+    reset_sequences
+  
+    assert_equal Mongoid::Sequences.collection_name, :__sequences
+  end
+  
+  def test_custom_collection_name
+    Mongoid::Sequence2.setup do |config|
+     config.collection_name = :sequences
+    end
+    assert_equal Mongoid::Sequence2.collection_name, :sequences
+  end
+  
+  def test_sequences_custom_collection_name
+    Mongoid::Sequence2.setup do |config|
+     config.collection_name = :sequences
+    end
+    
+    reload_sequences
+    assert_equal Mongoid::Sequences.collection_name, :sequences
+  end
+end

data/test/test_helper.rb

@@ -1,11 +1,12 @@
 require 'rubygems'
-require 'test/unit'
 require "bundler/setup"
 require "test/unit"
 require "mongoid"
 require 'database_cleaner'
 
-require File.expand_path("../../lib/mongoid-sequence2", __FILE__)
+$:.push File.expand_path("../lib", __FILE__)
+require "mongoid-sequence2"
+# require File.expand_path("../../lib/mongoid-sequence2", __FILE__)
 
 Mongoid.load!("./test/config/mongoid.yml", :test)
 

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-sequence2
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
+  prerelease: 
 platform: ruby
 authors:
 - jhjguxin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,6 +25,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -33,6 +36,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -40,6 +44,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,6 +52,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,6 +60,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -61,6 +68,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -68,10 +76,27 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.5
 description: Mongoid::Sequence2 gives you the ability to specify fields to behave
   like a sequence number (exactly like the "id" column in conventional SQL flavors).
 email:
@@ -87,6 +112,8 @@ files:
 - README.md
 - Rakefile
 - lib/mongoid-sequence2.rb
+- lib/mongoid-sequence2/sequence.rb
+- lib/mongoid-sequence2/sequences.rb
 - lib/mongoid-sequence2/version.rb
 - mongoid-sequence2.gemspec
 - test/config/mongoid.yml
@@ -96,30 +123,38 @@ files:
 - test/models/paranoia_sequenced_model.rb
 - test/models/second_sequenced_model.rb
 - test/paranoia_test.rb
+- test/setup_test.rb
 - test/test_helper.rb
 - test/uniqueness_test.rb
 homepage: https://github.com/jhjguxin/mongoid-sequence2
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -336202797
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -336202797
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Specify fields to behave like a sequence number (exactly like the "id" column
   in conventional SQL flavors).
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzI5ZmZkNzNjNjVmNTUzNjE4NGJmYTQ5YWYxZWNlYmNmMjdhODg4YQ==
-  data.tar.gz: !binary |-
-    Y2QyNWU3NGY1MWMwODYwOGI3MzliNjBjMjQ1NWE1ZTU3ZTdlYTYzZg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YjExYjE3M2E1OTg4Y2RkMTMyZDIwZDA5N2U3ZDM1YjEzOTE4M2I3NzFhNWIw
-    NzcxZTc5NTMyYmMzODlhZjM0OWI5YzAxMTM3ODFmNDU5NjVkMzM5NTJhMDEx
-    ZmNmMTEzNzQzZDg3Mjc5OGI0MDQzZDg5YjYxZGQyNjUxMDYwOWI=
-  data.tar.gz: !binary |-
-    ZDRhNGQ1YjA1NGZlZjkyMTYxYTZlMGVkNTA4YzViNWIwZWIyNWUwM2NmZGQ1
-    OTE3NGYzY2RkMmQzYzZmNmViMjNkZmI2NjliZjU0OGUyYmFiN2ZlMTNiM2Qz
-    MjliYmE3MTI1MmQ1MDhlYmMxZmIzMzM0ZTFhOTQwNWUxYTEyNmI=