mem_model 0.6.0 → 0.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzRmZDhkYTI1YTQ4MjUwZDEzMDcxZmQ2YjM3YjRmYjUxM2UzNzQxZg==
+    MjdiMTBhMWRhMGZmMWRkMDlkOGEwODJmNDUzYmJmOWFkODU0ZWJkZA==
   data.tar.gz: !binary |-
-    ZWNjODQxZGM3MjRlMjg3OTY2ODBlMGFhYWQ3MzUzYmFjNDQ0MDhmYw==
+    ZjM2OTc3OWQ1ODlmOTJjZGQ4NDY3MDliNDlkMWQ3MTdlOTc5ZDlhNQ==
 SHA512:
   metadata.gz: !binary |-
-    YTBjNDdhM2ZkYTc5NjkzMTQ1MTJjZGYwMDE5YWU3ZGYxMDMwY2RhMWI5ZjRh
-    MGY3MzY4ZGVlYmVhNmQwNTBiZDVlYjZmMzAzZmQ2MzVmZjRmNjZmNDhjZGQ5
-    OTA5YjZkMGM3MmJiNDdlNjA5ZjViMDhjMDkyZTg5ZTY3ZGNhYmE=
+    MTUzOTMwN2ViZjM1Y2Q4N2VhZDU4OWRkZDAyYjJkZjZiNjhlNGFjY2U2Y2Y2
+    YzY4YmEyYjY2MGYyZmJmNTM2MGVhN2NkZGU0MTFkNTUyNmI0NjBlNTM3MjMx
+    OWU5YTg2ZTgxMDI4MmUyOTk4MjM1YjJkNzVjZjk0ZDBmNzUxZGY=
   data.tar.gz: !binary |-
-    Njk1ZWUzNGVkYjdiODFhODY4NDZiMDFlMmY1MzU5M2RmZDJlMGRhZjRmNjNk
-    NWExM2Y1M2ZkY2EwNzk4NGQ1NWU1ODU5YzAwNjM5ZjY4NTNmZjgzMWU0ZDU4
-    MzY2YTJjMDI5NjFjMDFjZDVjZjU5M2IxMDQwZDY0NDIzZTBkMmQ=
+    ZWYyMjgzODkwNTQxZGU5ZTc4ZWQ4MzFlZmRiZGEwN2MxYjYwNWEzNmEyNjgx
+    MDk1NzllNmMyZGMzZmRkMjY2ZjMzOGM3Njk5OTYwMTAxZDYxYTkzMGM4ZmQz
+    ZGY2ZTEzZjA1NDE5YjFkMmM3NTlhMzdkY2E3NWI2NzBlZGQxYTY=

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 0.7.0 / 2014-01-03
+
+* 2 enhancements:
+
+  * Having GUID be default
+  * Update persistence methods
+
+
 ### 0.6.0 / 2014-01-02
 
 * 1 unknown:

data/lib/mem_model.rb

@@ -7,7 +7,25 @@ module MemModel
   def maglev?
     !defined?(Maglev).nil?
   end
-  module_function :maglev?
+
+  def commit
+    maglev? ? Maglev.commit_transaction : true
+  end
+
+  def abort
+    maglev? ? Maglev.abort_transaction : true
+  end
+
+  def persistent(&block)
+    if maglev?
+      Maglev.persistent{ block.call }
+      commit
+    else
+      block.call
+    end
+  end
+
+  module_function :maglev?, :commit, :abort, :persistent
 end
 
 %w[ concern base errors guid model_name rooted_base validations version ].each do |file|

data/lib/mem_model/base.rb

@@ -4,6 +4,7 @@ module MemModel
 
     included do
       include MemModel::Validations
+      include MemModel::Guid
       attr_accessor :id
     end
 
@@ -70,13 +71,11 @@ module MemModel
       end
 
       def abort
-        # no-op
-        true
+        MemModel.abort
       end
 
       def commit
-        # no-op
-        true
+        MemModel.commit
       end
 
       alias_method :to_str, :to_s
@@ -84,6 +83,16 @@ module MemModel
       def delete(record)
         store.delete(record)
       end
+
+      if !MemModel.maglev?
+        def committed?; false; end
+      end
+
+      def persistent(&block)
+        committed? ?
+          MemModel.persistent(&block) :
+          block.call
+      end
     end
 
     def initialize(attributes = {})
