rgeoserver 0.5.8.2 → 0.5.9

data/lib/rgeoserver/resource.rb

@@ -10,7 +10,7 @@ module RGeoServer
       define_model_callbacks :initialize, :only => :after
 
       # mapping object parameters to profile elements
-      OBJ_ATTRIBUTES = {:enabled => 'enabled'} 
+      OBJ_ATTRIBUTES = {:enabled => 'enabled'}
       OBJ_DEFAULT_ATTRIBUTES = {:enabled => 'true'}
 
       define_attribute_methods OBJ_ATTRIBUTES.keys
@@ -36,19 +36,19 @@ module RGeoServer
       # @param [Array<String>] names
       # @param [Hash] options
       # @param [bool] check_remote if already exists in catalog and cache it
-      # @yield [RGeoServer::ResourceInfo] 
+      # @yield [RGeoServer::ResourceInfo]
       def self.list klass, catalog, names, options, check_remote = false, &block
         if names.nil?
           return []
         elsif !block_given?
           to_enum(:list, klass, catalog, names, options).to_a unless block_given?
-        else 
+        else
           (names.is_a?(Array)? names : [names]).each { |name|
             obj = klass.new catalog, options.merge(:name => name)
-            obj.new? if check_remote  
+            obj.new? if check_remote
             block.call(obj)
-          }        
-        end 
+          }
+        end
       end
 
       def initialize options
@@ -58,7 +58,7 @@ module RGeoServer
       def to_s
         "#{self.class.name}: #{name}"
       end
-  
+
       # Return full name of resource with namespace prefix
       def prefixed_name
         return "#{workspace.name}:#{name}" if self.respond_to?(:workspace)
@@ -66,22 +66,22 @@ module RGeoServer
       end
 
       def create_method
-        :post 
+        :post
       end
 
       def update_method
-        :put 
+        :put
       end
-  
+
       # We pass the old name "name_route" in case the name of the resource is being edited
       # Child classes should implement this
       def update_params name_route = name
-        { self.class.resource_name.downcase.to_sym => name_route }  
+        { self.class.resource_name.downcase.to_sym => name_route }
       end
 
       # Modify or save the resource
       # @param [Hash] options / query parameters
-      # @return [RGeoServer::ResourceInfo] 
+      # @return [RGeoServer::ResourceInfo]
       def save options = {}
         @previously_changed = changes
         @changed_attributes.clear
@@ -101,31 +101,31 @@ module RGeoServer
             else
               route = {@route => nil}
             end
-            
+
             options = create_options.merge(options) if self.respond_to?(:create_options)
-            @catalog.add(route, message, create_method, options) 
-            clear 
+            @catalog.add(route, message, create_method, options)
+            clear
           else
             options = update_params(name_route).merge(options)
             route = {@route => name_route}
-            @catalog.modify(route, message, update_method, options) #unless changes.empty? 
+            @catalog.modify(route, message, update_method, options) #unless changes.empty?
           end
 
           self
         end
       end
-     
+
       # Purge resource from Geoserver Catalog
       # @param [Hash] options
       # @return [RGeoServer::ResourceInfo] `self`
-      def delete options = {} 
+      def delete options = {}
         run_callbacks :destroy do
-          @catalog.purge({@route => @name}, options)  unless new?
+          @catalog.purge({@route => @name}, options) unless new?
           clear
           self
         end
       end
-      
+
       # Check if this resource already exists
       # @return [Boolean]
       def new?
@@ -138,13 +138,13 @@ module RGeoServer
         @changed_attributes = {}
       end
 
-      # Retrieve the resource profile as a hash and cache it 
-      # @return [Hash]        
+      # Retrieve the resource profile as a hash and cache it
+      # @return [Hash]
       def profile
-        if @profile 
+        if @profile
           return @profile
         end
-    
+
         @profile ||= begin
           h = profile_xml_to_hash(@catalog.search @route => @name )
           @new = false
@@ -153,7 +153,7 @@ module RGeoServer
           # The resource is new
           @new = true
           {}
-        end.freeze 
+        end.freeze
       end
 
       def profile= profile_xml
