muve-store-mongo 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33464acefa3d59d3071f27af3019a285073dc7d1
-  data.tar.gz: a537c768adee7c8ca400d87607d0ad7ead7669ee
+  metadata.gz: 93b785d7d848372e3e0f88d79804905bcafe8b1d
+  data.tar.gz: 8d0ffc4195047662b2d3eaa7b4dfa8f9046f55bb
 SHA512:
-  metadata.gz: fc049c900e092be9babe15d44e009424352f8bc6531a4dd419652f613334f45aa33082b4aeee3d1f11decf44b8da475c7f0fe9706cc47ad61a666db7bd404194
-  data.tar.gz: 7c769583d16f698a924313263fa2fba815cba80fb40a82a55e1e4dec893e9de0f271378fcc8c77d33fcc481a5df2504a3c1511abd8cc2934e828749315228dbb
+  metadata.gz: fd5c4ea2ca8c748e67a5268493d6b7c08486788591e09cab08fb9f1fbe2d798563584012c0caf239ab94b8032982ec65d850d3330a84abec9abfb6f1161ad5cd
+  data.tar.gz: 83ba6f494982d0205f172653534ee614e46e054671a02ee12fcce99a7bd8f650f03c977e0363bfe5f99cb478077ebea5a8d898cf79e732a21b0868c574a745c3

data/Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem "bson_ext", "~> 1.10.2"
+gem "muve", "~> 1.2.0"
 
 group :test do
   gem "ffaker", "~> 1.24.0"

data/lib/muve-store-mongo/errors.rb

@@ -0,0 +1,5 @@
+module Muve
+  module Error
+    class MongoError < StandardError; end
+  end
+end

data/lib/muve-store-mongo/formatter.rb

@@ -0,0 +1,25 @@
+module Muve
+  module Store
+    module Mongo
+      module Formatter
+        extend Muve::Store::Formatter
+
+        def self.convert_to_storeable_object(resource)
+          return {
+            type: 'Place',
+            coordinates: [resource.longitude, resource.latitude]
+          } if resource.kind_of? Muve::Location
+          resource
+        end
+
+        def self.convert_from_storeable_object(storeable)
+          if storeable.kind_of? Hash
+            if Helper.symbolize_keys(storeable).to_a.include? [:type, 'Place']
+              Location.new(latitude: storeable[:coordinates][1], longitude: storeable[:coordinates][0]) if storeable[:coordinates]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/muve-store-mongo/version.rb

@@ -1,7 +1,7 @@
 module Muve
   module Store
     module Mongo
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/lib/muve-store-mongo.rb

@@ -1,30 +1,35 @@
-require "muve-store-mongo/version"
-require "muve"
+require 'muve-store-mongo/version'
+require 'muve'
+require 'mongo'
 
 module Muve
   module Store
     module Mongo
-      require 'mongo'
+      require 'muve-store-mongo/errors'
+      require 'muve-store-mongo/formatter'
 
       extend Muve::Store
 
       def self.create(resource, details)
-        raise MuveInvalidAttributes, "invalid update data" unless details.kind_of? Hash
+        raise Muve::Error::InvalidAttribute, "Invalid create details" unless details.kind_of? Hash
         resource.database[resource.container].insert(details)
       end
 
       def self.fetch(resource, id, details={})
         # TODO: discover a solution that works for situations where database 
         # driver returns string keys as well as symbol keys
-        details = {} unless details.kind_of? Hash
+        raise Muve::Error::InvalidAttribute, "Invalid details" unless details.kind_of? Hash
+        raise Muve::Error::InvalidQuery, "The id or details need to be set" if (id.nil? && details.empty?)
+        id = ((BSON::ObjectId.from_string(id) if id.kind_of? String) or id)
         result = resource.database[resource.container].find_one(details.merge(_id: id))
+        raise Muve::Error::NotFound, "#{resource} #{id} is not found" unless result
         result = Helper.symbolize_keys(result)
         result[:id] = result.delete(:_id)
         result
       end
 
-      def self.find(resource, details)
-        details = {} unless details.kind_of? Hash
+      def self.find(resource, details={})
+        raise Muve::Error::InvalidAttribute, "Invalid details" unless details.kind_of? Hash
         Enumerator.new do |result|
           resource.database[resource.container].find(details).each do |item|
             item = Helper.symbolize_keys(item)
@@ -35,19 +40,31 @@ module Muve
       end
 
       def self.update(resource, id, details)
-        raise MuveInvalidAttributes, "invalid update data" unless details.kind_of? Hash
+        raise Muve::Error::InvalidAttribute, "Invalid details" unless details.kind_of? Hash
         # TODO: raise error if details is not valid
