rgeoserver 0.5.4 → 0.5.5

data/Gemfile

@@ -2,7 +2,6 @@ source "http://rubygems.org"
 
 gemspec
 
-#gem 'rake', '0.8.7'
-gem 'activemodel', "~> 3.1.1"
+gem 'activemodel'
 
 

data/README.rdoc

@@ -17,6 +17,8 @@ http://docs.geoserver.org/stable/en/user/restconfig/rest-config-api.html
 
 == Example: 
 
+Sample usage from an irb console
+
   > catalog = RGeoServer::Catalog.new :user=>"admin", :url=>"http://10.0.0.2/geoserver/rest", :password=>"osgeo!"
   => Catalog: http://10.0.0.2/geoserver/rest
   > w = catalog.get_workspace('topp') 
@@ -30,6 +32,16 @@ http://docs.geoserver.org/stable/en/user/restconfig/rest-config-api.html
   > ft.profile
   => {:name=>"states", :workspace=>"topp", :nativeName=>"states"}  
 
+  > lyr = RGeoServer::Layer.new c, :name => 'Arc_Sample'
+  => RGeoServer::Layer: Arc_Sample 
+  > lyr.profile
+  => {"name"=>"Arc_Sample", "path"=>"/", "defaultstyle"=>"rain", "styles"=>["raster"], "type"=>"RASTER", "enabled"=>"true", "attribution"=>{"logoWidth"=>"0", "logoHeight"=>"0"}, "resource"=>{"type"=>"coverage", "name"=>"Arc_Sample", "store"=>"arcGridSample", "workspace"=>"nurc"}, "metadata"=>{"GWC.autoCacheStyles"=>"true", "GWC.metaTilingX"=>"4", "GWC.metaTilingY"=>"4", "GWC.gutter"=>"0", "GWC.cachedNonDefaultStyles"=>"raster", "GWC.enabled"=>"true", "GWC.cacheFormats"=>"image/jpeg,image/png", "GWC.gridSets"=>"EPSG:4326,EPSG:900913"}}
+  > sld = lyr.styles.first
+  => RGeoServer::Style: raster 
+  > sld.profile
+  => {"name"=>"raster", "sld_version"=>"1.0.0", "filename"=>"raster.sld", "sld"=>{"sld_name"=>"raster", "sld_title"=>"Default Raster"}} 
+
+ 
 A full sample script creating coverage stores in a small cluster:
 
   require 'rgeoserver'
