census_api 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c53cd28cfb5e25ffe09f1b7cb9b3e65f4dc350a4
-  data.tar.gz: 1ddefcdec5e8a53be784ed65afa4be1b72886076
+  metadata.gz: 4c6080f79695746c9da16b9a6a39eaaeb8f8932d
+  data.tar.gz: bb8d0ce3088e0c78fc36beba6b8bed9b1b95a604
 SHA512:
-  metadata.gz: b186c3a3ce6f225680c9b6693feda4300cfe94b5d8d20b63594c99c99f81afce952f4147011c145f3ee7c808353634ea47b27920440ec1f541b33eb214c17db7
-  data.tar.gz: 2ac5084552f5b1616fc19ff0c87d8116b774a36eff680a17f1d98cc46d599a1673a92f70e0c8788f7d38e2a6a8bcaf3480ce26bb59dcb3947a2ad8fcc723091b
+  metadata.gz: bde1d5a14e91651c1b29156fa4ddb23a9fc05c5206a2a42d9f28b7e2e968d38e0a7ec11bb696f619d6c6f3253f5956738d033e85fdae9103ce657d49f9b32889
+  data.tar.gz: 88a0931b9c90edde163cf67c6711e2b483ae0f5b951a9585e49912007c0a9ae002843f62e1aa9ac4c2c0b63f39a35a79a32b70f3cb9c58beba612b3197914d7f

data/lib/census_api/request.rb

@@ -20,10 +20,10 @@ module CensusApi
       fields = options[:fields]
       fields = fields.split(',').push('NAME').join(',') if fields.is_a? String
       fields = fields.push('NAME').join(',') if fields.is_a? Array
-      level  = format(options[:level], false)
+      level  = format(options[:level], false, source)
       params = { key: options[:key], get: fields, for: level }
       unless (options[:within].nil? || (options[:within].is_a?(Array) && options[:within].compact.empty?))
-        params.merge!(in: format(options[:within][0], true))
+        params.merge!(in: format(options[:within][0], true, source))
       end
       options.merge!(vintage: 2010) unless options[:vintage]
       request = new(options[:vintage], source, params)
@@ -61,11 +61,12 @@ module CensusApi
       }
     end
 
-    def self.format(str, truncate)
+    def self.format(str, truncate, source=nil)
       result = str.split('+').map do |s|
         s = s.match(':') ? s.split(':') : [s, '*']
         shp = shapes[s[0].upcase]
-        s.shift && s.unshift(shp['name'].downcase.gsub(' ', '+')) unless shp.nil?
+        name = shp[[source,'name'].compact.join("_")]||shp['name']
+        s.shift && s.unshift(name.downcase.gsub(' ', '+')) unless shp.nil?
         s.unshift(s.shift.split('/')[0]) if !s[0].scan('home+land').empty? && truncate
         s.join(':')
       end

data/lib/census_api/version.rb

@@ -1,4 +1,4 @@
 # => CensusApi::Version
 module CensusApi
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/lib/yml/census_shapes.yml

@@ -21,6 +21,7 @@ SUBMCD:
   sumlevel: '067'
   slug: SUBMCD
   name: Subminor Civil Subdivision
+  acs5_name: Subminor Civil Division
   description: state-county-county subdivision-subminor civil subdivision
   path: SUBMCD/2010
 TABBLOCK:

data/spec/support/census_examples.rb

@@ -63,8 +63,8 @@ module CensusExamples
     ['B00001_001E', 'COUNTY:001', 'STATE:06'],
     ['B00001_001E', 'COUSUB', 'STATE:02+COUNTY:290'],
     ['B00001_001E', 'COUSUB:86690', 'STATE:02+COUNTY:290'],
-    #['B00001_001E', 'SUBMCD', 'STATE:72+COUNTY:127+COUSUB:79693'],
-    #['B00001_001E', 'SUBMCD:02350', 'STATE:72+COUNTY:127+COUSUB:79693'],
+    ['B00001_001E', 'SUBMCD', 'STATE:72+COUNTY:127+COUSUB:79693'],
+    ['B00001_001E', 'SUBMCD:02350', 'STATE:72+COUNTY:127+COUSUB:79693'],
     ['B00001_001E', 'PLACE', 'STATE:02+COUNTY:290+COUSUB:86690'],
     ['B00001_001E', 'PLACE:05750', 'STATE:02+COUNTY:290+COUSUB:86690'],
     ['B00001_001E', 'TRACT', 'STATE:02+COUNTY:290+COUSUB:86690+PLACE:05750'],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: census_api
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Ty Rauber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http