rom-csv 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b4fa0eb73ae4be19bf5c40473f3015d008127f0
-  data.tar.gz: 7258ee79e604d5fd2698ca7987ff2e617ec87875
+  metadata.gz: 48a7a492d5142f1d19b80c34a209bebbab1c349b
+  data.tar.gz: ae1893bd435ef69c849cf4dc15ad5df9028855b9
 SHA512:
-  metadata.gz: 55d0a0a264ff0f404e1fd55d122aba626b740dbe4e42b8638055123e7b0d3d4ed7fcf397e3717e93442a25f2715494c3b6d1776144b3a22dd4e9f29aa1d75031
-  data.tar.gz: 7a5c75411dc268e9d6eb7fc7578f292b1d1a0757525bc2d0d2923f284fa3b64a33207eb6e3e09bc95db42d4d89c519a975e12055194e26238b14ac96176e4a45
+  metadata.gz: fac7adf3da1e06b6b8908149bc338d1bcdbeb800ea67e606ba76318fd0ae2d5a012300ecc9c0e28bb2468b29516ce9a1526838b87144b212c8e644d3b9415279
+  data.tar.gz: a912c91ebeebfb506233fc7dba5caa1467554b91352e65d3f346c9a9eef25453e802f315b99a0d92924e84b642bf4c3f67c8194c3034b2dd491457476f3fcd3f

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v0.1.0 2015-04-16
+
+### Added
+
+* Allow to call repository with extra `CSV` options (gotar)
+
+### Internal
+
+* Improve test coverage (wafcio)
+
+[Compare v0.0.1...v0.1.0](https://github.com/rom-rb/rom/compare/v0.0.1...v0.1.0)
+
 ## v0.0.1 2015-03-22
 
 First public release

data/Gemfile

@@ -4,6 +4,7 @@ gemspec
 
 group :test do
   gem 'rom', git: 'https://github.com/rom-rb/rom.git', branch: 'master'
+  gem 'virtus'
   gem 'rspec', '~> 3.1'
   gem 'codeclimate-test-reporter', require: false
   gem 'inflecto'

data/Rakefile

@@ -1,3 +1,4 @@
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)

data/lib/rom/csv/repository.rb

@@ -48,13 +48,14 @@ module ROM
       # * header_converters: :symbol
       #
       # @param path [String] path to csv
+      # @param options [Hash] options passed to CSV.table
       #
       # @api private
       #
       # @see CSV.table
-      def initialize(path)
+      def initialize(path, options = {})
         @datasets = {}
-        @connection = ::CSV.table(path).by_row!
+        @connection = ::CSV.table(path, options).by_row!
       end
 
       # Return dataset with the given name

data/lib/rom/csv/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module CSV
-    VERSION = '0.0.1'.freeze
+    VERSION = '0.1.0'.freeze
   end
 end

data/rom-csv.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'rom', '~> 0.6.0'
 
-  spec.add_development_dependency 'anima'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rubocop', '~> 0.28.0'

data/spec/fixtures/users.csv

@@ -1,3 +1,4 @@
 id,name,email
 1,Julie,julie.andrews@example.com
-2,Jane,jane@doe.org
+2,Julie,julie@doe.org
+3,Jane,jane@doe.org

data/spec/fixtures/users.utf-8.csv

@@ -0,0 +1,5 @@
+id;name;email
+1;Julie;julie.andrews@example.com
+2;Julie;julie@doe.org
+3;Jane;jane@doe.org
+4;Żółw;zolw@example.com

data/spec/integration/repository_spec.rb

@@ -1,41 +1,90 @@
 require 'spec_helper'
-require 'anima'
+require 'virtus'
 
 describe 'CSV repository' do
-  subject(:rom) { setup.finalize }
+  context 'without extra options' do
+    # If :csv is not passed in the repository is named `:default`
+    let(:path) { File.expand_path('./spec/fixtures/users.csv') }
+    let(:setup) { ROM.setup(:csv, path) }
+    subject(:rom) { setup.finalize }
 
-  let(:path) { File.expand_path('./spec/fixtures/users.csv') }
+    before do
+      setup.relation(:users) do
+        def by_name(name)
+          restrict(name: name)
+        end
 
-  # If :csv is not passed in the repository is named `:default`
-  let(:setup) { ROM.setup(:csv, path) }
+        def only_name
+          project(:name)
+        end
 
-  before do
-    setup.relation(:users) do
-      def by_name(name)
-        restrict(name: name)
+        def ordered
+          order(:name, :email)
+        end
       end
-    end
 
-    class User
-      # Anima allows creation of an instance with an attribute hash
-      include Anima.new(:id, :name, :email)
+      class User
+        include Virtus.model
+
+        attribute :id, Integer
+        attribute :name, String
+        attribute :email, String
+      end
+
+      setup.mappers do
+        define(:users) do
+          model User
+          register_as :entity
+        end
+      end
     end
 
-    setup.mappers do
-      define(:users) do
-        model User
-        register_as :entity
+    describe 'env#relation' do
+      it 'returns restricted and mapped object' do
+        jane = rom.relation(:users).as(:entity).by_name('Jane').to_a.first
+
+        expect(jane.id).to eql(3)
+        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
+
+        expect(jane.id).to be_nil
+        expect(jane.name).not_to be_nil
+        expect(jane.email).to be_nil
+      end
+
+      it 'return ordered attributes by name and email' do
+        results = rom.relation(:users).as(:entity).ordered.to_a
+
+        expect(results[0].name).to eql('Jane')
+        expect(results[0].email).to eq('jane@doe.org')
+
+        expect(results[1].name).to eql('Julie')
+        expect(results[1].email).to eq('julie.andrews@example.com')
+
+        expect(results[2].name).to eql('Julie')
+        expect(results[2].email).to eq('julie@doe.org')
       end
     end
-  end
 
-  describe 'env#relation' do
-    it 'returns mapped object' do
-      jane = rom.relation(:users).as(:entity).by_name('Jane').to_a.first
+    context 'with custom options' do
+      let(:path) { File.expand_path('./spec/fixtures/users.utf-8.csv') }
+      let(:options) { { encoding: 'iso-8859-2', col_sep: ';' } }
 
-      expect(jane.id).to eql(2)
-      expect(jane.name).to eql('Jane')
-      expect(jane.email).to eql('jane@doe.org')
+      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
+
+        expect(user[:id]).to eql(4)
+        expect(user[:name].bytes.to_a)
+          .to eql("\xC5\xBB\xC3\xB3\xC5\x82w".bytes.to_a)
+        expect(user[:email]).to eql('zolw@example.com')
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-csv
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Don Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: anima
-  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +96,7 @@ files:
 - rakelib/rubocop.rake
 - rom-csv.gemspec
 - spec/fixtures/users.csv
+- spec/fixtures/users.utf-8.csv
 - spec/integration/repository_spec.rb
 - spec/spec_helper.rb
 - spec/unit/dataset_spec.rb
@@ -134,12 +121,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: CSV support for Ruby Object Mapper
 test_files:
 - spec/fixtures/users.csv
+- spec/fixtures/users.utf-8.csv
 - spec/integration/repository_spec.rb
 - spec/spec_helper.rb
 - spec/unit/dataset_spec.rb