@@ -62,13 +74,33 @@ A full sample script creating coverage stores in a small cluster:
 
 == Testing
 We use {jettywrapper}[https://github.com/projecthydra/jettywrapper] to wrap a test instance of GeoServer. In theory, you should be able to point to any other local installation. Suppose that you download the binary stable version 2.1.3 binary from {here}[http://sourceforge.net/project/downloading.php?groupname=geoserver&filename=geoserver-2.1.3-bin.zip&use_mirror=softlayer], then unzip it under say, /tmp/geoserver-2.1.3. The integration tests are executed as follows:
-  > rake integration['/tmp/geoserver-2.1.3','8080','-DGEOSERVER_DATA_DIR=data_dir']
+  $ rake integration['/tmp/geoserver-2.1.3','8080','-DGEOSERVER_DATA_DIR=data_dir']
+
+If you have the test instance running already on port 8080, you can run the tests simply with:
+
+  $ rake
 
 To generate the documentation run:
-  > rake yard
+  $ rake yard
 
 To enter into an irb console with all classess loaded:
-  > rake console
+  $ rake console
+
+== Logging
+For now we use {RestClient's}[https://github.com/adamwiggins/rest-client] base logger. It can be enabled by setting:
+
+  RestClient.log = '/tmp/restclient.log'
+
+or set an environment variable, for example:
+
+  $ RESTCLIENT_LOG=stdout ruby ingest_layer.rb 
+  RestClient.get "http://localhost:8080/geoserver/rest/workspaces/cite.xml", "Accept"=>"application/xml", "Accept-Encoding"=>"gzip, deflate", "Content-Type"=>"application/xml"
+  # => 200 OK | application/xml 662 bytes
+  RestClient.get "http://localhost:8080/geoserver/rest/workspaces/cite/coveragestores/city_of_san_francisco_1859.xml", "Accept"=>"application/xml", "Accept-Encoding"=>"gzip, deflate", "Content-Type"=>"application/xml"
+  # => 404 NotFound | text/plain 73 bytes
+  RestClient.post "http://localhost:8080/geoserver/rest/workspaces/cite/coveragestores", "<?xml version=\"1.0\"?>\n<coverageStore>\n  <name>city_of_san_francisco_1859</name>\n  <workspace>\n    <name>cite</name>\n  </workspace>\n  <enabled>true</enabled>\n  <type>GeoTIFF</type>\n  <description>Map of San Francisco by the U.S. Coast Survey, with detail of the unsettled lands</description>\n  <url>file:///geo_data/rumsey/g1030000alpha.tif</url>\n</coverageStore>\n", "Accept"=>"application/xml", "Accept-Encoding"=>"gzip, deflate", "Content-Length"=>"363", "Content-Type"=>"application/xml"
+  # => 201 Created |  0 bytes
+
 
 == Related Resources
 * {OSGeo The Open Source Geospatial Foundation}[http://www.osgeo.org]
@@ -83,9 +115,16 @@ To enter into an irb console with all classess loaded:
 - <b>v0.5</b> - Initial alpha release
 
 == TODO
-- Complete stores and coverages functionality, handle Layers, styles and data upload.
-- Complete documentaion and test coverage. Add more flexibility for integration tests with embedded Jetty and other containers.
-- Add ability to connect under SSL.
+- Handle default resources transparently.
+- Complete data stores and coverages functionality, handle layers, styles, wmsstores and data upload.
+- Complete documentation.
+- Complete test coverage: 
+  - Add functional tests 
+  - Add more flexibility for integration tests with embedded Jetty and other containers.
+- Provide more examples:
+  - Customize configuration.
+  - Connect under SSL.
+  - Batch processing.
 - Migrate base HTTP client to {Weary}[https://github.com/mwunsch/weary]?
 
 == Contributing with Patches and Pull requests checklist

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/lib/rgeoserver/catalog.rb

@@ -32,6 +32,10 @@ module RGeoServer
       {:accept => sym, :content_type=> sym}
     end
 
+    #== Resources
+
+    #= Workspaces
+
     # List of available workspaces
     # @return [Array<RGeoServer::Workspace>]
     def get_workspaces &block
@@ -41,8 +45,8 @@ module RGeoServer
       ResourceInfo.list Workspace, self, workspaces, {}, &block
     end
    
-    # @param [String] workspace
-    # @return [<RGeoServer::Workspace]
+    # @param [String] workspace name
+    # @return [RGeoServer::Workspace]
     def get_workspace workspace
       response = self.search :workspaces => workspace
       doc = Nokogiri::XML(response)
@@ -50,9 +54,12 @@ module RGeoServer
       return Workspace.new self, :name => name.text if name
     end
 
-    # @return [<RGeoServer::Workspace]
+    # @return [RGeoServer::Workspace]
     def get_default_workspace
-      return Workspace.new self, :name => 'default'
+      dw = Workspace.new self, :name => 'default'
+      w = Workspace.new self, :name => w.name
+      raise "No default workspace is available in the catalog" unless w.new?
+      w
     end
  
     def set_default_workspace
@@ -62,12 +69,54 @@ module RGeoServer
     # @param [String] store
     # @param [String] workspace
     def reassign_workspace store, workspace
-      pass
+      raise NotImplementedError
     end
 
-    # List of feature types
+    #= Layers
+
+    # List of available layers
+    # @return [Array<RGeoServer::Layer>]
+    def get_layers &block
+      response = self.search :layers => nil 
+      doc = Nokogiri::XML(response)
+      layers = doc.xpath(Layer.root_xpath).collect{|l| l.text.to_s }
+      ResourceInfo.list Layer, self, layers, {}, &block
+    end
+   
+    # @param [String] layer name
+    # @return [RGeoServer::Layer]
+    def get_layer layer
+      response = self.search :layers => layer
+      doc = Nokogiri::XML(response)
+      name = doc.at_xpath(Layer.member_xpath)
+      return Layer.new self, :name => name.text if name
+    end
+
+    #= Styles (SLD Style Layer Descriptor)
+
+    # List of available styles
+    # @return [Array<RGeoServer::Style>]
+    def get_styles &block
+      response = self.search :styles => nil 
+      doc = Nokogiri::XML(response)
+      styles = doc.xpath(Style.root_xpath).collect{|l| l.text.to_s }
+      ResourceInfo.list Style, self, styles, {}, &block
+    end
+   
+    # @param [String] style name
+    # @return [RGeoServer::Style]
+    def get_style style
+      response = self.search :styles => style
+      doc = Nokogiri::XML(response)
+      name = doc.at_xpath(Style.member_xpath)
+      return Style.new self, :name => name.text if name
+    end
+
+
+    #= Namespaces
+ 
+    # List of available namespaces
     # @return [Array<RGeoServer::Namespace>]
-    # TODO: Implement when the stable release includes it
     def get_namespaces 
       raise NotImplementedError
     end 
@@ -107,8 +156,7 @@ module RGeoServer
     # @param [String] datastore 
     # @return [Array<RGeoServer::FeatureType>]
     def get_feature_types workspace, datastore
-      pass  
-
+      raise NotImplementedError  
     end
 
     # @param [String] workspace
@@ -116,8 +164,7 @@ module RGeoServer
     # @param [String] featuretype_id  
     # @return [RGeoServer::FeatureType]
     def get_feature_type workspace, datastore, featuretype_id
-      pass  
-  
+      raise NotImplementedError  
     end    
 
 
@@ -144,7 +191,7 @@ module RGeoServer
     end
 
     #= WMS Stores (Web Map Services)
-    # TODO: Implement when the stable release includes it
+
     # List of WMS stores.
     # @param [String] workspace  
     # @return [Array<RGeoServer::WmsStore>]

data/lib/rgeoserver/coverage.rb

@@ -4,7 +4,7 @@ module RGeoServer
     class Coverage < 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 } 
+      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
@@ -75,10 +75,10 @@ module RGeoServer
         h = {
           "coverage_store" => @coverage_store.name,
           "workspace" => @workspace.name,
-          "name" => doc.at_xpath('//name/text()').text.strip,
-          "nativeName" => doc.at_xpath('//nativeName/text()').to_s,
-          "title" => doc.at_xpath('//title/text()').to_s,
-          "supportedFormats" => doc.xpath('//supportedFormats/string/text()').collect{ |t| t.to_s }
+          "name" => doc.at_xpath('//name').text.strip,
+          "nativeName" => doc.at_xpath('//nativeName').to_s,
+          "title" => doc.at_xpath('//title').to_s,
+          "supportedFormats" => doc.xpath('//supportedFormats/string').collect{ |t| t.to_s }
         }.freeze
         h  
       end

data/lib/rgeoserver/datastore.rb

@@ -100,7 +100,7 @@ module RGeoServer
         doc.xpath('//featureTypes/atom:link/@href', "xmlns:atom"=>"http://www.w3.org/2005/Atom" ).each{ |l| 
           h["featureTypes"] = begin
             response = @catalog.fetch_url l.text
-            Nokogiri::XML(response).xpath('//name/text()').collect{ |a| a.text }
+            Nokogiri::XML(response).xpath('//name/text()').collect{ |a| a.text.strip }
           rescue RestClient::ResourceNotFound
             [] 
           end.freeze

data/lib/rgeoserver/featuretype.rb

@@ -2,8 +2,11 @@
 module RGeoServer
 
     class FeatureType < ResourceInfo
-  
-      define_attribute_methods [:catalog, :workspace, :data_store, :name] 
+      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",
@@ -69,32 +72,17 @@ module RGeoServer
           end
 
           @name = options[:name].strip
-          @enabled = options[:enabled] || true
           @route = route
         end        
       end
 
-      def name= val
-        name_will_change! unless val == @name
-        @name = val
-      end
-
-      def workspace= val
-        workspace_will_change! unless val == @workspace
-        @workspace = val
-      end
-
-      def catalog= val
-        catalog_will_change! unless val == @catalog
-        @catalog = val
-      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').text.to_s
+          "name" => doc.at_xpath('//name').text.strip, 
+          "workspace" => @workspace.name, 
+          "nativeName" => doc.at_xpath('//nativeName').to_s
         }.freeze  
         h  
       end

data/lib/rgeoserver/geoserver_url_helpers.rb

@@ -4,7 +4,7 @@ module RGeoServer
     API_DOCUMENTATION = "http://docs.geoserver.org/latest/en/user/restconfig/rest-config-api.html"
   
     def url_for base, options = nil
-      return base unless options.is_a? Hash
+      base = { base => nil } unless base.is_a? Hash
       format = options.delete(:format) || 'xml'
       new_base = base.map{ |key,value|  value.nil?? key.to_s : [key.to_s, CGI::escape(value.to_s)].join("/")  }.join("/") 
       new_base = new_base.gsub(/\/$/,'')

data/lib/rgeoserver/layer.rb

@@ -0,0 +1,159 @@
+
+module RGeoServer
+
+    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 }
+
+      define_attribute_methods OBJ_ATTRIBUTES.keys
+      update_attribute_accessors OBJ_ATTRIBUTES
+
+      @@r = Confstruct::Configuration.new(:route => 'layers', :resource_name => 'layer')
+  
+      def self.resource_name
+        @@r.resource_name
+      end
+
+      def self.create_method 
+        :post 
+      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 route
+        @@r.route  
+      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
+                }
+              }
+            } 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
+
+      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
+          else
+            nil
+          end
+        rescue Exception => e
+          nil
+        end
+      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
+
+      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/resource.rb

