rom-mongo 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd3c391e9bab1f7f5d67b1ac3dcdaf5c0b2cc779
-  data.tar.gz: 5fbfefe474f557aa8974b0573f38817a49882ab9
+  metadata.gz: 8a48989a26577814779425d8ef55181ffa6f3d47
+  data.tar.gz: 958e7bfea5f3dcf0cf50604c82578ae5bee76313
 SHA512:
-  metadata.gz: 080fd587154820d5b46472ff4ec995f6abb72af39736170ed3e878c7063b247a0aa00de2e99207994074cb21478c1c8d47b9e7bb8bbfa4582759355e8f016f65
-  data.tar.gz: 6c7600f8d3deb30b42c49b5ca04d46a083eeeff733b0356f181e08a84e34d0b4d366fd5aea1544b79ec40f8c2cc35e3261216830c73cac3b6df9f12c5232ba5f
+  metadata.gz: 7f9020ddc8ee6d5ab39a9e9231c8493c6e6e38fc021a7009114b15209db384d1d809168384f3577bb0ee4791dbb9b14306bf448572d38e5c1fc0dc145ce37ae5
+  data.tar.gz: 6ca1c6acf4fa3d06f8500ccd8c1134c4da37c55d101cf9d54866fb258a7f19d15b85913cd3d1c39b26ec8ff2bfe55838ac467d1c5619917dee356b67b11c9ebd

data/.rubocop.yml

@@ -1,20 +1,74 @@
+# Generated by `rubocop --auto-gen-config`
+inherit_from: .rubocop_todo.yml
+
+# Exclude temporary files
+AllCops:
+  Exclude:
+    - tmp/**/*
+
+# It’s quite readable when we know what we are doing
+Lint/AssignmentInCondition:
+  Enabled: false
+
+# No need to handle LoadError in Rakefile
+Lint/HandleExceptions:
+  Exclude:
+    - Rakefile
+
+# gemspec is a special snowflake
+Metrics/LineLength:
+  Exclude:
+    - rom-mongo.gemspec
+
+# The enforced style doesn’t match Vim’s defaults
+Style/AlignParameters:
+  Enabled: false
+
+# UTF-8 is perfectly fine in comments
+Style/AsciiComments:
+  Enabled: false
+
+# Allow using braces for value-returning blocks
+Style/Blocks:
+  Enabled: false
+
 # Documentation checked by Inch CI
 Style/Documentation:
   Enabled: false
 
-# This is a shim file for those who require 'rom-mongo'
-Style/FileName:
-  Exclude:
-    - lib/rom-mongo.rb
+# Early returns have their vices
+Style/GuardClause:
+  Enabled: false
+
+# Need to be skipped for >-> usage
+Style/Lambda:
+  Enabled: false
+
+# Multiline block chains are ok
+Style/MultilineBlockChain:
+  Enabled: false
 
 # Even a single escaped slash can be confusing
 Style/RegexpLiteral:
   MaxSlashes: 0
 
+# Don’t introduce semantic fail/raise distinction
+Style/SignalException:
+  EnforcedStyle: only_raise
+
+# Need to be skipped for >-> usage
+Style/SpaceAroundOperators:
+  Enabled: false
+
 # Accept both single and double quotes
 Style/StringLiterals:
   Enabled: false
 
-# %w makes more sense with 4+ elements
-Style/WordArray:
-  MinSize: 3
+# Allow def self.foo; @foo; end
+Style/TrivialAccessors:
+  Enabled: false
+
+# This is a shim file for those who require 'rom-mongo'
+Style/FileName:
+  Exclude:
+    - lib/rom-mongo.rb

data/.rubocop_todo.yml

@@ -0,0 +1,6 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2015-01-26 22:39:39 +0100 using RuboCop version 0.28.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.

data/.travis.yml

@@ -1,17 +1,23 @@
 language: ruby
-bundler_args: --without yard guard benchmarks
+sudo: false
+cache: bundler
+bundler_args: --without yard guard benchmarks tools
 env:
-  - CODECLIMATE_REPO_TOKEN=886f3b795e74159719804f8e18b853f4c23a81bd814404e52ec248a0dae6d656
-script: "bundle exec rake spec"
+  global:
+    - JRUBY_OPTS='--dev -J-Xmx1024M'
+    - CODECLIMATE_REPO_TOKEN=886f3b795e74159719804f8e18b853f4c23a81bd814404e52ec248a0dae6d656
+script: "bundle exec rake ci"
 rvm:
   - 2.0
   - 2.1
   - rbx-2
   - jruby
