document_mapper 0.1.4 → 0.1.5

data/lib/document_mapper/attribute_methods.rb

@@ -3,10 +3,10 @@ module DocumentMapper
     module Read
       extend ActiveSupport::Concern
 
-      included do
-        # Undefine id so it can be used as an attribute name
-        undef_method(:id) if method_defined?(:id)
-      end
+      # included do
+      #   # Undefine id so it can be used as an attribute name
+      #   undef_method(:id) if method_defined?(:id)
+      # end
 
       module ClassMethods
         def define_read_method(attr_name)

data/lib/document_mapper/core_ext/symbol.rb

@@ -6,4 +6,10 @@ class Symbol
       end
     OPERATORS
   end
+  
+  unless method_defined?(:"<=>")
+    def <=>(other)
+      self.to_s <=> other.to_s
+    end
+  end
 end

data/lib/document_mapper/document.rb

@@ -8,7 +8,7 @@ module DocumentMapper
     include ToHtml
     include YamlParsing
 
-    attr_accessor :attributes, :content, :directory
+    attr_accessor :attributes, :content
 
     included do
       @@documents = []
@@ -26,7 +26,7 @@ module DocumentMapper
 
       def reload
         self.reset
-        self.directory = @@directory
+        self.directory = @@directory.path
       end
 
       def from_file(file_path)
@@ -47,7 +47,7 @@ module DocumentMapper
         self.reset
         @@directory = Dir.new File.expand_path(new_directory)
         @@directory.each do |file|
-          next if file[0] == '.'
+          next if file[0,1] == '.'
           self.from_file [@@directory.path, file].join('/')
         end
       end
@@ -55,7 +55,7 @@ module DocumentMapper
       def select(options = {})
         documents = @@documents.dup
         options[:where].each do |selector, selector_value|
-          documents.select! do |document|
+          documents = documents.select do |document|
             next unless document.attributes.has_key? selector.attribute
             document_value = document.send(selector.attribute)
             operator = OPERATOR_MAPPING[selector.operator]
@@ -66,10 +66,12 @@ module DocumentMapper
         if options[:order_by].present?
           order_attribute = options[:order_by].keys.first
           asc_or_desc = options[:order_by].values.first
-          documents.select! do |document|
+          documents = documents.select do |document|
             document.attributes.include? order_attribute
           end
-          documents.sort_by! { |document| document.send order_attribute }
+          documents = documents.sort_by do |document|
+            document.send order_attribute
+          end
           documents.reverse! if asc_or_desc == :desc
         end
 

data/lib/document_mapper/query.rb

@@ -6,9 +6,8 @@ module DocumentMapper
     end
 
     def where(constraints_hash)
-      differentiator = ->(key, value){ key.is_a? Selector }
-      selector_hash = constraints_hash.select &differentiator
-      symbol_hash = constraints_hash.reject &differentiator
+      selector_hash = constraints_hash.reject { |key, value| !key.is_a? Selector }
+      symbol_hash = constraints_hash.reject { |key, value| key.is_a? Selector }
       symbol_hash.each do |attribute, value|
         selector = Selector.new(:attribute => attribute, :operator => 'equal')
         selector_hash.update({ selector => value })
@@ -43,7 +42,7 @@ module DocumentMapper
     def all
       result = @model.select(:where => @where, :order_by => @order_by)
       if @offset.present?
-        result = result.last(result.size - @offset)
+        result = result.last([result.size - @offset, 0].max)
       end
       if @limit.present?
         result = result.first(@limit)

data/lib/document_mapper/version.rb

@@ -1,3 +1,3 @@
 module DocumentMapper
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/test/document_mapper/document_mapper_test.rb

@@ -121,6 +121,10 @@ describe MyDocument do
     it 'should support offset and limit at the same time' do
       assert_equal_set [2,3], MyDocument.order_by(:id).offset(1).limit(2).all.map(&:id)
     end
+
+    it 'should not freak out about an offset higher than the document count' do
+      assert_equal_set [], MyDocument.order_by(:id).offset(5).all
+    end
   end
 
   describe 'resetting the MyDocument class' do

data/test/test_base.rb

@@ -1,3 +1,5 @@
+require 'rubygems'
+require 'bundler/setup'
 require 'set'
 require 'minitest/spec'
 MiniTest::Unit.autorun

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: document_mapper
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-23 00:00:00.000000000Z
+date: 2011-07-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153304900 !ruby/object:Gem::Requirement
+  requirement: &2156281780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153304900
+  version_requirements: *2156281780
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2153304400 !ruby/object:Gem::Requirement
+  requirement: &2156280460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153304400
+  version_requirements: *2156280460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153303940 !ruby/object:Gem::Requirement
+  requirement: &2156278980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153303940
+  version_requirements: *2156278980
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2153335980 !ruby/object:Gem::Requirement
+  requirement: &2156278120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153335980
+  version_requirements: *2156278120
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2153335520 !ruby/object:Gem::Requirement
+  requirement: &2156277280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,18 @@ dependencies:
         version: 4.2.0
   type: :development
   prerelease: false
-  version_requirements: *2153335520
+  version_requirements: *2156277280
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &2156276220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.1
+  type: :development
+  prerelease: false
+  version_requirements: *2156276220
 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
@@ -113,12 +124,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3820388701645222296
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3820388701645222296
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.5