@@ -66,17 +66,27 @@ module RGeoServer
 
 
       # Modify or save the resource
-      # @param [Hash] options
+      # @param [Hash] options / query parameters
       # @return [RGeoServer::ResourceInfo] 
       def save options = {}
         @previously_changed = changes
         @changed_attributes.clear
         run_callbacks :save do
           if new?
-              @catalog.add(@route, message, create_method) 
-              clear 
+            if self.respond_to?(:create_route)
+              raise "Resource cannot be created directly" if create_route.nil?
+              route = create_route
+            else
+              route = {@route => nil}
+            end
+            
+            options = create_options.merge(options) if self.respond_to?(:create_options)
+            @catalog.add(route, message, create_method, options) 
+            clear 
           else
-            @catalog.modify({@route => @name}, message, update_method) #unless changes.empty? 
+            options = update_options.merge(options) if self.respond_to?(:update_options)
+            route = self.respond_to?(:update_route)? update_route : {@route => @name}
+            @catalog.modify(route, message, update_method, options) #unless changes.empty? 
           end
 
           self
@@ -131,28 +141,9 @@ module RGeoServer
       def profile_xml_to_ng profile_xml
         Nokogiri::XML(profile_xml).xpath(self.class.member_xpath)
       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/text()').collect{ |a| a.text }