@@ -165,8 +165,8 @@ module RGeoServer
       end
 
       def profile_xml_to_hash profile_xml
-        raise NotImplementedError    
+        raise NotImplementedError
       end
 
     end
-end 
+end

data/lib/rgeoserver/utils/boundingbox.rb

@@ -0,0 +1,88 @@
+require 'rgeo'
+
+module RGeoServer
+  class BoundingBox
+    attr_accessor :minx, :miny, :maxx, :maxy
+
+    @@epsilon = 0.0001
+
+    def self.epsilon
+      @@epsilon
+    end
+
+    def self.epsilon= value
+      @@epsilon = value
+    end
+
+    def initialize
+      reset
+    end
+
+    def reset
+      @minx = @miny = @maxx = @maxy = 0.0
+      @empty = true
+    end
+
+    def add x, y
+      if @empty
+        @minx = @maxx = x
+        @miny = @maxy = y
+      end
+
+      @minx = [@minx, x].min
+      @miny = [@miny, y].min
+      @maxx = [@maxx, x].max
+      @maxy = [@maxy, y].max
+
+      @empty = false
+    end
+
+    def min
+      [@minx, @miny]
+    end
+
+    def max
+      [@maxx, @maxy]
+    end
+
+    def expand rate = @@epsilon
+      _minx, _miny = [@minx - rate, @miny - rate]
+      _maxx, _maxy = [@maxx + rate, @maxy + rate]
+
+      reset
+
+      add _minx, _miny
+      add _maxx, _maxy
+    end
+
+    def constrict rate = @@epsilon
+      expand -rate
+    end
+
+    def to_geometry
+      factory = RGeo::Cartesian::Factory.new
+
+      point_min, point_max = unless [@minx, @miny] == [@maxx, @maxy]
+        [factory.point(@minx, @miny), factory.point(@maxx, @maxy)]
+      else
+        [factory.point(@minx - @@epsilon, @miny - @@epsilon),
+         factory.point(@maxx + @@epsilon, @maxy + @@epsilon)]
+      end
+
+      line_string = factory.line_string [point_min, point_max]
+      line_string.envelope
+    end
+
+    def to_a
+      [@minx, @miny, @maxx, @maxy]
+    end
+
+    def to_s
+      to_a.join(', ')
+    end
+
+    def inspect
+      "#<#{self.class} #{to_s}>"
+    end
+  end
+end

data/lib/rgeoserver/utils/shapefile_info.rb

@@ -0,0 +1,89 @@
+require 'rgeo'
+require 'rgeo/shapefile'
+require 'zip/zip'
+
+module RGeoServer
+  class ShapefileInfo
+    class ShapefileInfoGeometryNotExpected < StandardError
+      def initialize geometry_type
+        @geometry_type = geometry_type
+      end
+
+      def message
+        "The geometry type %s was not expected." % geometry_type
+      end
+    end
+
+    attr_reader :file_path
+
+    def initialize file_path
+      @file_path = file_path
+    end
+
+    def bounds
+      resource_init
+
+      bbox = BoundingBox.new
+      RGeo::Shapefile::Reader.open(@shp_path) do |shp|
+        shp.each do |record|
+          geometry = record.geometry
+          envelope = geometry.envelope
+          envelope_type = envelope.geometry_type
+          points = case envelope_type
+                   when RGeo::Feature::Point
+                     [envelope]
+                   when RGeo::Feature::Polygon
+                     envelope.exterior_ring.points
+                   else
+                     raise ShapefileInfoGeometryNotExpected, envelope_type
+                   end
+          points.each { |point| bbox.add point.x, point.y }
+        end
+      end
+
+      resource_destroy
+
+      bbox.expand if [bbox.minx, bbox.miny] == [bbox.maxx, bbox.maxy]
+
+      bbox
+    end
+
+    def srid
+      resource_init
+
+      srid = 0
+      RGeo::Shapefile::Reader.open(@shp_path) do |shp|
+        srid = shp.factory.srid
+      end
+
+      resource_destroy
+
+      srid
+    end
+
+    private
+    def tmp_dir
+      @tmp_dir ||= Dir.mktmpdir
+    end
+
+    def resource_init
+      if @file_path =~ /\.zip$/i
+        Zip::ZipFile.open(@file_path) do |zipfile|
+          zipfile.glob('**/**').each do |entry_name|
+            dest_path = [tmp_dir, entry_name].join(File::SEPARATOR)
+            @shp_path = dest_path if entry_name.name =~ /\.shp$/i
+            zipfile.extract entry_name, dest_path
+          end
+        end
+      else
+        @shp_path = @file_path
+      end
+    end
+
+    def resource_destroy
+      FileUtils.rm_rf [tmp_dir]
+      @shp_path = nil
+      @tmp_dir = nil
+    end
+  end
+end

