policymap_wrap 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4241a7309e07251b272b7feb04aa8abfae58e86b
-  data.tar.gz: 6ba8fa4e33c85e7ee4da876c541c102743d2954b
+  metadata.gz: 0f185ed4a2bb58653a469276d87771b09f65439c
+  data.tar.gz: 10069fc06644d7d16efddb0aa03d2d01fd6874d6
 SHA512:
-  metadata.gz: 44d445671782ee826e6a3ec05f0f1d902f044541493a149cad6150e216d2afd6544a519bca37e1b6955ef2c786a4ef7bdba21711efb6a7c2a73d64dffd544c88
-  data.tar.gz: 1388e55d59d4ecab6439b3009eeb5e52720fb0a48661d3ed5f1bf785b590f8f5058af8ae60197f4c02d7b54d56da0c5c8798cb24795280c2d20088295e072be8
+  metadata.gz: 7e5845dfb609f079d5bb0e66b2267c6ddc18631ad4c6d4b81221e660f3e2330135ad779988fe6baf7c34e2b85da017b14d3727a3656dcb3ae9bcbf0ab52bf3a9
+  data.tar.gz: 12fc72f21c2a6f6ad499d47ba004279e7b5a049ac4fae749ed978dd63651a0f8034d12a8abe52a4c91f7b022af5997441f4eecaf5962064bbd31dcc4b6456145

data/Gemfile

@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gemspec

data/Gemfile.lock

