lib/clever-ruby/util.rb in clever-ruby-0.3.1 vs lib/clever-ruby/util.rb in clever-ruby-0.4.0

@@ -1,17 +1,18 @@
 module Clever
+  # LibraryhHelper methods
   module Util
     def self.objects_to_ids(h)
       case h
       when APIResource
         h.id
       when Hash
         res = {}
-        h.each { |k, v| res[k] = objects_to_ids(v) unless v.nil? }
+        h.each { |k, v| res[k] = objects_to_ids v unless v.nil? }
         res
       when Array
-        h.map { |v| objects_to_ids(v) }
+        h.map { |v| objects_to_ids v }
       else
         h
       end
     end
 
@@ -22,82 +23,80 @@
         'teachers'  => Teacher,
         'districts' => District,
         'schools'   => School,
         'events'    => Event
       }
-      types.fetch(type)
+      types.fetch type
     end
 
     def self.convert_to_clever_object(resp)
       case resp
       when Array
-        resp.map { |i| convert_to_clever_object(i) }
+        resp.map { |i| convert_to_clever_object i }
       when Hash
-        # Try converting to a known object class.  If none available, fall back to generic APIResource
-        # match = /\/v1.1\/([a-z]+)\/\S+$/.match(resp[:uri])
-        # puts match[1].inspect
-        if klass_name = /\/v1.1\/([a-z]+)\/\S+$/.match(resp[:uri])[1]
-          klass = types_to_clever_class(klass_name)
-        end
+        # Try converting to a known object class. If none available, fall back to generic
+        # APIResource.
+        klass_name = %r{/v1.1/([a-z]+)/\S+$}.match(resp[:uri])[1]
+        klass = types_to_clever_class klass_name if klass_name
         klass ||= CleverObject
-        klass.construct_from(resp[:data])
+        klass.construct_from resp[:data]
       else
         resp
       end
     end
 
     def self.file_readable(file)
-      begin
-        File.open(file) { |f| }
-      rescue
-        false
-      else
-        true
-      end
+      File.open(file) {}
+    rescue
+      false
+    else
+      true
     end
 
     def self.symbolize_names(object)
       case object
       when Hash
         new = {}
         object.each do |key, value|
-          key = (key.to_sym rescue key) || key
-          new[key] = symbolize_names(value)
+          begin
+            key = key.to_sym
+          end
+          new[key] = symbolize_names value
         end
         new
       when Array
-        object.map { |value| symbolize_names(value) }
+        object.map { |value| symbolize_names value }
       else
         object
       end
     end
 
     def self.encode_key(key)
-      URI.escape(key.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+      URI.escape key.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")
     end
 
-    def self.flatten_params(params, parent_key=nil)
+    def self.flatten_params(params, parent_key = nil)
       result = []
       params.each do |key, value|
-        calculated_key = parent_key ? "#{parent_key}[#{encode_key(key)}]" : encode_key(key)
-        if value.is_a?(Hash)
-          result += flatten_params(value, calculated_key)
-        elsif value.is_a?(Array)
-          result += flatten_params_array(value, calculated_key)
+        calculated_key = parent_key ? "#{parent_key}[#{encode_key key}]" : encode_key(key)
+        if value.is_a? Hash
+          result += flatten_params value, calculated_key
+        elsif value.is_a? Array
+          result += flatten_params_array value, calculated_key
         else
           result << [calculated_key, value]
         end
       end
       result
     end
 
     def self.flatten_params_array(value, calculated_key)
       result = []
       value.each do |elem|
-        if elem.is_a?(Hash)
-          result += flatten_params(elem, calculated_key)
-        elsif elem.is_a?(Array)
-          result += flatten_params_array(elem, calculated_key)
+        if elem.is_a? Hash
+          result += flatten_params elem, calculated_key
+        elsif elem.is_a? Array
+          result += flatten_params_array elem, calculated_key
         else
           result << ["#{calculated_key}[]", elem]
         end
       end
       result