rgeoserver 0.5.5 → 0.5.6

data/lib/rgeoserver/featuretype.rb

@@ -1,92 +1,86 @@
 
 module RGeoServer
+  # A feature type is a vector based spatial resource or data set that originates from a data store. In some cases, like Shapefile, a feature type has a one-to-one relationship with its data store. In other cases, like PostGIS, the relationship of feature type to data store is many-to-one, with each feature type corresponding to a table in the database.
+  class FeatureType < ResourceInfo
+    OBJ_ATTRIBUTES = {:catalog => "catalog", :name => "name", :workspace => "workspace", :enabled => "enabled" }
+    OBJ_DEFAULT_ATTRIBUTES = {:catalog => nil, :workspace => nil, :coverage_store => nil, :name => nil, :enabled => "false" } 
+   
+    define_attribute_methods OBJ_ATTRIBUTES.keys
+    update_attribute_accessors OBJ_ATTRIBUTES
+
+    @@route = "workspaces/%s/datastores/%s/featuretypes"
+    @@root = "featureTypes"
+    @@resource_name = "featureType"
+
+    def self.root
+      @@root
+    end
 
-    class FeatureType < ResourceInfo
-      OBJ_ATTRIBUTES = {:catalog => "catalog", :name => "name", :workspace => "workspace", :enabled => "enabled" }
-      OBJ_DEFAULT_ATTRIBUTES = {:catalog => nil, :workspace => nil, :coverage_store => nil, :name => nil, :enabled => "false" } 
-     
-      define_attribute_methods OBJ_ATTRIBUTES.keys
-      update_attribute_accessors OBJ_ATTRIBUTES
-  
-      @@r = Confstruct::Configuration.new(
-          :route => "workspaces/%s/datastores/%s/featuretypes",
-          :root => "featureTypes",
-          :resource_name => "featureType"
-        )
-
-      def self.root
-        @@r.root
-      end
-
-      def self.create_method
-        :put 
-      end
-      
-      def self.update_method
-        :put 
-      end
-
+    def self.resource_name
+      @@resource_name
+    end
 
-      def self.resource_name
-        @@r.resource_name
-      end
- 
-      def self.root_xpath
-        "//#{root}/#{resource_name}"
-      end
+    def self.root_xpath
+      "//#{root}/#{resource_name}"
+    end
 
-      def self.member_xpath
-        "//#{resource_name}"
-      end
+    def self.member_xpath
+      "//#{resource_name}"
+    end
 
-      def route
-        @@r.route % [@workspace.name , @data_store.name ]
-      end
+    def route
+      @@route % [@workspace.name , @data_store.name ]
+    end
 
-      def message
-        "<featureType/>"
+    def message
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.featureType {
+          xml.name @name
+        }
       end
+      @message = builder.doc.to_xml 
+    end
 
 
-      # @param [RGeoServer::Catalog] catalog
-      # @param [Hash] options
-      def initialize catalog, options 
-        super({})
-        _run_initialize_callbacks do
-          @catalog = catalog
-          workspace = options[:workspace] || 'default'
-          if workspace.instance_of? String
-            @workspace = @catalog.get_workspace(workspace)
-          elsif workspace.instance_of? Workspace
-            @workspace = workspace
-          else
-            raise "Not a valid workspace"
-          end
-          data_store = options[:data_store]
-          if data_store.instance_of? String
-            @data_store = DataStore.new @catalog, :workspace => @workspace, :name => data_store
-          elsif data_store.instance_of? DataStore
-            @data_store = data_store
-          else
-            raise "Not a valid data store"
-          end
-
-          @name = options[:name].strip
-          @route = route
-        end        
-      end
+    # @param [RGeoServer::Catalog] catalog
+    # @param [Hash] options
+    def initialize catalog, options 
+      super({})
+      _run_initialize_callbacks do
+        @catalog = catalog
+        workspace = options[:workspace] || 'default'
+        if workspace.instance_of? String
+          @workspace = @catalog.get_workspace(workspace)
+        elsif workspace.instance_of? Workspace
+          @workspace = workspace
+        else
+          raise "Not a valid workspace"
+        end
+        data_store = options[:data_store]
+        if data_store.instance_of? String
+          @data_store = DataStore.new @catalog, :workspace => @workspace, :name => data_store
+        elsif data_store.instance_of? DataStore
+          @data_store = data_store
+        else
+          raise "Not a valid data store"
+        end
+
+        @name = options[:name].strip
+        @route = route
+      end        
+    end
 
 
-      def profile_xml_to_hash profile_xml
-        doc = profile_xml_to_ng profile_xml
-        h = {
-          "name" => doc.at_xpath('//name').text.strip, 
-          "workspace" => @workspace.name, 
-          "nativeName" => doc.at_xpath('//nativeName').to_s
-        }.freeze  
-        h  
-      end
+    def profile_xml_to_hash profile_xml
+      doc = profile_xml_to_ng profile_xml
+      h = {
+        "name" => doc.at_xpath('//name').text.strip, 
+        "workspace" => @workspace.name, 
+        "nativeName" => doc.at_xpath('//nativeName').to_s
+      }.freeze  
+      h  
+    end
 
 
-    end
+  end
 end 

