colincasey-arcserver.rb 0.0.1 → 0.0.2

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "arcserver.rb"
-    gem.summary = %Q{TODO}
+    gem.summary = %Q{Library for accessing ESRI ArcServer REST and SOAP APIs.}
     gem.email = "casey.colin@gmail.com"
     gem.homepage = "http://github.com/colincasey/arcserver.rb"
     gem.authors = ["Colin Casey"]

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/arcserver.rb.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{arcserver.rb}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Colin Casey"]
-  s.date = %q{2009-07-22}
+  s.date = %q{2009-09-23}
   s.email = %q{casey.colin@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -26,7 +29,6 @@ Gem::Specification.new do |s|
      "lib/arcserver/soap/map_server.rb",
      "lib/arcserver/url_helper.rb",
      "test/functional/soap/map_server_test.rb",
-     "test/functional/soap/portland_landbase_get_legend_info.yml",
      "test/test_helper.rb",
      "test/unit/map_server_test.rb",
      "test/unit/url_helper_test.rb"
@@ -35,7 +37,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.4}
-  s.summary = %q{TODO}
+  s.summary = %q{Library for accessing ESRI ArcServer REST and SOAP APIs.}
   s.test_files = [
     "test/test_helper.rb",
      "test/functional/soap/map_server_test.rb",

data/lib/arcserver/map_server.rb

@@ -15,8 +15,10 @@ module ArcServer
     def_delegators :rest_service, :export
 
     def initialize(url, opts = {})
-      @soap_service = opts[:soap_service] || SOAP::MapServer.new(url)
-      @rest_service = opts[:rest_service] || REST::MapServer.new(url)
+      raise Exception, "#{url} is not a valid map server url" unless map_server?(url)
+
+      @soap_service = opts[:soap_service] || SOAP::MapServer.new(to_soap(url))
+      @rest_service = opts[:rest_service] || REST::MapServer.new(to_rest(url))
     end
   end
 end

data/lib/arcserver/soap/map_server.rb

@@ -10,12 +10,11 @@ module ArcServer
       end
 
       def on_before_dispatch
-        self.class.instance_variable_set(:@uri, @soap_url)
+        self.class.endpoint(:uri => @soap_url, :version => 1)
       end
 
       def initialize(soap_url, protocol_version=2)
         @soap_url = soap_url
-        self.class.instance_variable_set(:@protocol_version, protocol_version)
       end
 
       def get_default_map_name
@@ -26,7 +25,7 @@ module ArcServer
 
       def get_legend_info(args = {})
         response = invoke("ns:GetLegendInfo") do |message|
-          message.add "MapName", args[:map_name]
+          message.add "MapName", args[:map_name] || get_default_map_name
         end
         node = response.document.xpath('//tns:GetLegendInfoResponse/Result', ns).first
         parse_legend_info_result(node)

data/lib/arcserver/url_helper.rb

@@ -10,6 +10,10 @@ module ArcServer
       url.to_s.match(/ArcGIS\/(?!rest\/).*/)
     end
 
+    def map_server?(url)
+      url.to_s.match(/\/MapServer$/)
+    end
+
     def to_rest(url)
       rest_service?(url) ? url : url.sub('/ArcGIS/', '/ArcGIS/rest/')
     end

data/lib/arcserver.rb

@@ -1,3 +1,3 @@
 # encoding: utf-8
 require 'arcserver/url_helper'
-require 'arcserver/map_server'
+require 'arcserver/map_server' 

data/test/functional/soap/map_server_test.rb

@@ -36,6 +36,18 @@ class ArcServer::SOAP::MapServerTest < Test::Unit::TestCase
         end
       end
     end
+
+    should "use the default map name when getting the legend info" do
+      legend_info = @service.get_legend_info
+      legend_info.each do |item|
+        layer_assertion = "assert_legend_info_result_layer_#{item[:layer_id]}".to_sym
+        if respond_to?(layer_assertion)
+          send(layer_assertion, item)
+        else
+          raise "no assertions set for legend info with layer_id=#{item[:layer_id]}"
+        end
+      end
+    end
   end
 
   # legend info assertion helpers
@@ -152,7 +164,7 @@ class ArcServer::SOAP::MapServerTest < Test::Unit::TestCase
   end
 
   def assert_symbol_image(expected, actual)
-    assert_equal expected[:image_data], actual[:image_data]
+    assert_not_nil expected[:image_data] if actual[:image_data]
     assert_equal expected[:image_url], actual[:image_url]
     assert_equal expected[:image_height] || 16, actual[:image_height]
     assert_equal expected[:image_width] || 20, actual[:image_width]

data/test/test_helper.rb

@@ -8,5 +8,5 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'arcserver'
 
-class Test::Unit::TestCase
-end
+class Test::Unit::TestCase 
+end    

data/test/unit/map_server_test.rb

@@ -2,10 +2,17 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class ArcServer::MapServerTest < Test::Unit::TestCase
+  should "raise an error if the required url is not a map server url" do
+    assert_raise(Exception) { ArcServer::MapServer.new('http://not.a.map/server/url') }
+  end
+
   context "verifying delegation of actions to the SOAP service" do
     setup do
       @mock_soap_service = mock
-      @map_server = ArcServer::MapServer.new('http://www.map.server/', :soap_service => @mock_soap_service)
+      @map_server = ArcServer::MapServer.new(
+        'http://sampleserver1.arcgisonline.com/ArcGIS/services/Demographics/ESRI_Census_USA/MapServer',
+        :soap_service => @mock_soap_service
+      )
     end
 
     should "forward get_default_map_name" do
@@ -22,7 +29,10 @@ class ArcServer::MapServerTest < Test::Unit::TestCase
   context "verifying delegation of actions to the REST service" do
     setup do
       @mock_rest_service = mock
-      @map_server = ArcServer::MapServer.new('http://www.map.server/', :rest_service => @mock_rest_service)
+      @map_server = ArcServer::MapServer.new(
+        'http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Demographics/ESRI_Census_USA/MapServer',
+        :rest_service => @mock_rest_service
+      )
     end
 
     should "forward get_default_map_name" do

data/test/unit/url_helper_test.rb

@@ -43,4 +43,12 @@ class ArcServer::UrlHelperTest < Test::Unit::TestCase
       assert !soap_service?(rest_url)
     end
   end
+
+  should "recognize a valid map server url" do
+    assert map_server?('http://sampleserver1.arcgisonline.com/ArcGIS/services/Demographics/ESRI_Census_USA/MapServer')
+  end
+
+  should "recognize an invalid map server url" do
+    assert !map_server?('http://not.a.map/server/url')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: colincasey-arcserver.rb
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Colin Casey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-22 00:00:00 -07:00
+date: 2009-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -36,12 +36,12 @@ files:
 - lib/arcserver/soap/map_server.rb
 - lib/arcserver/url_helper.rb
 - test/functional/soap/map_server_test.rb
-- test/functional/soap/portland_landbase_get_legend_info.yml
 - test/test_helper.rb
 - test/unit/map_server_test.rb
 - test/unit/url_helper_test.rb
 has_rdoc: false
 homepage: http://github.com/colincasey/arcserver.rb
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -62,10 +62,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: TODO
+summary: Library for accessing ESRI ArcServer REST and SOAP APIs.
 test_files: 
 - test/test_helper.rb
 - test/functional/soap/map_server_test.rb

data/test/functional/soap/portland_landbase_get_legend_info.yml

@@ -1,134 +0,0 @@
----
-symbol_image_defaults: &symbol_image_defaults
-  :image_data: 
-  :image_url: 
-  :image_height: 16
-  :image_width: 20
-  :image_dpi: 96
-transparent_color_defaults: &transparent_color_defaults
-  :use_windows_dithering: true
-  :alpha_value: 255
-  :red: 254
-  :green: 255
-  :blue: 255
-
-get_legend_info_result:
-  - :layer_id: 1
-    :name: Zoomed in
-    :legend_groups:
-      - :heading: 
-        :legend_classes:
-          - :label: 
-            :description: 
-            :symbol_image:
-              <<: *symbol_image_defaults
-              :image_data: |
-                iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAA
-                R0lEQVR4nGP89/8/AzUBC4wR4O9PkckbNm5kZGBgYGCihmHIZrAgC8JsIdcwBgaoC6kJRg0cNXAw
-                GIiSU6iRBanuQkZqF18AsvET5O8fag8AAAAASUVORK5CYII=
-
-            :transparent_color:
-              <<: *transparent_color_defaults
-  - :layer_id: 2
-    :name: Zoomed out
-    :legend_groups:
-      - :heading: 
-        :legend_classes:
-          - :label: 
-            :description: 
-            :symbol_image:
-              <<: *symbol_image_defaults
-              :image_data: |
-                iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAA
-                PklEQVR4nGP89/8/AzUBE1VNY2BgYIExAvz9KXbqho0bGVnQBcg1DOYgqnt51MBRA4elgShZjxr5
-                mZHaxRcATwAQChHiw9IAAAAASUVORK5CYII=
-
-            :transparent_color:
-              <<: *transparent_color_defaults
-  - :layer_id: 3
-    :name: Buildings
-    :legend_groups:
-    - :heading: 
-      :legend_classes:
-        - :label: 
-          :description: 
-          :symbol_image:
-            <<: *symbol_image_defaults
-            :image_data: |
-              iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAA
-              NElEQVR4nGP89/8/AzUBE1VNY2BgYIExZtTVUeTUjKYmRgYGGrhw1MBRA0cNJAYwDvrSBgCGTgoZ
-              cGsDFQAAAABJRU5ErkJggg==
-
-          :transparent_color:
-            <<: *transparent_color_defaults
-  - :layer_id: 4
-    :name: Zoning
-    :legend_groups:
-      - :heading: 
-        :legend_classes:
-          - :label: Commercial
-            :description: 
-            :symbol_image:
-              <<: *symbol_image_defaults
-              :image_data: |
-                iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAA
-                NElEQVR4nGP89/8/AzUBE1VNY2BgYIExXjAyUuRUif//GRkYaODCUQNHDRw1kBjAOOhLGwBbzgoZ
-                pkxTgAAAAABJRU5ErkJggg==
-
-            :transparent_color:
-              <<: *transparent_color_defaults
-          - :label: Industrial
-            :description: 
-            :symbol_image:
-              <<: *symbol_image_defaults
-              :image_data: |
-                iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAA
-                NElEQVR4nGP89/8/AzUBE1VNY2BgYIEx2hhXUuTUqv/hjAwMNHDhqIGjBo4aSAxgHPSlDQBtTgoZ
-                vbcuLAAAAABJRU5ErkJggg==
-
-            :transparent_color:
-              <<: *transparent_color_defaults
-          - :label: Residential
-            :description: 
-            :symbol_image:
-              <<: *symbol_image_defaults
-              :image_data: |
-                iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAA
-                NElEQVR4nGP89/8/AzUBE1VNY2BgYIExGBlKKHLqf4YeRgYGGrhw1MBRA0cNJAYwDvrSBgAaUgkZ
-                JEjqtwAAAABJRU5ErkJggg==
-
-            :transparent_color:
-              <<: *transparent_color_defaults          
-          - :label: Mixed use
-            :description: 
-            :symbol_image:
-              <<: *symbol_image_defaults
-              :image_data: |
-                iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAA
-                NElEQVR4nGP89/8/AzUBE1VNY2BgYIExvuW5UORUrkl7GBkYaODCUQNHDRw1kBjAOOhLGwCLTgoZ
-                Ubp19QAAAABJRU5ErkJggg==
-
-            :transparent_color:
-              <<: *transparent_color_defaults
-          - :label: Parks and open space
-            :description: 
-            :symbol_image:
-              <<: *symbol_image_defaults
-              :image_data: |
-                iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAA
-                OUlEQVR4nGP89/8/AzUBE1VNY2BgYIExGBkYKHLqfwYGRgYGGrhw1MBRA0cNJAbA8zIsL1IKqO5C
-                AJdcBiBRj7wXAAAAAElFTkSuQmCC
-
-            :transparent_color:
-              <<: *transparent_color_defaults
-          - :label: Rural
-            :description: 
-            :symbol_image:
-              <<: *symbol_image_defaults
-              :image_data: |
-                iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAA
-                NElEQVR4nGP89/8/AzUBE1VNY2BgYIExus+lU+TUUqOZjAwMNHDhqIGjBo4aSAxgHPSlDQCRTgoZ
-                WZnonwAAAABJRU5ErkJggg==
-
-            :transparent_color:
-              <<: *transparent_color_defaults