data/rgeoserver.gemspec

@@ -20,6 +20,9 @@ Gem::Specification.new do |s|
   s.add_dependency "activesupport"
   s.add_dependency "activemodel"
   s.add_dependency "confstruct"
+  s.add_dependency "rgeo"
+  s.add_dependency "rgeo-shapefile"
+  s.add_dependency "rubyzip"
 
   s.add_development_dependency("rake")
   s.add_development_dependency("shoulda")
@@ -28,5 +31,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("yard")
   s.add_development_dependency("equivalent-xml")
   s.add_development_dependency("jettywrapper")
+  s.add_development_dependency("pry")
+  s.add_development_dependency("debugger")
 end
-

data/spec/integration/geoserver_spec.rb

@@ -4,24 +4,25 @@ describe "Integration test against a GeoServer instance", :integration => true d
   CONFIG = RGeoServer::Config
 
   before(:all) do
+    RestClient.log = '/tmp/restclient.log'
     @catalog = RGeoServer.catalog
     @fixtures_dir = File.expand_path File.join(File.dirname(__FILE__), "/../fixtures/")
     @shapefile = File.expand_path File.join(@fixtures_dir, 'datasets/vector/granules.shp')
+    @shapefile_zip = File.expand_path File.join(@fixtures_dir, 'datasets/vector/granules.zip')
     @raster = File.expand_path File.join(@fixtures_dir, 'datasets/raster/test.tif')
   end
-  
-  
-  context "Namespaces" do 
+
+  context "Namespaces" do
     it "should instantiate a namespace resource" do
       obj = RGeoServer::Namespace.new @catalog, :name => 'test_ns'
       obj.new?.should == true
-    end  
+    end
 
     it "should get default namespace" do
-      obj = @catalog.get_default_namespace 
+      obj = @catalog.get_default_namespace
       obj.name.should_not be_empty
       obj.uri.should_not be_empty
-    end  
+    end
 
     it "should create a new namespace, update  and delete it right after" do
       obj = RGeoServer::Namespace.new @catalog, :name => 'test_ns', :uri => 'http://localhost'
@@ -35,15 +36,15 @@ describe "Integration test against a GeoServer instance", :integration => true d
       ws.delete :recurse => true unless ws.new?
       obj = RGeoServer::Namespace.new @catalog, :name => 'test_ns', :uri => 'http://localhost'
       obj.new?.should == true
-    end  
+    end
 
     it "should be in correspondence with workspaces" do
       pending "Make sure this also works on update and delete"
     end
   end
 
-  context "Workspaces" do 
-  
+  context "Workspaces" do
+
     it "should get default workspace" do
       w = @catalog.get_default_workspace
       w.name.should_not be_empty
@@ -59,12 +60,12 @@ describe "Integration test against a GeoServer instance", :integration => true d
       # Switch to a default namespace that does not exist (create it too)
       nws = RGeoServer::Workspace.new @catalog, :name => 'test_new_default_workspace'
       dws = @catalog.set_default_workspace 'test_new_default_workspace'
-      aws = @catalog.get_default_workspace 
+      aws = @catalog.get_default_workspace
       aws.name.should == nws.name
       aws.delete
       nws.new?.should == true # nws should not exist
       # Switch to a default workspace that exists
-      ws = @catalog.get_workspaces.first 
+      ws = @catalog.get_workspaces.first
       dws = @catalog.set_default_workspace ws.name
       ws.name.should == dws.name
     end
