rgeoserver 0.5.7 → 0.5.8

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+script: bundle exec rspec spec/functional/*_spec.rb

data/README.rdoc

@@ -1,4 +1,5 @@
 {<img src="https://gemnasium.com/rnz0/rgeoserver.png" alt="Dependency Status" />}[https://gemnasium.com/rnz0/rgeoserver]
+{<img src="https://secure.travis-ci.org/rnz0/rgeoserver.png" />}[http://travis-ci.org/rnz0/rgeoserver]
 
 == RGeoServer
 
@@ -136,16 +137,14 @@ or set an environment variable, for example:
 - Complete updating data in objects. On failure, objects should roll back.
 - Complete documentation.
 - Complete test coverage: 
-  - Add functional tests and hook to CI service (most likely travis-ci). 
   - Break down testing into separate specs per class.
   - Add more flexibility for integration tests with embedded Jetty and other containers.
   - Add ability to perform integration tests in a CI server.
-- Add GeoWebCache REST API operations for seeding and truncating layers.
 - Provide more examples:
   - Customize configuration.
   - Connect under SSL.
   - Batch processing.
-- Migrate base HTTP client to {Weary}[https://github.com/mwunsch/weary]?
+- Migrate base HTTP client to {Faraday}[https://github.com/technoweenie/faraday]?
 - Curlify operations: To provide optional log/output of the curl command that would produce the same 
 result as the ResourceInfo#save method.
 
@@ -160,13 +159,13 @@ result as the ResourceInfo#save method.
 
 
 == Acknowledgements
-Inspired on the {Rubydora}[https://github.com/cbeer/rubydora] and RSolr gems. Followed somewhat closely to {gsconfig.py}[https://github.com/dwins/gsconfig.py] 
+Inspired on the {Rubydora}[https://github.com/cbeer/rubydora] gem. Followed somewhat closely to {gsconfig.py}[https://github.com/dwins/gsconfig.py] 
 
 == Contributors
 
 
 == License 
 
-Copyright (c) 2011 Renzo Sanchez-Silva <renzo@stanford.edu>.
+Copyright (c) 2012 Renzo Sanchez-Silva <renzo@stanford.edu>.
 
 Licensed under the {MIT License}[http://www.opensource.org/licenses/MIT].

data/VERSION

@@ -1 +1 @@
-0.5.7
+0.5.8

data/lib/rgeoserver/coveragestore.rb

@@ -73,7 +73,7 @@ module RGeoServer
     end
 
     def coverages &block
-      self.class.list Coverage, @catalog, profile['coverages'], {:workspace => @workspace}, check_remote = true, &block
+      self.class.list Coverage, @catalog, profile['coverages'], {:workspace => @workspace, :coverage_store => self}, check_remote = true, &block
     end
 
     def profile_xml_to_hash profile_xml

data/lib/rgeoserver/datastore.rb

@@ -48,7 +48,7 @@ module RGeoServer
               xml.entry(:key => k) {
                 xml.text v
               }
-            } unless @connection_parameters.empty? 
+            } unless @connection_parameters.nil? || @connection_parameters.empty?
           }
         }
       end
@@ -70,14 +70,14 @@ module RGeoServer
         else
           raise "Not a valid workspace"
         end
+        
         @name = options[:name].strip
-        @connection_parameters = options[:connection_parameters] || {}
         @route = route
       end        
     end
 
     def featuretypes &block
-      self.class.list FeatureType, @catalog, profile['featureTypes'], {:workspace => @workspace}, check_remote = true, &block
+      self.class.list FeatureType, @catalog, profile['featureTypes'], {:workspace => @workspace, :data_store => self}, check_remote = true, &block
     end
 
     def profile_xml_to_hash profile_xml
@@ -94,7 +94,6 @@ module RGeoServer
         rescue RestClient::ResourceNotFound
           [] 
         end.freeze
-        
        }
       h  
     end

data/lib/rgeoserver/featuretype.rb

@@ -2,8 +2,8 @@
 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", :metadata_links => "metadataLinks", :title => "title", :abstract => "abstract" }
-    OBJ_DEFAULT_ATTRIBUTES = {:catalog => nil, :workspace => nil, :coverage_store => nil, :name => nil, :enabled => "false", :metadata_links => [], :title => nil, :abtract => nil } 
+    OBJ_ATTRIBUTES = {:catalog => "catalog", :name => "name", :workspace => "workspace", :data_store => "data_store", :enabled => "enabled", :metadata_links => "metadataLinks", :title => "title", :abstract => "abstract" }
+    OBJ_DEFAULT_ATTRIBUTES = {:catalog => nil, :workspace => nil, :data_store => nil, :name => nil, :enabled => "false", :metadata_links => [], :title => nil, :abtract => nil } 
    
     define_attribute_methods OBJ_ATTRIBUTES.keys
     update_attribute_accessors OBJ_ATTRIBUTES
@@ -95,6 +95,7 @@ module RGeoServer
         "title" => doc.at_xpath('//title/text()').to_s,
         "abstract" => doc.at_xpath('//abstract/text()').to_s, 
         "workspace" => @workspace.name, 
+        "data_store" => @data_store.name,
         "nativeName" => doc.at_xpath('//nativeName/text()').to_s,
         "srs" => doc.at_xpath('//srs/text()').to_s,
         "nativeBoundingBox" => { 

data/lib/rgeoserver/resource.rb

@@ -38,14 +38,17 @@ module RGeoServer
       # @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)
-        }        
-        
+        if names.nil?
+          return []
+        elsif !block_given?
+          to_enum(:list, klass, catalog, names, options).to_a unless block_given?
+        else 
+          (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 
       end
 
       def initialize options

data/spec/fixtures/resources/datastore/old.xml

@@ -0,0 +1,22 @@
+<dataStore>
+  <name>sites_shape</name>
+  <type>Shapefile</type>
+  <enabled>true</enabled>
+  <workspace>
+    <name>test_ws</name>
+    <atom:link xmlns:atom="http://www.w3.org/2005/Atom" rel="alternate" href="https://geodata.example.com/geoserver/rest/workspaces/test_ws.xml" type="application/xml"/>
+  </workspace>
+  <connectionParameters>
+    <entry key="memory mapped buffer">false</entry>
+    <entry key="create spatial index">true</entry>
+    <entry key="charset">ISO-8859-1</entry>
+    <entry key="filetype">shapefile</entry>
+    <entry key="cache and reuse memory maps">true</entry>
+    <entry key="url">file:data/shapefiles/o_sites.shp</entry>
+    <entry key="namespace">http://www.openplans.org/spearfish</entry>
+  </connectionParameters>
+  <__default>false</__default>
+  <featureTypes>
+  <atom:link xmlns:atom="http://www.w3.org/2005/Atom" rel="alternate" href="https://geodata.example.com/geoserver/rest/workspaces/test_ws/datastores/sites_shape/featuretypes.xml" type="application/xml"/>
+  </featureTypes>
+</dataStore>

data/spec/fixtures/resources/datastore/old_featuretypes.xml

@@ -0,0 +1,6 @@
+<featureTypes>
+  <featureType>
+  <name>o_sitesnew</name>
+  <atom:link xmlns:atom="http://www.w3.org/2005/Atom" rel="alternate" href="https://geodata.example.com/geoserver/rest/workspaces/test_ws/datastores/sites_shape/featuretypes/o_sitesnew.xml" type="application/xml"/>
+  </featureType>
+</featureTypes>

data/spec/functional/datastore_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+describe RGeoServer::DataStore do
+  let(:old_test_ds_xml){ 
+     File.read(File.expand_path('../fixtures/resources/datastore/old.xml', File.dirname(__FILE__))) 
+  }
+  let(:old_test_ds_featuretypes_xml){
+     File.read(File.expand_path('../fixtures/resources/datastore/old_featuretypes.xml', File.dirname(__FILE__))) 
+  }
+  let(:catalog) { 
+    c = double('Catalog') 
+    # Stub profile responses
+    # For a new datastore
+    c.stub(:search).with({"workspaces/test_ws/datastores"=>"new_test_ds"}).and_raise(RestClient::ResourceNotFound)
+    # For a supposed existing datastore
+    c.stub(:search).with({"workspaces/test_ws/datastores"=>"old_test_ds"}).and_return(old_test_ds_xml)
+    # Fake featuretypes response for a new datastore
+    c.stub(:do_url).with("https://geodata.example.com/geoserver/rest/workspaces/test_ws/datastores/sites_shape/featuretypes.xml").and_raise(
+      RestClient::ResourceNotFound
+    )
+    # Fake featuretypes response for an existing (old) datastore
+    c.stub(:do_url).with("https://geodata.example.com/geoserver/rest/workspaces/test_ws/datastores/sites_shape/featuretypes.xml").and_return(
+      old_test_ds_featuretypes_xml
+    )
+    c
+  }
+  let(:workspace) { 
+    w = double('Workspace')
+    w.stub(:instance_of?).with(String).and_return(false)
+    w.stub(:instance_of?).with(RGeoServer::Workspace).and_return(true)
+    w.stub(:name).and_return('test_ws')
+    w
+  }
+
+  describe "#new" do
+    it 'should not allow empty parameters' do
+      expect{ RGeoServer::DataStore.new }.to raise_error ArgumentError
+    end   
+    it 'should not allow null name' do 
+      expect { RGeoServer::DataStore.new catalog, :workspace => workspace }.to raise_error
+    end
+
+    it 'should not allow empty workspace' do
+      expect { RGeoServer::DataStore.new catalog, :name => 'test_ds' }.to raise_error
+    end 
+
+    it 'should allow non null catalog, workspace and name' do 
+      ds = RGeoServer::DataStore.new catalog, :workspace => workspace, :name => 'test_ds'
+    end
+
+  end
+
+  describe "#connection_parameters" do
+    it 'should not override connection_parameters if on a existing datastore with non empty connection parameters' do
+      ds = RGeoServer::DataStore.new catalog, :workspace => workspace, :name => 'old_test_ds'
+      ds.connection_parameters.should == {
+        "memory mapped buffer"=>"false", 
+        "create spatial index"=>"true", 
+        "charset"=>"ISO-8859-1", 
+        "filetype"=>"shapefile",
+        "cache and reuse memory maps"=>"true", 
+        "url"=>"file:data/shapefiles/o_sites.shp", 
+        "namespace"=>"http://www.openplans.org/spearfish"
+      }
+    end 
+
+    it 'should have empty connection_parameters on new datastores' do 
+      ds = RGeoServer::DataStore.new catalog, :workspace => workspace, :name => 'new_test_ds'
+      ds.connection_parameters.should be_empty 
+    end
+
+  end
+
+  describe "#featuretypes" do
+    it 'should list feature types in datastore' do
+      ds = RGeoServer::DataStore.new catalog, :workspace => workspace, :name => 'old_test_ds'
+      # there is only one feature type in fixture response old_featuretypes.xml 
+      ds.featuretypes.size.should == 1
+      ft = ds.featuretypes.first
+      ft.should be_an_instance_of(RGeoServer::FeatureType)
+      ft.name.should == 'o_sitesnew'
+    end
+
+    it 'should return an empty array of datastore is new or has no feature type resources' do
+      ds = RGeoServer::DataStore.new catalog, :workspace => workspace, :name => 'new_test_ds'
+      ds.featuretypes.should be_empty
+    end
+  end
+
+  describe "#profile_xml_to_hash" do
+    it 'should parse correctly profile_xml response for existing datastores' do
+      # this is called implicitely in previous tests  
+    end
+  end
+end
+

data/spec/integration/geoserver_spec.rb

@@ -114,10 +114,6 @@ describe "Integration test against a GeoServer instance", :integration => true d
       before :all do
         @ws = RGeoServer::Workspace.new @catalog, :name => 'test_workspace_with_stores'
         @ws.save 
-        ["s1", "s2","s3"].each{ |s|
-          ds = RGeoServer::DataStore.new @catalog, :workspace => @ws, :name => s
-          ds.save 
-        }
       end
 
       after :all do
@@ -125,9 +121,13 @@ describe "Integration test against a GeoServer instance", :integration => true d
       end
 
       it "should list datastore objects that belong to it" do
-        @ws.data_stores do |ds| 
+        ['s1', 's2', 's3'].each{ |s|
+          ds = RGeoServer::DataStore.new @catalog, :workspace => @ws, :name => s
+          ds.save 
+        }
+        @ws.data_stores do |ds|
           ds.should be_kind_of(RGeoServer::DataStore)
-          ["s1", "s2", "s3"].should include ds.name
+          ['s1', 's2', 's3'].should include ds.name
         end
       end
 
@@ -173,7 +173,8 @@ describe "Integration test against a GeoServer instance", :integration => true d
     
     it "should be created from a store" do
       # Create a Datastore and a feature type under the default workspace (set it up as nil)
-      ds = RGeoServer::DataStore.new @catalog, :workspace => nil, :name => 'test_shapefile2', :connection_parameters => {"url" => "file://#{@shapefile}"}
+      ds = RGeoServer::DataStore.new @catalog, :workspace => nil, :name => 'test_shapefile2'
+      ds.connection_parameters = {"url" => "file://#{@shapefile}"}
       ds.enabled = true
       ds.new?.should == true
       ds.save
@@ -326,7 +327,8 @@ 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_shapefile', :connection_parameters => {"namespace"=> "http://test_workspace_for_stores", "url" => "file://#{@shapefile}"}
+        ds = RGeoServer::DataStore.new @catalog, :workspace => @ws, :name => 'test_shapefile'
+        ds.connection_parameters = {"namespace"=> "http://test_workspace_for_stores", "url" => "file://#{@shapefile}"}
         ds.new?.should == true
         ds.save
         ds.new?.should == false
@@ -342,11 +344,17 @@ describe "Integration test against a GeoServer instance", :integration => true d
       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_shapefile2', :connection_parameters => {"url" => "file://#{@shapefile}", "namespace" => "http://test_workspace_for_stores"}
+        ds = RGeoServer::DataStore.new @catalog, :workspace => @ws, :name => 'test_shapefile2'
+        ds.connection_parameters = {"url" => "file://#{@shapefile}", "namespace" => "http://test_workspace_for_stores"}
         ds.new?.should == true
         ds.save
         ft = RGeoServer::FeatureType.new @catalog, :workspace => @ws, :data_store => ds, :name => 'granules'
         ft.save
+        ds.featuretypes.each do |dft|  
+          dft.name.should == ft.name
+          dft.workspace.should == ft.workspace
+          dft.data_store.should == ft.data_store  
+        end 
         #ft.metadata_links = [{"type"=>"text/plain", "metadataType"=>"FGDC", "content"=>"http://example.com/geonetwork/srv/en/fgdc.xml?id=2"}]
         #ft.save
         #ft.metadata_links.first["metadataType"].should == "FGDC"
@@ -386,6 +394,11 @@ describe "Integration test against a GeoServer instance", :integration => true d
         c.title = 'Test Raster Layer'
         c.abstract = 'This is the abstract of the layer'
         c.save
+        cs.coverages.each do |ct|  
+          ct.name.should == c.name
+          ct.workspace.should == c.workspace
+          ct.coverage_store.should == ct.coverage_store  
+        end 
         #c.metadata_links = [{"type"=>"text/plain", "metadataType"=>"FGDC", "content"=>"http://example.com/geonetwork/srv/en/fgdc.xml?id=1090"}]
         #c.save
         #c.metadata_links.first["metadataType"].should == "FGDC"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeoserver
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-27 00:00:00.000000000 Z
+date: 2012-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70326335633780 !ruby/object:Gem::Requirement
+  requirement: &2151853540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326335633780
+  version_requirements: *2151853540
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70326335632900 !ruby/object:Gem::Requirement
+  requirement: &2151852340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326335632900
+  version_requirements: *2151852340
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70326335631460 !ruby/object:Gem::Requirement
+  requirement: &2151850840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326335631460
+  version_requirements: *2151850840
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70326335630760 !ruby/object:Gem::Requirement
+  requirement: &2151849240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326335630760
+  version_requirements: *2151849240
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70326335630180 !ruby/object:Gem::Requirement
+  requirement: &2151848360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326335630180
+  version_requirements: *2151848360
 - !ruby/object:Gem::Dependency
   name: confstruct
-  requirement: &70326335629640 !ruby/object:Gem::Requirement
+  requirement: &2151847220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326335629640
+  version_requirements: *2151847220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70326335629140 !ruby/object:Gem::Requirement
+  requirement: &2151846340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326335629140
+  version_requirements: *2151846340
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70326335628580 !ruby/object:Gem::Requirement
+  requirement: &2151856020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326335628580
+  version_requirements: *2151856020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70326335644200 !ruby/object:Gem::Requirement
+  requirement: &2151854640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.0.14
   type: :development
   prerelease: false
-  version_requirements: *70326335644200
+  version_requirements: *2151854640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70326335643700 !ruby/object:Gem::Requirement
+  requirement: &2151868580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326335643700
+  version_requirements: *2151868580
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70326335643020 !ruby/object:Gem::Requirement
+  requirement: &2151867020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326335643020
+  version_requirements: *2151867020
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70326335642480 !ruby/object:Gem::Requirement
+  requirement: &2151865340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326335642480
+  version_requirements: *2151865340
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &70326335642020 !ruby/object:Gem::Requirement
+  requirement: &2151863900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326335642020
+  version_requirements: *2151863900
 description: ! 'GeoServer REST API Ruby library : Requires GeoServer 2.1.3+'
 email:
 - renzo.sanchez.silva@gmail.com
@@ -162,6 +162,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -193,8 +194,11 @@ files:
 - spec/fixtures/datasets/vector/granules.qix
 - spec/fixtures/datasets/vector/granules.shp
 - spec/fixtures/datasets/vector/granules.shx
+- spec/fixtures/resources/datastore/old.xml
+- spec/fixtures/resources/datastore/old_featuretypes.xml
 - spec/fixtures/styles/poptest.sld
 - spec/fixtures/styles/test_style.sld
+- spec/functional/datastore_spec.rb
 - spec/functional/resource_spec.rb
 - spec/integration/geoserver_spec.rb
 - spec/spec_helper.rb
@@ -231,8 +235,11 @@ test_files:
 - spec/fixtures/datasets/vector/granules.qix
 - spec/fixtures/datasets/vector/granules.shp
 - spec/fixtures/datasets/vector/granules.shx
+- spec/fixtures/resources/datastore/old.xml
+- spec/fixtures/resources/datastore/old_featuretypes.xml
 - spec/fixtures/styles/poptest.sld
 - spec/fixtures/styles/test_style.sld
+- spec/functional/datastore_spec.rb
 - spec/functional/resource_spec.rb
 - spec/integration/geoserver_spec.rb
 - spec/spec_helper.rb