+        id = ((BSON::ObjectId.from_string(id) if id.kind_of? String) or id)
         resource.database[resource.container].find_and_modify(
           query: { _id: id },
           update: details
         )
       end
 
-      def self.delete(resource, id, details=nil)
-        details = {} unless details.kind_of? Hash
+      def self.delete(resource, id, details={})
+        raise Muve::Error::InvalidAttribute, "Invalid details" unless details.kind_of? Hash
+        id = ((BSON::ObjectId.from_string(id) if id.kind_of? String) or id)
         details = details.merge(_id: id) if id
         resource.database[resource.container].remove(details)
       end
+
+      # TODO: raise error if details is not a hash
+      def self.count(resource, details={})
+        raise Muve::Error::InvalidAttribute, "Invalid details" unless details.kind_of? Hash
+        resource.database[resource.container].count(details)
+      end
+
+      def self.formatter
+        Muve::Store::Mongo::Formatter
+      end
     end
   end
 end

data/muve-store-mongo.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency "muve", "~> 1.0.0"
+  gem.add_runtime_dependency "muve", "~> 1.2.0-alpha.1"
   gem.add_runtime_dependency "mongo", "~> 1.10.2"
 
   gem.required_ruby_version = '>= 1.9.2'

data/spec/formatter_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'mongo'
+
+describe 'Mongo Formatter' do
+  let(:latitude) { Faker::Geolocation.lat }
+  let(:longitude) { Faker::Geolocation.lng }
+  let(:location) { Muve::Location.new(latitude: latitude, longitude: longitude) }
+  let(:place) { Muve::Place.new(location: location, name: 'Somewhere') }
+  let(:storeable) { { type: 'Place', coordinates: [ longitude, latitude ] } }
+
+  before do
+    # Muve.init(connection, database)
+  end
+
+  it { expect(Muve::Store::Mongo::Formatter.convert_to_storeable_object(location)).to eq({
+    type: 'Place',
+    coordinates: [longitude, latitude]
+  }) }
+
+  it { expect(
+    Muve::Store::Mongo::Formatter.convert_from_storeable_object(storeable)
+  ).to eq(Muve::Location.new(latitude: latitude, longitude: longitude)) }
+end

data/spec/mongo_spec.rb

@@ -4,8 +4,15 @@ require 'mongo'
 describe 'Mongo Adaptor' do
   let(:connection) { Mongo::MongoClient.new }
   let(:database) { connection.db('muve_test') }
+  let(:adaptor) { Muve::Store::Mongo }
+  let(:id_of_stored_resource) { database['places'].insert(
+    name: Faker::Venue.name
+  ) }
+
   before do
     class Place
+      attr_accessor :city, :street, :building, :name
+
       include Muve::Model
 
       def self.container
@@ -13,12 +20,42 @@ describe 'Mongo Adaptor' do
       end
     end
 
+    class MockCollection
+      def self.insert(arg)
+      end
+    end
+
+    class MockResource
+      def self.database
+        [ MockCollection ]
+      end
+
+      def self.container
+        0
+      end
+
+      def self.collection
+        'collection'
+      end
+    end
+
     Muve.init(connection, database)
   end
   