@@ -72,12 +73,12 @@ describe "Integration test against a GeoServer instance", :integration => true d
     it "should list workspaces" do
       @catalog.get_workspaces.each{ |obj|
         obj.profile.should_not be_nil
-      } 
+      }
     end
 
     it "should return workspace from catalog" do
       obj = @catalog.get_workspace 'topp'
-      obj.profile.should_not be_empty 
+      obj.profile.should_not be_empty
     end
 
     it "should instantiate an existing worskpace object" do
@@ -90,7 +91,7 @@ describe "Integration test against a GeoServer instance", :integration => true d
       obj = RGeoServer::Workspace.new @catalog, :name => 'test_ws'
       obj.delete(:recurse=>true) if !obj.new?
       obj.new?.should == true
-      obj.profile.should == {}  
+      obj.profile.should == {}
       obj.save
       obj.new?.should == false
       obj.enabled.should == 'true'
@@ -104,7 +105,7 @@ describe "Integration test against a GeoServer instance", :integration => true d
     end
 
     it "should fail trying to delete unexisting workspace names from catalog" do
-      lambda{ ["asdfdg", "test3", "test5", "test6"].each{ |w| 
+      lambda{ ["asdfdg", "test3", "test5", "test6"].each{ |w|
           @catalog.purge({:workspaces => w}, {:recurse  => true})
         }
       }.should raise_error
@@ -113,7 +114,7 @@ describe "Integration test against a GeoServer instance", :integration => true d
     context "Datastores of a Workspace" do
       before :all do
         @ws = RGeoServer::Workspace.new @catalog, :name => 'test_workspace_with_stores'
-        @ws.save 
+        @ws.save
       end
 
       after :all do
@@ -123,7 +124,7 @@ describe "Integration test against a GeoServer instance", :integration => true d
       it "should list datastore objects that belong to it" do
         ['s1', 's2', 's3'].each{ |s|
           ds = RGeoServer::DataStore.new @catalog, :workspace => @ws, :name => s
-          ds.save 
+          ds.save
         }
         @ws.data_stores do |ds|
           ds.should be_kind_of(RGeoServer::DataStore)
@@ -134,14 +135,23 @@ describe "Integration test against a GeoServer instance", :integration => true d
     end
   end
 
-  context "Layers" do 
+  context "Layers" do
+    before :each do
+      @ws = RGeoServer::Workspace.new @catalog, :name => 'test_workspace_for_layers'
+      @ws.save
+    end
+
+    after :each do
+      @ws.delete :recurse => true
+    end
+
     it "should instantiate a new layer" do
       lyr = RGeoServer::Layer.new @catalog, :name => 'layer_rgeoserver_test'
       lyr.new?.should == true
     end
 
     it "should not create a new layer directly" do
-      lyr = RGeoServer::Layer.new @catalog, :name => 'layer_rgeoserver_test' 
+      lyr = RGeoServer::Layer.new @catalog, :name => 'layer_rgeoserver_test'
       lyr.new?.should == true
       lyr.default_style = 'rain'
       lyr.alternate_styles = ['raster']
@@ -161,26 +171,29 @@ describe "Integration test against a GeoServer instance", :integration => true d
         'title' => 'New attribution title'
       }
       lyr.save
-      
+
       chklyr = RGeoServer::Layer.new @catalog, :name => original_name
       lyr.eql? chklyr
-    
+
       # Undo changes
       chklyr.attribution = original_attribution
       chklyr.save
       chklyr.attribution.eql? original_attribution
     end
-    
+
     it "should be created from a store" do
       # Create a Datastore and a feature type under the default workspace (set it up as nil)
-      ds = RGeoServer::DataStore.new @catalog, :workspace => nil, :name => 'test_shapefile2'
+      ds = RGeoServer::DataStore.new @catalog, :workspace => @ws, :name => 'test_shapefile2'
       ds.connection_parameters = {"url" => "file://#{@shapefile}"}
       ds.enabled = true
       ds.new?.should == true
       ds.save
-      ft = RGeoServer::FeatureType.new @catalog, :workspace => nil, :data_store => ds, :name => 'granules'
+
+      ft = RGeoServer::FeatureType.new @catalog, :workspace => @ws, :data_store => ds, :name => 'granules'
       ft.save
-  
+
+      ds.clear
+
       lyr = RGeoServer::Layer.new @catalog, :name => 'granules'
       lyr.new?.should == false
       lyr.resource.eql? ft
@@ -190,12 +203,57 @@ describe "Integration test against a GeoServer instance", :integration => true d
       lyr.new?.should == true
     end
 
+    it "should be created from a store with file upload" do
+      # Create a Datastore and a feature type under the default workspace (set it up as nil)
+      ds = RGeoServer::DataStore.new @catalog, :workspace => @ws, :name => 'test_granules'
+      ds.delete :recurse => true unless ds.new?
+
+      ds.enabled = true
+      ds.new?.should == true
+      ds.upload_file @shapefile_zip
+
+      ds.clear #reload DataStore
+
+      ft = RGeoServer::FeatureType.new @catalog, :workspace => @ws, :data_store => ds, :name => ds.name
+      ft.save
+
+      lyr = RGeoServer::Layer.new @catalog, :name => ds.name
+      lyr.new?.should == false
+      lyr.resource.eql? ft
+      ds.delete :recurse => true
+
+      # Check layer does not exist anymore after deleting the base store
+      lyr = RGeoServer::Layer.new @catalog, :name => ds.name
+      lyr.new?.should == true
+    end
+
+    it "should be created automatically from a store with file upload" do
+      # Create a Datastore and a feature type under the default workspace (set it up as nil)
+      ds = RGeoServer::DataStore.new @catalog, :workspace => @ws, :name => 'test_granules'
+      ds.delete :recurse => true unless ds.new?
+
+      ds.enabled = true
+      ds.new?.should == true
+      ds.upload_file @shapefile_zip, publish: true
+
+      ds.clear #reload DataStore
+
+      lyr = RGeoServer::Layer.new @catalog, :name => ds.name
+      lyr.new?.should == false
+      ds.delete :recurse => true
+
+      # Check layer does not exist anymore after deleting the base store
+      lyr = RGeoServer::Layer.new @catalog, :name => ds.name
+      lyr.new?.should == true
+    end
+
     it "should list layers" do
-      @catalog.get_layers.each { |l| 
+      @catalog.get_layers.each { |l|
         l.profile.should_not be_empty
       }
     end
-    it "should issue seed on an existing layer's cache" do 
+
+    it "should issue seed on an existing layer's cache" do
       pending "This certainly passes. We are skipping it since it is a CPU intensive operation"
       lyr = RGeoServer::Layer.new @catalog, :name => 'Arc_Sample'
       options = {
@@ -205,10 +263,10 @@ describe "Integration test against a GeoServer instance", :integration => true d
         :format => 'image/png',
         :threadCount => 1
       }
-      lyr.seed :issue, options 
+      lyr.seed :issue, options
     end
 
-    it "should truncate an existing layer's cache" do 
+    it "should truncate an existing layer's cache" do
       lyr = RGeoServer::Layer.new @catalog, :name => 'states'
       options = {
         #:gridSetId => 'EPSG:2163', # this was not found in sample data
@@ -224,24 +282,40 @@ describe "Integration test against a GeoServer instance", :integration => true d
             3291070.6104286816,
             959189.3312465074
           ]
-        },  
+        },
         :parameters => {
           :STYLES => 'pophatch',
           :CQL_FILTER => 'TOTPOP > 10000'
         }
       }