data/lib/rgeoserver/layer.rb

@@ -1,159 +1,152 @@
 
 module RGeoServer
+  # A layer is a published resource (feature type or coverage).
+  class Layer < ResourceInfo
 
-    class Layer < ResourceInfo
+    OBJ_ATTRIBUTES = {:enabled => 'enabled', :catalog => 'catalog', :name => 'name', :default_style => 'default_style', :alternate_styles => 'alternate_styles', :metadata => 'metadata', :attribution => 'attribution', :layer_type => 'type' }
+    OBJ_DEFAULT_ATTRIBUTES = {:enabled => 'true', :catalog => nil, :name => nil, :default_style => nil, :alternate_styles => [], :metadata => {}, :attribution => {:logo_height => '0', :logo_width => '0', 'title' => ''}, :layer_type => nil }
 
-      OBJ_ATTRIBUTES = {:enabled => 'enabled', :catalog => 'catalog', :name => 'name', :default_style => 'default_style', :alternate_styles => 'alternate_styles', :metadata => 'metadata', :attribution => 'attribution', :layer_type => 'type' }
-      OBJ_DEFAULT_ATTRIBUTES = {:enabled => 'true', :catalog => nil, :name => nil, :default_style => nil, :alternate_styles => [], :metadata => {}, :attribution => {:logo_height => '0', :logo_width => '0', 'title' => ''}, :layer_type => nil }
+    define_attribute_methods OBJ_ATTRIBUTES.keys
+    update_attribute_accessors OBJ_ATTRIBUTES
 
-      define_attribute_methods OBJ_ATTRIBUTES.keys
-      update_attribute_accessors OBJ_ATTRIBUTES
+    @@route = "layers" 
+    @@resource_name = "layer"
 
-      @@r = Confstruct::Configuration.new(:route => 'layers', :resource_name => 'layer')
-  
-      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  
-      end
-  
-      # No direct layer creation
-      def create_route 
-        nil 
-      end
+    # No direct layer creation
+    def create_route 
+      nil 
+    end
 
