rgeoserver 0.5.5 → 0.5.6

data/lib/rgeoserver/style.rb

@@ -1,104 +1,99 @@
 
 module RGeoServer
+  # A style describes how a resource (feature type or coverage) should be symbolized or rendered by a Web Map Service. In GeoServer styles are specified with {SLD}[http://docr.geoserver.org/stable/en/user/styling/index.html#styling]
+  class Style < ResourceInfo
 
-    class Style < ResourceInfo
+    OBJ_ATTRIBUTES = {:catalog => 'catalog', :name => 'name', :sld_version => 'sldVersion', :filename => 'filename', :sld_doc => 'sld_doc' }
+    OBJ_DEFAULT_ATTRIBUTES = {:catalog => nil, :name => nil, :sld_version => nil, :filename => '', :sld_doc => nil }
 
-      OBJ_ATTRIBUTES = {:catalog => 'catalog', :name => 'name', :sld_version => 'sldVersion', :filename => 'filename', :sld_doc => 'sld_doc' }
-      OBJ_DEFAULT_ATTRIBUTES = {:catalog => nil, :name => nil, :sld_version => nil, :filename => '', :sld_doc => nil }
+    define_attribute_methods OBJ_ATTRIBUTES.keys
+    update_attribute_accessors OBJ_ATTRIBUTES
 
-      define_attribute_methods OBJ_ATTRIBUTES.keys
-      update_attribute_accessors OBJ_ATTRIBUTES
+    @@route = "styles"
+    @@resource_name = "style"
+    @@sld_namespace = "http://www.opengis.net/sld"
 
-      @@r = Confstruct::Configuration.new(:route => 'styles', :resource_name => 'style', :sld_namespace => 'http://www.opengis.net/sld')
-  
-      def self.resource_name
-        @@r.resource_name
-      end
+    def self.resource_name
+      @@resource_name
+    end
 
-      def self.create_method 
-        :post 
-      end
+    def self.root_xpath
+      "//#{@@route}/#{@@resource_name}"
+    end
 
-      def self.update_method 
-        :put 
-      end
- 
-      def self.root_xpath
-        "//#{@@r.route}/#{@@r.resource_name}"
-      end
+    def self.member_xpath
+      "//#{resource_name}"
+    end
 
-      def self.member_xpath
-        "//#{resource_name}"
-      end
+    def route
+      @@route  
+    end
+
+    def sld_namespace
+      @@sld_namespace
+    end
 
-      def route
-        @@r.route  
-      end
-   
-      def create_options
-        {
-          :headers => {
-            :accept => :xml,
-            :content_type=> "application/vnd.ogc.sld+xml"
-          },
-          :format => :xml,
-          :name => @name
-        }
-      end   
-      
-      def update_options
-        {
-          :headers => {
-            :accept => :xml,
-            :content_type=> "application/vnd.ogc.sld+xml"
-          },
-          :format => :sld
-        }
-      end
  
-      def sld_namespace
-        @@r.sld_namespace
-      end
+    def create_options
+      {
+        :headers => {
+          :accept => :xml,
+          :content_type=> "application/vnd.ogc.sld+xml"
+        },
+        :format => :xml,
+        :name => @name
+      }
+    end   
+    
+    def update_options
+      {
+        :headers => {
+          :accept => :xml,
+          :content_type=> "application/vnd.ogc.sld+xml"
+        },
+        :format => :sld
+      }
+    end
 
-      def message
-        @sld_doc
-      end
+    def message
+      @sld_doc
+    end
 
-      # @param [RGeoServer::Catalog] catalog
-      # @param [Hash] options
-      def initialize catalog, options
-        super({})
-        _run_initialize_callbacks do
-          @catalog = catalog
-          @name = options[:name].strip
-        end        
-        @route = route
-      end
-  
-      # Obtain all layers that use this style.
-      # WARNING: This will be slow and inneficient when the list of all layers is too long.
-      def layers &block
-        return to_enum(:layers).to_a unless block_given?
-        @catalog.get_layers do |l|
-          lyrs = [l.profile['default_style']]+l.profile['alternate_styles']
-          yield l if lyrs.include? @name
-        end 
-      end
+    # @param [RGeoServer::Catalog] catalog
+    # @param [Hash] options
+    def initialize catalog, options
+      super({})
+      _run_initialize_callbacks do
+        @catalog = catalog
+        @name = options[:name].strip
+      end        
+      @route = route
+    end
 
