conformist 0.2.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e2571df3b1d38f03302084d750cf10d2a8d1db75
+  data.tar.gz: d0637c6991ff0a7caca1fbf5ad19cfa03ffcc0bd
+SHA512:
+  metadata.gz: 429e5ccf39a435cb89efe02a1be91cc20e2b46ed23c76f512ff6263f5d7a9b9a2b39319d9a8ae8d445a0177b1a5d41df0c87c11c4b5772826461ec1d39e5ab00
+  data.tar.gz: fdb0a7140d3618ca81f864cbba957c49d29c716498f555ac273da568f5ac6d6f07a5e561240c86bf7dba893c1e5ce74bc242c195c4747dc6b4f60528e278298d

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0
   - jruby

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.2.1 / 2015-01-31
+
+* Add support for named columns. (@rywall)
+* Dropped support for Ruby 1.8.7, 1.9.2.
+
 ## 0.2.0 / 2012-08-18
 
 * `Conformist::Schema#confrom` takes option to skip first row.
@@ -7,7 +12,7 @@
 
 ## 0.1.3 / 2012-02-09
 
-* Column indexes are implicitly incremented when the index argument is omitted. Implicit indexing is all or nothing.
+* Column indexes are implicitly incremented when the index argument is omitted. Implicit indexing is all or nothing. (@coop)
 
 ## 0.1.2 / 2012-01-19
 

data/README.md

