conformist 0.0.2 → 0.0.3

data/CHANGELOG.markdown

@@ -1,6 +1,10 @@
 # CHANGELOG
 
-## 0.0.2
+## 0.0.3 / 2011-05-07
+
+* Inheriting from a class which mixes in Conformist::Base gives you access to all of the superclasses' columns.
+
+## 0.0.2 / 2011-04-28
 
 * Column#values_in will be nil if the index is out of range rather than an empty string. This is consistent with CSV
 * Fixed 1.8.7 and JRuby dependancies. Gemspec will not let you specify dependancies based on the version of Ruby. Everyone gets it

data/README.markdown

@@ -23,7 +23,7 @@ class Citizen1
   include Conformist::Base
     
   column :name, 0, 1
-  column :address, 2 do |value|
+  column :city, 2 do |value|
     value.upcase
   end
 end
@@ -32,7 +32,7 @@ class Citizen2
   include Conformist::Base
   
   column :name, 0
-  column :address, 1
+  column :city, 1
 end
 ```
 
@@ -74,7 +74,7 @@ column :name, 0, 1
 Indexing is completely arbitrary and you can map any combination.
 
 ``` ruby
-column :name_and_address, 0, 2
+column :name_and_city 0, 2
 ```
 
 ### Preprocessing
@@ -105,6 +105,37 @@ column :day do
 end
 ```
 
+### Inheritance
+
+Inheriting from a class which mixes in Conformist::Base gives you access to all of the superclasses' columns.
+
+``` ruby
+class Citizen
+  include Conformist::Base
+
+  column :name, 0, 1
+end
+
+class Adult < Citizen
+  column :category do
+    'Adult'
+  end
+end
+
+class Child < Citizen
+  column :category do
+    'Child'
+  end
+end
+
+Adult.load('adults.csv').foreach do |row|
+  row # => {:name => 'Tate Johnson', :category => 'Adult}
+end
+```
+## Example
+
+* https://gist.github.com/949576
+
 ## Compatibility
 
 * 1.9.2-p180

data/lib/conformist/base.rb

@@ -3,7 +3,6 @@ module Conformist
     def self.included base
       base.class_eval do
         extend ClassMethods
-        
         attr_accessor :path
       end
     end
@@ -30,7 +29,11 @@ module Conformist
       end
 
       def columns
-        @columns ||= []
+        @columns ||= if superclass.ancestors.include? Conformist::Base
+          superclass.columns.dup
+        else
+          []
+        end
       end
 
       def option value

data/lib/conformist/version.rb

@@ -1,3 +1,3 @@
 module Conformist
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/test/conformist/base_test.rb

@@ -2,35 +2,45 @@ require 'helper'
 
 class BaseTest < MiniTest::Unit::TestCase
   def setup
-    @klass = Class.new.tap { |klass| klass.send :include, Conformist::Base }
+    @class = Class.new.tap { |klass| klass.send :include, Conformist::Base }
   end
   
   def test_option
-    @klass.option :a => 1
-    @klass.option :b => 2
-    assert_equal({:a => 1, :b => 2}, @klass.options)
+    @class.option :a => 1
+    @class.option :b => 2
+    assert_equal({:a => 1, :b => 2}, @class.options)
   end
   
   def test_column
-    @klass.column :a, 0
-    @klass.column :b, 1
-    assert_equal 2, @klass.columns.size
-    assert_instance_of Conformist::Column, @klass.columns[rand(2)]
+    @class.column :a, 0
+    @class.column :b, 1
+    assert_equal 2, @class.columns.size
+    assert_instance_of Conformist::Column, @class.columns[rand(2)]
+  end
+  
+  def test_columns_inherit_from_superclass
+    subclass = Class.new @class
+    @class.column :a, 0
+    @class.column :b, 1
+    assert_equal @class.columns, subclass.columns
+    subclass.column :c, 2
+    subclass.column :d, 3
+    refute_equal @class.columns, subclass.columns
   end
   
   def test_load