-      def profile_xml_to_hash profile_xml
-        doc = profile_xml_to_ng profile_xml
-        h = {
-          'name' => doc.at_xpath('//name').text.strip, 
-          'sld_version' => doc.at_xpath('//sldVersion/version/text()').to_s,
-          'filename' => doc.at_xpath('//filename/text()').to_s,
-          'sld_doc' => begin
-            Nokogiri::XML(@catalog.search({:styles => @name}, options={:format => 'sld'})).to_xml
-          rescue RestClient::ResourceNotFound
-            nil 
-          end
-        }.freeze 
-        h 
-      end
- 
+    # Obtain all layers that use this style.
+    # WARNING: This will be slow and inneficient when the list of all layers is too long.
+    def layers &block
+      return to_enum(:layers).to_a unless block_given?
+      @catalog.get_layers do |l|
+        lyrs = [l.profile['default_style']]+l.profile['alternate_styles']
+        yield l if lyrs.include? @name
+      end 
     end
+
+    def profile_xml_to_hash profile_xml
+      doc = profile_xml_to_ng profile_xml
+      h = {
+        'name' => doc.at_xpath('//name').text.strip, 
+        'sld_version' => doc.at_xpath('//sldVersion/version/text()').to_s,
+        'filename' => doc.at_xpath('//filename/text()').to_s,
+        'sld_doc' => begin
+          Nokogiri::XML(@catalog.search({:styles => @name}, options={:format => 'sld'})).to_xml
+        rescue RestClient::ResourceNotFound
+          nil 
+        end
+      }.freeze 
+      h 
+    end
+
+  end
 end 

data/lib/rgeoserver/wmsstore.rb

@@ -5,26 +5,16 @@ module RGeoServer
   
       define_attribute_methods [:catalog, :workspace, :name] 
   
-      @@r = Confstruct::Configuration.new(
-          :route => "workspaces/%s/wmsstores",
-          :root => "wmsStores",
-          :resource_name => "wmsStore"
-        )
+      @@route = "workspaces/%s/wmsstores"
+      @@root = "wmsStores"
+      @@resource_name = "wmsStore"
 
       def self.root
-        @@r.root
-      end
-
-      def self.create_method
-        :put 
-      end
-
-      def self.update_method
-        :put 
+        @@root
       end
 
       def self.resource_name
-        @@r.resource_name
+        @@resource_name
       end
  
       def self.root_xpath
@@ -36,7 +26,7 @@ module RGeoServer
       end
 
       def route
-        @@r.route % @workspace.name 
+        @@route % @workspace.name 
       end
 
       def xml options = nil

data/lib/rgeoserver/workspace.rb

@@ -1,95 +1,88 @@
 
 module RGeoServer
+  # A workspace is a grouping of data stores. More commonly known as a namespace, it is commonly used to group data that is related in some way.
+  class Workspace < ResourceInfo
 
-    class Workspace < ResourceInfo
+    OBJ_ATTRIBUTES = {:enabled => 'enabled', :catalog => 'catalog', :name => 'name' }
+    OBJ_DEFAULT_ATTRIBUTES = {:enabled => 'true', :catalog => nil, :name => nil }
 
-      OBJ_ATTRIBUTES = {:enabled => 'enabled', :catalog => 'catalog', :name => 'name' }
-      OBJ_DEFAULT_ATTRIBUTES = {:enabled => 'true', :catalog => nil, :name => nil }
+    define_attribute_methods OBJ_ATTRIBUTES.keys
+    update_attribute_accessors OBJ_ATTRIBUTES
 
-      define_attribute_methods OBJ_ATTRIBUTES.keys
-      update_attribute_accessors OBJ_ATTRIBUTES
+    @@route = "workspaces"
+    @@resource_name = "workspace"
 
-      @@r = Confstruct::Configuration.new(:route => 'workspaces', :resource_name => 'workspace')
-  
-      def self.resource_name
-        @@r.resource_name
-      end
+    def self.resource_name
+      @@resource_name
+    end
 
-      def self.create_method 
-        :post 
-      end
+    def self.root_xpath
+      "//#{@@route}/#{@@resource_name}"
+    end
 
-      def self.update_method 
-        :put 
-      end
- 
-      def self.root_xpath
-        "//#{@@r.route}/#{@@r.resource_name}"
-      end
+    def self.member_xpath
+      "//#{resource_name}"
+    end
 
-      def self.member_xpath
-        "//#{resource_name}"
-      end
+    def route
+      @@route  
+    end
 
-      def route
-        @@r.route  
+    def message
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.workspace { 
+          xml.enabled @enabled if enabled_changed?
+          xml.name @name 
+        }
       end
