toughguy 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 503921d8feeb6ca7b9c9012b589aa6665df1bd24
-  data.tar.gz: f04d741f4c17c579626f5f7c2a7141fdc085c17d
+  metadata.gz: 455afb848105f624c48c038bb7f4861ee4ab430a
+  data.tar.gz: b1cc52e6b73deaf3bd3f68ba30cbe77a3797f6ce
 SHA512:
-  metadata.gz: 9b5c5257a30b1450a59e160d67629049d59042d758751c53b589e1a372199bbd5a4490b497c24e423fa0425bf65aca8533c80cd76d530645857e461b5adb8d9a
-  data.tar.gz: 2ef7156be46aa1bda56afa34869002a414cc12305bb1d98a3cfbea47d11cb1e03b17c9e74c5e704a2bf87df26f809b41f62b58ed477a184db612d69ae58849c7
+  metadata.gz: 18fd76232d199c8b41dc67327f65b0f2abab1c35b3378a53f4145ee14c9ee8946c0734282c48147ecc4bbd2890c6abc1e807fe841129032c640717a4ebe40bbe
+  data.tar.gz: 70a115cd1c20335aff0109f12aa56e4b37d82878a06304ecb61dddc57549d418e529a440db3119922986dd92febb5ef5397e6f1e517074e94425d144cdaba28d

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    toughguy (0.2.6)
+    toughguy (0.2.8)
       assistance (= 0.1.5)
-      bson_ext (= 1.12.3)
-      mongo (= 1.12.3)
+      bson_ext (>= 1.8.0)
+      mongo (>= 1.8.0)
       plucky (= 0.6.6)
 
 GEM
@@ -41,3 +41,6 @@ DEPENDENCIES
   rake
   rspec
   toughguy!
+
+BUNDLED WITH
+   1.11.2

data/Rakefile

@@ -1,4 +1,24 @@
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
 
-task :default => :spec
+task :default => :spec
+
+require File.expand_path("./lib/toughguy/version", File.dirname(__FILE__))
+PACKAGE_NAME = "toughguy"
+VERSION = ToughGuy::VERSION
+
+desc "Push gem to rubygems.org"
+task :push_gem do
+  sh "gem build toughguy.gemspec"
+  sh "gem push toughguy-#{VERSION}.gem"
+  sh "rm *.gem"
+end
+
+desc "Install gem locally"
+task :install_gem do
+  sh "rm ~/.toughguy/bin/*" rescue nil
+  sh "gem uninstall -a -x --force toughguy"
+  sh "gem build toughguy.gemspec"
+  sh "gem install toughguy-#{VERSION}.gem"
+  sh "rm *.gem"
+end

data/lib/toughguy/model.rb

@@ -31,7 +31,7 @@ module ToughGuy
     def model
       self.class
     end
-    
+
     def bulk(&block)
       model.bulk(&block)
     end
@@ -67,7 +67,7 @@ module ToughGuy
         self.class.update({_id: id}, values.exclude(:_id))
       end
     end
-    
+
     def update(hash)
       model.update({_id: id}, hash)
     end
@@ -119,7 +119,7 @@ module ToughGuy
     def exists?
       model.find(id) != nil
     end
-    
+
     class << self
       def bulk(&block)
         reentered = @bulk
@@ -129,23 +129,23 @@ module ToughGuy
       ensure
         @bulk = nil unless reentered
       end
-      
+
       def add_index(spec, opts={})
         @indexes ||= []
         @indexes << [spec, opts]
       end
-  
+
       def ensure_index(spec, opts={})
         add_index(spec, opts)
         collection.create_index(spec, opts)
       end
-  
+
       def recreate_indexes
         if @indexes
           @indexes.each {|idx| ensure_index(*idx)}
         end
       end
-  
+
       def load(values)
         new(values).tap {|o| o.after_load}
       end
@@ -162,25 +162,25 @@ module ToughGuy
         end
         first(opts)
       end
-  
+
       alias_method :find, :[]
 
       def query(opts = {})
         ToughGuy::Query.new(self).where(opts)
       end
-  
+
       alias_method :q, :query
       alias_method :where, :query
       alias_method :filter, :query
-  
+
       def sort(*args)
         query.sort(*args)
       end
-  
+
       def limit(l, skip = 0)
         query.limit(l).skip(0)
       end
-  
+
       def paginate(opts)
         query.paginate(opts)
       end
@@ -192,15 +192,15 @@ module ToughGuy
       def all(opts = {})
         query(opts).to_a
       end
-  
+
       def each(*args, &block)
         query.each(*args, &block)
       end
-  
+
       def map(key = nil, &block)
         query.map(key, &block)
       end