-            rescue RestClient::ResourceNotFound
-              []
-            end.freeze
-          end
-         }
-        h  
+        raise NotImplementedError    
       end
 
     end

data/lib/rgeoserver/rest_api_client.rb

@@ -24,8 +24,9 @@ module RGeoServer
     # @param [OrderedHash] what
     # @param [Hash] options
     def search what, options = {}
+      h = options.delete(:headers) || headers(:xml)
       resources = client[url_for(what, options)]
-      resources.options[:headers] ||= headers(:xml)
+      resources.options[:headers] = h
       begin
         return resources.get
       rescue RestClient::InternalServerError => e
@@ -55,9 +56,11 @@ module RGeoServer
     # @param [String] what
     # @param [String] message
     # @param [Symbol] method
-    def add what, message, method
-      request = client[url_for(what)]
-      request.options[:headers] ||= headers(:xml)
+    # @param [Hash] options
+    def add what, message, method, options = {}
+      h = options.delete(:headers) || headers(:xml)
+      request = client[url_for(what, options)]
+      request.options[:headers] = h
       begin 
         return request.send method, message
       rescue RestClient::InternalServerError => e
@@ -72,9 +75,11 @@ module RGeoServer
     # @param [String] what
     # @param [String] message
     # @param [Symbol] method
