rgeoserver 0.5.2 → 0.5.3

data/README.rdoc

@@ -50,7 +50,7 @@ To enter into an irb console with all classess loaded:
 
 == Release History
 
-- <b>v0.5.0</b> - Initial alpha release
+- <b>v0.5</b> - Initial alpha release
 
 == TODO
 - Complete stores and coverages functionality, handle Layers, styles and data upload.

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/rgeoserver/catalog.rb

@@ -32,12 +32,13 @@ module RGeoServer
       {:accept => sym, :content_type=> sym}
     end
 
-    # List of workspaces available
+    # List of available workspaces
     # @return [Array<RGeoServer::Workspace>]
-    def get_workspaces
+    def get_workspaces &block
       response = self.search :workspaces => nil 
       doc = Nokogiri::XML(response)
-      doc.xpath(Workspace.root_xpath).collect { |w| Workspace.new self, :name => w.text } 
+      workspaces = doc.xpath(Workspace.root_xpath).collect{|w| w.text.to_s }
+      ResourceInfo.list Workspace, self, workspaces, {}, &block
     end
    
     # @param [String] workspace

data/lib/rgeoserver/coveragestore.rb

@@ -78,10 +78,8 @@ module RGeoServer
         end        
       end
 
-      def coverages
-        profile["coverages"].collect{ |name|
-          Coverage.new @catalog, :workspace => @workspace, :coverage_store => self, :name => name
-        }
+      def coverages &block
+        self.class.list Coverage, @catalog, profile['coverages'], {:workspace => @workspace}, check_remote = true, &block
       end
 
       def profile_xml_to_hash profile_xml

data/lib/rgeoserver/datastore.rb

@@ -86,10 +86,8 @@ module RGeoServer
         end        
       end
 
-      def featuretypes
-        profile["featureTypes"].collect{ |name|
-          FeatureType.new @catalog, :workspace => @workspace, :data_store => self, :name => name
-        }
+      def featuretypes &block
+        self.class.list FeatureType, @catalog, profile['featureTypes'], {:workspace => @workspace}, check_remote = true, &block
       end
 
       def profile_xml_to_hash profile_xml

data/lib/rgeoserver/resource.rb

@@ -30,6 +30,24 @@ module RGeoServer
         end
       end
 
+      # Generic object construction iterator
+      # @param [RGeoServer::ResourceInfo.class] klass
+      # @param [RGeoServer::Catalog] catalog
+      # @param [Array<String>] names
+      # @param [Hash] options
+      # @param [bool] check_remote if already exists in catalog and cache it
+      # @yield [RGeoServer::ResourceInfo] 
+      def self.list klass, catalog, names, options, check_remote = false, &block
+        return to_enum(:list, klass, catalog, names, options).to_a unless block_given?
+         
+        (names.is_a?(Array)? names : [names]).each { |name|
+          obj = klass.new catalog, options.merge(:name => name)
+          obj.new? if check_remote  
+          block.call(obj)
+        }        
+        
+      end
+
       def initialize options
         @new = true
       end
@@ -46,8 +64,9 @@ module RGeoServer
         self.class.update_method
       end
 
+
       # Modify or save the resource
-      # @param options [Hash] 
+      # @param [Hash] options
       # @return [RGeoServer::ResourceInfo] 
       def save options = {}
         @previously_changed = changes
@@ -65,7 +84,7 @@ module RGeoServer
       end
      
       # Purge resource from Geoserver Catalog
-      # @param options [Hash] 
+      # @param [Hash] options
       # @return [RGeoServer::ResourceInfo] `self`
       def delete options = {} 
         run_callbacks :destroy do

data/lib/rgeoserver/workspace.rb

@@ -56,22 +56,16 @@ module RGeoServer
         @route = route
       end
 
-      def data_stores
-        profile['dataStores'].collect{ |name| 
-          DataStore.new @catalog, :workspace => self, :name => name
-        }
+      def data_stores &block
+        self.class.list DataStore, @catalog, profile['dataStores'], {:workspace => self}, check_remote = true, &block
       end
     
-      def coverage_stores
-        profile['coverageStores'].collect{ |name| 
-          CoverageStore.new @catalog, :workspace => self, :name => name
-        }
+      def coverage_stores &block
+        self.class.list CoverageStore, @catalog, profile['coverageStores'], {:workspace => self}, check_remote = true, &block
       end
 
-      def wms_stores
-        profile['wmsStores'].collect{ |name| 
-          WmsStore.new @catalog, :workspace => self, :name => name
-        }
+      def wms_stores &block
+        self.class.list WmsStore, @catalog, profile['wmsStores'], {:workspace => self}, check_remote = true, &block
       end
  
     end

data/spec/lib/integration_test_spec.rb

@@ -64,10 +64,10 @@ describe "Integration test against a GeoServer instance", :integration => true d
       end
 
       it "should list datastore objects that belong to it" do
-        @ws.data_stores.each{ |ds| 
+        @ws.data_stores do |ds| 
           ds.should be_kind_of(RGeoServer::DataStore)
           ["s1", "s2", "s3"].should include ds.name
-        }
+        end
       end
 
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rgeoserver
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Renzo Sanchez-Silva
@@ -207,10 +207,8 @@ files:
 - lib/rgeoserver/catalog.rb
 - lib/rgeoserver/config.rb
 - lib/rgeoserver/coverage.rb
-- lib/rgeoserver/coverages.rb
 - lib/rgeoserver/coveragestore.rb
 - lib/rgeoserver/datastore.rb
-- lib/rgeoserver/datastores.rb
 - lib/rgeoserver/featuretype.rb
 - lib/rgeoserver/geoserver_url_helpers.rb
 - lib/rgeoserver/resource.rb