-  
+
       def sort(*args)
         query.sort(*args)
       end
@@ -208,7 +208,7 @@ module ToughGuy
       def first(opts = {})
         query(opts).first
       end
-  
+
       def map_keys(hash)
         hash.each do |key, short_key|
           define_method(key) {@values[short_key]}
@@ -219,17 +219,17 @@ module ToughGuy
       def collection
         @collection ||= database[collection_name]
       end
-  
+
       def set_collection(c)
         @collection = c
       end
-  
+
       def to_table_name
         parts = name.downcase.split('::')
         parts.push(parts.pop.pluralize)
         parts.join('.')
       end
-  
+
       def collection_name
         @collection_name ||= to_table_name
       end
@@ -237,11 +237,11 @@ module ToughGuy
       def set_collection_name(n)
         @collection_name = n
       end
-  
+
       def delete_all
         collection.remove
       end
-  
+
       def delete(selector)
         if @bulk
           @bulk.find(selector).remove
@@ -249,7 +249,7 @@ module ToughGuy
           q(selector).remove
         end
       end
-  
+
       def destroy_all
         q.each {|d| d.destroy}
       end
@@ -257,7 +257,7 @@ module ToughGuy
       def drop
         collection.drop
       end
-  
+
       def update(*args)
         if @bulk
           @bulk.find(args[0]).update(args[1])
@@ -266,7 +266,7 @@ module ToughGuy
         end
         # (@bulk || collection).update(*args)
       end
-      
+
       def stats
         collection.stats
       end
@@ -278,30 +278,26 @@ module ToughGuy
       end
 
       alias_method :db, :database
-  
-      @@db_map = {}
-  
+
       def database=(db)
-        if db.is_a?(String)
-          db = (@@db_map[db] = connection[db])
-        end
+        db = connection[db] if db.is_a?(String)
         @database = db
-        # update also for mapped model
+        # update also for specialized model classes
         if self == ToughGuy::Model
           ToughGuy::MappedModel.database = db
           ToughGuy::SingletonModel.database = db
         end
       end
-  
+
       def db_key(db)
         db.is_a?(String) ? db : db.name
       end
-  
+
       def db_class_name(db_key)
         name = (db_key =~ /_(.+)/) && $1.gsub(/[^a-z0-9]/, '').capitalize
         "P_#{name}"
       end
-  
+
       def subclass_with_db(db, db_key)
         c = Class.new(self).tap do |klass|
           klass.database = db
@@ -310,7 +306,7 @@ module ToughGuy
             @indexes.each {|idx| klass.ensure_index(*idx)}
           end
         end
-        
+
         # create proper class name
         class_name = db_class_name(db_key)
         if class_name
@@ -318,10 +314,10 @@ module ToughGuy
           send(:remove_const, class_name) if const_defined?(class_name, false)
           const_set(class_name, c)
         end
-    
+
         c
       end
-  
+
       def with_db(db)
         key = db_key(db)
         return self if key == db_key(self.db)
@@ -338,23 +334,28 @@ module ToughGuy
           send(:remove_const, class_name) if const_defined?(class_name, false)
         end
       end
-  
+
       def inherited(subclass)
+        subclass.connection = connection
         subclass.database = database
       end
-  
+
       def mapped_db_classes
         (@subclass_map || {}).values.unshift(self)
       end
 
-      @@connection = nil
-
       def connection
-        @@connection
+        @connection
       end
 
       def connection=(c)
-        @@connection = c
+        @connection = c
+
+        # update also for specialized model classes
+        if self == ToughGuy::Model
+          ToughGuy::MappedModel.connection = c
+          ToughGuy::SingletonModel.connection = c
+        end
       end
     end
   end

data/lib/toughguy/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module ToughGuy
-  Version = '0.2.7'
-end
+  VERSION = '0.2.8'
+end

data/spec/toughguy_spec.rb

@@ -230,4 +230,4 @@ describe "Model.with_db" do
     s1.object_id.should ==  s3.object_id
     s2.object_id.should ==  s4.object_id
   end
-end
+end

data/toughguy.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.authors      = ['Sharon Rosner']
   s.email        = ['ciconia@gmail.com']
-  s.version      = ToughGuy::Version
+  s.version      = ToughGuy::VERSION
   s.platform     = Gem::Platform::RUBY
 
   s.files         = `git ls-files`.split("\n")
@@ -20,4 +20,4 @@ Gem::Specification.new do |s|
   s.add_dependency 'bson_ext', '>= 1.8.0'
   s.add_dependency 'plucky', '0.6.6'
   s.add_dependency 'assistance', '0.1.5'
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toughguy
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple MongoDB ORM