rom-csv 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50f29f9955ae5aa228873154052cb12ea961f582
-  data.tar.gz: 3979e8a009b8725a7a5280703e29bc89259ac512
+  metadata.gz: 785fc82ce3b26b8c689e96b6f7726be09737fc04
+  data.tar.gz: 5a7806a367a01478c6a6531bc73356ceb9cacef6
 SHA512:
-  metadata.gz: 03fb8e82792ea55ed6b72ff437d4c8c1381a24e980f82b0fe32c7df16b9a0473ea8e87cdb907498abe3d703cf1289f746b09493e059e22427d413e73173fff35
-  data.tar.gz: 9d6f4ab54cef76ed4f27b8c28a142dd6999f905ac1cb2d4daceab3c9d7bb32ae502b435048d790072878f57f32f11b66402dc5e0dcaa10be91c2bfff5178e462
+  metadata.gz: cd6265073e0ace7189e5eccffc40d51685381e607d17e3d5f4dd6affe311d38fa25623afa1758963c6a1ee85cdafe4a5c363f0af8f4c3771a8d3db9416ea7bcf
+  data.tar.gz: b467d48226beae9684bfa297adcd5a59bc1cf095987980aea7c8bb34ac8b1b7dacb88c6ff183667de771b78fac3805d77baa128a349a921f2456d3cfba2b92f4

data/.rubocop.yml

@@ -19,7 +19,7 @@ Style/AsciiComments:
   Enabled: false
 
 # Allow using braces for value-returning blocks
-Style/Blocks:
+Style/BlockDelimiters:
   Enabled: false
 
 # Documentation checked by Inch CI
@@ -38,10 +38,6 @@ Style/Lambda:
 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

data/.travis.yml

@@ -7,8 +7,9 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.0
   - rbx-2
-  - jruby
+  - jruby-9000
   - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.3.0 2016-02-22
+
+* Update dependency to ROM 1.0
+
 ## v0.2.0 2015-08-19
 
 ### Added

data/examples/find_user.rb

@@ -6,11 +6,10 @@ require 'ostruct'
 
 csv_file = ARGV[0] || File.expand_path("./users.csv", File.dirname(__FILE__))
 
-ROM.use :auto_registration
+configuration = ROM::Configuration.new(:csv, csv_file)
+configuration.use(:macros)
 
-setup = ROM.setup(:csv, csv_file)
-
-setup.relation(:users) do
+configuration.relation(:users) do
   def by_name(name)
     restrict(name: name)
   end
@@ -19,15 +18,16 @@ end
 class User < OpenStruct
 end
 
-setup.mappers do
+configuration.mappers do
   define(:users) do
     register_as :entity
     model User
   end
 end
 
-rom = setup.finalize
-user = rom.relation(:users).as(:entity).by_name('Jane').one
+container = ROM.container(configuration)
+
+user = container.relation(:users).as(:entity).by_name('Jane').one
 # => #<User id=2, name="Jane", email="jane@doe.org">
 
 user or abort "user not found"

data/lib/rom/csv/commands/create.rb

@@ -8,7 +8,7 @@ module ROM
         adapter :csv
 
         def execute(tuples)
-          insert_tuples =  [tuples].flatten.map do |tuple|
+          insert_tuples = [tuples].flatten.map do |tuple|
             attributes = input[tuple]
             validator.call(attributes)
             attributes.to_h

data/lib/rom/csv/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module CSV
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/rom-csv.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rom', '~> 0.9', '>= 0.9.0'
+  spec.add_runtime_dependency 'rom', '~> 1.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/spec/integration/commands/create_spec.rb

@@ -2,20 +2,12 @@ require 'spec_helper'
 require 'virtus'
 
 describe 'Commands / Create' do
-  subject(:rom) { setup.finalize }
+  include_context 'database setup'
 
-  let(:original_path) { File.expand_path('./spec/fixtures/users.csv') }
-  let(:path) { File.expand_path('./spec/fixtures/testing.csv') }
-
-  # If :csv is not passed in the gateway is named `:default`
-  let(:setup) { ROM.setup(:csv, path) }
-
-  subject(:users) { rom.commands.users }
+  subject(:users) { container.commands.users }
 
   before do
-    FileUtils.copy(original_path, path)
-
-    setup.relation(:users)
+    configuration.relation(:users)
 
     class User
       include Virtus.model
@@ -25,14 +17,14 @@ describe 'Commands / Create' do
       attribute :email, String
     end
 
-    setup.mappers do
+    configuration.mappers do
       define(:users) do
         model User
         register_as :entity
       end
     end
 
-    setup.commands(:users) do
+    configuration.commands(:users) do
       define(:create) do
         result :one
       end
@@ -49,7 +41,7 @@ describe 'Commands / Create' do
     end
     expect(result.value).to eql(user_id: 4, name: 'John', email: 'john@doe.org')
 