+      return builder.doc.to_xml 
+    end
 
-      def message
-        builder = Nokogiri::XML::Builder.new do |xml|
-          xml.workspace { 
-            xml.enabled @enabled if enabled_changed?
-            xml.name @name 
-          }
-        end
-        return builder.doc.to_xml 
-      end
+    # @param [RGeoServer::Catalog] catalog
+    # @param [Hash] options
+    def initialize catalog, options
+      super({})
+      _run_initialize_callbacks do
+        @catalog = catalog
+        @name = options[:name].strip
+      end        
+      @route = route
+    end
 
-      # @param [RGeoServer::Catalog] catalog
-      # @param [Hash] options
-      def initialize catalog, options
-        super({})
-        _run_initialize_callbacks do
-          @catalog = catalog
-          @name = options[:name].strip
-        end        
-        @route = route
-      end
+    def data_stores &block
+      self.class.list DataStore, @catalog, profile['dataStores'], {:workspace => self}, check_remote = true, &block
+    end
+  
+    def coverage_stores &block
+      self.class.list CoverageStore, @catalog, profile['coverageStores'], {:workspace => self}, check_remote = true, &block
+    end
 
-      def data_stores &block
-        self.class.list DataStore, @catalog, profile['dataStores'], {:workspace => self}, check_remote = true, &block
-      end
-    
-      def coverage_stores &block
-        self.class.list CoverageStore, @catalog, profile['coverageStores'], {:workspace => self}, check_remote = true, &block
-      end
+    def wms_stores &block
+      self.class.list WmsStore, @catalog, profile['wmsStores'], {:workspace => self}, check_remote = true, &block
+    end
 
-      def wms_stores &block
-        self.class.list WmsStore, @catalog, profile['wmsStores'], {:workspace => self}, check_remote = true, &block
-      end
- 
-      def profile_xml_to_hash profile_xml
-        doc = profile_xml_to_ng profile_xml 
-        h = {'name' => doc.at_xpath('//name').text.strip, 'enabled' => @enabled }
-        doc.xpath('//atom:link/@href', "xmlns:atom"=>"http://www.w3.org/2005/Atom").each{ |l| 
-          target = l.text.match(/([a-zA-Z]+)\.xml$/)[1]
-          if !target.nil? && target != l.parent.parent.name.to_s.downcase
-            begin
-              h[l.parent.parent.name.to_s] << target
-            rescue
-              h[l.parent.parent.name.to_s] = []
-            end
-          else
-            h[l.parent.parent.name.to_s] = begin
-              response = @catalog.fetch_url l.text
-              Nokogiri::XML(response).xpath('//name').collect{ |a| a.text.strip }
-            rescue RestClient::ResourceNotFound
-              []
-            end.freeze
+    def profile_xml_to_hash profile_xml
+      doc = profile_xml_to_ng profile_xml 
+      h = {'name' => doc.at_xpath('//name').text.strip, 'enabled' => @enabled }
+      doc.xpath('//atom:link/@href', "xmlns:atom"=>"http://www.w3.org/2005/Atom").each{ |l| 
+        target = l.text.match(/([a-zA-Z]+)\.xml$/)[1]
+        if !target.nil? && target != l.parent.parent.name.to_s.downcase
+          begin
+            h[l.parent.parent.name.to_s] << target
+          rescue
+            h[l.parent.parent.name.to_s] = []
           end
-         }
-        h  
-      end
- 
+        else
+          h[l.parent.parent.name.to_s] = begin
+            response = @catalog.do_url l.text
+            Nokogiri::XML(response).xpath('//name').collect{ |a| a.text.strip }
+          rescue RestClient::ResourceNotFound
+            []
+          end.freeze
+        end
+       }
+      h  
     end
+
+  end
 end 

data/lib/rgeoserver.rb

@@ -16,6 +16,7 @@ module RGeoServer
   autoload :WmsStore, "rgeoserver/wmsstore"
   autoload :Style, "rgeoserver/style"
   autoload :Layer, "rgeoserver/layer"
+  autoload :LayerGroup, "rgeoserver/layergroup"
 
   require 'restclient'
   require 'nokogiri'

data/spec/lib/integration_test_spec.rb

@@ -5,6 +5,7 @@ describe "Integration test against a GeoServer instance", :integration => true d
 
   before(:all) do
     @catalog = RGeoServer.catalog
+    @fixtures_dir = File.join(File.dirname(__FILE__), "/../fixtures/")
   end
 
 