-      lyr.seed :truncate, options  
+      lyr.seed :truncate, options
+    end
+
+    it 'should return projection policy' do
+      layer = @catalog.get_layers.first.resource
+      layer.projection_policy.should be_kind_of(Symbol)
     end
 
   end
 
   context "LayerGroups" do
+    it "should list group layers" do
+      @catalog.get_layergroups.each { |l|
+        l.profile.should_not be_empty
+      }
+    end
+
+    it "should return a group layer from catalog" do
+      obj = @catalog.get_layergroup 'tiger-ny'
+      obj.profile.should_not be_empty
+    end
+
     it "should instantiate a new group layer" do
       lyrs = ['a','b','c'].collect{|l| RGeoServer::Layer.new @catalog, :name => l}
       stys = ['s1','s2','s3','s4'].collect{|s| RGeoServer::Style.new @catalog, :name => s}
       g = RGeoServer::LayerGroup.new @catalog, :name => 'test_group_layer'
       g.layers = lyrs
-      g.styles = stys 
+      g.styles = stys
       g.new?.should == true
     end
 
@@ -257,6 +331,22 @@ describe "Integration test against a GeoServer instance", :integration => true d
       g.new?.should == true
     end
 
+    it 'should return layer group bounds' do
+      lg = RGeoServer::LayerGroup.new @catalog, :name => 'tasmania'
+      bounds = lg.bounds
+      bounds['minx'].should > 0
+      bounds['miny'].should < 0
+      bounds['maxx'].should > 0
+      bounds['maxy'].should < 0
+    end
+
+    it 'should recalculate layer group bounds' do
+      lg = RGeoServer::LayerGroup.new @catalog, :name => 'tasmania'
+      bounds = lg.bounds
+      bounds_new = lg.recalculate_bounds
+      bounds.should == bounds_new
+    end
+
   end
 
   context "Styles" do