-    result = rom.relation(:users).as(:entity).to_a
+    result = container.relation(:users).as(:entity).to_a
     expect(result.count).to eql(4)
   end
 
@@ -66,7 +58,7 @@ describe 'Commands / Create' do
       { user_id: 5, name: 'Jack', email: 'jack@doe.org' }
     ])
 
-    result = rom.relation(:users).as(:entity).to_a
+    result = container.relation(:users).as(:entity).to_a
     expect(result.count).to eql(5)
   end
 end

data/spec/integration/commands/delete_spec.rb

@@ -1,26 +1,18 @@
 require 'spec_helper'
 
 describe 'Commands / Delete' do
-  subject(:rom) { setup.finalize }
+  include_context 'database setup'
 
-  let(:original_path) { File.expand_path('./spec/fixtures/users.csv') }
-  let(:path) { File.expand_path('./spec/fixtures/testing.csv') }
-
-  # If :csv is not passed in the gateway is named `:default`
-  let(:setup) { ROM.setup(:csv, path) }
-
-  subject(:users) { rom.commands.users }
+  subject(:users) { container.commands.users }
 
   before do
-    FileUtils.copy(original_path, path)
-
-    setup.relation(:users) do
+    configuration.relation(:users) do
       def by_id(id)
         restrict(user_id: id)
       end
     end
 
-    setup.commands(:users) do
+    configuration.commands(:users) do
       define(:delete) do
         result :one
       end
@@ -40,9 +32,9 @@ describe 'Commands / Delete' do
     expect(result.value)
       .to eql(user_id: 1, name: "Julie", email: "julie.andrews@example.com")
 
-    rom.relation(:users).dataset.reload!
+    container.relation(:users).dataset.reload!
 
-    result = rom.relation(:users).to_a
+    result = container.relation(:users).to_a
     expect(result.count).to eql(2)
   end
 end

data/spec/integration/commands/update_spec.rb

@@ -2,17 +2,11 @@ require 'spec_helper'
 require 'virtus'
 
 describe 'Commands / Updates' do
-  subject(:rom) { setup.finalize }
+  include_context 'database setup'
 
-  let(:original_path) { File.expand_path('./spec/fixtures/users.csv') }
-  let(:path) { File.expand_path('./spec/fixtures/testing.csv') }
+  subject(:users) { container.commands.users }
 
-  # If :csv is not passed in the gateway is named `:default`
-  let(:setup) { ROM.setup(:csv, path) }
-
-  subject(:users) { rom.commands.users }
-
-  let(:relation) { rom.relations.users }
+  let(:relation) { container.relations.users }
   let(:first_data) { relation.by_id(1).to_a.first }
   let(:new_data) { { name: 'Peter' } }
   let(:output_data) do
@@ -20,9 +14,7 @@ describe 'Commands / Updates' do
   end
 
   before do
-    FileUtils.copy(original_path, path)
-
-    setup.relation(:users) do
+    configuration.relation(:users) do
       def by_id(id)
         restrict(user_id: id)
       end
@@ -36,14 +28,14 @@ describe 'Commands / Updates' do
       attribute :email, String
     end
 
-    setup.mappers do
+    configuration.mappers do
       define(:users) do
         model User
         register_as :entity
       end
     end
 
-    setup.commands(:users) do
+    configuration.commands(:users) do
       define(:update)
     end
   end
@@ -56,9 +48,9 @@ describe 'Commands / Updates' do
     expect(result.value.to_a).to match_array(output_data)
 
     # FIXME: reload! should not be necessary
-    rom.relation(:users).dataset.reload!
+    container.relation(:users).dataset.reload!
 
-    result = rom.relation(:users).as(:entity).by_id(1).to_a.first
+    result = container.relation(:users).as(:entity).by_id(1).to_a.first
     expect(result.email).to eql('tester@example.com')
   end
 end

data/spec/integration/relation_spec.rb

@@ -3,13 +3,7 @@ require 'virtus'
 
 describe 'CSV gateway' do
   context 'without extra options' do
-    # If :csv is not passed in the gateway is named `:default`
-    let(:users_path) { File.expand_path('./spec/fixtures/users.csv') }
-    let(:setup) do
-      ROM.setup(
-        users: [:csv, users_path]
-      )
-    end
+    include_context 'database setup'
 
     before do
       module TestPlugin; end