-      def message
-        builder = Nokogiri::XML::Builder.new do |xml|
-          xml.layer { 
-            #xml.name @name
-            xml.type_ layer_type  
-            xml.enabled enabled
-            xml.defaultStyle {
-              xml.name default_style
-            } 
-            xml.styles {
-              alternate_styles.each { |s|
-                xml.style {
-                  xml.name s
-                }
+    def message
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.layer { 
+          #xml.name @name
+          xml.type_ layer_type  
+          xml.enabled enabled
+          xml.defaultStyle {
+            xml.name default_style
+          } 
+          xml.styles {
+            alternate_styles.each { |s|
+              xml.style {
+                xml.name s
               }
-            } unless alternate_styles.empty?
-            xml.resource(:class => resource.class.resource_name){
-              xml.name resource.name 
-            } unless resource.nil?
-            xml.attribution {
-              xml.title attribution['title'] unless attribution['title'].empty?
-              xml.logoWidth attribution['logo_width']
-              xml.logoHeight attribution['logo_height'] 
-            } if !attribution['logo_width'].nil? && !attribution['logo_height'].nil?
-          }
-        end
-        return builder.doc.to_xml 
+            }
+          } unless alternate_styles.empty?
+          xml.resource(:class => resource.class.resource_name){
+            xml.name resource.name 
+          } unless resource.nil?
+          xml.attribution {
+            xml.title attribution['title'] unless attribution['title'].empty?
+            xml.logoWidth attribution['logo_width']
+            xml.logoHeight attribution['logo_height'] 
+          } if !attribution['logo_width'].nil? && !attribution['logo_height'].nil?
+        }
       end
+      return builder.doc.to_xml 
+    end
 
-      # @param [RGeoServer::Catalog] catalog
-      # @param [Hash] options
-      # @option options [String] :name
-      # @option options [String] :default_style
-      # @option options [Array<String>] :alternate_styles
-      def initialize catalog, options
-        super({})
-        _run_initialize_callbacks do
-          @catalog = catalog
-          @name = options[:name].strip
-          #@default_style = options[:default_style] || ''
-          #@alternate_styles = options[:alternate_styles] || []
-        end        
-        @route = route
-      end
+    # @param [RGeoServer::Catalog] catalog
+    # @param [Hash] options
+    # @option options [String] :name
+    # @option options [String] :default_style
+    # @option options [Array<String>] :alternate_styles
+    def initialize catalog, options
+      super({})
+      _run_initialize_callbacks do
+        @catalog = catalog
+        @name = options[:name].strip
+        #@default_style = options[:default_style] || ''
+        #@alternate_styles = options[:alternate_styles] || []
+      end        
+      @route = route
+    end
 
-      def resource= r
-        if r.is_a?(RGeoServer::Coverage) || r.is_a?(RGeoServer::FeatureType) 
-          @resource = r
-        else
-          raise 'Unknown resource type'  
-        end  
-      end
+    def resource= r
+      if r.is_a?(RGeoServer::Coverage) || r.is_a?(RGeoServer::FeatureType) 
+        @resource = r
+      else
+        raise 'Unknown resource type'  
+      end  
+    end
 
-      def resource
-        @resource ||= begin
-          unless profile['resource'].empty?
-            data_type = profile['resource']['type']
-            workspace = profile['resource']['workspace']
-            name = profile['resource']['name']
-            store = profile['resource']['store']
-
-            case data_type
-            when 'coverage'
-              return RGeoServer::Coverage.new @catalog, :workspace => workspace, :coverage_store => store, :name => name
-            when 'featureType'
-              return RGeoServer::FeatureType.new @catalog, :workspace => workspace, :data_store => store, :name => name
-            else
-              raise 'Unknown resource type'  
-            end
+    def resource
+      @resource ||= begin
+        unless profile['resource'].empty?
+          data_type = profile['resource']['type']
+          workspace = profile['resource']['workspace']
+          name = profile['resource']['name']
+          store = profile['resource']['store']
+
+          case data_type
+          when 'coverage'
+            return RGeoServer::Coverage.new @catalog, :workspace => workspace, :coverage_store => store, :name => name
+          when 'featureType'
+            return RGeoServer::FeatureType.new @catalog, :workspace => workspace, :data_store => store, :name => name
           else
-            nil
+            raise 'Unknown resource type'  
           end
-        rescue Exception => e
+        else
           nil
         end
+      rescue Exception => e
+        nil
       end
-  
-      # TODO: Simplify if necessary with "/layers/<l>/styles[.<format>]", as speficied in the API
-      def get_default_style &block
-        self.class.list Style, @catalog, @default_style, {:layer => self}, check_remote = false, &block
-      end
- 
-      def get_alternate_styles &block
-        self.class.list Style, @catalog, @alternate_styles, {:layer => self}, check_remote = false, &block
-      end
+    end
 
-      def profile_xml_to_hash profile_xml
-        doc = profile_xml_to_ng profile_xml
-        name = doc.at_xpath('//name/text()').text.strip
-        link = doc.at_xpath('//resource//atom:link/@href', "xmlns:atom"=>"http://www.w3.org/2005/Atom").text.strip
-        workspace, _, store = link.match(/workspaces\/(.*?)\/(.*?)\/(.*?)\/(.*?)\/#{name}.xml$/).to_a[1,3]
-
-        h = {
-          "name" => name, 
-          "path" => doc.at_xpath('//path/text()').to_s,
-          "default_style" => doc.at_xpath('//defaultStyle/name/text()').to_s,
-          "alternate_styles" => doc.xpath('//styles/style/name/text()').collect{ |s| s.to_s},
-          "type" => doc.at_xpath('//type/text()').to_s,
-          "enabled" => doc.at_xpath('//enabled/text()').to_s,
-          "attribution" => { 
-            "title" => doc.at_xpath('//attribution/title/text()').to_s,
-            "logo_width" => doc.at_xpath('//attribution/logoWidth/text()').to_s,
-            "logo_height" => doc.at_xpath('//attribution/logoHeight/text()').to_s
-          },
-          "resource" => {
-            "type" => doc.at_xpath('//resource/@class').to_s,
-            "name" => doc.at_xpath('//resource/name/text()').to_s,
-            "store" => store,
-            "workspace" => workspace 
-          },
-          "metadata" => doc.xpath('//metadata/entry').inject({}){ |h, e| h.merge(e['key']=> e.text.to_s) } 
-        }.freeze
-        h  
-      end
- 
+    # TODO: Simplify if necessary with "/layers/<l>/styles[.<format>]", as specified in the API
+    def get_default_style &block
+      self.class.list Style, @catalog, @default_style, {:layer => self}, check_remote = false, &block
+    end
+
+    def get_alternate_styles &block
+      self.class.list Style, @catalog, @alternate_styles, {:layer => self}, check_remote = false, &block
     end
+
+    def profile_xml_to_hash profile_xml
+      doc = profile_xml_to_ng profile_xml
+      name = doc.at_xpath('//name/text()').text.strip
+      link = doc.at_xpath('//resource//atom:link/@href', "xmlns:atom"=>"http://www.w3.org/2005/Atom").text.strip
+      workspace, _, store = link.match(/workspaces\/(.*?)\/(.*?)\/(.*?)\/(.*?)\/#{name}.xml$/).to_a[1,3]
+
+      h = {
+        "name" => name, 
+        "path" => doc.at_xpath('//path/text()').to_s,
+        "default_style" => doc.at_xpath('//defaultStyle/name/text()').to_s,
+        "alternate_styles" => doc.xpath('//styles/style/name/text()').collect{ |s| s.to_s},
+        "type" => doc.at_xpath('//type/text()').to_s,
+        "enabled" => doc.at_xpath('//enabled/text()').to_s,
+        "attribution" => { 
+          "title" => doc.at_xpath('//attribution/title/text()').to_s,
+          "logo_width" => doc.at_xpath('//attribution/logoWidth/text()').to_s,
+          "logo_height" => doc.at_xpath('//attribution/logoHeight/text()').to_s
+        },
+        "resource" => {
+          "type" => doc.at_xpath('//resource/@class').to_s,
+          "name" => doc.at_xpath('//resource/name/text()').to_s,
+          "store" => store,
+          "workspace" => workspace 
+        },
+        "metadata" => doc.xpath('//metadata/entry').inject({}){ |h, e| h.merge(e['key']=> e.text.to_s) } 
+      }.freeze
+      h  
+    end
+
+  end
 end 

data/lib/rgeoserver/layergroup.rb

@@ -0,0 +1,138 @@
+
+module RGeoServer
+  # A layer group is a grouping of layers and styles that can be accessed as a single layer in a WMS GetMap request. A Layer group is often referred to as a "base map".
+  class LayerGroup < ResourceInfo
+
+    OBJ_ATTRIBUTES = {:catalog => 'catalog', :name => 'name', :layers => 'layers', :styles => 'styles', :bounds => 'bounds', :metadata => 'metadata' }
+    OBJ_DEFAULT_ATTRIBUTES = {:catalog => nil, :name => nil, :layers => [], :styles => [], :bounds => {'minx'=>'', 'miny' =>'', 'maxx'=>'', 'maxy'=>'', 'crs' =>''}, :metadata => {} }
+
+    define_attribute_methods OBJ_ATTRIBUTES.keys
+    update_attribute_accessors OBJ_ATTRIBUTES
+
+    @@route = "layergroups" 
+    @@resource_name = "layerGroup"
+
+    def self.resource_name
+      @@resource_name
+    end
+
+    def self.root_xpath
+      "//#{@@route}/#{@@resource_name}"
+    end
+
+    def self.member_xpath
+      "//#{resource_name}"
+    end
+
+    def route
+      @@route  
+    end
+
+    def message
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.layerGroup { 
+          xml.name @name
+          xml.layers {
+            layers.each { |l| 
+              xml.layer {
+                xml.name l.name
+              }
+            }
+          } unless layers.nil?
+          xml.styles {
+            styles.each { |s|
+              xml.style {
+                xml.name s.name
+              }
+            }
+          } unless styles.nil?
+          xml.bounds {
+            xml.minx bounds['minx']
+            xml.maxx bounds['maxx']
+            xml.miny bounds['miny']
+            xml.maxy bounds['maxy']
+            xml.crs bounds['crs']
+          } if @bounds
+        }
+      end
+      return builder.doc.to_xml 
+    end
+
+    # @param [RGeoServer::Catalog] catalog
+    # @param [Hash] options
+    # @option options [String] :name
+    def initialize catalog, options
+      super({})
+      _run_initialize_callbacks do
+        @catalog = catalog
+        @name = options[:name].strip
+      end        
+      @route = route
+    end
+    
+    # @param [Array<RGeoServer::Style>] sl list of styles
+    def styles= sl
+      if sl.inject(true){|t,s| t && s.is_a?(RGeoServer::Style)}
+        styles_will_change! unless sl == styles
+        @styles = sl
+      else
+        raise 'Unknown list of styles'
+      end
+    end
+    
+    def styles
+      @styles ||= begin
+        unless profile['styles'].empty?
+          return profile['styles'].each{ |s| RGeoServer::Style.new @catalog, :name => s.name }
+        else
+          nil
+        end
+      rescue Exception => e
+        nil
+      end
+    end
+
+    # @param [Array<RGeoServer::Layer>] ll list of layers
+    def layers= ll
+      if ll.inject(true){ |t,l| t && l.is_a?(RGeoServer::Layer) }
+        layers_will_change! unless ll == layers
+        @layers = ll
+      else
+        raise 'Unknown list of layers'
+      end
+    end
+    
+    def layers
+      @layers ||= begin
+        unless profile['layers'].empty?
+          return profile['layers'].each{ |s| RGeoServer::Layer.new @catalog, :name => s.name }
+        else
+          nil
+        end
+      rescue Exception => e
+        nil
+      end
+    end
+
+    def profile_xml_to_hash profile_xml
+      doc = profile_xml_to_ng profile_xml
+      name = doc.at_xpath('//name/text()').text.strip
+
+      h = {
+        "name" => name, 
+        "layers" => doc.xpath('//layers/layer/name/text()').collect{|l| l.to_s},
+        "styles" => doc.xpath('//styles/style/name/text()').collect{|s| s.to_s},
+        "bounds" => { 
+          "minx" => doc.at_xpath('//bounds/minx/text()').to_s,
+          "maxx" => doc.at_xpath('//bounds/maxx/text()').to_s,
+          "miny" => doc.at_xpath('//bounds/miny/text()').to_s,
+          "maxy" => doc.at_xpath('//bounds/maxy/text()').to_s,
+          "crs" => doc.at_xpath('//bounds/crs/text()')
+        },
+        "metadata" => doc.xpath('//metadata/entry').inject({}){ |h, e| h.merge(e['key']=> e.text.to_s) } 
+      }.freeze
+      h  
+    end
+
+  end
+end 

data/lib/rgeoserver/resource.rb

@@ -57,14 +57,13 @@ module RGeoServer
       end
 
       def create_method
-        self.class.create_method
+        :post 
       end
 
       def update_method
-        self.class.update_method
+        :put 
       end
 
-
       # Modify or save the resource
       # @param [Hash] options / query parameters
       # @return [RGeoServer::ResourceInfo] 

data/lib/rgeoserver/rest_api_client.rb

@@ -36,20 +36,22 @@ module RGeoServer
       end
     end
 
-    # Fetch an arbitrary URL within the catalog
+    # Do an action on an arbitrary URL within the catalog passing no data
+    # Default method is GET
     # @param [String] url
-    def fetch_url url
+    # @param [String] method
+    def do_url url, method = :get
       url.slice! client.url
       fetcher = client[url]
       fetcher.options[:headers] ||= headers(:xml)
-      begin  
-        return fetcher.get
+      begin
+        return fetcher.get if method == :get 
+        fetcher.send method, nil
       rescue RestClient::InternalServerError => e
         $logger.error e.response
         $logger.flush if $logger.respond_to? :flush
         raise GeoServerInvalidRequest, "Error fetching URL: #{url}. See $logger for details"
       end
-
     end
 
     # Add resource to the catalog