@@ -265,15 +355,15 @@ describe "Integration test against a GeoServer instance", :integration => true d
       @test_sld = Nokogiri::XML(File.new(File.join(sld_dir, 'test_style.sld')))
       @pop_sld = Nokogiri::XML(File.new(File.join(sld_dir, 'poptest.sld')))
     end
- 
+
     it "should instantiate a new style" do
       style = RGeoServer::Style.new @catalog, :name => 'style_rgeoserver_test'
       style.new?.should == true
     end
 
     it "should create new styles and delete them" do
-      {'granules_test_style'=> @test_sld, 'poptest_test_style'=> @pop_sld}.each_pair do |name,sld_ng| 
-        style = RGeoServer::Style.new @catalog, :name => name 
+      {'granules_test_style'=> @test_sld, 'poptest_test_style'=> @pop_sld}.each_pair do |name,sld_ng|
+        style = RGeoServer::Style.new @catalog, :name => name
         style.sld_doc = sld_ng.to_xml
         style.save
         style.sld_doc.should be_equivalent_to(sld_ng)
@@ -282,7 +372,7 @@ describe "Integration test against a GeoServer instance", :integration => true d
         style.new?.should == true
       end
     end
-    
+
     it "should list layers that include a style" do
       @catalog.get_styles[1,1].each do |s|
         break
@@ -297,18 +387,18 @@ describe "Integration test against a GeoServer instance", :integration => true d
   end
 
   context "Stores" do
-    before :all do
+    before :each do
       @ws = RGeoServer::Workspace.new @catalog, :name => 'test_workspace_for_stores'
       @ws.save
     end
-  
-    after :all do
-      @ws.delete :recurse => true 
+
+    after :each do
+      @ws.delete :recurse => true
     end
 
     context "DataStores" do
       it "should list all available data stores" do
