census_api 1.0.2 → 1.0.3

data/lib/census_api/client.rb

@@ -1,8 +1,12 @@
 module CensusApi
   class Client
+
+    require "yaml"
+    
     attr_reader   :api_key, :options
     attr_accessor :dataset
 
+    SUMMARY_LEVELS = {}
     DATASETS = %w( sf1 acs5 ) # can add more datasets as support becomes available
 
     def initialize(api_key, options = {})
@@ -20,11 +24,19 @@ module CensusApi
       if options[:dataset]
         @dataset = options[:dataset].downcase if DATASETS.include? options[:dataset].downcase
       end
+
+      set_summary_levels
     end
 
     def find(fields, level, *within)
       raise "Client has not been assigned a dataset to query. Try @client.dataset = 'SF1' or anything from #{DATASETS}" if self.dataset.nil?
       Request.find(dataset, {key: @api_key, fields: fields, level: level, within: within})
     end
+
+    def set_summary_levels
+      if SUMMARY_LEVELS.empty?
+        YAML.load_file(File.dirname(__FILE__).to_s + '/../yml/census_shapes.yml').each{ |k,v| SUMMARY_LEVELS[k] = v }
+      end
+    end
   end
 end

data/lib/census_api/request.rb

@@ -4,12 +4,9 @@ module CensusApi
     require 'restclient'
     require 'hpricot'
     require 'json'
-    require "yaml"
     
     attr_accessor :response
     
-    @@census_shapes
-    
     CENSUS_URL = "http://api.census.gov/data/2010"
 
     def initialize(url, source, options)
@@ -52,21 +49,13 @@ module CensusApi
           else 
             s = [s,"*"]
           end
-          shp = shapes[s[0].upcase]
+          shp = CensusApi::Client::SUMMARY_LEVELS[s[0].upcase]
           s.shift && s.unshift(shp['name'].downcase.gsub(" ", "+")) if !shp.nil?
           s.unshift(s.shift.split("/")[0]) if !s[0].scan("home+land").empty? && truncate
           s.join(":")
         }
         return result.join("+")
-      end 
-      
-      def self.shapes
-        return  @@census_shapes if defined?( @@census_shapes)
-        @@census_shapes = {} 
-        YAML.load_file(File.dirname(__FILE__).to_s + '/../yml/census_shapes.yml').each{|k,v| @@census_shapes[k] = v}
-        return @@census_shapes
       end
-      
     end
   end
 

data/lib/census_api/version.rb

@@ -1,3 +1,3 @@
 module CensusApi
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: census_api
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors: