ibge 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bb4210540e49df0ba3f713e8b414c58d4e7b422
-  data.tar.gz: 7dfaab976499b7e3ed845d4577450a29a1a90b8d
+  metadata.gz: 80232f32e1ca3fe301c1abfe7a5a87981df49c71
+  data.tar.gz: bc5e203e2309aa62d263418a9b5d4fec2807b60e
 SHA512:
-  metadata.gz: 3dd4c04e05bc163d669871436d886c4dc6f3c7a5c7cabf968cac1690dccd7c1e966b365409296ddb594e03ae42fdadaa6256da827be86c73861f55b6a35888a9
-  data.tar.gz: 9b34cfd88f22b2fa56671f5b91f37c47365c31a8652326a0a28535f1a11ec5c82b754a097f6a5025288726f162ac357ea6d4fb710595459a46d2b88f4a21ef4a
+  metadata.gz: d51d20081b0f09a6096f3f881d77bb6468528fbf604a85c9ff042390abc875ca3d4921ea046e26ac4e0d6d5d73986ef6b9a93e87377211c1b7744ce9898231f8
+  data.tar.gz: 9c5c550044bd2d2cff27b079b97ec40d1ef4056ef48419b8e707e62f9cc2057ec857e4d9cdd3df1531d048f8e8049fe24b2312a62a56b8dcc1734157e46787a2

data/lib/ibge/reader/base.rb

@@ -4,11 +4,28 @@ module Ibge
   module Reader
     class Base
       class << self
-        attr_reader :defined_columns
+        SOURCES = {
+          dtb: 'DTB_2014_subdistrito.xls',
+          sidra: 'sidra.xls'
+        }
+
+        attr_reader :defined_columns, :selected_source
 
         def columns(columns = {})
           @defined_columns = columns
         end
+
+        def source(selected_source = :dtb)
+          unless SOURCES.keys.include?(selected_source)
+            raise ArgumentError, "Source must be one of those '#{SOURCES.keys.flatten.join(', ')}'"
+          end
+
+          @selected_source = selected_source
+        end
+
+        def sources
+          SOURCES
+        end
       end
 
       attr_reader :filename
@@ -32,7 +49,7 @@ module Ibge
       protected
 
       def default_filename
-        File.join DATA_PATH, 'DTB_2014_subdistrito.xls'
+        File.join DATA_PATH, sources[selected_source]
       end
 
       def spreadsheet
@@ -47,8 +64,20 @@ module Ibge
         @rows ||= sheet.rows
       end
 
+      def selected_source
+        self.class.selected_source || :dtb
+      end
+
+      def sources
+        self.class.sources
+      end
+
+      def defined_columns
+        self.class.defined_columns
+      end
+
       def column_keys
-        self.class.defined_columns.keys.map(&:to_s).map(&:to_i)
+        defined_columns.keys.map(&:to_s).map(&:to_i)
       end
 
       def column_range

data/lib/ibge/reader/neighborhood.rb

@@ -0,0 +1,11 @@
+module Ibge
+  module Reader
+    class Neighborhood < Base
+      source :sidra
+
+      columns "0": :state_code,
+              "3": :municipality_full_code,
+              "5": :name
+    end
+  end
+end

data/lib/ibge/reader/state.rb

@@ -1,8 +1,11 @@
 module Ibge
   module Reader
     class State < Base
+      source :sidra
+
       columns "0": :code,
-              "1": :state_name
+              "1": :state_name,
+              "2": :state_federative_unit
     end
   end
 end

data/lib/ibge/version.rb

@@ -1,3 +1,3 @@
 module Ibge
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/ibge.rb

@@ -13,5 +13,6 @@ module Ibge
     autoload :Municipality, 'ibge/reader/municipality'
     autoload :District,     'ibge/reader/district'
     autoload :SubDistrict,  'ibge/reader/sub_district'
+    autoload :Neighborhood, 'ibge/reader/neighborhood'
   end
 end

data/spec/ibge/reader/base_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe Ibge::Reader::Base do
   class Reader < Ibge::Reader::Base
+    source :sidra
+
     columns "0": :code
   end
 
@@ -31,9 +33,15 @@ describe Ibge::Reader::Base do
     end
   end
 
+  describe '.selected_source' do
+    it 'show the default file source to read' do
+      expect(subject.selected_source).to eq :sidra
+    end
+  end
+
   describe '#filename' do
     it 'sets the default to file inside data folder' do
-      expect(subject.new.filename).to include 'data/DTB_2014_subdistrito.xls'
+      expect(subject.new.filename).to include 'data/sidra.xls'
     end
   end
 end

data/spec/ibge/reader/neighborhood_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Ibge::Reader::Neighborhood do
+  subject { described_class }
+
+  it 'should have defined columns' do
+    expect(subject.defined_columns).to include "0": :state_code, "3": :municipality_full_code, "5": :name
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibge
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Bruno Arueira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-23 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
@@ -68,6 +68,7 @@ files:
 - README.md
 - Rakefile
 - data/DTB_2014_subdistrito.xls
+- data/sidra.xls
 - ibge.gemspec
 - lib/ibge.rb
 - lib/ibge/reader/base.rb
@@ -75,6 +76,7 @@ files:
 - lib/ibge/reader/meso_region.rb
 - lib/ibge/reader/micro_region.rb
 - lib/ibge/reader/municipality.rb
+- lib/ibge/reader/neighborhood.rb
 - lib/ibge/reader/state.rb
 - lib/ibge/reader/sub_district.rb
 - lib/ibge/version.rb
@@ -84,6 +86,7 @@ files:
 - spec/ibge/reader/meso_region_spec.rb
 - spec/ibge/reader/micro_region_spec.rb
 - spec/ibge/reader/municipality_spec.rb
+- spec/ibge/reader/neighborhood_spec.rb
 - spec/ibge/reader/state_spec.rb
 - spec/ibge/reader/sub_district_spec.rb
 - spec/spec_helper.rb
@@ -107,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Unofficial gem with a bunch of data collected by ibge
@@ -118,6 +121,7 @@ test_files:
 - spec/ibge/reader/meso_region_spec.rb
 - spec/ibge/reader/micro_region_spec.rb
 - spec/ibge/reader/municipality_spec.rb
+- spec/ibge/reader/neighborhood_spec.rb
 - spec/ibge/reader/state_spec.rb
 - spec/ibge/reader/sub_district_spec.rb
 - spec/spec_helper.rb