rom-git 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 111cf1f0241af1ad9f5b154cb1d81f2d79fdef5a
-  data.tar.gz: 07a83b21d7665f71a08436aa440631aeb1fd87ff
+  metadata.gz: 9127df6dee3e69958709ed95a7d8324c4d64d3ec
+  data.tar.gz: 4f6d9a43f647b2f297cd77c79b4ce3bdbb24fea5
 SHA512:
-  metadata.gz: 7e98545766f30e46127a5dfbdce642cc80b6e1f6db32224fba2e97fbbe76fc48bb93393cf48ce3bc5307a48ed019ab8647feea5fd36afec32d4da14ae5444f2f
-  data.tar.gz: a07f1b6b18a6551b4873ff745d0b55d25a61701828591577be0afd50686b66d1ed65db1441b504a81a71a23176c18c4880a990f7a8db9305a6bfd32b3c13da08
+  metadata.gz: 7baa254bcca878d54345fa88259ce3a462fbd2e6ef15cff8ec58779bc911e8433cad61b27528729a05b8a4f607b636eb01f7c6c293a476d0a1769e1bf444dc9f
+  data.tar.gz: b7975580bbbb61672c1e00a97b93641500f3ca2ce0508c181241d3b321f985d148458b7847e76fe8cffa5e756f7a9fe8863fb0d07b0e9443e78c2e9b9e65a1e9

data/CHANGELOG.md

@@ -1,3 +1,10 @@
-# v1.0.0 (Unreleased)
+# v2.0.0
+
+## BREAKING CHANGE
+
+  * Use ROM's new Relation/Gateway API
+  * Restrict rom-git to ROM v0.8.x
+
+# v1.0.0
 
 * Initial release

data/Gemfile

@@ -1,2 +1,6 @@
 source "https://rubygems.org"
 gemspec
+
+group :test do
+  gem 'inflecto'
+end

data/README.md