-    def modify what, message, method
-      request = client[url_for(what, {})]
-      request.options[:headers] ||= headers(:xml) 
+    # @param [Hash] options
+    def modify what, message, method, options = {}
+      h = options.delete(:headers) || headers(:xml)
+      request = client[url_for(what, options)]
+      request.options[:headers] = h
       $logger.debug "Modifying: \n #{message}"
       begin 
         return request.send method, message

data/lib/rgeoserver/style.rb

@@ -0,0 +1,104 @@
+
+module RGeoServer
+
+    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 }
+
+      define_attribute_methods OBJ_ATTRIBUTES.keys
+      update_attribute_accessors OBJ_ATTRIBUTES
+
+      @@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.create_method 
+        :post 
+      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 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 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
+
+      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

@@ -99,6 +99,11 @@ module RGeoServer
         catalog_will_change! unless val == @catalog
         @catalog = val
       end
+ 
+      def profile_xml_to_hash profile_xml
+        doc = profile_xml_to_ng profile_xml 
+        return {'name' => doc.at_xpath('//name').text.strip, 'enabled' => @enabled }
+      end
 
     end
 end 

data/lib/rgeoserver/workspace.rb

@@ -68,5 +68,28 @@ module RGeoServer
         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
+          end
+         }
+        h  
+      end
+ 
     end
 end 

data/lib/rgeoserver.rb

@@ -14,6 +14,8 @@ module RGeoServer
   autoload :DataStore, "rgeoserver/datastore"
   autoload :CoverageStore, "rgeoserver/coveragestore"
   autoload :WmsStore, "rgeoserver/wmsstore"
+  autoload :Style, "rgeoserver/style"
+  autoload :Layer, "rgeoserver/layer"
 
   require 'restclient'
   require 'nokogiri'

data/rgeoserver.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("bundler", ">= 1.0.14")
   s.add_development_dependency("rspec")
   s.add_development_dependency("yard")
+  s.add_development_dependency("equivalent-xml")
   s.add_development_dependency("jettywrapper")
 end
 

data/spec/fixtures/datasets/vector/granules.prj

@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

