mordor 0.1.2 → 0.1.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mordor (0.1.0)
+    mordor (0.1.2)
       bson_ext
       extlib
       json
@@ -11,16 +11,12 @@ GEM
   specs:
     bson (1.4.0)
     bson_ext (1.4.0)
-    columnize (0.3.4)
     diff-lcs (1.1.3)
     extlib (0.9.15)
     json (1.6.1)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
     mongo (1.4.0)
       bson (= 1.4.0)
     rake (0.9.2.2)
-    rbx-require-relative (0.0.5)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
       rspec-expectations (~> 2.7.0)
@@ -29,11 +25,6 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
 
 PLATFORMS
   ruby
@@ -46,4 +37,3 @@ DEPENDENCIES
   mordor!
   rake
   rspec (~> 2.0)
-  ruby-debug

data/lib/mordor/collection.rb

@@ -7,20 +7,40 @@ module Mordor
       @cursor = cursor
     end
 
+    def to_a
+      array = []
+      unless @cursor.is_a? Array
+        @cursor.each do |element|
+          if element.is_a? @klass
+            array << element
+          else
+            array << @klass.new(element)
+          end
+        end
+      else
+        array = @cursor.dup
+      end
+      array
+    end
+
     def each
       @cursor.each do |element|
-        if element
-          yield @klass.new(element)
+        if element.is_a? @klass
+          yield element
         else
-          next
+          yield @klass.new(element)
         end
       end
     end
 
     def first
-      result = @cursor.first
-      @cursor.rewind!
-      result ? @klass.new(result) : nil
+      if @cursor.is_a? Array
+        @cursor.first ? @klass.new(@cursor.first) : nil
+      else
+        result = @cursor.first
+        @cursor.rewind!
+        result ? @klass.new(result) : nil
+      end
     end
 
     def size
@@ -45,5 +65,17 @@ module Mordor
       end
       res.to_json
     end
+
+    def merge(other_collection)
+      Collection.new(@klass, (self.to_a + other_collection.to_a))
+    end
+    alias_method :+, :merge
+
+    def merge!(other_collection)
+      unless @cursor.is_a? Array
+        @cursor = @cursor.to_a
+      end
+      @cursor += other_collection.to_a
+    end
   end
 end

data/lib/mordor/resource.rb

@@ -42,6 +42,14 @@ module Mordor
       value
     end
 
+    def new?
+      return self._id == nil
+    end
+
+    def saved?
+      return !new?
+    end
+
     def save
       unless self._id
         insert_id = self.class.collection.insert(self.to_hash)
@@ -49,9 +57,11 @@ module Mordor
       else
         insert_id = self.update
       end
-      insert_id != nil
+      saved?
     end
 
+    alias_method :save!, :save
+
     def update
       insert_id = self.class.collection.update({:_id => self._id}, self.to_hash)
       insert_id
@@ -72,6 +82,12 @@ module Mordor
     end
 
     module ClassMethods
+      def create(attributes = {})
+        resource = self.new(attributes)
+        resource.save
+        resource
+      end
+
       def all(options = {})
         Collection.new(self, collection.find({}, options).to_a)
       end
@@ -104,7 +120,11 @@ module Mordor
         get(id)
       end
 
-      def find_by_day(day)
+      def find(query, options = {})
+        Collection.new(self, collection.find(query, options).to_a)
+      end
+
+      def find_by_day(day, options = {})
         case day
         when DateTime
           start = day.to_date.to_time
@@ -117,8 +137,11 @@ module Mordor
           end_of_day = (day.to_date + 1).to_datetime.to_date.to_time
         end
         hash = {:at => {'$gte' => start, '$lt' => end_of_day}}
-        pp hash
-        cursor = collection.find(:at => {'$gte' => start, '$lt' => end_of_day})
+        if options.keys.include?(:limit)
+          cursor = collection.find({:at => {'$gte' => start, '$lt' => end_of_day}}, options).to_a
+        else
+          cursor = collection.find({:at => {'$gte' => start, '$lt' => end_of_day}})
+        end
         Collection.new(self, cursor)
       end
 