@@ -1,4 +1,4 @@
-# ROM::Git [![Travis](https://secure.travis-ci.org/franckverrot/rom-git.png)](http://travis-ci.org/franckverrot/rom-git)
+# ROM::Git [![Travis](https://secure.travis-ci.org/rom-rb/rom-git.png)](http://travis-ci.org/rom-rb/rom-git)
 Minimal Git support for [Ruby Object Mapper](https://github.com/rom-rb/rom).
 Currently only supports reading from the repository.
 

data/lib/rom/git.rb

@@ -1,4 +1,7 @@
 require "rugged"
 
-require "rom"
-require "rom/git/adapter"
+require 'rom'
+require 'rom/git/gateway'
+require 'rom/git/relation'
+
+ROM.register_adapter(:git, ROM::Git)

data/lib/rom/git/dataset.rb

@@ -0,0 +1,29 @@
+require 'rom/memory/dataset'
+
+module ROM
+  module Git
+    class Dataset < ROM::Memory::Dataset
+      option :path, reader: true
+      option :options, reader: true
+      option :gateway, reader: true
+
+      def self.row_proc
+        lambda do |row|
+          {
+            sha1:      row[:id_new] || row[:sha1],
+            message:   row[:message],
+            committer: (row[:committer].fetch(:name, 'unknown committer name') rescue row[:committer].to_s)
+          }
+        end
+      end
+
+      def reload!
+        @data = gateway.reset_data
+      end
+
+      def count
+        @data.count
+      end
+    end
+  end
+end

data/lib/rom/git/gateway.rb

@@ -0,0 +1,37 @@
+require 'rom/gateway'
+require 'rom/git/dataset'
+
+module ROM
+  module Git
+    class Gateway < ROM::Gateway
+      def initialize(path, options = {})
+        super()
+        @path = path
+        @options = options
+        @datasets = {}
+        reset_data
+      end
+
+      def [](name)
+        @datasets[name]
+      end
+
+      def dataset(name)
+        @datasets[name] = Dataset.new(@connection, path: @path, options: @options, gateway: self)
+      end
+
+      def dataset?(name)
+        @datasets.key?(name)
+      end
+
+      def reset_data
+        repo   = Rugged::Repository.new(@path)
+        walker = Rugged::Walker.new(repo)
+        branch = (@options || {}).fetch(:branch, 'refs/head/master')
+        ref    = repo.references[branch]
+
+        @connection = ref.log rescue []
+      end
+    end
+  end
+end

data/lib/rom/git/relation.rb

@@ -0,0 +1,15 @@
+require 'rom/relation'
+
+module ROM
+  module Git
+    class Relation < ROM::Relation
+      adapter :git
+
+      forward :join, :project, :restrict, :order
+
+      def count
+        dataset.count
+      end
+    end
+  end
+end

data/rom-git.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "rom-git"
-  spec.version       = "1.0.0"
+  spec.version       = "2.0.0"
   spec.authors       = ["Franck Verrot"]
   spec.email         = ["franck@verrot.fr"]
   spec.summary       = "Git support for the ROM Ruby Object Mapper"
@@ -14,7 +14,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", "~> 0.5", ">= 0.5.0"
+  spec.add_runtime_dependency "rom", "~> 0.8.0"
 
   spec.add_dependency "rugged"
 
@@ -22,5 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "anima"
+  spec.add_development_dependency "inflecto"
+  spec.add_development_dependency "virtus"
 end

data/test/integration/gateway_test.rb

@@ -0,0 +1,58 @@
+require 'test_helper'
+require 'virtus'
+
+describe 'Git gateway' do
+  describe 'using the default (master) branch' do
+    let(:path) { File.expand_path('./test/fixtures') }
+    let(:rom_setup) do
+      ROM.setup(
+        commits: [
+          :git,
+          path,
+          branch: 'refs/heads/master'
+        ]
+      )
+    end
+    let(:rom) { rom_setup.finalize }
+
+    before do
+      rom_setup.relation(:commits) do
+        gateway :commits
+
+        def by_sha1(sha1)
+          restrict(sha1: sha1)
+        end
+
+        def by_committer(committer_name)
+          restrict(committer: committer_name)
+        end
+      end
+
+      rom_setup.mappers do
+        define(:commits) do
+          model(Class.new do
+            include Virtus.model
+
+            attribute :sha1,     String
+            attribute :message,  String
+            attribute :committer, String
+          end)
+
+          register_as :entity
+        end
+      end
+    end
+
+    describe 'env#relation' do
+      it 'returns restricted and mapped object' do
+        commit = rom.relation(:commits).as(:entity).by_sha1('101868c4ce62b7e96a1f7c3b64fa40285ee00d5e').to_a.first
+
+        assert_equal '101868c4ce62b7e96a1f7c3b64fa40285ee00d5e', commit.sha1
+        assert_equal 'commit (initial): Initial commit', commit.message
+        assert_equal 'Franck Verrot', commit.committer
+      end
+    end
+
+    # describe 'with a custom branch'
+  end
+end

data/test/integration/relation_test.rb

@@ -0,0 +1,31 @@
+require "test_helper"
+
+describe "Git Gateway" do
+  let(:path) { File.expand_path("./test/fixtures") }
+  let(:rom_setup) do
+    ROM.setup(
+      commits: [
+        :git,
+        path,
+        branch: 'refs/heads/master'
+      ]
+    )
+  end
+
+  before do
+    ROM.plugins do
+      adapter :git do
+        register :test_plugin, Module.new, type: :relation
+      end
+    end
+  end
+
+  describe "relation with plugin" do
+    it "shouldn't raise error" do
+      rom_setup.relation(:commits) do
+        gateway :commits
+        use :test_plugin
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-git
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Franck Verrot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: anima
+  name: inflecto
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -130,7 +138,9 @@ files:
 - Rakefile
 - lib/rom-git.rb
 - lib/rom/git.rb
-- lib/rom/git/adapter.rb
+- lib/rom/git/dataset.rb
+- lib/rom/git/gateway.rb
+- lib/rom/git/relation.rb
 - rom-git.gemspec
 - test/fixtures/HEAD
 - test/fixtures/logs/HEAD
@@ -147,7 +157,8 @@ files:
 - test/fixtures/objects/f0/184ad83045ea3a7e32fb547d5275f21686558d
 - test/fixtures/objects/fe/326fd5cb986e6ef3d83f02857fb5bc10333aa4
 - test/fixtures/refs/heads/master
-- test/integration/adapter_test.rb
+- test/integration/gateway_test.rb
+- test/integration/relation_test.rb
 - test/test_helper.rb
 homepage: https://github.com/franckverrot/rom-git
 licenses:
@@ -169,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Git support for the ROM Ruby Object Mapper
@@ -189,5 +200,7 @@ test_files:
 - test/fixtures/objects/f0/184ad83045ea3a7e32fb547d5275f21686558d
 - test/fixtures/objects/fe/326fd5cb986e6ef3d83f02857fb5bc10333aa4
 - test/fixtures/refs/heads/master
-- test/integration/adapter_test.rb
+- test/integration/gateway_test.rb
+- test/integration/relation_test.rb
 - test/test_helper.rb
+has_rdoc: 

data/lib/rom/git/adapter.rb

@@ -1,49 +0,0 @@
-module ROM
-  module Git
-    class Adapter < ROM::Adapter
-      def self.schemes
-        [:git]
-      end
-
-      class Dataset
-        include Charlatan.new(:rows)
-        include Enumerable
-
-        def each
-          rows.each do |row|
-            res = {
-              sha1:      row[:id_new],
-              message:   row[:message],
-              committer: row[:committer].fetch(:name, 'Unknown committer name')
-            }
-            yield(res)
-          end
-        end
-      end
-
-      # Expect a path to a single csv file which will be registered by
-      # rom to the given name or :default as the repository.
-      def initialize(*args)
-        super
-        repo   = Rugged::Repository.new(uri.path)
-        walker = Rugged::Walker.new(repo)
-        branch = (@options || {}).fetch(:branch, 'refs/head/master')
-        ref    = repo.references[branch]
-
-        @connection = ref.log rescue []
-      end
-
-      def [](_name)
-        connection
-      end
-
-      def dataset(_name, _header)
-        Dataset.new(connection)
-      end
-
-      def dataset?(_name)
-        connection
-      end
-    end
-  end
-end

data/test/integration/adapter_test.rb

@@ -1,71 +0,0 @@
-require "test_helper"
-require "anima"
-
-
-describe "Git Adapter" do
-  let(:path) { File.expand_path("./test/fixtures") }
-
-  def setup
-    setup = ROM.setup("git://#{path}", branch: 'refs/heads/master')
-
-    setup.schema do
-      base_relation(:commits) do
-        repository :default
-
-        attribute "sha1"
-        attribute "message"
-        attribute "committer"
-      end
-    end
-
-    setup.relation(:commits) do
-      def by_committer(committer_name)
-        find_all { |row| row[:committer] == committer_name }
-      end
-
-      def find_commit(sha1)
-        find_all { |row| row[:sha1] == sha1 }
-      end
-    end
-
-
-    setup.mappers do
-      define(:commits) do
-        model (Class.new do
-          include Anima.new(:sha1, :message, :committer)
-        end)
-      end
-    end
-    setup
-  end
-
-  subject { s = setup; s.finalize }
-
-  describe "env#read" do
-    it "returns mapped object" do
-      commit = subject.read(:commits).by_committer("Franck Verrot").to_a.first
-
-      assert_equal '101868c4ce62b7e96a1f7c3b64fa40285ee00d5e', commit.sha1
-      assert_equal 'commit (initial): Initial commit', commit.message
-      assert_equal 'Franck Verrot', commit.committer
-    end
-  end
-
-  describe "dataset#header" do
-    it "returns the header defined in the schema" do
-      assert_equal %w(sha1 message committer), subject.relations.commits.header
-    end
-  end
-
-  describe "relation" do
-    it "finds a specific commit by its sha1" do
-      sha1 = 'fe326fd5cb986e6ef3d83f02857fb5bc10333aa4'
-
-      commit = subject.read(:commits).find_commit(sha1).to_a.first
-
-      assert_equal sha1,              commit.sha1
-      assert_equal 'commit: Add bar', commit.message
-      assert_equal 'Franck Verrot',   commit.committer
-    end
-  end
-end