data/spec/fixtures/styles/poptest.sld

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<sld:StyledLayerDescriptor xmlns="http://www.opengis.net/sld"
+xmlns:sld="http://www.opengis.net/sld"
+xmlns:ogc="http://www.opengis.net/ogc"
+xmlns:gml="http://www.opengis.net/gml" version="1.0.0">
+  <sld:NamedLayer>
+    <sld:Name>pophatch</sld:Name>
+    <sld:UserStyle>
+      <sld:Name>pophatch</sld:Name>
+      <sld:Title>Population in the United States</sld:Title>
+      <sld:Abstract>A sample filter that filters the United States
+      into three categories of population, drawn in different
+      colors</sld:Abstract>
+      <sld:FeatureTypeStyle>
+        <sld:Name>name</sld:Name>
+        <sld:Rule>
+          <sld:Title>&lt; 2M</sld:Title>
+          <ogc:Filter>
+            <ogc:PropertyIsLessThan>
+              <ogc:PropertyName>PERSONS</ogc:PropertyName>
+              <ogc:Literal>2000000</ogc:Literal>
+            </ogc:PropertyIsLessThan>
+          </ogc:Filter>
+          <sld:PolygonSymbolizer>
+            <sld:Fill>
+              <sld:GraphicFill>
+                <sld:Graphic>
+                  <sld:Mark>
+                    <sld:WellKnownName>
+                    shape://slash</sld:WellKnownName>
+                    <sld:Stroke>
+                      <sld:CssParameter name="stroke">
+                      0xAAAAAA</sld:CssParameter>
+                    </sld:Stroke>
+                  </sld:Mark>
+                  <sld:Size>
+                    <ogc:Literal>16</ogc:Literal>
+                  </sld:Size>
+                </sld:Graphic>
+              </sld:GraphicFill>
+            </sld:Fill>
+          </sld:PolygonSymbolizer>
+        </sld:Rule>
+        <sld:Rule>
+          <sld:Title>2M - 4M</sld:Title>
+          <ogc:Filter>
+            <ogc:PropertyIsBetween>
+              <ogc:PropertyName>PERSONS</ogc:PropertyName>
+              <ogc:LowerBoundary>
+                <ogc:Literal>2000000</ogc:Literal>
+              </ogc:LowerBoundary>
+              <ogc:UpperBoundary>
+                <ogc:Literal>4000000</ogc:Literal>
+              </ogc:UpperBoundary>
+            </ogc:PropertyIsBetween>
+          </ogc:Filter>
+          <sld:PolygonSymbolizer>
+            <sld:Fill>
+              <sld:GraphicFill>
+                <sld:Graphic>
+                  <sld:Mark>
+                    <sld:WellKnownName>
+                    shape://slash</sld:WellKnownName>
+                    <sld:Stroke>
+                      <sld:CssParameter name="stroke">
+                      0xAAAAAA</sld:CssParameter>
+                    </sld:Stroke>
+                  </sld:Mark>
+                  <sld:Size>
+                    <ogc:Literal>8</ogc:Literal>
+                  </sld:Size>
+                </sld:Graphic>
+              </sld:GraphicFill>
+            </sld:Fill>
+          </sld:PolygonSymbolizer>
+        </sld:Rule>
+        <sld:Rule>
+          <sld:Title>&gt; 4M</sld:Title>
+          <ogc:Filter>
+            <ogc:PropertyIsGreaterThan>
+              <ogc:PropertyName>PERSONS</ogc:PropertyName>
+              <ogc:Literal>4000000</ogc:Literal>
+            </ogc:PropertyIsGreaterThan>
+          </ogc:Filter>
+          <sld:PolygonSymbolizer>
+            <sld:Fill>
+              <sld:GraphicFill>
+                <sld:Graphic>
+                  <sld:Mark>
+                    <sld:WellKnownName>
+                    shape://slash</sld:WellKnownName>
+                    <sld:Stroke>
+                      <sld:CssParameter name="stroke">
+                      0xAAAAAA</sld:CssParameter>
+                    </sld:Stroke>
+                  </sld:Mark>
+                  <sld:Size>
+                    <ogc:Literal>4</ogc:Literal>
+                  </sld:Size>
+                </sld:Graphic>
+              </sld:GraphicFill>
+            </sld:Fill>
+          </sld:PolygonSymbolizer>
+        </sld:Rule>
+        <sld:Rule>
+          <sld:Title>Boundary</sld:Title>
+          <sld:LineSymbolizer>
+            <sld:Stroke />
+          </sld:LineSymbolizer>
+          <sld:TextSymbolizer>
+            <sld:Label>
+              <ogc:PropertyName>STATE_ABBR</ogc:PropertyName>
+            </sld:Label>
+            <sld:Font>
+              <sld:CssParameter name="font-family">Times New
+              Roman</sld:CssParameter>
+              <sld:CssParameter name="font-size">
+              14</sld:CssParameter>
+              <sld:CssParameter name="font-style">
+              Normal</sld:CssParameter>
+              <sld:CssParameter name="font-weight">
+              normal</sld:CssParameter>
+            </sld:Font>
+            <sld:LabelPlacement>
+              <sld:PointPlacement>
+                <sld:AnchorPoint>
+                  <sld:AnchorPointX>
+                    <ogc:Literal>0.5</ogc:Literal>
+                  </sld:AnchorPointX>
+                  <sld:AnchorPointY>
+                    <ogc:Literal>0.5</ogc:Literal>
+                  </sld:AnchorPointY>
+                </sld:AnchorPoint>
+                <sld:Rotation>
+                  <ogc:Literal>0.0</ogc:Literal>
+                </sld:Rotation>
+              </sld:PointPlacement>
+            </sld:LabelPlacement>
+            <sld:Halo>
+              <sld:Radius>
+                <ogc:Literal>2</ogc:Literal>
+              </sld:Radius>
+              <sld:Fill>
+                <sld:CssParameter name="fill">
+                0xFFFFFF</sld:CssParameter>
+              </sld:Fill>
+            </sld:Halo>
+          </sld:TextSymbolizer>
+        </sld:Rule>
+      </sld:FeatureTypeStyle>
+    </sld:UserStyle>
+  </sld:NamedLayer>
+</sld:StyledLayerDescriptor>