data/lib/rgeoserver/coverages.rb

@@ -1,114 +0,0 @@
-
-module RGeoServer
-
-    class CoverageStore < ResourceInfo
-
-      OBJ_ATTRIBUTES = {:catalog => 'catalog', :workspace => 'workspace', :url => 'url', :data_type => 'type', :name => 'name', :enabled => 'enabled', :description => 'description'}  
-      OBJ_DEFAULT_ATTRIBUTES = {:catalog => nil, :workspace => nil, :url => '', :data_type => 'GeoTIFF', :name => nil, :enabled => true, :description=>nil}  
-      define_attribute_methods OBJ_ATTRIBUTES.keys
-      update_attribute_accessors OBJ_ATTRIBUTES
-  
-      @@r = Confstruct::Configuration.new(
-          #:route => "workspaces/%s/coveragestores",
-          :route => "workspaces/%s/coveragestores/%s",
-          #:root => "coverageStores",
-          :root => "coverageStore",
-          :resource_name => "coverageStore"
-        )
-
-      def self.root
-        @@r.root
-      end
-
-      def self.method
-        :put 
-      end
-
-      def self.resource_name
-        @@r.resource_name
-      end
- 
-      def self.root_xpath
-        "//#{root}/#{resource_name}"
-      end
-
-      def self.member_xpath
-        "//#{resource_name}"
-      end
-
-      def route
-        #@@r.route % @workspace.name 
-        @@r.route % [@workspace.name , @name]
-      end
-
-      def message
-        builder = Nokogiri::XML::Builder.new do |xml|
-          xml.coverageStore {
-            xml.name @name
-            xml.enabled profile['enabled'] 
-            xml.type_ @data_type if data_type_changed?
-            xml.description @description if description_changed?
-            xml.url @url if url_changed? 
-          }
-        end
-        return builder.doc.to_xml 
-      end
-
-      # @param [RGeoServer::Catalog] catalog
-      # @param [RGeoServer::Workspace|String] workspace
-      # @param [String] name
-      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
-          @name = options[:name].strip
-          @route = route
-        end        
-      end
-
-      def coverages
-        profile[:coverages].collect{ |name|
-          Coverage.new @catalog, :workspace => @workspace, :coverage_store => self, :name => name if name
-        }
-      end
-
-      def profile_xml_to_ng1 profile_xml
-        Nokogiri::XML(profile_xml).xpath(self.member_xpath)
-      end 
-
-      def profile_xml_to_hash profile_xml
-        doc = profile_xml_to_ng profile_xml 
-        {
-          'name' => doc.at_xpath('//name').text.strip, 
-          'workspace' => @workspace.name, 
-          'type' => doc.at_xpath('//type/text()').to_s,
-          'enabled' => doc.at_xpath('//enabled/text()').to_s,
-          'description' => doc.at_xpath('//description/text()').to_s,
-          'url' => doc.at_xpath('//url/text()').to_s
-        }
-      end
-
-      def profile_xml_to_hash1 profile_xml
-        doc = profile_xml_to_ng profile_xml 
-        h = {:name => doc.at_xpath('//name').text.strip, :workspace => @workspace.name, :coverages => [] }
-        doc.xpath('//coverages/atom:link/@href', "xmlns:atom"=>"http://www.w3.org/2005/Atom" ).each{ |l| 
-          h[:coverages] << { 
-            :name => l.parent.parent.at_xpath('//name/text()').to_s,
-            :type => l.parent.parent.at_xpath('//type/text()').to_s,
-            :enabled => l.parent.parent.at_xpath('//enabled/text()').to_s,
-            :description => l.parent.parent.at_xpath('//description/text()').to_s,
-            :url => l.parent.parent.at_xpath('//url/text()').to_s
-          }
-        }
-        h  
-      end
-    end
-end 

data/lib/rgeoserver/datastores.rb

@@ -1,83 +0,0 @@
-
-module RGeoServer
-
-    class DataStores < ResourceInfo
-  
-      OBJ_ATTRIBUTES = {:enabled => "enabled", :catalog => "catalog", :workspace => "workspace", :name => "name"} 
-      OBJ_DEFAULT_ATTRIBUTES = {:enabled => 'true', :catalog => nil, :workspace => nil, :name => nil, }
-      define_attribute_methods OBJ_ATTRIBUTES.keys
-      update_attribute_accessors OBJ_ATTRIBUTES
- 
-      @@r = Confstruct::Configuration.new(
-          :route => "workspaces/%s/datastores",
-          :root => "dataStores",
-          :resource_name => "dataStore"
-        )
-
-      def self.root
-        @@r.root
-      end
-
-      def self.create_method
-        :put 
-      end
-
-      def self.update_method
-        :put 
-      end
-
-      def self.resource_name
-        @@r.resource_name
-      end
- 
-      def self.root_xpath
-        "//#{root}/#{resource_name}"
-      end
-
-      def self.member_xpath
-        "//#{resource_name}"
-      end
-
-      def route
-        @@r.route % @workspace.name 
-      end
-
-      def message
-        builder = Nokogiri::XML::Builder.new do |xml|
-          xml.dataStore {
-            xml.enabled @enabled
-            xml.name @name
-          }
-        end
-        return builder.doc.to_xml 
-      end
-
-      # @param [RGeoServer::Catalog] catalog
-      # @param [RGeoServer::Workspace|String] workspace
-      # @param [String] name
-      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
-          @name = options[:name].strip
-          @connection_parameters = options[:connection_parameters] || {}
-          @route = route
-        end        
-      end
-
-      def data_stores
-        profile['dataStores'].collect{ |name|
-          DataStore.new @catalog, :workspace => @workspace, :data_store => self, :name => name
-        }
-      end
-
-    end
-end