@@ -24,7 +18,7 @@ describe 'CSV gateway' do
     describe 'specify relation with plugin' do
       it "shouldn't raise error" do
         expect {
-          setup.relation(:users) do
+          configuration.relation(:users) do
             gateway :users
             use :test_plugin
           end

data/spec/integration/repository_spec.rb

@@ -3,19 +3,10 @@ require 'virtus'
 
 describe 'CSV gateway' do
   context 'without extra options' do
-    # If :csv is not passed in the gateway is named `:default`
-    let(:users_path) { File.expand_path('./spec/fixtures/users.csv') }
-    let(:addresses_path) { File.expand_path('./spec/fixtures/addresses.csv') }
-    let(:setup) do
-      ROM.setup(
-        users: [:csv, users_path],
-        addresses: [:csv, addresses_path]
-      )
-    end
-    subject(:rom) { setup.finalize }
+    include_context 'database setup'
 
     before do
-      setup.relation(:users) do
+      configuration.relation(:users) do
         gateway :users
 
         def by_name(name)
@@ -35,7 +26,7 @@ describe 'CSV gateway' do
         end
       end
 
-      setup.relation(:addresses) do
+      configuration.relation(:addresses) do
         gateway :addresses
       end
 
@@ -63,7 +54,7 @@ describe 'CSV gateway' do
         attribute :street, String
       end
 
-      setup.mappers do
+      configuration.mappers do
         define(:users) do
           model User
           register_as :entity
@@ -85,14 +76,14 @@ describe 'CSV gateway' do
 
     describe 'env#relation' do
       it 'returns restricted and mapped object' do
-        jane = rom.relation(:users).as(:entity).by_name('Jane').to_a.first
+        jane = container.relation(:users).as(:entity).by_name('Jane').to_a.first
 
         expect(jane.name).to eql('Jane')
         expect(jane.email).to eql('jane@doe.org')
       end
 
       it 'returns specified attributes in mapped object' do
-        jane = rom.relation(:users).as(:entity).only_name.to_a.first
+        jane = container.relation(:users).as(:entity).only_name.to_a.first
 
         expect(jane.user_id).to be_nil
         expect(jane.name).not_to be_nil
@@ -100,7 +91,7 @@ describe 'CSV gateway' do
       end
 
       it 'return ordered attributes by name and email' do
-        results = rom.relation(:users).as(:entity).ordered.to_a
+        results = container.relation(:users).as(:entity).ordered.to_a
 
         expect(results[0].name).to eql('Jane')
         expect(results[0].email).to eq('jane@doe.org')
@@ -113,7 +104,7 @@ describe 'CSV gateway' do
       end
 
       it 'returns joined data' do
-        results = rom.relation(:users).as(:entity_with_address)
+        results = container.relation(:users).as(:entity_with_address)
                   .with_addresses.first
 
         expect(results.attributes.keys.sort)
@@ -125,14 +116,14 @@ describe 'CSV gateway' do
     end
 
     context 'with custom options' do
-      let(:path) { File.expand_path('./spec/fixtures/users.utf-8.csv') }
-      let(:options) { { encoding: 'iso-8859-2', col_sep: ';' } }
+      before do
+        configuration.relation(:users_utf8) do
+          gateway :utf8
+        end
+      end
 
       it 'allows to force encoding' do
-        setup = ROM.setup(:csv, path, options)
-        setup.relation(:users)
-        rom = setup.finalize
-        user = rom.relation(:users).to_a.last
+        user = container.relation(:users_utf8).to_a.last
 
         expect(user[:id]).to eql(4)
         expect(user[:name].bytes.to_a)

data/spec/spec_helper.rb

@@ -13,6 +13,4 @@ require 'rom-csv'
 
 root = Pathname(__FILE__).dirname
 
-Dir[root.join('shared/*.rb').to_s].each { |f| require f }
-
-ROM.use :auto_registration
+Dir[root.join('support/*.rb').to_s].each { |f| require f }

data/spec/support/database_setup.rb

@@ -0,0 +1,20 @@
+shared_context 'database setup' do
+  let(:configuration) do
+    ROM::Configuration.new(
+      default: [:csv, path],
+      users: [:csv, path],
+      addresses: [:csv, addresses_path],
+      utf8: [:csv, users_with_utf8_path, { encoding: 'iso-8859-2', col_sep: ';' }]
+    ).use(:macros)
+  end
+  let(:container) { ROM.container(configuration) }
+
+  let(:original_path) { File.expand_path('./spec/fixtures/users.csv') }
+  let(:path) { File.expand_path('./spec/fixtures/testing.csv') }
+  let(:addresses_path) { File.expand_path('./spec/fixtures/addresses.csv') }
+  let(:users_with_utf8_path) { File.expand_path('./spec/fixtures/users.utf-8.csv') }
+
+  before do
+    FileUtils.copy(original_path, path)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-csv
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Don Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +108,7 @@ files:
 - spec/integration/relation_spec.rb
 - spec/integration/repository_spec.rb
 - spec/spec_helper.rb
+- spec/support/database_setup.rb
 - spec/unit/dataset_spec.rb
 - spec/unit/repository_spec.rb
 homepage: http://rom-rb.org
@@ -136,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: CSV support for Ruby Object Mapper
@@ -150,5 +145,6 @@ test_files:
 - spec/integration/relation_spec.rb
 - spec/integration/repository_spec.rb
 - spec/spec_helper.rb
+- spec/support/database_setup.rb
 - spec/unit/dataset_spec.rb
 - spec/unit/repository_spec.rb