rom-git 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dc7c7847111033dcda9033ead9ae4d8c9181ed41
-  data.tar.gz: 60278f7a76878300cced492b235021a591a51ccf
+SHA256:
+  metadata.gz: 77ab5fc6800244554a0c0a58677eb018a603e6418c702fec5518111ef35d567f
+  data.tar.gz: 44358d9aa4a07a3b185d89d4f62dd9544b26a45a4d6cd16f8fe5ccef7eb4693b
 SHA512:
-  metadata.gz: dbc659a12eab3caf1e9d79994313ee7292965d6bea104fe8aa2bd719858e2b5e0a6e25c36187dcb2823130d825d3b7fc322a1f26429bc5c2794f4e40435cf06c
-  data.tar.gz: 8254494552c97aec04ed92b82751a447713faad2f114eabc832fb28e77527b358f985b249ef315d280ec96c174ecda230f5c7b741394befc1aca4834ca3d8dc9
+  metadata.gz: efe88b058be1e2299d5017cb09a1bc19751af984dafc113c1d09aeb7aac918de280cfb0974344edef00921b31bb5d910a14d046a40d13b2306af184728f0d2be
+  data.tar.gz: 4550de32a33e82666ab392453cf21c8e791bc26d3078c0175d7d55b22484f144b49c865031272585d18829d5e227e5934913cc6b554c176d5959657bd429b4ae

data/.gitignore

@@ -1 +1,2 @@
 Gemfile.lock
+coverage

data/.travis.yml

@@ -1,17 +1,18 @@
 language: ruby
 bundler_args: --without tools
+after_success:
+- '[ "$TRAVIS_RUBY_VERSION" = "2.5.0" ] && [ "$TRAVIS_BRANCH" = "master" ] && bundle exec codeclimate-test-reporter'
 script: "bundle exec rake spec"
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
+  - 2.3.4
+  - 2.4.1
+  - 2.5.0
   - rbx-2
-  - jruby-9.0.5.0
   - ruby-head
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-9.0.5.0
+    - rvm: rbx-2
 notifications:
   webhooks:
     urls:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v3.0.0
+
+Update to work with rom 4.0.0. Thanks @alsemyonov !
+
 # v2.1.0 2016-08-01
 
 Update to work with rom 2.0.0 and rom-repository

data/Gemfile

@@ -4,5 +4,6 @@ gemspec
 
 group :test do
   gem 'rom-repository'
-  gem 'codeclimate-test-reporter'
+  gem 'simplecov', require: false
+  gem 'codeclimate-test-reporter', require: false
 end

data/lib/rom/git/gateway.rb

@@ -1,37 +1,42 @@
-require 'rom/support/options'
-require 'rom/support/constants'
-
+require 'rom/constants'
 require 'rom/gateway'
+require 'rom/initializer'
+
 require 'rom/git/dataset'
 
 module ROM
   module Git
     class Gateway < ROM::Gateway
-      DEFAULT_BRANCH = 'refs/heads/master'.freeze
-      include Options
-
-      option :path, accept: String, reader: true
+      extend Initializer
 
-      option :branch, accept: String, reader: true, default: DEFAULT_BRANCH
-
-      attr_reader :datasets
-
-      attr_reader :repo
+      DEFAULT_BRANCH = 'refs/heads/master'.freeze
 
-      def initialize(path, options = EMPTY_HASH)
-        super
-        @datasets = {}
-        @repo = Rugged::Repository.new(path)
+      # @!attribute [r] path
+      #   @return [String]
+      param :path, Types::Coercible::String
+      # @!attribute [r] branch
+      #   @return [String]
+      option :branch, Types::Coercible::String, default: proc { DEFAULT_BRANCH }
+      # @!attribute [r] repo
+      #   @return [Rugged::Repository]
+      option :repo, Types.Instance(Rugged::Repository), default: proc { Rugged::Repository.new(path) }
+
+      # @return [Hash]
+      def datasets
+        @datasets ||= {}
       end
 
+      # @return [Dataset]
       def [](name)
         datasets[name]
       end
 
+      # @return [Dataset]
       def dataset(name)
         datasets[name] = Dataset.new(repo.references[branch].log)
       end
 
+      # @return [Boolean]
       def dataset?(name)
         datasets.key?(name)
       end

data/lib/rom/git/relation.rb

@@ -1,6 +1,4 @@
 require 'rom/relation'
-require 'rom/plugins/relation/key_inference'
-require 'rom/plugins/relation/view'
 
 module ROM
   module Git
@@ -9,9 +7,6 @@ module ROM
 
       forward :join, :project, :restrict, :order
 
-      use :view
-      use :key_inference
-
       def count
         dataset.count
       end

data/lib/rom/git/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Git
-    VERSION = '2.1.0'.freeze
+    VERSION = '3.0.0'.freeze
   end
 end

data/rom-git.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^test/})
 
-  spec.add_runtime_dependency "rom", "~> 2.0"
+  spec.add_runtime_dependency "rom", "~> 4.0"
   spec.add_runtime_dependency "rugged", "~> 0.24"
 
   spec.add_development_dependency "bundler"

data/spec/integration/gateway_spec.rb

@@ -7,7 +7,6 @@ RSpec.describe 'Git gateway' do
     let(:rom) do
       ROM.container(:git, path) do |conf|
         conf.relation(:commits) do
-
           def by_sha1(sha1)
             restrict(sha1: sha1)
           end
@@ -28,9 +27,6 @@ RSpec.describe 'Git gateway' do
 
     shared_context 'a mapped relation tuple' do
       it 'returns restricted and mapped object' do
-        commit = rom.relation(:commits)
-          .as(:entity).by_sha1('101868c4ce62b7e96a1f7c3b64fa40285ee00d5e').one
-
         expect(commit.sha1).to eql('101868c4ce62b7e96a1f7c3b64fa40285ee00d5e')
         expect(commit.message).to eql('commit (initial): Initial commit')
         expect(commit.committer).to eql('Franck Verrot')
@@ -39,8 +35,8 @@ RSpec.describe 'Git gateway' do
 
     describe 'using a relation with a custom mapper' do
       let(:commit) do
-        rom.relation(:commits)
-        .as(:entity).by_sha1('101868c4ce62b7e96a1f7c3b64fa40285ee00d5e').one
+        rom.relations[:commits]
+          .map_with(:entity).by_sha1('101868c4ce62b7e96a1f7c3b64fa40285ee00d5e').one
       end
 
       include_context 'a mapped relation tuple'
@@ -48,10 +44,14 @@ RSpec.describe 'Git gateway' do
 
     describe 'using a repository' do
       let(:repo) do
-        Class.new(ROM::Repository[:commits]).new(rom)
+        Class.new(ROM::Repository[:commits]) do
+          def find(sha1)
+            root.by_sha1(sha1).one
+          end
+        end.new(rom)
       end
 
-      let(:commits) { repo.commits.one }
+      let(:commit) { repo.find('101868c4ce62b7e96a1f7c3b64fa40285ee00d5e') }
 
       include_context 'a mapped relation tuple'
     end

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.3.1'
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
+  require "simplecov"
+  SimpleCov.start
 end
 
 require 'rom-git'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rom-git
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Franck Verrot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-31 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Git adapter for the rom-rb