@@ -132,8 +155,13 @@ module Mordor
         class_eval <<-EOS, __FILE__, __LINE__
           attr_accessor name
 
-          def self.#{method_name}(value)
-            Collection.new(self, collection.find(:#{name} => value))
+          def self.#{method_name}(value, options = {})
+            if options.keys.include?(:limit)
+              col = collection.find({:#{name} => value}, options).to_a
+            else
+              col = collection.find(:#{name} => value)
+            end
+            Collection.new(self, col)
           end
         EOS
       end

data/mordor.gemspec

@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
   s.name    = "mordor"
   
   # Do not set the version and date field manually, this is done by the release script
-  s.version = "0.1.2"
-  s.date    = "2011-11-11"
+  s.version = "0.1.3"
+  s.date    = "2011-11-15"
 
   s.summary     = "mordor"
   s.description = <<-eos
@@ -11,7 +11,6 @@ Gem::Specification.new do |s|
   eos
 
   s.add_development_dependency('rake')
-  s.add_development_dependency('ruby-debug')
   s.add_development_dependency('rspec', '~> 2.0')
   s.add_development_dependency('json')
 

data/spec/mordor/collection_spec.rb

@@ -35,4 +35,54 @@ describe "with respect to collections" do
       json_collection[collection_name].size.should == 5
     end
   end
+
+  describe "merging array based collection" do
+    before :each do
+      @first_collection  = Mordor::Collection.new(TestResource, [TestResource.new(:first => "first", :second => "second", :third => "third")])
+      @second_collection = Mordor::Collection.new(TestResource, [TestResource.new(:first => "1st", :second => "2nd", :third => "3rd")])
+    end
+
+    it "should not change original collections when no bang is used" do
+      first_size = @first_collection.size
+      second_size = @second_collection.size
+
+      new_collection = @first_collection.merge(@second_collection)
+      @first_collection.size.should == first_size
+      @second_collection.size.should == second_size
+    end
+
+    it "should create collection with all elements from original collections" do
+      new_collection = @first_collection.merge(@second_collection)
+      new_collection.size.should == (@first_collection.size + @second_collection.size)
+
+      [@first_collection, @second_collection].each do |collection|
+        collection.each do |element|
+          new_collection.should include element
+        end
+      end
+    end
+
+    it "should be possible to use the + as an alias" do
+      new_collection = @first_collection + @second_collection
+      new_collection.size.should == (@first_collection.size + @second_collection.size)
+
+      [@first_collection, @second_collection].each do |collection|
+        collection.each do |element|
+          new_collection.should include element
+        end
+      end
+    end
+
+    it "should change the receiver of the merge! to have all elements" do
+      first_size = @first_collection.size
+      second_size = @second_collection.size
+
+      @first_collection.merge!(@second_collection)
+      @first_collection.size.should == (first_size + second_size)
+
+      @second_collection.each do |element|
+        @first_collection.should include element
+      end
+    end
+  end
 end

data/spec/mordor/resource_spec.rb

@@ -63,7 +63,27 @@ describe "with respect to resources" do
       hash.size.should     == 3
       hash[:first].should  == "first"
       hash[:second].should == "second"
-      hash[:third].should  == "third" 
+      hash[:third].should  == "third"
+    end
+  end
+
+  context "with respect to creating" do
+    before :each do
+      clean_sheet
+      @resource = TestResource.create({:first => "first", :second => "second", :third => "third"})
+    end
+
+    it "should be possible to create a resource" do
+      @resource.should be_saved
+    end
+
+    it "should be possible to retrieve created resources" do
+      res = TestResource.get(@resource._id)
+      res.should_not be_nil
+      res.first.should eql @resource.first
+      res.second.should eql @resource.second
+      res.third.should eql @resource.third
+      res._id.should eql @resource._id
     end
   end
 
@@ -114,13 +134,41 @@ describe "with respect to resources" do
       res.second.should == resource.second
     end
 
+    it "should be possible to find resources using queries" do
+      resource = TestResource.new({:first => "first", :second => "second"})
+      resource.save.should be_true
+
+      resource2 = TestResource.new({:first => "first", :second => "2nd"})
+      resource2.save.should be_true
+
+      collection = TestResource.find({:first => "first"})
+      collection.should_not be_nil
+      collection.size.should == 2
+
+      collection = TestResource.find({:second => "2nd"})
+      collection.should_not be_nil
+      collection.size.should == 1
+    end
+
+    it "should be possible to query with a limit" do
+      resource = TestResource.new({:first => "first", :second => "second"})
+      resource.save.should be_true
+
+      resource2 = TestResource.new({:first => "first", :second => "2nd"})
+      resource2.save.should be_true
+
+      collection = TestResource.find({:first => "first"}, :limit => 1)
+      collection.should_not be_nil
+      collection.size.should == 1
+    end
+
     it "should be possible to retrieve all resources" do
       TestResource.all.should_not be_nil
       TestResource.all.size.should == 0
 
       resource = TestResource.new({:first => "first", :second => "second"})
       resource.save.should be_true
-      
+
       resource2 = TestResource.new({:first => "first", :second => "second"})
       resource2.save.should be_true
 
@@ -135,7 +183,7 @@ describe "with respect to resources" do
 
       resource = TestResource.new({:first => "first", :second => "second"})
       resource.save.should be_true
-      
+
       resource2 = TestResource.new({:first => "first", :second => "second"})
       resource2.save.should be_true
 
@@ -145,6 +193,34 @@ describe "with respect to resources" do
     end
   end
 
+  context "with respect to retrieving by day" do
+    class TestTimedResource
+      include Mordor::Resource
+
+      attribute :first
+      attribute :at
+    end
+
+    before :each do
+      clean_sheet
+    end
+
+    it "should be possible to retrieve a Resource by day" do
+      TestTimedResource.create({:first => "hallo", :at => DateTime.civil(2011, 11, 11, 11, 11)})
+
+      col = TestTimedResource.find_by_day(DateTime.civil(2011,11,11))
+      col.size.should == 1
+      col.first.first.should eql "hallo"
+    end
+
+    it "should not retrieve resources from other days" do
+      TestTimedResource.create({:first => "hallo", :at => DateTime.civil(2011, 11, 11, 11, 11)})
+
+      col = TestTimedResource.find_by_day(DateTime.civil(2011,11,10))
+      col.size.should == 0
+    end
+ end
+
   context "with respect to collections" do
     it "should correctly return a collection name" do
       TestResource.collection_name.should == "testresources"
@@ -167,4 +243,6 @@ describe "with respect to resources" do
       resource.should be_nil
     end
   end
+
+
 end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'mongo'
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'mordor'
 
-module Auditing
+module Mordor
 CONFIG = {
   :hostname => 'localhost',
   :port     =>  27017,
@@ -15,8 +15,11 @@ end
 def clean_sheet
   @connection ||= Mongo::Connection.new(Mordor::CONFIG[:hostname], Mordor::CONFIG[:port])
   @db ||= @connection[Mordor::CONFIG[:database]]
-  if Object.const_defined?('TestResource')
-    @db[TestResource.collection_name].drop
+
+  ['TestResource', 'TestTimedResource'].each do |resource|
+    if Object.const_defined?(resource)
+      @db[Object.const_get(resource).collection_name].drop
+    end
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mordor
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jan-Willem Koelewijn
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-11 00:00:00 +01:00
+date: 2011-11-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,36 +34,36 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 2
         - 0
-        version: "0"
+        version: "2.0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: json
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 2
         - 0
-        version: "2.0"
+        version: "0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: extlib
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,7 +77,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: extlib
+  name: mongo
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -91,7 +91,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: mongo
+  name: bson_ext
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -105,7 +105,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: bson_ext
+  name: extlib
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -116,10 +116,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: extlib
+  name: mongo
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -133,7 +133,7 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: mongo
+  name: bson_ext
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -147,7 +147,7 @@ dependencies:
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: bson_ext
+  name: json
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -160,20 +160,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id011
 description: "    Small gem to add MongoDB Resources, resources have attributes that translate into document fields. When an attribute is declared, finders for the attribute are added to the Resource automatically\n"
 email: 
 - janwillem.koelewijn@nedap.com