-        @catalog.get_data_stores.each { |d|  
+        @catalog.get_data_stores.each { |d|
           d.profile.should_not be_empty
         }
       end
@@ -317,13 +407,38 @@ describe "Integration test against a GeoServer instance", :integration => true d
         obj = RGeoServer::DataStore.new @catalog, :workspace => @ws, :name => 'test_shapefile'
         obj.new?.should == true
         obj.name.should == 'test_shapefile'
-        obj.workspace.name.should == @ws.name 
+        obj.workspace.name.should == @ws.name
+      end
+
+      it "should instantiate a datastore from file" do
+        obj = RGeoServer::DataStore.new @catalog, :workspace => @ws, :name => 'test_shapefile'
+        obj.new?.should == true
+        obj.name.should == 'test_shapefile'
+        obj.workspace.name.should == @ws.name
+        obj.upload_file @shapefile_zip
+      end
+
+      it "tries to instantiate a datastore from file with invalid data type" do
+        obj = RGeoServer::DataStore.new @catalog, :workspace => @ws, :name => 'test_shapefile'
+        obj.new?.should == true
+        obj.name.should == 'test_shapefile'
+        obj.workspace.name.should == @ws.name
+        expect { obj.upload_file @shapefile_zip, :data_type => :xxx }.to raise_error(RGeoServer::DataStore::DataTypeNotExpected)
+      end
+
+      it "tries to update an existing datastore with file" do
+        obj = RGeoServer::DataStore.new @catalog, :workspace => @ws, :name => 'test_shapefile'
+        obj.new?.should == true
+        obj.name.should == 'test_shapefile'
+        obj.workspace.name.should == @ws.name
+        obj.save
+        expect { obj.upload_file @shapefile_zip }.to raise_error(RGeoServer::DataStore::DataStoreAlreadyExists)
       end
 
       it "should not create a datastore if workspace does not exit" do
         new_ws = RGeoServer::Workspace.new @catalog, :name => 'workspace_rgeoserver_test'
         obj = RGeoServer::DataStore.new @catalog, :workspace => new_ws, :name => 'test_random_store'
-        obj.new? #.should raise_error 
+        obj.new? #.should raise_error
       end
 
       it "should create a datastore under existing workspace, update and delete it right after" do
@@ -337,7 +452,7 @@ describe "Integration test against a GeoServer instance", :integration => true d
 
         # Add new information
         new_connection_parameters = {"namespace"=>"http://localhost/test_with_stores", "url" => 'file:data/taz_shapes'}
-        ds.connection_parameters = new_connection_parameters 
+        ds.connection_parameters = new_connection_parameters
         ds.changed?.should == true
         ds.save
         ds.profile['connectionParameters'].should == new_connection_parameters
@@ -350,11 +465,11 @@ describe "Integration test against a GeoServer instance", :integration => true d
         ds.save
         ft = RGeoServer::FeatureType.new @catalog, :workspace => @ws, :data_store => ds, :name => 'granules'
         ft.save
-        ds.featuretypes.each do |dft|  
+        ds.featuretypes.each do |dft|
           dft.name.should == ft.name
           dft.workspace.should == ft.workspace
-          dft.data_store.should == ft.data_store  
-        end 
+          dft.data_store.should == ft.data_store
+        end
         #ft.metadata_links = [{"type"=>"text/plain", "metadataType"=>"FGDC", "content"=>"http://example.com/geonetwork/srv/en/fgdc.xml?id=2"}]
         #ft.save
         #ft.metadata_links.first["metadataType"].should == "FGDC"
@@ -363,7 +478,7 @@ describe "Integration test against a GeoServer instance", :integration => true d
 
     context "CoverageStores" do
       it "should list all available coverage stores" do
-        @catalog.get_coverage_stores.each { |c|  
+        @catalog.get_coverage_stores.each { |c|
           c.profile.should_not be_empty
         }
       end
@@ -374,7 +489,7 @@ describe "Integration test against a GeoServer instance", :integration => true d
         cs.enabled = 'true'
         cs.data_type = 'GeoTIFF'
         cs.new?.should == true
-        cs.save 
+        cs.save
         cs.new?.should == false
         cs.description = 'new description'
         cs.description_changed?.should == true
@@ -394,26 +509,26 @@ describe "Integration test against a GeoServer instance", :integration => true d
         c.title = 'Test Raster Layer'
         c.abstract = 'This is the abstract of the layer'
         c.save
-        cs.coverages.each do |ct|  
+        cs.coverages.each do |ct|
           ct.name.should == c.name
           ct.workspace.should == c.workspace
-          ct.coverage_store.should == ct.coverage_store  
-        end 
+          ct.coverage_store.should == ct.coverage_store
+        end
         #c.metadata_links = [{"type"=>"text/plain", "metadataType"=>"FGDC", "content"=>"http://example.com/geonetwork/srv/en/fgdc.xml?id=1090"}]
         #c.save
         #c.metadata_links.first["metadataType"].should == "FGDC"
       end
     end
-  
+
     context "Catalog operations" do
       it "should reload the catalog"  do
         @catalog.reload
       end
-  
+
       it "should reset the catalog" do
         @catalog.reset
       end
-  
+
     end
   end
 end