-    instance = @klass.load 'file'
+    instance = @class.load 'file'
     assert_equal 'file', instance.path
-    assert_instance_of @klass, instance
+    assert_instance_of @class, instance
   end
   
   def test_foreach
     rows = [
-      {:name => "CRAFERS", :callsign => "ABS2",  :latitude => "34 58 49S", :signtal_type => "digital"},
-      {:name => "CRAFERS", :callsign => "SAS7",  :latitude => "34 58 57S", :signtal_type => "digital"},
-      {:name => "CRAFERS", :callsign => "NWS9",  :latitude => "34 59 02S", :signtal_type => "digital"},
-      {:name => "CRAFERS", :callsign => "ADS10", :latitude => "34 59 02S", :signtal_type => "digital"},
-      {:name => "CRAFERS", :callsign => "ADS10", :latitude => "34 58 57S", :signtal_type => "digital"}
+      {:name => "CRAFERS", :callsign => "ABS2",  :latitude => "34 58 49S"},
+      {:name => "CRAFERS", :callsign => "SAS7",  :latitude => "34 58 57S"},
+      {:name => "CRAFERS", :callsign => "NWS9",  :latitude => "34 59 02S"},
+      {:name => "CRAFERS", :callsign => "ADS10", :latitude => "34 59 02S"},
+      {:name => "CRAFERS", :callsign => "ADS10", :latitude => "34 58 57S"}
     ]
     ACMA.load(fixture('acma.csv')).foreach do |row|
       assert_equal rows.shift, row

data/test/conformist/conformist_test.rb

@@ -14,7 +14,7 @@ class ConformistTest < MiniTest::Unit::TestCase
       {:name => "SACRAMENTO, CA",  :callsign => "KCSO-LD", :latitude => "38 7 10.00 N",  :signtal_type => "digital"},
       {:name => "LOS ANGELES, CA", :callsign => "KVTU-LP", :latitude => "34 13 38.00 N", :signtal_type => "digital"}
     ]
-    Conformist.foreach ACMA.load(fixture('acma.csv')), FCC.load(fixture('fcc.txt')) do |row|
+    Conformist.foreach ACMA::Digital.load(fixture('acma.csv')), FCC.load(fixture('fcc.txt')) do |row|
       assert_equal rows.shift, row
     end
   end

data/test/definitions/acma.rb

@@ -1,16 +1,24 @@
-class FCC
+class ACMA
   include Conformist::Base
   
-  option :col_sep => '|'
-   
-  column :name, 10, 11 do |values|
-    "#{values[0].upcase}, #{values[-1]}"
+  option :col_sep => ','
+  option :quote_char => '"'
+
+  column :name, 11 do |value| 
+    value.match(/[A-Z]+$/)[0].upcase
   end
   column :callsign, 1
-  column :latitude, 20, 21, 22, 19 do |values|
-    values.join(' ')
-  end
-  column :signtal_type do
-    'digital'
+  column :latitude, 15
+end
+
+class ACMA::Digital < ACMA
+  column :signtal_type do 
+     'digital'
+   end
+ end
+
+class ACMA::Analogue < ACMA
+  column :signtal_type do 
+    'analogue'
   end
 end

data/test/definitions/fcc.rb

@@ -1,15 +1,16 @@
-class ACMA
+class FCC
   include Conformist::Base
   
-  option :col_sep => ','
-  option :quote_char => '"'
-
-  column :name, 11 do |value| 
-    value.match(/[A-Z]+$/)[0].upcase
+  option :col_sep => '|'
+   
+  column :name, 10, 11 do |values|
+    "#{values[0].upcase}, #{values[-1]}"
   end
   column :callsign, 1
-  column :latitude, 15
-  column :signtal_type do 
+  column :latitude, 20, 21, 22, 19 do |values|
+    values.join(' ')
+  end
+  column :signtal_type do
     'digital'
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: conformist
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Tate Johnson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 +10:00
+date: 2011-05-07 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1209245458572220166
+      hash: 3830580058108286643
       segments: 
       - 0
       version: "0"