@@ -86,7 +87,8 @@ describe "Integration test against a GeoServer instance", :integration => true d
       lyr.default_style = 'rain'
       lyr.alternate_styles = ['raster']
       lyr.enabled = 'true'
-      expect{ lyr.save }.to raise_error 
+      lyr.resource = @catalog.get_coverage 'sf','sfdem', 'sfdem'
+      expect{ lyr.save }.to raise_error
     end
 
     it "should list layers" do
@@ -96,9 +98,33 @@ describe "Integration test against a GeoServer instance", :integration => true d
     end
   end
 
+  context "LayerGroups" do
+    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.new?.should == true
+    end
+
+    it "should create a new group layer from existing layers and styles and delete it right after" do
+      g = RGeoServer::LayerGroup.new @catalog, :name => 'test_group_layer'
+      g.layers = @catalog.get_layers[1,2]
+      g.styles = @catalog.get_styles[1,2]
+      g.new?.should == true
+      g.save
+      # Bounds metadata should come back aggregated from the server
+      g.bounds['maxx'].should_not == ''
+      g.delete
+      g.new?.should == true
+    end
+
+  end
+
   context "Styles" do
     before :all do
-      sld_dir = File.join(File.dirname(__FILE__), '/../fixtures/styles/')
+      sld_dir = File.join(@fixtures_dir, 'styles')
       @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
@@ -137,6 +163,8 @@ describe "Integration test against a GeoServer instance", :integration => true d
     before :all do
       @ws = RGeoServer::Workspace.new @catalog, :name => 'test_workspace_for_stores'
       @ws.save
+      @shapefile = File.join(@fixtures_dir, 'datasets/vector/granules.shp')
+      @raster = File.join(@fixtures_dir, 'datasets/raster/test.tif')
     end
   
     after :all do
@@ -164,7 +192,7 @@ describe "Integration test against a GeoServer instance", :integration => true d
       end
 
       it "should create a datastore under existing workspace, update and delete it right after" do
-        ds = RGeoServer::DataStore.new @catalog, :workspace => @ws, :name => 'test', :connection_parameters => {"namespace"=>"http://test_workspace_for_stores", "url" => "file://tmp/geo.tif"}
+        ds = RGeoServer::DataStore.new @catalog, :workspace => @ws, :name => 'test', :connection_parameters => {"namespace"=>"http://test_workspace_for_stores", "url" => "file:#{@shapefile}"}
         ds.new?.should == true
         ds.save
         ds.new?.should == false
@@ -179,6 +207,15 @@ describe "Integration test against a GeoServer instance", :integration => true d
         ds.profile['connectionParameters'].should == new_connection_parameters
         ds.delete
       end
+
+      it "should create a datastore under existing workspace and add a feature type that will also create a layer" do
+        ds = RGeoServer::DataStore.new @catalog, :workspace => @ws, :name => 'test', :connection_parameters => {"namespace"=>"http://test_workspace_for_stores", "url" => "file:#{@shapefile}"}
+        ds.new?.should == true
+        ds.save
+        ft = RGeoServer::FeatureType.new @catalog, :workspace => @ws, :data_store => ds, :name => 'granules'
+        ft.save
+        
+      end
     end
 
     context "CoverageStores" do
@@ -189,7 +226,7 @@ describe "Integration test against a GeoServer instance", :integration => true d
       end
       it "should create a coverage store under existing workspace, update and delete it right after" do
         cs = RGeoServer::CoverageStore.new @catalog, :workspace => @ws, :name => 'test_coverage_store'
-        cs.url = "file:data_dir/sf/raster.tif"
+        cs.url = "file://#{@raster}"
         cs.description = 'description'
         cs.enabled = 'true'
         cs.data_type = 'GeoTIFF'
@@ -202,6 +239,28 @@ describe "Integration test against a GeoServer instance", :integration => true d
         cs.description.should == 'new description'
         cs.new?.should == false
       end
+      it "should create a coverage store under existing workspace and add a coverage to it. A layer must be created as a result of this operation" do
+        cs = RGeoServer::CoverageStore.new @catalog, :workspace => @ws, :name => 'raster'
+        cs.url = "file://#{@raster}"
+        cs.description = 'description'
+        cs.enabled = 'true'
+        cs.data_type = 'GeoTIFF'
+        cs.save
+        c = RGeoServer::Coverage.new @catalog, :workspace => @ws, :coverage_store => cs, :name => 'raster'
+        c.title = 'Test Raster Layer'
+        #c.save
+      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