mem_model 0.7.0 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjdiMTBhMWRhMGZmMWRkMDlkOGEwODJmNDUzYmJmOWFkODU0ZWJkZA==
+    OWUyZGEyNjVkNDU2YTEzODQxYTRiZmZhNDk5YTVkMTNjN2UzZDY1ZQ==
   data.tar.gz: !binary |-
-    ZjM2OTc3OWQ1ODlmOTJjZGQ4NDY3MDliNDlkMWQ3MTdlOTc5ZDlhNQ==
+    YTlmNjU4MTBlNzQwNzQ4YzUxMDlmMGU5YmVjODg1MjliNTNiMTk4Mw==
 SHA512:
   metadata.gz: !binary |-
-    MTUzOTMwN2ViZjM1Y2Q4N2VhZDU4OWRkZDAyYjJkZjZiNjhlNGFjY2U2Y2Y2
-    YzY4YmEyYjY2MGYyZmJmNTM2MGVhN2NkZGU0MTFkNTUyNmI0NjBlNTM3MjMx
-    OWU5YTg2ZTgxMDI4MmUyOTk4MjM1YjJkNzVjZjk0ZDBmNzUxZGY=
+    ZWFiZjNiODE0YmM3MzZhNTFhZDBmMjA0NTA0NzkyODVkOGY0ZmM5YWJlODZm
+    NDcyMWM0MGViY2Y1YWY4ZjdiNDJkNTM5MThkMjRiYjEzYjE4YWJkNDdiNGM0
+    NDExNjcxMGU2Zjg4NzdjNTViNTE3ZGE1MTczMDU2YzUwOTRmMWI=
   data.tar.gz: !binary |-
-    ZWYyMjgzODkwNTQxZGU5ZTc4ZWQ4MzFlZmRiZGEwN2MxYjYwNWEzNmEyNjgx
-    MDk1NzllNmMyZGMzZmRkMjY2ZjMzOGM3Njk5OTYwMTAxZDYxYTkzMGM4ZmQz
-    ZGY2ZTEzZjA1NDE5YjFkMmM3NTlhMzdkY2E3NWI2NzBlZGQxYTY=
+    ODEyZTFhNzQzNDA5ZTVlNjllMjkxMjI0M2JhOGNmZTgwNjFjYTA2NTZiYjFl
+    NmNhZTkyNzA5YTVlYjRkMjdlOGMwMmU1YjZiYTZlN2ZiZDg0MDg5ZDQ0MmQ1
+    OGEzZTg3NTAzNTZiOTAyNzk5MWQ2YmJlYjMzMjA0MDQ4MWIwM2M=

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 0.8.0 / 2014-01-03
+
+* 1 enhancement:
+
+  * Merge RootedBase into Base
+
+
 ### 0.7.0 / 2014-01-03
 
 * 2 enhancements:

data/Manifest.txt

@@ -14,7 +14,6 @@ lib/mem_model/concern.rb
 lib/mem_model/errors.rb
 lib/mem_model/guid.rb
 lib/mem_model/model_name.rb
-lib/mem_model/rooted_base.rb
 lib/mem_model/validations.rb
 lib/mem_model/version.rb
 mem_model.gemspec

data/lib/mem_model.rb

@@ -28,6 +28,6 @@ module MemModel
   module_function :maglev?, :commit, :abort, :persistent
 end
 
-%w[ concern base errors guid model_name rooted_base validations version ].each do |file|
+%w[ concern base errors guid model_name validations version ].each do |file|
   load File.expand_path("../mem_model/#{file}.rb", __FILE__)
 end

data/lib/mem_model/base.rb

@@ -1,4 +1,6 @@
 module MemModel
+  PERSISTENT_ROOT = {} if !MemModel.maglev?
+
   module Base
     extend MemModel::Concern
 
@@ -11,6 +13,24 @@ module MemModel
     module ClassMethods
       include Enumerable
 
+      def root_container
+        MemModel.maglev? ? Maglev : MemModel
+      end
+
+      def container_key
+        name.to_sym
+      end
+
+      def store
+        root[:MemModel] ||= {}
+        root[:MemModel][container_key] ||= store_class.new
+      end
+
+      def root
+        @root ||= root_container::PERSISTENT_ROOT
+      end
+
+
       def each(&block)
         store.each(&block)
       end
@@ -23,10 +43,6 @@ module MemModel
         maglev? ? IdentitySet : Set
       end
 
-      def store
-        @store ||= store_class.new
-      end
-
       def size
         store.size
       end

data/lib/mem_model/version.rb

@@ -1,3 +1,3 @@
 module MemModel
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/mem_model.gemspec

@@ -1,13 +1,13 @@
 # -*- encoding: utf-8 -*-
-# stub: mem_model 0.7.0.20140103165733 ruby lib
+# stub: mem_model 0.8.0.20140103190534 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mem_model"
-  s.version = "0.7.0.20140103165733"
+  s.version = "0.8.0.20140103190534"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["JohnnyT"]
-  s.date = "2014-01-03"
+  s.date = "2014-01-04"
   s.description = "MemModel persists Ruby objects using MagLev as a data storage engine. It's an ActiveModel implementation so it works stand-alone or in Rails 3 as a drop-in replacement for ActiveRecord or DataMapper.  If MemModel is used in non-MagLev platforms, objects will be persisted to in-memory sets."
   s.email = ["ubergeek3141@gmail.com"]
   s.extra_rdoc_files = ["CHANGELOG.md", "CONTRIBUTING.md", "LICENSE.md", "Manifest.txt", "README.md"]

data/test/mem_model/test_rooted_base.rb

@@ -2,7 +2,7 @@ require File.expand_path('../../helper', __FILE__)
 
 class TestRootedBase < Minitest::Test
   class Account
-    include MemModel::RootedBase
+    include MemModel::Base
   end
 
   def setup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mem_model
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - JohnnyT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -97,7 +97,6 @@ files:
 - lib/mem_model/errors.rb
 - lib/mem_model/guid.rb
 - lib/mem_model/model_name.rb
-- lib/mem_model/rooted_base.rb
 - lib/mem_model/validations.rb
 - lib/mem_model/version.rb
 - mem_model.gemspec

data/lib/mem_model/rooted_base.rb

@@ -1,30 +0,0 @@
-module MemModel
-  PERSISTENT_ROOT = {} if !MemModel.maglev?
-
-  module RootedBase
-    extend MemModel::Concern
-
-    included do
-      include MemModel::Base
-    end
-
-    module ClassMethods
-      def root_container
-        MemModel.maglev? ? Maglev : MemModel
-      end
-
-      def container_key
-        name.to_sym
-      end
-
-      def store
-        root[:MemModel] ||= {}
-        root[:MemModel][container_key] ||= store_class.new
-      end
-
-      def root
-        @root ||= root_container::PERSISTENT_ROOT
-      end
-    end
-  end
-end