data/spec/fixtures/styles/test_style.sld

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<StyledLayerDescriptor version="1.1.0"
+  xmlns="http://www.opengis.net/sld"
+  xmlns:se="http://www.opengis.net/se"
+  xmlns:ogc="http://www.opengis.net/ogc"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.opengis.net/sld
+  http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd">
+<NamedLayer>
+  <se:Name>granules</se:Name>
+    <UserStyle>
+      <se:Name>xxx</se:Name>
+      <se:FeatureTypeStyle>
+        <se:Rule>
+          <se:LineSymbolizer>
+            <se:Geometry>
+              <ogc:PropertyName>center-line</ogc:PropertyName>
+            </se:Geometry>
+            <se:Stroke>
+              <se:SvgParameter name="stroke">#0000ff</se:SvgParameter>
+            </se:Stroke>
+          </se:LineSymbolizer>
+        </se:Rule>
+      </se:FeatureTypeStyle>
+    </UserStyle>
+  </NamedLayer>
+</StyledLayerDescriptor>

data/spec/lib/integration_test_spec.rb

@@ -7,6 +7,7 @@ describe "Integration test against a GeoServer instance", :integration => true d
     @catalog = RGeoServer.catalog
   end
 
+
   context "Workspaces" do 
     it "should list workspaces" do
       @catalog.get_workspaces.each{ |obj|
@@ -73,6 +74,65 @@ describe "Integration test against a GeoServer instance", :integration => true d
     end
   end
 
+  context "Layers" do 
+    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.new?.should == true
+      lyr.default_style = 'rain'
+      lyr.alternate_styles = ['raster']
+      lyr.enabled = 'true'
+      expect{ lyr.save }.to raise_error 
+    end
+
+    it "should list layers" do
+      @catalog.get_layers.each { |l| 
+        l.profile.should_not be_empty
+      }
+    end
+  end
+
+  context "Styles" do
+    before :all do
+      sld_dir = File.join(File.dirname(__FILE__), '/../fixtures/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
+ 
+    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 
+        style.sld_doc = sld_ng.to_xml
+        style.save
+        style.sld_doc.should be_equivalent_to(sld_ng)
+        style.new?.should == false
+        style.delete :purge => true
+        style.new?.should == true
+      end
+    end
+    
+    it "should list layers that include a style" do
+      @catalog.get_styles[1,1].each do |s|
+        break
+        s.profile.should_not be_empty
+        s.layers do |l|
+          lyrs = l.profile['alternate_styles'] + [l.profile['default_style']]
+          lyrs.should include s.name unless lyrs.empty?
+        end
+      end
+    end
+
+  end
+
   context "Stores" do
     before :all do
       @ws = RGeoServer::Workspace.new @catalog, :name => 'test_workspace_for_stores'
@@ -84,6 +144,12 @@ describe "Integration test against a GeoServer instance", :integration => true d
     end
 
     context "DataStores" do
+      it "should list all available data stores" do
+        @catalog.get_data_stores.each { |d|  
+          d.profile.should_not be_empty
+        }
+      end
+
       it "should instantiate a datastore" do
         obj = RGeoServer::DataStore.new @catalog, :workspace => @ws, :name => 'test_shapefile'
         obj.new?.should == true
@@ -92,9 +158,9 @@ describe "Integration test against a GeoServer instance", :integration => true d
       end
 
       it "should not create a datastore if workspace does not exit" do
-        new_ws = RGeoServer::Workspace.new @catalog, :name => SecureRandom.hex(5)
+        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
@@ -114,7 +180,13 @@ describe "Integration test against a GeoServer instance", :integration => true d
         ds.delete
       end
     end
+
     context "CoverageStores" do
+      it "should list all available coverage stores" do
+        @catalog.get_coverage_stores.each { |c|  
+          c.profile.should_not be_empty
+        }
+      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"

data/spec/spec_helper.rb

@@ -2,5 +2,4 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rgeoserver'
 require 'rspec'
-require 'active_support/secure_random'
-
+require 'equivalent-xml'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeoserver
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2151853600 !ruby/object:Gem::Requirement
+  requirement: &2156047080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151853600
+  version_requirements: *2156047080
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2151852040 !ruby/object:Gem::Requirement
+  requirement: &2156045940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151852040
+  version_requirements: *2156045940
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &2151850600 !ruby/object:Gem::Requirement
+  requirement: &2156045140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151850600
+  version_requirements: *2156045140
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2151849080 !ruby/object:Gem::Requirement
+  requirement: &2156044240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151849080
+  version_requirements: *2156044240
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2151847820 !ruby/object:Gem::Requirement
+  requirement: &2156043140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151847820
+  version_requirements: *2156043140
 - !ruby/object:Gem::Dependency
   name: confstruct
-  requirement: &2151846960 !ruby/object:Gem::Requirement
+  requirement: &2156042500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151846960
+  version_requirements: *2156042500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151862320 !ruby/object:Gem::Requirement
+  requirement: &2156041700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151862320
+  version_requirements: *2156041700
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2151861320 !ruby/object:Gem::Requirement
+  requirement: &2156062780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151861320
+  version_requirements: *2156062780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151859920 !ruby/object:Gem::Requirement
+  requirement: &2156061480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.0.14
   type: :development
   prerelease: false
-  version_requirements: *2151859920
+  version_requirements: *2156061480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151858660 !ruby/object:Gem::Requirement
+  requirement: &2156060280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151858660
+  version_requirements: *2156060280
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2151856760 !ruby/object:Gem::Requirement
+  requirement: &2156056640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151856760
+  version_requirements: *2156056640
+- !ruby/object:Gem::Dependency
+  name: equivalent-xml
+  requirement: &2156056020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156056020
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &2151855380 !ruby/object:Gem::Requirement
+  requirement: &2156055520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151855380
+  version_requirements: *2156055520
 description: ! 'GeoServer REST API Ruby library : Requires GeoServer 2.1.3+'
 email:
 - renzo.sanchez.silva@gmail.com
@@ -164,12 +175,21 @@ files:
 - lib/rgeoserver/datastore.rb
 - lib/rgeoserver/featuretype.rb
 - lib/rgeoserver/geoserver_url_helpers.rb
+- lib/rgeoserver/layer.rb
 - lib/rgeoserver/resource.rb
 - lib/rgeoserver/rest_api_client.rb
+- lib/rgeoserver/style.rb
 - lib/rgeoserver/version.rb
 - lib/rgeoserver/wmsstore.rb
 - lib/rgeoserver/workspace.rb
 - rgeoserver.gemspec
+- spec/fixtures/datasets/raster/test.tif
+- spec/fixtures/datasets/vector/granules.dbf
+- spec/fixtures/datasets/vector/granules.prj
+- spec/fixtures/datasets/vector/granules.shp
+- spec/fixtures/datasets/vector/granules.shx
+- spec/fixtures/styles/poptest.sld
+- spec/fixtures/styles/test_style.sld
 - spec/lib/integration_test_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/rnz0/rgeoserver
@@ -197,6 +217,13 @@ signing_key:
 specification_version: 3
 summary: GeoServer REST API ruby library
 test_files:
+- spec/fixtures/datasets/raster/test.tif
+- spec/fixtures/datasets/vector/granules.dbf
+- spec/fixtures/datasets/vector/granules.prj
+- spec/fixtures/datasets/vector/granules.shp
+- spec/fixtures/datasets/vector/granules.shx
+- spec/fixtures/styles/poptest.sld
+- spec/fixtures/styles/test_style.sld
 - spec/lib/integration_test_spec.rb
 - spec/spec_helper.rb
 has_rdoc: