spacialdb 0.0.2 → 0.0.3

data/lib/spacialdb/client.rb

@@ -52,6 +52,27 @@ class Spacialdb::Client
     delete("/api/databases/#{name}", :accept => 'json').to_s
   end
 
+  # Get a list of layers on the database
+  def list_layers()
+    json_decode get("/api/layers", :accept => 'json').to_s
+  end
+
+  def show_layer(name)
+    json_decode get("/api/layers/#{name}", :accept => 'json').to_s
+  end
+
+  def add_layer(name, database, table_name=nil, srid=4326)
+    payload = {:name => name, :database => database}
+    payload.merge!(:table_name => table_name) unless table_name == nil
+    payload.merge!(:srid => srid) unless srid == 4326
+
+    post('/api/layers', payload, :accept => 'json')
+  end
+
+  def remove_layer(name)
+    delete("/api/layers/#{name}", :accept => 'json').to_s
+  end
+
   def get(uri, extra_headers={})    # :nodoc:
     process(:get, uri, extra_headers)
   end
@@ -105,8 +126,7 @@ class Spacialdb::Client
   def resource(uri, options={})
     RestClient.proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
     resource = RestClient::Resource.new(realize_full_uri(uri),
-      :user => login,
-      :password => password
+      options.merge(:user => login, :password => password)
     )
     resource
   end

data/lib/spacialdb/command.rb

@@ -103,7 +103,9 @@ module Spacialdb
       run "login"
       retry
     rescue RestClient::ResourceNotFound => e
-      error extract_not_found(e.http_body)
+      error extract_error(e.http_body) {
+        e.http_body =~ /^[\w\s]+ not found$/ ? e.http_body : "Resource not found"
+      }
     rescue RestClient::Locked => e
       db = e.response.headers[:x_confirmation_required]
       message = extract_error(e.response.body)
@@ -127,12 +129,9 @@ module Spacialdb
       commands[cmd] || commands[command_aliases[cmd]]
     end
 
-    def self.extract_not_found(body)
-      body =~ /^[\w\s]+ not found$/ ? body : "Resource not found"
-    end
-
     def self.extract_error(body)
-      msg = parse_error_json(body) || parse_error_plain(body) || 'Internal server error'
+      default_error = block_given? ? yield : "Internal server error"
+      msg = parse_error_json(body) || parse_error_plain(body) || default_error
       msg.split("\n").map { |line| ' !   ' + line }.join("\n")
     end
 

data/lib/spacialdb/command/base.rb

@@ -1,5 +1,5 @@
 require "fileutils"
-require "spacialdb/client"
+require "spacialdb/auth"
 require "spacialdb/command"
 
 class Spacialdb::Command::Base

data/lib/spacialdb/command/db.rb

@@ -1,6 +1,6 @@
 require "spacialdb/command/base"
 
-# manage databases (create, destroy)
+# manage databases (list, create, destroy)
 #
 class Spacialdb::Command::Db < Spacialdb::Command::Base
 

data/lib/spacialdb/command/help.rb

@@ -5,7 +5,7 @@ require "spacialdb/deprecated/help"
 #
 class Spacialdb::Command::Help < Spacialdb::Command::Base
 
-  PRIMARY_NAMESPACES = %w( auth db )
+  PRIMARY_NAMESPACES = %w( auth db layers )
 
   include Spacialdb::Deprecated::Help
 

data/lib/spacialdb/command/layers.rb

@@ -0,0 +1,64 @@
+require "spacialdb/command/base"
+
+# manage layers (list, create, destroy)
+#
+class Spacialdb::Command::Layers < Spacialdb::Command::Base
+
+  # layers
+  #
+  # list your layers
+  #
+  def index
+    display spacialdb.list_layers.join("\n")
+  end
+
+  # layers:add NAME
+  #
+  # add a new layer to a database
+  #
+  # NAME should be the name of the layer.
+  #
+  # --db DATABASE         # name of the database
+  # --tablename TABLENAME # name of the table in the database (defaults to NAME)
+  # --srid SRID           # srid (defaults to 4326)
+  #
+  def add
+    tablename = extract_option('--tablename', nil)
+    srid = extract_option('--srid') || 4326 
+    srid = srid.to_i rescue 4326
+
+    name    = args.shift.downcase.strip rescue ''
+    raise(Spacialdb::Command::CommandFailed, "Invalid name.") if name == ''
+
+    database = extract_option('--db', nil)
+    raise(Spacialdb::Command::CommandFailed, "Invalid database.") if database == nil
+
+    display spacialdb.add_layer(name, database, tablename, srid)
+  end
+  
+  # layers:info NAME
+  #
+  # show the layer info
+  #
+  # NAME should be the name of the layer.
+  #
+  def info
+    name    = args.shift.downcase.strip rescue ''
+    raise(Spacialdb::Command::CommandFailed, "Invalid name.") if name == ''
+
+    display spacialdb.show_layer(name)
+  end
+
+  # layers:remove NAME
+  #
+  # remove a layer
+  #
+  # NAME should be the name of the layer.
+  #
+  def remove
+    name    = args.shift.downcase.strip rescue ''
+    raise(Spacialdb::Command::CommandFailed, "Invalid name.") if name == ''
+
+    display spacialdb.remove_layer(name)
+  end
+end

