simplegeo 0.0.3 → 0.1.0

data/lib/simplegeo.rb

@@ -1,177 +1,2 @@
-require 'rubygems'
-
-gem 'crack', '~> 0.1.7'
-require 'crack'
-
-gem 'oauth', '>= 0.3.6'
-require 'oauth'
-
-gem 'json', '>= 1.2.2'
-require 'json'
-
-require 'forwardable'
-require 'uri'
-
-# This is a client for accessing Simplegeo's REST APIs
-# for full documentation see:
-# http://help.simplegeo.com/faqs/api-documentation/endpoints
-
-class Simplegeo
-  BASE_URI = 'http://api.simplegeo.com'
-  VER = '0.1'
-  attr_accessor :layer
-  attr_reader :access_token
-
-  extend Forwardable
-  def_delegators :access_token, :get, :post, :put, :delete
-
-  class NotAuthorized < StandardError; end
-  class NotFound < StandardError; end
-  class InternalError < StandardError; end
-
-  # initialize a new client with a acess key, secret key, and a default layer
-  def initialize(key, secret, layer = nil)
-    @access_token = self.class.get_access_token(key, secret)
-    @layer = layer
-  end
- 
-  # find nearby objects given a lat & lng
-  # by default, only searches the the current layer
-  def nearby(lat, lng, options = {})
-    options[:layers] ||= [self.layer]
-    perform_get("/nearby/#{lat},#{lng}.json", :query => options)
-  end
-
-  # reverse geocodes a lat & lng
-  def nearby_address(lat, lng, options = {})
-    perform_get("/nearby/address/#{lat},#{lng}.json", :query => options)
-  end
-
-  def user_stats
-    perform_get("/stats.json")
-  end
-
-  def layer_stats
-    perform_get("/stats/#{layer}.json")
-  end
-
-  class Records
-    def initialize(simplegeo) #:nodoc:
-      @simplegeo = simplegeo
-    end
-
-    # get a record by id
-    def get(id)
-      @simplegeo.records_dispatch(:get, id)
-    end
-
-    # put a record by id
-    # data should be a hash with at least lat & lon keys, as well as extra data
-    def put(id, data)
-      @simplegeo.records_dispatch(:put, id, data)
-    end
-
-    # delete a record by id
-    def delete(id)
-      @simplegeo.records_dispatch(:delete, id)
-    end
-
-    # get the history of a record by id
-    def history(id)
-      @simplegeo.records_dispatch(:get_history, id)
-    end
-  end
-
-  # used to access record APIs
-  # i.e. client.records.get(1)
-  def records
-    Records.new(self)
-  end
-
-  def records_dispatch(operation, id, body = nil) #:nodoc:
-    case operation
-    when :get_history
-      perform(:get, "/records/#{layer}/#{id}/history.json")
-    when :put
-      perform(:put, "/records/#{layer}/#{id}.json", :body => build_feature(id, body))
-    else
-      perform(operation, "/records/#{layer}/#{id}.json")
-    end
-  end
-
-  protected
-
-  def self.get_access_token(key, secret)
-    consumer = OAuth::Consumer.new(key,secret, :site => BASE_URI)
-    OAuth::AccessToken.new(consumer)
-  end
-
-  def perform(operation, path, options = {})
-    case operation
-    when :put, :post
-      handle_response(self.send(operation, build_uri(path, options), options[:body].to_json))
-    else
-      handle_response(self.send(operation, build_uri(path, options)))
-    end
-  end
-
-  def perform_get(path, options = {})
-    perform(:get, path, options)
-  end
-
-  def perform_delete(path, options = {})
-    perform(:delete, path, options)
-  end
-
-  def perform_put(path, options = {})
-    perform(:put, path, options)
-  end
-
-  def perform_post(path, options = {})
-    perform(:post, path, options)
-  end
-
-  def build_uri(path, options = {})
-    uri = URI.parse("/#{VER}#{path}")
-    uri.query = build_query(options[:query])
-    uri.to_s 
-  end
-
-  def build_query(query)
-    if query && query != {}
-      query.map do |k,v|
-        [k.to_s,v.to_s].join('=')
-      end.join('&')
-    end
-  end
-
-  def build_feature(id, body)
-    {:type => 'Feature', 
-     :id => id,
-     :created => body[:created],
-     :geometry => { :type => 'Point',
-                    :coordinates => [body[:lon], body[:lat]]},
-     :properties => body.reject{|k,v| [:created, :lat, :lon].include?(k) }}
-  end
-
-  def handle_response(response)
-    raise_errors(response)
-    parse(response)
-  end
-
-  def raise_errors(response)
-    case response.code.to_i
-      when 401
-        raise NotAuthorized.new "(#{response.code}): #{response.message}"
-      when 404
-        raise NotFound.new "(#{response.code}): #{response.message}"
-      when 500
-        raise InternalError.new "(#{response.code}): #{response.message}"
-    end
-  end
- 
-  def parse(response)
-    Crack::JSON.parse(response.body)
-  end
-
-end
+# So you can require "simplegeo" instead of "simple_geo"
+require "simple_geo"