@@ -0,0 +1,20 @@
+PATH
+  remote: .
+  specs:
+    policymap_wrap (1.0.0)
+      rest-client (~> 1.6)
+      yajl-ruby (~> 1.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    mime-types (1.23)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    yajl-ruby (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  policymap_wrap!

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/policymap_wrap/client.rb

@@ -2,26 +2,60 @@ module PolicyMap
 
   class Client
 
-    BOUNDARY_TYPES = { :state => 2, :county => 4, :city => 16, :zip => 8, :census_tract => 6,
-                       :block_group => 15, :congressional_district => 23, :assembly_district => 49,
-                       :senate_district => 48, :all => 'all' }
-
-    INDICATORS = { :total_population => 9876598, :percent_african_american => 9876222, :percent_asian => 9876202,
-                   :percent_pacific_islander => 9876468, :percent_hispanic => 9876280, :percent_native_american => 9876623,
-                   :percent_mixed_race => 9876437, :percent_under_18 => 9869063, :percent_65_or_older => 9869059,
-                   :percent_foreign_born => 9869060, :percent_disabled => 9869050, :percent_high_school_or_less => 9873913,
-                   :percent_college_degree => 9873916, :percent_graduate_degree => 9873904, :median_home_value => 9873606,
-                   :median_rent => 9873661, :percent_moved_in_since_1990 => 9873776, :percent_homeowners => 9873049,
-                   :vacancy_rate => 9876608, :median_household_income => 9871831, :poverty_rate => 9871807,
-                   :percent_white => 9876415, :percent_households_wo_car => 0, :average_vehicles_per_household => 9873779,
-                   :percent_who_commute_to_work_using_public_transit => 9873811, :unemployment_rate => 9841103,
-                   :independent_artists => 9618303, :performing_arts_and_spectator_sports => 9584608,
-                   :movie_and_sound_industries => 9584731, :mueseums_and_historical_sites => 9584676,
-                   :publishing_industries => 9584638, :broadcasting => 9584691, :other_info_services => 9584624, :all => 'all' }
+    BOUNDARY_TYPES = {
+      :state                  => 2,
+      :county                 => 4,
+      :census_tract           => 6,
+      :zip                    => 8,
+      :block_group            => 15,
+      :city                   => 16,
+      :congressional_district => 23,
+      :assembly_district      => 25,
+      :senate_district        => 24
+    }.freeze
+
+    INDICATORS = {
+      :average_vehicles_per_household                   => 9873779,
+      :broadcasting                                     => 9584691,
+      :distressed_community                             => 9629156,
+      :percent_homeowners                               => 9873049,
+      :total_population                                 => 9876593,
+      :independent_artists                              => 9618303,
+      :median_gross_rent                                => 9873661,
+      :median_gross_rent_2009                           => 9873663,
+      :median_home_value                                => 9873606,
+      :median_household_income                          => 9871831,
+      :movie_and_sound_industries                       => 9584731,
+      :museums_and_historical_sites                     => 9584676,
+      :other_info_services                              => 9584624,
+      :percent_moved_in_since_1990                      => 9873776,
+      :percent_who_commute_to_work_using_public_transit => 9873811,
+      :percent_african_american                         => 9876222,
+      :percent_native_american                          => 9876623,
+      :percent_asian                                    => 9876202,
+      :percent_foreign_born                             => 9869060,
+      :percent_hispanic                                 => 9876280,
+      :percent_pacific_islander                         => 9876468,
+      :poverty_rate                                     => 9871807,
+      :percent_disabled                                 => 9869050,
+      :percent_65_or_older                              => 9869059,
+      :percent_under_18                                 => 9869063,
+      :percent_college_degree                           => 9873916,
+      :percent_high_school_or_less                      => 9873913,
+      :percent_mixed_race                               => 9876437,
+      :percent_vacant_units                             => 9631221,
+      :percent_white                                    => 9876415,
+      :percent_graduate_degree                          => 9873904,
+      :performing_arts_and_spectator_sports             => 9584608,
+      :publishing_industries                            => 9584638,
+      :unemployment_rate                                => 9841103,
+      :vacancy_rate                                     => 9876608
+    }.freeze
 
     @@connection = nil
     @@debug = false
     @@default_options = nil
+    @@boundary_types_by_id = nil
 
     class << self
 
@@ -57,17 +91,17 @@ module PolicyMap
 
         raise InsufficientArgsForSearch unless options.has_key?(:boundary_types) && options.has_key?(:query)
 
-        options[:boundary_types] = Array(options[:boundary_types]).collect {|bt| BOUNDARY_TYPES[bt] }.join(',')
+        options[:boundary_types] = sanitized_boundary_types(options[:boundary_types])
         HashUtils.rename_key!(options, :boundary_types, :bt)
-        HashUtils.rename_key!(options, :query, :s)
-        HashUtils.rename_key!(options, :state, :st) if options.has_key?(:state)
-        HashUtils.rename_key!(options, :county, :co) if options.has_key?(:county)
-        HashUtils.rename_key!(options, :census_tract, :ct) if options.has_key?(:census_tract)
+        HashUtils.rename_key!(options, :query, :ss)
+        HashUtils.rename_key!(options, :state, :sst) if options.has_key?(:state)
+        HashUtils.rename_key!(options, :county, :sco) if options.has_key?(:county)
+        HashUtils.rename_key!(options, :census_tract, :sct) if options.has_key?(:census_tract)
 
         options = default_options.merge(options)
 
         result = get(Endpoint.endpoint_url, options)
-        result['sch'].collect {|hsh| HashUtils.symbolize_keys(hsh) }
+        result['sch']
       end
 
       def boundary_search(*args)
@@ -78,7 +112,7 @@ module PolicyMap
 
         raise InsufficientArgsForSearch unless options.has_key?(:boundary_types) || options.has_key?(:boundary_ids)
 
-        options[:boundary_types] = Array(options[:boundary_types]).collect {|bt| BOUNDARY_TYPES[bt] }.join(',') if options.has_key?(:boundary_types)
+        options[:boundary_types] = sanitized_boundary_types(options[:boundary_types])
         options[:boundary_ids] = Array(options[:boundary_ids]).join(',') if options.has_key?(:boundary_ids)
         HashUtils.rename_key!(options, :boundary_types, :bt) if options.has_key?(:boundary_types)
         HashUtils.rename_key!(options, :boundary_ids, :bi) if options.has_key?(:boundary_ids)
@@ -87,7 +121,7 @@ module PolicyMap
         options = default_options.merge(options)
 
         result = get(Endpoint.endpoint_url, options)
-        HashUtils.recursively_symbolize_keys(result["bnd"])
+        result["bnd"]
       end
 
       def indicator_search(*args)
@@ -98,8 +132,8 @@ module PolicyMap
 
         raise InsufficientArgsForSearch unless options.has_key?(:indicators) && (options.has_key?(:boundary_types) || options.has_key?(:boundary_ids))
 
-        options[:indicators] = Array(options[:indicators]).collect {|i| INDICATORS[i] }.join(',')
-        options[:boundary_types] = Array(options[:boundary_types]).collect {|bt| BOUNDARY_TYPES[bt] }.join(',') if options.has_key?(:boundary_types)
+        options[:indicators] = sanitized_indicators(options[:indicators])
+        options[:boundary_types] = sanitized_boundary_types(options[:boundary_types])
         options[:boundary_ids] = Array(options[:boundary_ids]).join(',') if options.has_key?(:boundary_ids)
         HashUtils.rename_key!(options, :indicators, :ii)
         HashUtils.rename_key!(options, :boundary_types, :bt) if options.has_key?(:boundary_types)
@@ -109,18 +143,18 @@ module PolicyMap
         options = default_options.merge(options)
 
         result = get(Endpoint.endpoint_url, options)
-        HashUtils.recursively_symbolize_keys(result["ind"])
+        result["ind"]
       end
 
       def containment_search(*args)
         default_options = @@default_options
-        default_options[:t] = "cnt"
+        default_options[:t]  = 'bnd'
 
         options = extract_options!(args)
 
         raise InsufficientArgsForSearch unless options.has_key?(:boundary_types) && options.has_key?(:boundary_id)
 
-        options[:boundary_types] = Array(options[:boundary_types]).collect {|bt| BOUNDARY_TYPES[bt] }.join(',')
+        options[:boundary_types] = sanitized_boundary_types(options[:boundary_types])
         HashUtils.rename_key!(options, :boundary_types, :cbt)
         HashUtils.rename_key!(options, :boundary_id, :bi)
 
@@ -128,7 +162,7 @@ module PolicyMap
         options = default_options.merge(options)
 
         result = get(Endpoint.endpoint_url, options)
-        result['cnt'].first
+        result['bnd']
       end
 
       def get(endpoint, data=nil)
@@ -146,6 +180,24 @@ module PolicyMap
         end
       end
 
+      def sanitized_boundary_types(types)
+        # Convert :all to an array of all types
+        types = Array(types)
+        types = BOUNDARY_TYPES.keys if !types.empty? && :all == types.first.to_sym
+
+        # Convert symbols to a list of numbers
+        types.map { |bt| BOUNDARY_TYPES[bt] }.join(',')
+      end
+
+      def sanitized_indicators(indicators)
+        # Convert :all to an array of all types
+        indicators = Array(indicators)
+        indicators = INDICATORS.keys if !indicators.empty? && :all == indicators.first.to_sym
+
+        # Convert symbols to a list of numbers
+        indicators.map { |i| INDICATORS[i] }.join(',')
+      end
+
     end
 
   end

data/lib/policymap_wrap/connection.rb

@@ -48,7 +48,7 @@ module PolicyMap
       if debug
         puts "\nresponse: #{response.code}"
         puts "headers:"
-        response.header.each do |key, value|
+        response.headers.each do |key, value|
           puts "#{key}=#{value}"
         end
         puts "body:"

data/policymap_wrap.gemspec

@@ -11,11 +11,10 @@ Gem::Specification.new do |s|
   s.email = "mgomes@geminisbs.com"
 
   s.add_dependency "yajl-ruby", "~> 1.1.0"
-  s.add_dependency "rest-client", "~> 1.6"
+  s.add_dependency "rest-client", "~> 1.8"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 end
-

metadata

@@ -1,51 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: policymap_wrap
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mauricio Gomes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
 description: Ruby wrapper around the PolicyMap API v2
 email: mgomes@geminisbs.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
+- ".document"
+- ".gitignore"
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -69,17 +71,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper around the PolicyMap API v2