xamplr 1.9.13 → 1.9.14

data/lib/xamplr/xampl-object.rb

@@ -40,21 +40,32 @@ module Xampl
     def invalid
       return kind_of?(InvalidXampl)
     end
+    alias invalid? invalid
 
     def changes_accepted
       ResetIsChanged.new.start(self)
     end
 
     def changed
-      unless Xampl.persister then
-        raise UnmanagedChange.new(self)
-      end
+      raise UnmanagedChange.new(self) unless Xampl.persister
       unless @is_changed then
         @is_changed = true
-        @parents.each{ | parent | parent.changed } if nil != @parents
+        if nil != @parents
+          @parents.each do |parent|
+            parent.changed
+          end
+        end
       end
     end
 
+#    def changed?
+#      @is_changed
+#    end
+
+    def dirty?
+      @is_changed
+    end
+
     def accessed
       raise XamplIsInvalid.new(self) if invalid
     end
@@ -134,7 +145,11 @@ module Xampl
     def to_s
       if self.persisted? then
         persister_name = self.persister ? "#{ self.persister.name }/" : ''
-        "<<#{ self.class.name } #{ self.object_id } [#{ self.persister ? self.persister.name  : 'no-persister' }/#{ self.get_the_index }]#{ @is_changed ? ' DIRTY' : ''}>>"
+        if @load_needed then
+          "<<#{ self.class.name } #{ self.object_id } [#{ self.persister ? self.persister.name  : 'no-persister' }/#{ self.get_the_index }] NOT LOADED>>"
+        else
+          "<<#{ self.class.name } #{ self.object_id } [#{ self.persister ? self.persister.name  : 'no-persister' }/#{ self.get_the_index }]#{ @is_changed ? ' DIRTY' : ''}>>"
+        end
       elsif self.indexed_by then
         "<<#{ self.class.name } #{ self.object_id } [#{ self.get_the_index }]>>"
       else

data/lib/xamplr/xampl-persisted-object.rb

@@ -12,54 +12,16 @@ module Xampl
     end
 
     def accessed
-      raise XamplIsInvalid.new(self) if invalid
-      # TODO -- why do I need to get rid of this line, alternatively, why
-      # is this next line even there? Well, because accessed is now called
-      # differently. But???
-      #raise NoActivePersister unless @persister
-
-      if @load_needed and @persister then
-        raise NoActivePersister.new unless @persister
-
-        if nil == Xampl.persister then
-          #raise UnmanagedChange.new(self)
-          if not @persister.syncing then
-            Xampl.read_only(@persister) do
-              Xampl.lazy_load(self)
-            end
-          else
-            puts "LOAD NEEDED(2): REFUSED (persister: #{@persister.name})"
-            puts "                pid: #{self.get_the_index} #{self}"
-            caller(0).each { | trace | puts "  #{trace}"}
-          end
-        elsif Xampl.persister != @persister then
-          raise MixedPersisters.new(@persister, self)
-        elsif Xampl.persister == @persister then
-          if not @persister.syncing then
-            Xampl.read_only(@persister) do
-              Xampl.lazy_load(self)
-            end
-          else
-            puts "LOAD NEEDED(3): BAD IDEA, but load anyway (persister: #{@persister.name})"
-            puts "                #{self.class.name}"
-            puts "                pid: #{self.get_the_index}"
-            Xampl.read_only(@persister) do
-              Xampl.lazy_load(self)
-            end
-#            puts "LOAD NEEDED(3): REFUSED (persister: #{@persister.name})"
-#            puts "                #{self.class.name}"
-#            puts "                pid: #{self.get_the_index}"
-#            caller(0).each { | trace | puts "  #{trace}"}
-          end
-        else
-          puts "LOAD NEEDED(4): REFUSED (persister: #{@persister.name})"
-          puts "                pid: #{self.get_the_index} #{self}"
-          caller(0).each { | trace | puts "  #{trace}"}
-        end
-      else
-        puts "LOAD NEEDED(5): REFUSED (persister: #{@persister})" if @load_needed
-        puts "                pid: #{self.get_the_index} #{self}" if @load_needed
-        caller(0).each { | trace | puts "  #{trace}"} if @load_needed
+      raise XamplIsInvalid.new(self) if invalid #need this error to be more prominent
+      return unless @load_needed
+
+#      raise XamplIsInvalid.new(self) if invalid
+      raise NoActivePersister.new unless @persister
+      raise XamplException(:load_blocked_because_persister_is_syncing,
+                           "often happens when you are describing a xampl object using a different persisted xampl object that hasn't been loaded yet") if @persister.syncing
+
+      Xampl.read_only(@persister) do
+        Xampl.lazy_load(self)
       end
     end
 
@@ -68,18 +30,13 @@ module Xampl
     end
 
     def changed
-#      puts "CHANGED: is_changed #{@is_changed} xampl #{self}"
-      unless Xampl.persister then
-        raise UnmanagedChange.new(self)
-      end
+      raise UnmanagedChange.new(self) unless Xampl.persister
+
       if @persister then
-        if Xampl.persister != @persister then
-          raise UnmanagedChange.new(self)
-        end
-        if @persister.block_changes then
-          raise BlockedChange.new(self)
-        end
+        raise UnmanagedChange.new(self) if Xampl.persister != @persister
+        raise BlockedChange.new(self) if @persister.block_changes
       end
+
       unless @is_changed then
         @is_changed = true
         if @persister then