data/simplegeo.gemspec

@@ -5,37 +5,54 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simplegeo}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Scott Windsor"]
-  s.date = %q{2010-06-16}
-  s.description = %q{a simplegeo client written in ruby.  see http://help.simplegeo.com/faqs/api-documentation/endpoints for more info.}
-  s.email = %q{swindsor@gmail.com}
+  s.authors = ["Dan Dofter"]
+  s.date = %q{2010-05-12}
+  s.email = %q{dan@dofter.com}
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
+    ".document",
+     ".gitignore",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "lib/simple_geo.rb",
+     "lib/simple_geo/client.rb",
+     "lib/simple_geo/connection.rb",
+     "lib/simple_geo/endpoint.rb",
+     "lib/simple_geo/hash_utils.rb",
+     "lib/simple_geo/record.rb",
      "lib/simplegeo.rb",
      "simplegeo.gemspec",
-     "spec/simplegeo_spec.rb",
+     "spec/client_spec.rb",
+     "spec/fixtures/contains.json",
+     "spec/fixtures/get_density_by_day.json",
+     "spec/fixtures/get_density_by_hour.json",
+     "spec/fixtures/get_history.json",
+     "spec/fixtures/get_nearby.json",
+     "spec/fixtures/get_record.json",
+     "spec/fixtures/get_records.json",
+     "spec/fixtures/layer_info.json",
+     "spec/fixtures/nearby_address.json",
+     "spec/fixtures/no_such_record.json",
+     "spec/fixtures/nonetype_not_iterable.json",
+     "spec/fixtures/overlaps.json",
      "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/test_keys.yml"
+     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/sentientmonkey/simplegeo-ruby}
+  s.homepage = %q{http://github.com/simplegeo/simplegeo-ruby}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{a simplegeo client written in ruby}
+  s.summary = %q{A SimpleGeo Ruby Client}
   s.test_files = [
-    "spec/simplegeo_spec.rb",
+    "spec/client_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -44,24 +61,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_development_dependency(%q<hanna>, [">= 0.1.12"])
-      s.add_runtime_dependency(%q<oauth>, [">= 0.3.6"])
-      s.add_runtime_dependency(%q<crack>, [">= 0.1.7"])
-      s.add_runtime_dependency(%q<json>, [">= 1.2.2"])
+      s.add_runtime_dependency(%q<oauth>, [">= 0.4.0"])
+      s.add_runtime_dependency(%q<json_pure>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.0"])
+      s.add_development_dependency(%q<fakeweb>, [">= 1.2.0"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_dependency(%q<hanna>, [">= 0.1.12"])
-      s.add_dependency(%q<oauth>, [">= 0.3.6"])
-      s.add_dependency(%q<crack>, [">= 0.1.7"])
-      s.add_dependency(%q<json>, [">= 1.2.2"])
+      s.add_dependency(%q<oauth>, [">= 0.4.0"])
+      s.add_dependency(%q<json_pure>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 1.2.0"])
+      s.add_dependency(%q<fakeweb>, [">= 1.2.0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
-    s.add_dependency(%q<hanna>, [">= 0.1.12"])
-    s.add_dependency(%q<oauth>, [">= 0.3.6"])
-    s.add_dependency(%q<crack>, [">= 0.1.7"])
-    s.add_dependency(%q<json>, [">= 1.2.2"])
+    s.add_dependency(%q<oauth>, [">= 0.4.0"])
+    s.add_dependency(%q<json_pure>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 1.2.0"])
+    s.add_dependency(%q<fakeweb>, [">= 1.2.0"])
   end
 end