data/lib/spacialdb/version.rb

@@ -1,3 +1,3 @@
 module Spacialdb
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/vendor/okjson.rb

@@ -28,7 +28,6 @@ require 'stringio'
 module OkJson
   extend self
 
-  class ParserError < ::StandardError; end
 
   # Decodes a json document in string s and
   # returns the corresponding ruby value.
@@ -166,7 +165,7 @@ module OkJson
   end
 
 
-  # Sans s and returns a list of json tokens,
+  # Scans s and returns a list of json tokens,
   # excluding white space (as defined in RFC 4627).
   def lex(s)
     ts = []
@@ -186,7 +185,7 @@ module OkJson
 
   # Scans the first token in s and
   # returns a 3-element list, or nil
-  # if no such token exists.
+  # if s does not begin with a valid token.
   #
   # The first list element is one of
   # '{', '}', ':', ',', '[', ']',
@@ -579,4 +578,4 @@ module OkJson
   Spc = ' '[0]
   Unesc = {?b=>?\b, ?f=>?\f, ?n=>?\n, ?r=>?\r, ?t=>?\t}
   Hex = '0123456789abcdef'
-end
+end

data/spec/auth_spec.rb

@@ -5,7 +5,12 @@ module Spacialdb
   describe Auth do
     before do
       @cli = Spacialdb::Auth
+      @cli.stub!(:check)
+      @cli.stub!(:display)
+      @cli.stub!(:running_on_a_mac?).and_return(false)
       @cli.stub!(:set_credentials_permissions)
+      @cli.credentials = nil
+
       FakeFS.activate!
 
       File.open(@cli.credentials_file, "w") do |file|

data/spec/spec_helper.rb

@@ -29,27 +29,25 @@ def execute(command_line)
   Spacialdb::Command.load
   object, method = Spacialdb::Command.prepare_run(command, args)
 
-  $command_output = []
+  $command_output = ""
 
   def object.print(line=nil)
-    last_line = $command_output.pop || ""
-    last_line.concat(line)
-    $command_output.push last_line
+    $command_output << "#{line}"
   end
 
   def object.puts(line=nil)
-    $command_output << line
+    print("#{line}\n")
   end
 
   def object.error(line=nil)
-    $command_output << line
+    puts(line)
   end
 
   object.send(method)
 end
 
 def output
-  ($command_output || []).join("\n")
+  $command_output.gsub(/\n$/, '')
 end
 
 def run(command_line)
@@ -68,11 +66,26 @@ def capture_stdout(&block)
   fake.string
 end
 
+def fail_command(message)
+  raise_error(Spacialdb::Command::CommandFailed, message)
+end
+
+def stub_core
+  stubbed_core = nil
+  any_instance_of(Spacialdb::Client) do |core|
+    stubbed_core = stub(core)
+  end
+  stub(Spacialdb::Auth).user.returns("user")
+  stub(Spacialdb::Auth).password.returns("pass")
+  stub(Spacialdb::Client).auth.returns("apikey01")
+  stubbed_core
+end
+
 module Spacialdb::Helpers
   def display(msg, newline=true)
   end
 end
 
-Rspec.configure do |config|
+RSpec.configure do |config|
   config.color_enabled = true
 end

metadata

@@ -2,7 +2,7 @@
 name: spacialdb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Shoaib Burq
@@ -11,7 +11,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-11 00:00:00 Z
+date: 2011-08-26 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
@@ -24,7 +25,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: Ruby client for SpacialDB
+description: Client gem for SpacialDB a cloud hosted Geospatial data store.
 email: 
 - shoaib@nomad-labs.com
 - kashif@nomad-labs.com
@@ -43,6 +44,7 @@ files:
 - lib/spacialdb/command/base.rb
 - lib/spacialdb/command/db.rb
 - lib/spacialdb/command/help.rb
+- lib/spacialdb/command/layers.rb
 - lib/spacialdb/command/version.rb
 - lib/spacialdb/command.rb
 - lib/spacialdb/deprecated/help.rb
@@ -59,7 +61,8 @@ files:
 - spec/command/version_spec.rb
 - spec/commmad_spec.rb
 - spec/spec_helper.rb
-homepage: http://spacialdb.com
+has_rdoc: true
+homepage: http://spacialdb.com/
 licenses: []
 
 post_install_message: 
@@ -82,10 +85,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Client gem for SpacialDB cloud hosting
+summary: Ruby CLI for SpacialDB.
 test_files: 
 - spec/auth_spec.rb
 - spec/client_spec.rb