data/xamplr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xamplr}
-  s.version = "1.9.13"
+  s.version = "1.9.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bob Hutchison"]
-  s.date = %q{2010-07-14}
+  s.date = %q{2010-09-02}
   s.description = %q{xamplr is the ruby version of xampl.}
   s.email = %q{hutch@recursive.ca}
   s.extra_rdoc_files = [
@@ -36,6 +36,8 @@ Gem::Specification.new do |s|
      "lib/xamplr/exceptions.rb",
      "lib/xamplr/from-xml-orig.rb",
      "lib/xamplr/from-xml.rb",
+     "lib/xamplr/from-xml.rb.libxml",
+     "lib/xamplr/from-xml.rb.nokogiri",
      "lib/xamplr/indexed-array.rb",
      "lib/xamplr/iterator.rb",
      "lib/xamplr/mixins.rb",
@@ -48,7 +50,8 @@ Gem::Specification.new do |s|
      "lib/xamplr/persisters/dumb.rb",
      "lib/xamplr/persisters/filesystem.rb",
      "lib/xamplr/persisters/in-memory.rb",
-     "lib/xamplr/persisters/mongo.rb",
+     "lib/xamplr/persisters/mongo.rb.cannot-use",
+     "lib/xamplr/persisters/redis.rb",
      "lib/xamplr/persisters/simple.rb",
      "lib/xamplr/persisters/tokyo-cabinet.rb",
      "lib/xamplr/persisters/tokyo-cabinet.rb.1-DB",
@@ -72,6 +75,17 @@ Gem::Specification.new do |s|
      "lib/xamplr/test-support/test-names.rb",
      "lib/xamplr/test-support/test-rollback.rb",
      "lib/xamplr/test-support/test.rb",
+     "lib/xamplr/tests/.gitignore",
+     "lib/xamplr/tests/redis/Makefile",
+     "lib/xamplr/tests/redis/author.rb",
+     "lib/xamplr/tests/redis/project-generator.rb",
+     "lib/xamplr/tests/redis/redis_spec.rb",
+     "lib/xamplr/tests/redis/spec.opts",
+     "lib/xamplr/tests/redis/spec_helper.rb",
+     "lib/xamplr/tests/redis/testing-db/.gitignore",
+     "lib/xamplr/tests/redis/testing-db/Makefile",
+     "lib/xamplr/tests/redis/testing-db/unit-testing.redis.conf",
+     "lib/xamplr/tests/redis/xml/redis-test.xml",
      "lib/xamplr/to-ruby.rb",
      "lib/xamplr/to-xml.rb",
      "lib/xamplr/visitor.rb",
@@ -125,14 +139,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<xamplr-pp>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<libxml-ruby>, [">= 1.1.3"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.3"])
     else
       s.add_dependency(%q<xamplr-pp>, [">= 1.2.0"])
-      s.add_dependency(%q<libxml-ruby>, [">= 1.1.3"])
+      s.add_dependency(%q<nokogiri>, [">= 1.4.3"])
     end
   else
     s.add_dependency(%q<xamplr-pp>, [">= 1.2.0"])
-    s.add_dependency(%q<libxml-ruby>, [">= 1.1.3"])
+    s.add_dependency(%q<nokogiri>, [">= 1.4.3"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xamplr
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: false
   segments: 
   - 1
   - 9
-  - 13
-  version: 1.9.13
+  - 14
+  version: 1.9.14
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 -04:00
+date: 2010-09-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,19 +35,19 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: libxml-ruby
+  name: nokogiri
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 1
         segments: 
         - 1
-        - 1
+        - 4
         - 3
-        version: 1.1.3
+        version: 1.4.3
   type: :runtime
   version_requirements: *id002
 description: xamplr is the ruby version of xampl.
@@ -79,6 +79,8 @@ files:
 - lib/xamplr/exceptions.rb
 - lib/xamplr/from-xml-orig.rb
 - lib/xamplr/from-xml.rb
+- lib/xamplr/from-xml.rb.libxml
+- lib/xamplr/from-xml.rb.nokogiri
 - lib/xamplr/indexed-array.rb
 - lib/xamplr/iterator.rb
 - lib/xamplr/mixins.rb
@@ -91,7 +93,8 @@ files:
 - lib/xamplr/persisters/dumb.rb
 - lib/xamplr/persisters/filesystem.rb
 - lib/xamplr/persisters/in-memory.rb
-- lib/xamplr/persisters/mongo.rb
+- lib/xamplr/persisters/mongo.rb.cannot-use
+- lib/xamplr/persisters/redis.rb
 - lib/xamplr/persisters/simple.rb
 - lib/xamplr/persisters/tokyo-cabinet.rb
 - lib/xamplr/persisters/tokyo-cabinet.rb.1-DB
@@ -115,6 +118,17 @@ files:
 - lib/xamplr/test-support/test-names.rb
 - lib/xamplr/test-support/test-rollback.rb
 - lib/xamplr/test-support/test.rb
+- lib/xamplr/tests/.gitignore
+- lib/xamplr/tests/redis/Makefile
+- lib/xamplr/tests/redis/author.rb
+- lib/xamplr/tests/redis/project-generator.rb
+- lib/xamplr/tests/redis/redis_spec.rb
+- lib/xamplr/tests/redis/spec.opts
+- lib/xamplr/tests/redis/spec_helper.rb
+- lib/xamplr/tests/redis/testing-db/.gitignore
+- lib/xamplr/tests/redis/testing-db/Makefile
+- lib/xamplr/tests/redis/testing-db/unit-testing.redis.conf
+- lib/xamplr/tests/redis/xml/redis-test.xml
 - lib/xamplr/to-ruby.rb
 - lib/xamplr/to-xml.rb
 - lib/xamplr/visitor.rb