+  - jruby-head
   - ruby-head
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: jruby-head
 services:
   - mongodb
 notifications:

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v0.1.0 2014-12-23
+
+Update to work with ROM 0.6.0
+
+### Changed
+
+* Updated to work with latest ROM (splattael)
+
 ## v0.0.3 2014-12-31
 
 ### Added
@@ -8,7 +16,7 @@
 
 * Updated to work with latest ROM (solnic)
 
-[Compare v0.0.2...v0.0.3](https://github.com/rom-rb/rom-mongo/compare/v0.0.1...v0.0.3)
+[Compare v0.0.2...v0.0.3](https://github.com/rom-rb/rom-mongo/compare/v0.0.2...v0.0.3)
 
 ## v0.0.2 2014-12-06
 

data/Gemfile

@@ -3,8 +3,17 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
+  gem 'inflecto'
   gem 'rom', git: 'https://github.com/rom-rb/rom.git', branch: 'master'
   gem 'rspec', '~> 3.1'
   gem 'codeclimate-test-reporter', require: false
   gem 'virtus'
 end
+
+group :tools do
+  gem 'rubocop'
+
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
+end

data/README.md

@@ -33,8 +33,8 @@ Or install it yourself as:
 
 ## Usage
 
-See `spec/integration/adapter_spec.rb` for a sample usage.
+See [spec/integration/repository_spec.rb](spec/integration/repository_spec.rb) for a sample usage.
 
 ## License
 
-See `LICENSE` file.
+See [LICENSE](LICENSE) file.

data/Rakefile

@@ -1,10 +1,18 @@
 require "rspec/core/rake_task"
-require "rubocop/rake_task"
-
-task default: [:spec, :rubocop]
 
 RSpec::Core::RakeTask.new(:spec)
+task default: [:ci]
+
+desc "Run CI tasks"
+task ci: [:spec]
+
+begin
+  require "rubocop/rake_task"
+
+  Rake::Task[:default].enhance [:rubocop]
 
-RuboCop::RakeTask.new do |task|
-  task.options << "--display-cop-names"
+  RuboCop::RakeTask.new do |task|
+    task.options << "--display-cop-names"
+  end
+rescue LoadError
 end

data/lib/rom/mongo.rb

@@ -1,7 +1,6 @@
-require 'moped'
-
 require 'rom'
+
 require 'rom/mongo/version'
-require 'rom/mongo/adapter'
+require 'rom/mongo/repository'
 
-require 'rom/mongo/commands'
+ROM.register_adapter(:mongo, ROM::Mongo)

data/lib/rom/mongo/commands.rb

@@ -1,10 +1,14 @@
 require 'bson'
 
+require 'rom/commands'
+
 module ROM
   module Mongo
     module Commands
       class Create < ROM::Commands::Create
-        alias_method :collection, :relation
+        def collection
+          relation.dataset
+        end
 
         def execute(document)
           collection.insert(document)
@@ -13,8 +17,9 @@ module ROM
       end
 
       class Update < ROM::Commands::Update
-        alias_method :set, :call
-        alias_method :collection, :relation
+        def collection
+          relation.dataset
+        end
 
         def execute(attributes)
           collection.update_all('$set' => attributes)
@@ -25,7 +30,7 @@ module ROM
       class Delete < ROM::Commands::Delete
         def execute
           removed = target.to_a
-          target.remove_all
+          target.dataset.remove_all
           removed
         end
       end

data/lib/rom/mongo/dataset.rb

@@ -0,0 +1,9 @@
+require 'charlatan'
+
+module ROM
+  module Mongo
+    class Dataset
+      include Charlatan.new(:collection, kind: Moped::Query)
+    end
+  end
+end

data/lib/rom/mongo/repository.rb

@@ -0,0 +1,42 @@
+require 'moped'
+require 'uri'
+
+require 'rom/repository'
+
+require 'rom/mongo/dataset'
+require 'rom/mongo/commands'
+
+module ROM
+  module Mongo
+    class Relation < ROM::Relation
+      forward :insert, :find
+    end
+
+    class Repository < ROM::Repository
+      attr_reader :collections
+
+      def initialize(uri)
+        host, database = uri.split('/')
+        @connection = Moped::Session.new([host])
+        @connection.use database
+        @collections = {}
+      end
+
+      def [](name)
+        collections.fetch(name)
+      end
+
+      def dataset(name)
+        collections[name] = Dataset.new(connection[name])
+      end
+
+      def dataset?(name)
+        connection.collection_names.include?(name.to_s)
+      end
+
+      def command_namespace
+        Mongo::Commands
+      end
+    end
+  end
+end

data/lib/rom/mongo/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Mongo
-    VERSION = '0.0.3'.freeze
+    VERSION = '0.1.0'.freeze
   end
 end

data/rom-mongo.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "charlatan"
   spec.add_runtime_dependency "moped"
-  spec.add_runtime_dependency "rom", "~> 0.5", ">= 0.5.0"
+  spec.add_runtime_dependency "rom", "~> 0.6", ">= 0.6.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/spec/integration/{adapter_spec.rb → repository_spec.rb}

@@ -2,26 +2,17 @@ require 'spec_helper'
 
 require 'virtus'
 
-describe 'Mongo adapter' do
+describe 'Mongo repository' do
   subject(:rom) { setup.finalize }
 
-  let(:setup) { ROM.setup(mongo: 'mongo://127.0.0.1:27017/test') }
+  let(:setup) { ROM.setup(:mongo, '127.0.0.1:27017/test') }
+  let(:repository) { rom.repositories[:default] }
 
   after do
-    rom.mongo.connection.drop
+    repository.connection.drop
   end
 
   before do
-    setup.schema do
-      base_relation(:users) do
-        repository :mongo
-
-        attribute '_id'
-        attribute 'name'
-        attribute 'email'
-      end
-    end
-
     setup.relation(:users) do
       def by_name(name)
         find(name: name)
@@ -52,42 +43,36 @@ describe 'Mongo adapter' do
       define(:users) do
         model(user_model)
 
+        register_as :model
+
         attribute :id, from: '_id'
+        attribute :name, from: 'name'
+        attribute :email, from: 'email'
       end
     end
 
-    rom.schema.users.insert(name: 'Jane', email: 'jane@doe.org')
-    rom.schema.users.insert(name: 'Joe', email: 'joe@doe.org')
+    rom.relations.users.insert(name: 'Jane', email: 'jane@doe.org')
+    rom.relations.users.insert(name: 'Joe', email: 'joe@doe.org')
   end
 
-  describe 'env#read' do
+  describe 'env#relation' do
     it 'returns mapped object' do
-      jane = rom.read(:users).by_name('Jane').to_a.first
+      jane = rom.relation(:users).as(:model).by_name('Jane').one!
 
       expect(jane.id)
-        .to eql(rom.schema.users.find(name: 'Jane').one['_id'].to_s)
+        .to eql(rom.relation(:users) { |r| r.find(name: 'Jane') }.one['_id'].to_s)
       expect(jane.name).to eql('Jane')
       expect(jane.email).to eql('jane@doe.org')
     end
   end
 
-  describe 'adapter#dataset?' do
+  describe 'repository#dataset?' do
     it 'returns true if a collection exists' do
-      expect(rom.mongo.adapter.dataset?(:users)).to be(true)
+      expect(repository.dataset?(:users)).to be(true)
     end
 
     it 'returns false if a does not collection exist' do
-      expect(rom.mongo.adapter.dataset?(:not_here)).to be(false)
-    end
-  end
-
-  describe 'dataset#header' do
-    it 'returns the header defined in the schema' do
-      expect(rom.relations.users.header).to eql(['_id', 'name', 'email'])
-
-      users = rom.relations.users.find('name' => 'Jane').select(['email'])
-
-      expect(users.header).to eql(['email'])
+      expect(repository.dataset?(:not_here)).to be(false)
     end
   end
 
@@ -99,7 +84,7 @@ describe 'Mongo adapter' do
         id = BSON::ObjectId.new
 
         result = commands.try do
-          create(_id: id, name: 'joe', email: 'joe@doe.org')
+          commands.create.call(_id: id, name: 'joe', email: 'joe@doe.org')
         end
 
         expect(result)
@@ -109,10 +94,10 @@ describe 'Mongo adapter' do
 
     describe 'update' do
       it 'updates a document in the collection' do
-        jane = rom.read(:users).by_name('Jane').first
+        jane = rom.relation(:users).as(:model).by_name('Jane').one!
 
         result = commands.try do
-          update(:by_name, 'Jane').set(email: 'jane.doe@test.com')
+          commands.update.by_name('Jane').set(email: 'jane.doe@test.com')
         end
 
         expect(result).to match_array(
@@ -125,10 +110,10 @@ describe 'Mongo adapter' do
 
     describe 'delete' do
       it 'deletes documents from the collection' do
-        jane = rom.read(:users).by_name('Jane').first
-        joe = rom.read(:users).by_name('Joe').first
+        jane = rom.relation(:users).as(:model).by_name('Jane').one!
+        joe = rom.relation(:users).as(:model).by_name('Joe').one!
 
-        result = commands.try { delete(:by_name, 'Joe') }
+        result = commands.try { commands.delete.by_name('Joe') }
 
         expect(result).to match_array(
           [{ '_id' => BSON::ObjectId.from_string(joe.id),
@@ -136,7 +121,7 @@ describe 'Mongo adapter' do
              'email' => 'joe@doe.org' }]
         )
 
-        expect(rom.read(:users).all).to match_array([jane])
+        expect(rom.relation(:users).as(:model).all).to match_array([jane])
       end
     end
   end

data/spec/spec_helper.rb

@@ -10,3 +10,14 @@ require 'rom-mongo'
 root = Pathname(__FILE__).dirname
 
 Dir[root.join('shared/*.rb').to_s].each { |f| require f }
+
+RSpec.configure do |config|
+  config.before do
+    @constants = Object.constants
+  end
+
+  config.after do
+    added_constants = Object.constants - @constants
+    added_constants.each { |name| Object.send(:remove_const, name) }
+  end
+end

data/spec/unit/repository_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+require 'rom/lint/spec'
+
+describe ROM::Mongo::Repository do
+  it_behaves_like 'a rom repository' do
+    let(:identifier) { :mongo }
+    let(:repository) { ROM::Mongo::Repository }
+    let(:uri) { '127.0.0.1:27017/test' }
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rom-mongo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: charlatan
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: moped
   requirement: !ruby/object:Gem::Requirement
@@ -30,20 +44,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +110,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -104,12 +119,14 @@ files:
 - Rakefile
 - lib/rom-mongo.rb
 - lib/rom/mongo.rb
-- lib/rom/mongo/adapter.rb
 - lib/rom/mongo/commands.rb
+- lib/rom/mongo/dataset.rb
+- lib/rom/mongo/repository.rb
 - lib/rom/mongo/version.rb
 - rom-mongo.gemspec
-- spec/integration/adapter_spec.rb
+- spec/integration/repository_spec.rb
 - spec/spec_helper.rb
+- spec/unit/repository_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -135,5 +152,6 @@ signing_key:
 specification_version: 4
 summary: MongoDB support for Ruby Object Mapper
 test_files:
-- spec/integration/adapter_spec.rb
+- spec/integration/repository_spec.rb
 - spec/spec_helper.rb
+- spec/unit/repository_spec.rb

data/lib/rom/mongo/adapter.rb

@@ -1,68 +0,0 @@
-module ROM
-  module Mongo
-    class Adapter < ROM::Adapter
-      def self.schemes
-        [:mongo]
-      end
-
-      module RelationInclusion
-        def header
-          dataset.header
-        end
-      end
-
-      class Dataset
-        include Charlatan.new(:collection, kind: Moped::Query)
-        include Equalizer.new(:collection, :header)
-
-        alias_method :query, :collection
-
-        def initialize(collection, header)
-          super
-          @header = header unless query?
-        end
-
-        def header
-          query? ? query.operation.fields : @header
-        end
-
-        def each(&block)
-          collection.find.each(&block)
-        end
-
-        def query?
-          collection.is_a?(Moped::Query)
-        end
-      end
-
-      attr_reader :collections
-
-      def initialize(*args)
-        super
-        @connection = Moped::Session.new(["#{uri.host}:#{uri.port}"])
-        @connection.use uri.path.gsub('/', '')
-        @collections = {}
-      end
-
-      def [](name)
-        collections.fetch(name)
-      end
-
-      def dataset(name, header)
-        collections[name] = Dataset.new(connection[name], header)
-      end
-
-      def dataset?(name)
-        connection.collection_names.include?(name.to_s)
-      end
-
-      def command_namespace
-        Mongo::Commands
-      end
-
-      def extend_relation_class(klass)
-        klass.send(:include, RelationInclusion)
-      end
-    end
-  end
-end