+  it { expect { Muve::Store::Mongo.create(Place, 12) }.to raise_error(Muve::Error::InvalidAttribute) }
+  it { expect { Muve::Store::Mongo.update(Place, 12, nil) }.to raise_error(Muve::Error::InvalidAttribute) }
+  it { expect { Muve::Store::Mongo.delete(Place, 12, nil) }.to raise_error(Muve::Error::InvalidAttribute) }
+  it { expect { Muve::Store::Mongo.count(Place, 12) }.to raise_error(Muve::Error::InvalidAttribute) }
+  it { expect { Muve::Store::Mongo.count(Place, 12) }.to raise_error(Muve::Error::InvalidAttribute) }
+  it { expect { Muve::Store::Mongo.find(Place, 12) }.to raise_error(Muve::Error::InvalidAttribute) }
+  it { expect { Muve::Store::Mongo.fetch(Place, 12, nil) }.to raise_error(Muve::Error::InvalidAttribute) }
+
+  it { expect(Muve::Store::Mongo.formatter).to eq(Muve::Store::Mongo::Formatter) }
+
   it 'writes model data to the store' do
     expect{
       Muve::Store::Mongo.create(Place, {
+        name: Faker::Venue.name,
         city: Faker::Address.city,
         street: Faker::Address.street_name,
         building: Faker::Address.building_number
@@ -26,28 +63,100 @@ describe 'Mongo Adaptor' do
     }.to change{database['places'].count}.by(1)
   end
 
+  it 'counts the records in the datastore' do
+    expect{
+      database['places'].insert(
+        name: "Willy Wonka's Chocolate Factory",
+        street: "Chocolane 12",
+        building: "8",
+        city: "Confectionopolis"
+      )
+    }.to change{Muve::Store::Mongo.count(Place, {})}.by(1)
+  end
+
   it 'writes modifications to the store' do
-    id = database['places'].insert(name: Faker::Venue.name)
     new_name = Faker::Venue.name
-
-    expect{
-      Muve::Store::Mongo.update(Place, id, { name: new_name })
-    }.to change{database['places'].find_one(_id: id)['name']}.to(new_name)
+    expect {
+      adaptor.update(Place, id_of_stored_resource, { name: new_name })
+    }.to change {
+      database['places'].find_one(_id: id_of_stored_resource)['name']
+    }.to(new_name)
   end
 
   it 'finds a resource from store' do
-    id = database['places'].insert(name: Faker::Venue.name)
-    expect(Muve::Store::Mongo.get(Place, id)[:id]).to eq(id)
+    expect(adaptor.get(Place, id_of_stored_resource)[:id]).to eq(id_of_stored_resource)
   end
 
   it 'finds multiple resources from store' do
-    expect(Muve::Store::Mongo.find(Place, {})).to be_a(Enumerable)
+    expect(adaptor.find(Place, {})).to be_a(Enumerable)
+  end
+
+  it 'removes a resource from the store' do
+    id_of_resource_to_be_removed = id_of_stored_resource
+    expect {
+      adaptor.delete(Place, id_of_resource_to_be_removed)
+    }.to change { database['places'].count }.by(-1)
   end
 
   it 'extracts a resource from every result in a multiple resource set' do
-    Muve::Store::Mongo.find(Place, {}).take(3).each do |result|
+    adaptor.find(Place, {}).take(3).each do |result|
       attributes = result.keys.map{ |i| i.to_s }
-      expect(attributes).to include('id', 'city', 'street', 'building')
+      expect(attributes).to include('id', 'name')
     end
   end
+
+  context "wired to handle model I/O" do
+    before do
+      Place.adaptor = adaptor
+    end
+
+    it {
+      expect(adaptor).to receive(:find).with(Place, {})
+      Place.where({}).count
+    }
+
+    it {
+      expect_any_instance_of(Place).to receive(:populate).with(anything).once
+      Place.where({}).take(1).each do |item|
+        expect(item).to be_a_kind_of(Place)
+      end
+    }
+
+    it {
+      Muve::Place.adaptor = adaptor
+      expect(adaptor).to receive(:create).with(Muve::Place, {
+        name: 'Hell',
+        location: { type: 'Place', coordinates: [6, 66] }
+      })
+
+      Muve::Place.new(
+        name: 'Hell', 
+        location: Muve::Location.new(latitude: 66, longitude: 6)
+      ).save
+    }
+
+    it {
+      Place.adaptor = adaptor
+      expect(adaptor).to receive(:create).with(Muve::Place, {
+        name: 'Hell',
+        location: { type: 'Place', coordinates: [6, 66] }
+      })
+
+      Muve::Place.new(
+        name: 'Hell', 
+        location: Muve::Location.new(latitude: 66, longitude: 6)
+      ).save
+    }
+
+    it {
+      storeable_object = {
+        name: 'Hell', 
+        location: Muve::Location.new(latitude: 66, longitude: 6)
+      }
+
+      expect(MockCollection).to receive(:insert).with(storeable_object)
+
+      Muve::Store::Mongo.create(MockResource, storeable_object)
+    }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muve-store-mongo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - David Asabina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: muve
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0.pre.alpha.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0.pre.alpha.1
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
@@ -52,8 +52,11 @@ files:
 - README.md
 - Rakefile
 - lib/muve-store-mongo.rb
+- lib/muve-store-mongo/errors.rb
+- lib/muve-store-mongo/formatter.rb
 - lib/muve-store-mongo/version.rb
 - muve-store-mongo.gemspec
+- spec/formatter_spec.rb
 - spec/mongo_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/vidbina/muve-store-mongo
@@ -80,5 +83,6 @@ signing_key:
 specification_version: 4
 summary: Mongo adaptor for the Muve engine
 test_files:
+- spec/formatter_spec.rb
 - spec/mongo_spec.rb
 - spec/spec_helper.rb