@@ -98,11 +107,25 @@ module MemModel
 
     def model_name; self.class.model_name; end
 
-    unless MemModel.maglev?
+    if !MemModel.maglev?
       def committed?; @persisted == true; end
     end
-    alias_method :persisted?, :committed?
-    alias_method :exists?, :committed?
+
+    def class_committed?
+      self.class.committed?
+    end
+
+    def persisted?
+      class_committed? ?
+        committed? :
+        @persisted == true
+    end
+    alias_method :exists?, :persisted?
+
+    def new?
+      !persisted?
+    end
+    alias_method :new_record?, :new?
 
     def to_key; end
     def to_param; end
@@ -110,7 +133,6 @@ module MemModel
 
     def errors; @errors ||= Errors.new(self); end
 
-
     def maglev?
       self.class.maglev?
     end
@@ -124,15 +146,9 @@ module MemModel
     end
 
     def persistent(&block)
-      # no-op
-      block.call
+      self.class.persistent(&block)
     end
 
-    def new?
-      !persisted?
-    end
-    alias_method :new_record?, :new?
-
     def save
       new? ? create : update
     end
@@ -141,7 +157,7 @@ module MemModel
       self.id ||= generate_id
       persistent do
         self.class.store << self
-        @persisted = true unless maglev?
+        @persisted = true unless class_committed?
       end
       self.id
     end

data/lib/mem_model/guid.rb

@@ -2,11 +2,23 @@ module MemModel
   module Guid
     extend MemModel::Concern
 
+    def generate_id
+      self.class.generate_id
+    end
+
     module ClassMethods
       def generate_id
         [guid_prefix, '-', new_uuid].join.upcase
       end
 
+      def guid_prefix
+        name[0...3]
+      end
+
+      def find_all_matching(substring)
+        store.select{ |r| r.id.include?(substring.to_s.upcase) }
+      end
+
       def random_bytes(n=16)
         flags = File::RDONLY
         flags |= File::NONBLOCK if defined? File::NONBLOCK
@@ -34,14 +46,6 @@ module MemModel
         ary[3] = (ary[3] & 0x3fff) | 0x8000
         "%08x-%04x-%04x-%04x-%04x%08x" % ary
       end
-
-      def guid_prefix
-        name[0...3]
-      end
-
-      def find_all_matching(substring)
-        store.select{ |r| r.id.include?(substring.to_s.upcase) }
-      end
     end
   end
 end

data/lib/mem_model/rooted_base.rb

@@ -3,7 +3,10 @@ module MemModel
 
   module RootedBase
     extend MemModel::Concern
-    include Base
+
+    included do
+      include MemModel::Base
+    end
 
     module ClassMethods
       def root_container
@@ -22,28 +25,6 @@ module MemModel
       def root
         @root ||= root_container::PERSISTENT_ROOT
       end
-
-      def abort
-        Maglev.abort_transaction if maglev?
-        true
-      end
-
-      def commit
-        Maglev.commit_transaction if maglev?
-        true
-      end
-
-      def persistent(&block)
-        abort
-        maglev? ?
-          Maglev.persistent { block.call } :
-          block.call
-        commit
-      end
-    end
-
-    def persistent(&block)
-      self.class.persistent(&block)
     end
   end
 end

data/lib/mem_model/version.rb

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

data/mem_model.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: mem_model 0.6.0.20140102221058 ruby lib
+# stub: mem_model 0.7.0.20140103165733 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mem_model"
-  s.version = "0.6.0.20140102221058"
+  s.version = "0.7.0.20140103165733"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["JohnnyT"]

data/test/mem_model/test_rooted_base.rb

@@ -18,23 +18,10 @@ class TestRootedBase < Minitest::Test
     refute Account.exists? 314159
   end
 
-  if MemModel.maglev?
-
-    def test_maglev_exists
-      assert_raises TransactionError, 'The test Account class is transient' do
-        @account.save
-      end
-      @account.abort
-    end
-
-  else
-
-    def test_mri_exists
-      refute Account.exists? @account.id
-      @account.save
-      assert Account.exists? @account.id
-    end
-
+  def test_exists
+    refute Account.exists? @account.id
+    @account.save
+    assert Account.exists? @account.id
   end
 
   def test_root_container

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mem_model
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - JohnnyT