@@ -1,6 +1,7 @@
 # Conformist
 
 [![Build Status](https://secure.travis-ci.org/tatey/conformist.png)](http://travis-ci.org/tatey/conformist)
+[![Code Climate](https://codeclimate.com/github/tatey/conformist.png)](https://codeclimate.com/github/tatey/conformist)
 
 Bend CSVs to your will with declarative schemas. Map one or many columns, preprocess cells and lazily enumerate. Declarative schemas are easier to understand, quicker to setup and independent of I/O. Use [CSV](http://www.ruby-doc.org/stdlib-1.9.3/libdoc/csv/rdoc/CSV.html) (Formally [FasterCSV](https://rubygems.org/gems/fastercsv)), [Spreadsheet](https://rubygems.org/gems/spreadsheet) or any array of array-like data structure.
 
@@ -42,7 +43,7 @@ Only insert the transmitters with the name "Mount Cooth-tha" using ActiveRecord
 transmitters = schema.conform(csv).select do |transmitter|
   transmitter.name == 'Mount Coot-tha'
 end
-transmitter.each do |transmitter|
+transmitters.each do |transmitter|
   Transmitter.create! transmitter.attributes
 end
 ```
@@ -186,6 +187,20 @@ the first row is the header row and irrelevant for enumeration.
 schema.conform CSV.open('~/file_with_headers.csv'), :skip_first => true
 ```
 
+#### Named Columns
+
+Strings can be used as column indexes instead of integers. These strings will be matched
+against the first row to determine the appropriate numerical index.
+
+``` ruby
+citizen = Conformist.new do
+  column :email, 'EM'
+  column :name, 'FN', 'LN'
+end
+
+citizen.conform [['FN', 'LN', 'EM'], ['Tate', 'Johnson', 'tate@tatey.com']], :skip_first => true
+```
+
 #### Enumerator
 
 `#conform` is lazy, returning an [Enumerator](http://www.ruby-doc.org/core-1.9.3/Enumerator.html). Input is not parsed until you call `#each`, `#map` or any method defined in [Enumerable](http://www.ruby-doc.org/core-1.9.3/Enumerable.html). That means schemas can be assigned now and evaluated later. `#each` has the lowest memory footprint because it does not build a collection.
@@ -331,9 +346,8 @@ See CHANGELOG.md for a full list of changes.
 
 ## Compatibility
 
-* MRI 1.9.2+
-* MRI 1.8.7
-* JRuby 1.6.5
+* MRI 2.2.0, 2.1.0, 2.0.0, 1.9.3
+* JRuby
 
 ## Dependencies
 
@@ -344,8 +358,14 @@ No explicit dependencies, although `CSV` and `Spreadsheet` are commonly used.
 1. Fork
 2. Install dependancies by running `$ bundle install`
 3. Write tests and code
-4. Make sure the tests pass by running `$ bundle exec rake`
-5. Push and send a pull request on GitHub
+4. Make sure the tests pass locally by running `$ bundle exec rake`
+5. Push to GitHub and make sure continuous integration tests pass at
+   https://travis-ci.org/tatey/conformist/pull_requests
+5. Send a pull request on GitHub
+
+Please do not increment the version number in `lib/conformist/version.rb`.
+The version number will be incremented by the maintainer after the patch
+is accepted.
 
 ## Motivation
 

data/conformist.gemspec

@@ -14,9 +14,10 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "conformist"
 
-  s.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = '>= 1.9.3'
 
-  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'minitest', '>= 5.4.0'
+  s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'spreadsheet'
 

data/lib/conformist.rb

@@ -6,11 +6,6 @@ require 'conformist/hash_struct'
 require 'conformist/schema'
 
 module Conformist
-  unless defined? Enumerator # Compatible with 1.8
-    require 'generator'
-    Enumerator = Generator
-  end
-
   def self.extended base
     base.extend Schema
   end

data/lib/conformist/column.rb

@@ -1,13 +1,26 @@
 module Conformist
   class Column
-    attr_accessor :name, :indexes, :preprocessor
+    attr_accessor :name, :sources, :indexes, :preprocessor
 
-    def initialize name, *indexes, &preprocessor
+    def initialize name, *sources, &preprocessor
       self.name         = name
-      self.indexes      = indexes
+      self.sources      = sources
+      self.indexes      = sources
       self.preprocessor = preprocessor
     end
 
+    def calculate_indices!(headers)
+      headers = Array(headers).collect {|header| header.to_s.downcase.squeeze.strip }
+
+      self.indexes = sources.collect do |source|
+        if source.is_a?(String)
+          headers.index(source.downcase)
+        else
+          source
+        end
+      end.compact
+    end
+
     def values_in enumerable
       values = Array(enumerable).values_at(*indexes).map do |value|
         if value.respond_to? :strip

data/lib/conformist/schema.rb

@@ -1,4 +1,4 @@
-module Conformist  
+module Conformist
   module Schema
     def self.included base
       base.send :include, InstanceExtensions
@@ -24,7 +24,7 @@ module Conformist
           self.columns = super_schema.columns.dup
         end
         if block
-          instance_eval &block 
+          instance_eval &block
         end
       end
     end
@@ -53,9 +53,14 @@ module Conformist
 
       def conform enumerables, options = {}
         options = options.dup
+
         Enumerator.new do |yielder|
           enumerables.each do |enumerable|
-            next if options.delete :skip_first
+            if options.delete :skip_first
+              columns.each {|column| column.calculate_indices!(enumerable) }
+              next
+            end
+
             yielder.yield builder.call(self, enumerable)
           end
         end

data/lib/conformist/version.rb

@@ -1,3 +1,3 @@
 module Conformist
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/test/helper.rb

@@ -1,4 +1,5 @@
 require 'conformist'
 require 'minitest/autorun'
+require 'pry'
 
 include Conformist

data/test/unit/conformist/builder_test.rb

@@ -1,11 +1,11 @@
 require 'helper'
 
-class Conformist::BuilderTest < MiniTest::Unit::TestCase
+class Conformist::BuilderTest < Minitest::Test
   def test_call
-    column = MiniTest::Mock.new
+    column = Minitest::Mock.new
     column.expect :name, :a
     column.expect :values_in, [1], [Array]
-    definition = MiniTest::Mock.new
+    definition = Minitest::Mock.new
     definition.expect :columns, [column]
     assert_equal HashStruct.new({:a => [1]}), Builder.call(definition, [])
   end

data/test/unit/conformist/column_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Conformist::ColumnTest < MiniTest::Unit::TestCase
+class Conformist::ColumnTest < Minitest::Test
   def stub_row
     ('a'..'d').to_a
   end
@@ -41,7 +41,7 @@ class Conformist::ColumnTest < MiniTest::Unit::TestCase
   end
 
   def test_array
-    mock   = MiniTest::Mock.new
+    mock   = Minitest::Mock.new
     mock.expect :to_a, ['a']
     column = Column.new :foo, 0
     assert_equal 'a', column.values_in(['a'])

data/test/unit/conformist/hash_struct_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Conformist::HashStructTest < MiniTest::Unit::TestCase
+class Conformist::HashStructTest < Minitest::Test
   def test_initialize
     assert_equal({:a => 1}, HashStruct.new({:a => 1}).attributes)
     assert_empty HashStruct.new.attributes
@@ -17,9 +17,9 @@ class Conformist::HashStructTest < MiniTest::Unit::TestCase
   def test_equality
     hash1 = HashStruct.new :a => 1
     hash2 = HashStruct.new :a => 1
-    hash3 = MiniTest::Mock.new
+    hash3 = Minitest::Mock.new
     hash3.expect :attributes, {:a => 1}
-    hash3.expect :class, MiniTest::Mock
+    hash3.expect :class, Minitest::Mock
     assert_equal hash1, hash2
     refute_equal hash1, hash3
   end

data/test/unit/conformist/schema_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Conformist::SchemaTest < MiniTest::Unit::TestCase
+class Conformist::SchemaTest < Minitest::Test
   def test_initialize_with_instance
     parent = Class.new { include Schema }.new.tap { |d| d.columns = [0] }
     child1 = Class.new { include Schema }.new(parent).tap { |d| d.columns << 1 }

data/test/unit/conformist_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ConformistTest < MiniTest::Unit::TestCase
+class ConformistTest < Minitest::Test
   def test_extended
     definition = Class.new { extend Conformist }
     assert definition.respond_to?(:builder)

data/test/unit/integration_test.rb

@@ -5,7 +5,7 @@ require 'schemas/citizens'
 require 'schemas/fcc'
 require 'spreadsheet'
 
-class IntegrationTest < MiniTest::Unit::TestCase
+class IntegrationTest < Minitest::Test
   def fixture filename
     File.expand_path "../../fixtures/#{filename}", __FILE__
   end
@@ -81,7 +81,7 @@ class IntegrationTest < MiniTest::Unit::TestCase
       column :capital, 2
     end
     child = Conformist.new parent do
-      column :country do 
+      column :country do
         'Australia'
       end
     end
@@ -89,4 +89,15 @@ class IntegrationTest < MiniTest::Unit::TestCase
     last = enumerable.to_a.last
     assert_equal HashStruct.new(:state => 'QLD, Queensland', :capital => 'Brisbane', :country => 'Australia'), last
   end
+
+  def test_named_columns
+    schema = Conformist.new do
+      column :name, 'Name'
+      column :age, 'Age'
+      column :gender, 'Gender'
+    end
+    enumerable = schema.conform open_csv('citizens.csv'), :skip_first => true
+    first      = enumerable.to_a.first
+    assert_equal HashStruct.new(:name => 'Aaron', :age => '21', :gender => 'Male'), first
+  end
 end

metadata

@@ -1,62 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: conformist
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Tate Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-18 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.4.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Bend CSVs to your will with declarative schemas.
@@ -66,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -96,30 +103,26 @@ files:
 - test/unit/integration_test.rb
 homepage: https://github.com/tatey/conformist
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2869076359774702419
 requirements: []
 rubyforge_project: conformist
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Bend CSVs to your will with declarative schemas.
 test_files:
 - test/fixtures/acma.csv