document_mapper 0.1.6 → 0.1.7

data/lib/document_mapper/document.rb

@@ -11,7 +11,7 @@ module DocumentMapper
     attr_accessor :attributes, :content
 
     included do
-      @@documents = []
+      @documents = []
     end
 
     def ==(other_document)
@@ -21,12 +21,12 @@ module DocumentMapper
 
     module ClassMethods
       def reset
-        @@documents = []
+        @documents = []
       end
 
       def reload
         self.reset
-        self.directory = @@directory.path
+        self.directory = @directory.path
       end
 
       def from_file(file_path)
@@ -38,22 +38,22 @@ module DocumentMapper
             :file_path => File.expand_path(file_path)
           }
           document.read_yaml
-          @@documents << document
+          @documents << document
         end
       end
 
       def directory=(new_directory)
         raise FileNotFoundError unless File.directory?(new_directory)
         self.reset
-        @@directory = Dir.new File.expand_path(new_directory)
-        @@directory.each do |file|
+        @directory = Dir.new File.expand_path(new_directory)
+        @directory.each do |file|
           next if file[0,1] == '.'
-          self.from_file [@@directory.path, file].join('/')
+          self.from_file [@directory.path, file].join('/')
         end
       end
 
       def select(options = {})
-        documents = @@documents.dup
+        documents = @documents.dup
         options[:where].each do |selector, selector_value|
           documents = documents.select do |document|
             next unless document.attributes.has_key? selector.attribute
@@ -95,19 +95,19 @@ module DocumentMapper
       end
 
       def all
-        @@documents
+        @documents
       end
 
       def first
-        @@documents.first
+        @documents.first
       end
 
       def last
-        @@documents.last
+        @documents.last
       end
 
       def attributes
-        @@documents.map(&:attributes).map(&:keys).flatten.uniq.sort
+        @documents.map(&:attributes).map(&:keys).flatten.uniq.sort
       end
     end
   end

data/lib/document_mapper/version.rb

@@ -1,3 +1,3 @@
 module DocumentMapper
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/test/document_mapper/document_mapper_test.rb

@@ -336,6 +336,16 @@ EOS
     end
   end
 
+  describe 'multiple document classes' do
+    it 'can serve multiple document directories' do
+      MyDocument.directory = 'test/documents'
+      MyOtherDocument.directory = 'test/other_documents'
+
+      assert_equal 4, MyDocument.all.count
+      assert_equal 1, MyOtherDocument.all.count
+    end
+  end
+
   def sample_file_path_1
     'test/documents/2010-08-08-test-document-file.textile'
   end

data/test/other_documents/2011-12-26-some-test-document.textile

@@ -0,0 +1,5 @@
+---
+title: Some test document
+---
+
+This is just some test document.

data/test/test_base.rb

@@ -12,6 +12,10 @@ class MyDocument
   include DocumentMapper::Document
 end
 
+class MyOtherDocument
+  include DocumentMapper::Document
+end
+
 module MiniTest::Assertions
   def assert_equal_set exp, act, msg = nil
     msg = message(msg) { "Expected #{mu_pp(exp)}, not #{mu_pp(act)}" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: document_mapper
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-14 00:00:00.000000000Z
+date: 2012-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70138859185020 !ruby/object:Gem::Requirement
+  requirement: &70120929299440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70138859185020
+  version_requirements: *70120929299440
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70138859184180 !ruby/object:Gem::Requirement
+  requirement: &70120929298880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70138859184180
+  version_requirements: *70120929298880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70138859183360 !ruby/object:Gem::Requirement
+  requirement: &70120929298380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70138859183360
+  version_requirements: *70120929298380
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70138859182700 !ruby/object:Gem::Requirement
+  requirement: &70120929297840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70138859182700
+  version_requirements: *70120929297840
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70138859182100 !ruby/object:Gem::Requirement
+  requirement: &70120929297320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 4.2.0
   type: :development
   prerelease: false
-  version_requirements: *70138859182100
+  version_requirements: *70120929297320
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70138859181500 !ruby/object:Gem::Requirement
+  requirement: &70120929296820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70138859181500
+  version_requirements: *70120929296820
 description: ! '  DocumentMapper is an object mapper for plain text documents. The
   documents look like the ones used in jekyll (http://github.com/mojombo/jekyll).
   They consist of a preambel written in YAML (also called YAML front matter), and
@@ -111,6 +111,7 @@ files:
 - test/documents/2010-08-09-another-test-document.textile
 - test/documents/document_with_date_in_yaml.textile
 - test/documents/document_without_date.textile
+- test/other_documents/2011-12-26-some-test-document.textile
 - test/test_base.rb
 homepage: http://github.com/ralph/document_mapper
 licenses: []
@@ -126,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4508131542455826029
+      hash: 2393159709703028438
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4508131542455826029
+      hash: 2393159709703028438
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10