yelp4r 1.1.0 → 1.2.0

data/Rakefile

@@ -37,9 +37,10 @@ begin
       "examples/yelp.rb"
     ]
     s.authors = ["Tom Cocca"]
-    s.add_dependency 'httparty'
+    s.add_dependency "httparty", ">= 0.6.1"
+    s.add_dependency "hashie", ">= 0.4.0"
+    s.add_dependency "rash", ">= 0.2.0"
     s.add_dependency 'nokogiri'
-    s.add_dependency 'mash'
     s.add_development_dependency "rspec"
   end
   Jeweler::GemcutterTasks.new

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :patch: 0
 :major: 1
-:minor: 1
 :build: 
+:minor: 2

data/examples/yelp.rb

@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/../lib/yelp4r'
 # http://www.yelp.com/developers/documentation
 
 # Initialize a new Yelp Client
-client = Yelp4r::Client.new('your_ywsid_key')
+client = Yelp4r::Client.new('your_ywsid_here')
 
 
 # Initialize a new Phone Search object
@@ -14,7 +14,7 @@ phone_search = Yelp4r::PhoneSearch.new(client)
 results = phone_search.search_by_phone_number('1234567890')
 
 # A response object is returned
-# The response is either a Mash Object or an array of Mash objects, these are hashes that have been converted into OpenStruct-esque objects
+# The response is either a Rash Object or an array of Rash objects, these are hashes that have been converted into OpenStruct-esque objects
 # Also all keys have been rubyified, eg:  results.body['camelCase] is now results.body.camel_case
 # The following response methods are available to all Yelp searches in the 3 search classes
 #   PhoneSearch, ReveiwSearch, NeighborhoodSearch
@@ -59,7 +59,7 @@ results = review_search.search_by_bounding_box(38, -122.6, 37.788022, -122.39979
 # This method accepts and optional param of 
 # :radius => max of 25
 results = review_search.search_by_geocode_and_radius(37.788022, -122.399797)
-results = review_search.search_by_geocode_and_radius(37.788022, -122.399797, :radius => .5)
+results = review_search.search_by_geocode_and_radius(37.788022, -122.399797, :radius => 0.5)
 results = review_search.search_by_geocode_and_radius(37.788022, -122.399797, :category => "bars", :radius => 1)
 
 # Search by location

data/lib/yelp4r.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'httparty'
-require 'mash'
-require 'rubyify_keys'
+require 'hashie'
+require 'rash'
 
 require 'yelp4r/client'
 require 'yelp4r/phone_search'

data/lib/yelp4r/response.rb

@@ -4,7 +4,7 @@ module Yelp4r
     attr_accessor :body
     
     def initialize(response)
-      @body = mash_response(response)
+      @body = rash_response(response)
     end
     
     def response_code
@@ -29,18 +29,18 @@ module Yelp4r
     
     private
     
-    def mash_response(response)
+    def rash_response(response)
       if response.is_a?(Array)
         @body = []
         response.each do |b|
           if b.is_a?(Hash)
-            @body << Mash.new(b.rubyify_keys!)
+            @body << Hashie::Rash.new(b)
           else
             @body << b
           end
         end
       elsif response.is_a?(Hash)
-        @body = Mash.new(response.rubyify_keys!)
+        @body = Hashie::Rash.new(response)
       else
         @body = response
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yelp4r
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Tom Cocca
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-09 00:00:00 -05:00
+date: 2010-11-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,20 +20,30 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.6.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: hashie
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.4.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rash
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mash
+  name: nokogiri
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -67,7 +77,6 @@ files:
 - Rakefile
 - VERSION.yml
 - examples/yelp.rb
-- lib/rubyify_keys.rb
 - lib/yelp4r.rb
 - lib/yelp4r/categories.rb
 - lib/yelp4r/client.rb

data/lib/rubyify_keys.rb

@@ -1,29 +0,0 @@
-class Hash
- 
-  # Converts all of the keys to strings, optionally formatting key name
-  def rubyify_keys!
-    keys.each{|k|
-      v = delete(k)
-      new_key = k.to_s.to_underscore!
-      self[new_key] = v
-      v.rubyify_keys! if v.is_a?(Hash)
-      v.each{|p| p.rubyify_keys! if p.is_a?(Hash)} if v.is_a?(Array)
-    }
-    self
-  end
- 
-end
-
-class String
-  
-  # converts a camel_cased string to a underscore string, 
-  # Same way ActiveSupport does string.underscore
-  def to_underscore!
-    self.to_s.gsub(/::/, '/').
-      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-      gsub(/([a-z\d])([A-Z])/,'\1_\2').
-      tr("-", "_").
-      downcase
-  end
-  
-end