conformist 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 0.1.2 / 2012-01-19
+
+* `Conformist::Builder` coerces enumerables into an Array. Works with Spreadsheet for conforming Microsoft Excel spreadsheets.
+
+## 0.1.1 / 2012-01-17
+
+* Explicitly required `Forwardable`.
+
 ## 0.1.0 / 2012-01-05
 
 * Added anonymous schemas.

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/tatey/conformist.png)](http://travis-ci.org/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 (Formally FasterCSV) or any array of array-like data structure.
+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.
 
 ![](http://f.cl.ly/items/00191n3O1J2E1a342F1L/conformist.jpg)
 
@@ -75,7 +75,31 @@ db = SQLite3::Database.new 'transmitters.db'
 end
 ```
 
-For **more examples** see `test/fixtures`, `test/schemas` and `test/unit/integration_test.rb`.
+Open a Microsoft Excel spreadsheet and declare a schema.
+
+``` ruby
+require 'conformist'
+require 'spreadsheet'
+
+book   = Spreadsheet.open '~/states.xls'
+sheet  = book.worksheet 0
+schema = Conformist.new do
+  column :state, 0, 1 do |values|
+    "#{values.first}, #{values.last}"
+  end
+  column :capital, 2
+end
+```
+
+Print each state's attributes to standard out.
+
+``` ruby
+schema.conform(sheet).each do |state|
+  $stdout.puts state.attributes
+end
+```
+
+For more examples see [test/fixtures](https://github.com/tatey/conformist/tree/master/test/fixtures), [test/schemas](https://github.com/tatey/conformist/tree/master/test/schemas) and [test/unit/integration_test.rb](https://github.com/tatey/conformist/blob/master/test/unit/integration_test.rb).
 
 ## Installation
 

data/conformist.gemspec

@@ -25,8 +25,9 @@ EOS
 
   s.required_ruby_version = '>= 1.8.7'
   
-  s.add_development_dependency 'rake'
   s.add_development_dependency 'minitest'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'spreadsheet'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/conformist/column.rb

@@ -8,8 +8,8 @@ module Conformist
       self.preprocessor = preprocessor
     end
     
-    def values_in array
-      values = array.values_at(*indexes).map do |value|
+    def values_in enumerable
+      values = Array(enumerable).values_at(*indexes).map do |value|
         if value.respond_to? :strip
           value.strip
         else

data/lib/conformist/version.rb

@@ -1,3 +1,3 @@
 module Conformist
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/test/unit/conformist/base_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class BuilderTest < MiniTest::Unit::TestCase
+class Conformist::BuilderTest < MiniTest::Unit::TestCase
   def test_included
     assert_raises RuntimeError do
       Class.new { include Base }

data/test/unit/conformist/builder_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class BuilderTest < MiniTest::Unit::TestCase
+class Conformist::BuilderTest < MiniTest::Unit::TestCase
   def test_call
     column = MiniTest::Mock.new
     column.expect :name, :a

data/test/unit/conformist/column_test.rb

@@ -1,47 +1,56 @@
 require 'helper'
 
-class ColumnTest < MiniTest::Unit::TestCase
+class Conformist::ColumnTest < MiniTest::Unit::TestCase
   def stub_row
     ('a'..'d').to_a
   end
   
   def test_name
-    column = Conformist::Column.new :foo
+    column = Column.new :foo
     assert_equal :foo, column.name
   end
   
   def test_one_index
-    column = Conformist::Column.new :foo, 0
+    column = Column.new :foo, 0
     assert_equal 'a', column.values_in(stub_row)
   end
   
   def test_preprocess_with_one_index
-    column = Conformist::Column.new(:foo, 0) { |value| value.upcase }
+    column = Column.new(:foo, 0) { |value| value.upcase }
     assert_equal 'A', column.values_in(stub_row)
   end
   
   def test_many_indexes
-    column = Conformist::Column.new :foo, 1, 2, 3
+    column = Column.new :foo, 1, 2, 3
     assert_equal ['b', 'c', 'd'], column.values_in(stub_row)
   end
   
   def test_preprocess_with_many_indexes
-    column = Conformist::Column.new(:foo, 1, 2, 3) { |values| values.reverse }
+    column = Column.new(:foo, 1, 2, 3) { |values| values.reverse }
     assert_equal ['d', 'c', 'b'], column.values_in(stub_row)
   end
   
   def test_virtual
-    column = Conformist::Column.new(:foo) { 'a' }
+    column = Column.new(:foo) { 'a' }
     assert_equal 'a', column.values_in(stub_row)
   end
   
   def test_strip_whitespace
-    column = Conformist::Column.new(:foo, 0)
+    column = Column.new :foo, 0
     assert_equal 'a', column.values_in(['  a  '])
   end
   
+  def test_array
+    mock   = MiniTest::Mock.new
+    mock.expect :to_a, ['a']
+    column = Column.new :foo, 0
+    assert_equal 'a', column.values_in(['a'])
+    assert_equal 'a', column.values_in('a')
+    assert_equal 'a', column.values_in(mock)
+  end
+  
   def test_nil
-    column = Conformist::Column.new(:foo, 0)
+    column = Column.new :foo, 0
     assert_nil column.values_in([])
   end
 end

data/test/unit/conformist/hash_struct_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class HashStructTest < MiniTest::Unit::TestCase
+class Conformist::HashStructTest < MiniTest::Unit::TestCase
   def test_initialize
     assert_equal({:a => 1}, HashStruct.new({:a => 1}).attributes)
     assert_empty HashStruct.new.attributes

data/test/unit/conformist/schema_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class SchemaTest < MiniTest::Unit::TestCase
+class Conformist::SchemaTest < MiniTest::Unit::TestCase
   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/integration_test.rb

@@ -2,14 +2,18 @@ require 'csv'
 require 'helper'
 require 'schemas/acma'
 require 'schemas/fcc'
+require 'spreadsheet'
 
 class IntegrationTest < MiniTest::Unit::TestCase
+  def fixture filename
+    File.expand_path "../../fixtures/#{filename}", __FILE__
+  end
+
   def open_csv filename, options = {}
-    path = File.expand_path "../../fixtures/#{filename}", __FILE__
     if CSV.method(:open).arity == -3 # 1.8 CSV
-      CSV.open path, 'r', options[:col_sep]
+      CSV.open fixture(filename), 'r', options[:col_sep]
     else
-      CSV.open path, options
+      CSV.open fixture(filename), options
     end
   end
 
@@ -31,19 +35,28 @@ class IntegrationTest < MiniTest::Unit::TestCase
     assert_equal HashStruct.new(:name => 'LOS ANGELES, CA', :callsign => 'KVTU-LP', :latitude => '34 13 38.00 N', :signtal_type => 'digital'), last
   end
   
+  def test_instance_with_spreadsheet
+    book       = Spreadsheet.open fixture('states.xls')
+    sheet      = book.worksheet 0
+    schema     = Conformist.new { column :state, 0 }
+    enumerable = schema.conform sheet
+    last       = enumerable.to_a.last
+    assert_equal HashStruct.new(:state => 'QLD'), last
+  end
+  
   def test_instance_with_array_of_arrays
     data = Array.new.tap do |d|
       d << ['NSW', 'New South Wales', 'Sydney']
       d << ['VIC', 'Victoria', 'Melbourne']
       d << ['QLD', 'Queensland', 'Brisbane']
     end
-    definition = Conformist.new do
+    schema = Conformist.new do
       column :state, 0, 1 do |values|
         "#{values.first}, #{values.last}"
       end
       column :capital, 2
     end
-    enumerable = definition.conform data
+    enumerable = schema.conform data
     last = enumerable.to_a.last
     assert_equal HashStruct.new(:state => 'QLD, Queensland', :capital => 'Brisbane'), last
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conformist
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000 Z
+date: 2012-01-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70205885514860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70205885514860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70138920491840 !ruby/object:Gem::Requirement
+  requirement: &70205885551760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138920491840
+  version_requirements: *70205885551760
 - !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: &70138920488020 !ruby/object:Gem::Requirement
+  name: spreadsheet
+  requirement: &70205885551340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138920488020
+  version_requirements: *70205885551340
 description: Bend CSVs to your will with declarative schemas.
 email:
 - tate@tatey.com
@@ -57,6 +68,7 @@ files:
 - lib/conformist/version.rb
 - test/fixtures/acma.csv
 - test/fixtures/fcc.txt
+- test/fixtures/states.xls
 - test/helper.rb
 - test/schemas/acma.rb
 - test/schemas/fcc.rb
@@ -91,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 688471822358112849
+      hash: -2238739611496231910
 requirements: []
 rubyforge_project: conformist
 rubygems_version: 1.8.11
@@ -101,6 +113,7 @@ summary: Bend CSVs to your will with declarative schemas.
 test_files:
 - test/fixtures/acma.csv
 - test/fixtures/fcc.txt
+- test/fixtures/states.xls
 - test/helper.rb
 - test/schemas/acma.rb
 - test/schemas/fcc.rb