YaST Commits September 2009

yast-commit@lists.opensuse.org

35 participants
1625 discussions

[yast-commit] <rest-service> basesystem : catch exceptions, return an error message

by Ladislav Slezak

ref: refs/heads/basesystem commit e3f4f4eb81c5ffdc3c658f7838b0c91c53fed098 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Tue Sep 1 15:59:33 2009 +0200 catch exceptions, return an error message --- .../app/controllers/services_controller.rb | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/plugins/services/app/controllers/services_controller.rb b/plugins/services/app/controllers/services_controller.rb index 246e822..fd3a471 100644 --- a/plugins/services/app/controllers/services_controller.rb +++ b/plugins/services/app/controllers/services_controller.rb @@ -8,7 +8,11 @@ class ServicesController < ApplicationController render ErrorResult.error(403, 1, "no permission") and return end - @services = Service.find_all params + begin + @services = Service.find_all params + rescue Exception => e + render ErrorResult.error(404, 107, e.to_s) and return + end end # GET /services/service_name @@ -20,7 +24,12 @@ class ServicesController < ApplicationController end @service = Service.new(params[:id]) - @service.read_status + + begin + @service.read_status + rescue Exception => e + render ErrorResult.error(404, 108, e.to_s) and return + end respond_to do |format| format.html { render :xml => @service.to_xml(:root => 'service', :dasherize => false), :location => "none" } #return xml only -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

12 years, 11 months

[yast-commit] <rest-service> network : HostnameControllerTest uses PluginBasicTests.

by Martin Vidner

ref: refs/heads/network commit 1220c411b21b0a2c9d5bdefe6e8bf08ea2039ebf Author: Martin Vidner <martin(a)vidner.net> Date: Tue Sep 1 15:55:19 2009 +0200 HostnameControllerTest uses PluginBasicTests. Had to move the controller to network/ for that. (?!) --- .../network/app/controllers/hostname_controller.rb | 45 ------------------- .../app/controllers/network/hostname_controller.rb | 46 ++++++++++++++++++++ .../test/functional/hostname_controller_test.rb | 23 +++++----- 3 files changed, 58 insertions(+), 56 deletions(-) diff --git a/plugins/network/app/controllers/hostname_controller.rb b/plugins/network/app/controllers/hostname_controller.rb deleted file mode 100644 index bb2db89..0000000 --- a/plugins/network/app/controllers/hostname_controller.rb +++ /dev/null @@ -1,45 +0,0 @@ -# = Hostname controller -# Provides access to hostname settings for authenticated users. -# Main goal is checking permissions. -class HostnameController < ApplicationController - - before_filter :login_required - - # Sets hostname settings. Requires write permissions for network YaPI. - def update - unless permission_check( "org.opensuse.yast.modules.yapi.network.write") - render ErrorResult.error(403, 1, "no permission") and return - end - - root = params[:hostname] - if root == nil - render ErrorResult.error(404, 2, "format or internal error") and return - end - - @hostname = Hostname.new(root) - @hostname.save - render :show - end - - # See update - def create - update - end - - # Shows hostname settings. Requires read permission for network YaPI. - def show - - unless permission_check( "org.opensuse.yast.modules.yapi.network.read") - render ErrorResult.error( 403, 1, "no permission" ) and return - end - - @hostname = Hostname.find - - respond_to do |format| - format.html { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } - format.xml { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } - format.json { render :json => @hostname.to_json } - end - end - -end diff --git a/plugins/network/app/controllers/network/hostname_controller.rb b/plugins/network/app/controllers/network/hostname_controller.rb new file mode 100644 index 0000000..d25ec82 --- /dev/null +++ b/plugins/network/app/controllers/network/hostname_controller.rb @@ -0,0 +1,46 @@ +# = Hostname controller +# Provides access to hostname settings for authenticated users. +# Main goal is checking permissions. + +class Network::HostnameController < ApplicationController + + before_filter :login_required + + # Sets hostname settings. Requires write permissions for network YaPI. + def update + unless permission_check( "org.opensuse.yast.modules.yapi.network.write") + render ErrorResult.error(403, 1, "no permission") and return + end + + root = params[:hostname] + if root == nil + render ErrorResult.error(404, 2, "format or internal error") and return + end + + @hostname = Hostname.new(root) + @hostname.save + render :show + end + + # See update + def create + update + end + + # Shows hostname settings. Requires read permission for network YaPI. + def show + + unless permission_check( "org.opensuse.yast.modules.yapi.network.read") + render ErrorResult.error( 403, 1, "no permission" ) and return + end + + @hostname = Hostname.find + + respond_to do |format| + format.html { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } + format.xml { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } + format.json { render :json => @hostname.to_json } + end + end + +end diff --git a/plugins/network/test/functional/hostname_controller_test.rb b/plugins/network/test/functional/hostname_controller_test.rb index 76d1eba..1f26a95 100644 --- a/plugins/network/test/functional/hostname_controller_test.rb +++ b/plugins/network/test/functional/hostname_controller_test.rb @@ -1,21 +1,22 @@ require File.expand_path(File.dirname(__FILE__) + "/../test_helper") require 'test/unit' -require 'rubygems' require 'hostname' -require "scr" +require 'rubygems' require 'mocha' require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.parent ) -class HostnameControllerTest < Test::Unit::TestCase +class HostnameControllerTest < ActionController::TestCase + + def setup + @model_class = Hostname + Hostname.stubs(:find).returns(Hostname.new({"name" => "BAD", "domain" => "DOMAIN"})) + @controller = Network::HostnameController.new + @request = ActionController::TestRequest.new + # http://railsforum.com/viewtopic.php?id=1719 + @request.session[:account_id] = 1 # defined in fixtures + end - # this is test only for mocked data - not very useful - # we need to extend it to test both model and controller - # to extract hostname data from all YaPI map - # - def test_show - Hostname.expects(:find).returns({:name=>'linux', :domain=>'suse.cz'}) - Hostname.find - end + include PluginBasicTests end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

12 years, 11 months

[yast-commit] <rest-service> master : HostnameControllerTest uses PluginBasicTests.

by Martin Vidner

ref: refs/heads/master commit 1220c411b21b0a2c9d5bdefe6e8bf08ea2039ebf Author: Martin Vidner <martin(a)vidner.net> Date: Tue Sep 1 15:55:19 2009 +0200 HostnameControllerTest uses PluginBasicTests. Had to move the controller to network/ for that. (?!) --- .../network/app/controllers/hostname_controller.rb | 45 ------------------- .../app/controllers/network/hostname_controller.rb | 46 ++++++++++++++++++++ .../test/functional/hostname_controller_test.rb | 23 +++++----- 3 files changed, 58 insertions(+), 56 deletions(-) diff --git a/plugins/network/app/controllers/hostname_controller.rb b/plugins/network/app/controllers/hostname_controller.rb deleted file mode 100644 index bb2db89..0000000 --- a/plugins/network/app/controllers/hostname_controller.rb +++ /dev/null @@ -1,45 +0,0 @@ -# = Hostname controller -# Provides access to hostname settings for authenticated users. -# Main goal is checking permissions. -class HostnameController < ApplicationController - - before_filter :login_required - - # Sets hostname settings. Requires write permissions for network YaPI. - def update - unless permission_check( "org.opensuse.yast.modules.yapi.network.write") - render ErrorResult.error(403, 1, "no permission") and return - end - - root = params[:hostname] - if root == nil - render ErrorResult.error(404, 2, "format or internal error") and return - end - - @hostname = Hostname.new(root) - @hostname.save - render :show - end - - # See update - def create - update - end - - # Shows hostname settings. Requires read permission for network YaPI. - def show - - unless permission_check( "org.opensuse.yast.modules.yapi.network.read") - render ErrorResult.error( 403, 1, "no permission" ) and return - end - - @hostname = Hostname.find - - respond_to do |format| - format.html { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } - format.xml { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } - format.json { render :json => @hostname.to_json } - end - end - -end diff --git a/plugins/network/app/controllers/network/hostname_controller.rb b/plugins/network/app/controllers/network/hostname_controller.rb new file mode 100644 index 0000000..d25ec82 --- /dev/null +++ b/plugins/network/app/controllers/network/hostname_controller.rb @@ -0,0 +1,46 @@ +# = Hostname controller +# Provides access to hostname settings for authenticated users. +# Main goal is checking permissions. + +class Network::HostnameController < ApplicationController + + before_filter :login_required + + # Sets hostname settings. Requires write permissions for network YaPI. + def update + unless permission_check( "org.opensuse.yast.modules.yapi.network.write") + render ErrorResult.error(403, 1, "no permission") and return + end + + root = params[:hostname] + if root == nil + render ErrorResult.error(404, 2, "format or internal error") and return + end + + @hostname = Hostname.new(root) + @hostname.save + render :show + end + + # See update + def create + update + end + + # Shows hostname settings. Requires read permission for network YaPI. + def show + + unless permission_check( "org.opensuse.yast.modules.yapi.network.read") + render ErrorResult.error( 403, 1, "no permission" ) and return + end + + @hostname = Hostname.find + + respond_to do |format| + format.html { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } + format.xml { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } + format.json { render :json => @hostname.to_json } + end + end + +end diff --git a/plugins/network/test/functional/hostname_controller_test.rb b/plugins/network/test/functional/hostname_controller_test.rb index 76d1eba..1f26a95 100644 --- a/plugins/network/test/functional/hostname_controller_test.rb +++ b/plugins/network/test/functional/hostname_controller_test.rb @@ -1,21 +1,22 @@ require File.expand_path(File.dirname(__FILE__) + "/../test_helper") require 'test/unit' -require 'rubygems' require 'hostname' -require "scr" +require 'rubygems' require 'mocha' require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.parent ) -class HostnameControllerTest < Test::Unit::TestCase +class HostnameControllerTest < ActionController::TestCase + + def setup + @model_class = Hostname + Hostname.stubs(:find).returns(Hostname.new({"name" => "BAD", "domain" => "DOMAIN"})) + @controller = Network::HostnameController.new + @request = ActionController::TestRequest.new + # http://railsforum.com/viewtopic.php?id=1719 + @request.session[:account_id] = 1 # defined in fixtures + end - # this is test only for mocked data - not very useful - # we need to extend it to test both model and controller - # to extract hostname data from all YaPI map - # - def test_show - Hostname.expects(:find).returns({:name=>'linux', :domain=>'suse.cz'}) - Hostname.find - end + include PluginBasicTests end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

12 years, 11 months

[yast-commit] <rest-service> dmacvicar_log_viewer : HostnameControllerTest uses PluginBasicTests.

by Martin Vidner

ref: refs/heads/dmacvicar_log_viewer commit 1220c411b21b0a2c9d5bdefe6e8bf08ea2039ebf Author: Martin Vidner <martin(a)vidner.net> Date: Tue Sep 1 15:55:19 2009 +0200 HostnameControllerTest uses PluginBasicTests. Had to move the controller to network/ for that. (?!) --- .../network/app/controllers/hostname_controller.rb | 45 ------------------- .../app/controllers/network/hostname_controller.rb | 46 ++++++++++++++++++++ .../test/functional/hostname_controller_test.rb | 23 +++++----- 3 files changed, 58 insertions(+), 56 deletions(-) diff --git a/plugins/network/app/controllers/hostname_controller.rb b/plugins/network/app/controllers/hostname_controller.rb deleted file mode 100644 index bb2db89..0000000 --- a/plugins/network/app/controllers/hostname_controller.rb +++ /dev/null @@ -1,45 +0,0 @@ -# = Hostname controller -# Provides access to hostname settings for authenticated users. -# Main goal is checking permissions. -class HostnameController < ApplicationController - - before_filter :login_required - - # Sets hostname settings. Requires write permissions for network YaPI. - def update - unless permission_check( "org.opensuse.yast.modules.yapi.network.write") - render ErrorResult.error(403, 1, "no permission") and return - end - - root = params[:hostname] - if root == nil - render ErrorResult.error(404, 2, "format or internal error") and return - end - - @hostname = Hostname.new(root) - @hostname.save - render :show - end - - # See update - def create - update - end - - # Shows hostname settings. Requires read permission for network YaPI. - def show - - unless permission_check( "org.opensuse.yast.modules.yapi.network.read") - render ErrorResult.error( 403, 1, "no permission" ) and return - end - - @hostname = Hostname.find - - respond_to do |format| - format.html { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } - format.xml { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } - format.json { render :json => @hostname.to_json } - end - end - -end diff --git a/plugins/network/app/controllers/network/hostname_controller.rb b/plugins/network/app/controllers/network/hostname_controller.rb new file mode 100644 index 0000000..d25ec82 --- /dev/null +++ b/plugins/network/app/controllers/network/hostname_controller.rb @@ -0,0 +1,46 @@ +# = Hostname controller +# Provides access to hostname settings for authenticated users. +# Main goal is checking permissions. + +class Network::HostnameController < ApplicationController + + before_filter :login_required + + # Sets hostname settings. Requires write permissions for network YaPI. + def update + unless permission_check( "org.opensuse.yast.modules.yapi.network.write") + render ErrorResult.error(403, 1, "no permission") and return + end + + root = params[:hostname] + if root == nil + render ErrorResult.error(404, 2, "format or internal error") and return + end + + @hostname = Hostname.new(root) + @hostname.save + render :show + end + + # See update + def create + update + end + + # Shows hostname settings. Requires read permission for network YaPI. + def show + + unless permission_check( "org.opensuse.yast.modules.yapi.network.read") + render ErrorResult.error( 403, 1, "no permission" ) and return + end + + @hostname = Hostname.find + + respond_to do |format| + format.html { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } + format.xml { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } + format.json { render :json => @hostname.to_json } + end + end + +end diff --git a/plugins/network/test/functional/hostname_controller_test.rb b/plugins/network/test/functional/hostname_controller_test.rb index 76d1eba..1f26a95 100644 --- a/plugins/network/test/functional/hostname_controller_test.rb +++ b/plugins/network/test/functional/hostname_controller_test.rb @@ -1,21 +1,22 @@ require File.expand_path(File.dirname(__FILE__) + "/../test_helper") require 'test/unit' -require 'rubygems' require 'hostname' -require "scr" +require 'rubygems' require 'mocha' require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.parent ) -class HostnameControllerTest < Test::Unit::TestCase +class HostnameControllerTest < ActionController::TestCase + + def setup + @model_class = Hostname + Hostname.stubs(:find).returns(Hostname.new({"name" => "BAD", "domain" => "DOMAIN"})) + @controller = Network::HostnameController.new + @request = ActionController::TestRequest.new + # http://railsforum.com/viewtopic.php?id=1719 + @request.session[:account_id] = 1 # defined in fixtures + end - # this is test only for mocked data - not very useful - # we need to extend it to test both model and controller - # to extract hostname data from all YaPI map - # - def test_show - Hostname.expects(:find).returns({:name=>'linux', :domain=>'suse.cz'}) - Hostname.find - end + include PluginBasicTests end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

12 years, 11 months

[yast-commit] <rest-service> basesystem : HostnameControllerTest uses PluginBasicTests.

by Martin Vidner

ref: refs/heads/basesystem commit 1220c411b21b0a2c9d5bdefe6e8bf08ea2039ebf Author: Martin Vidner <martin(a)vidner.net> Date: Tue Sep 1 15:55:19 2009 +0200 HostnameControllerTest uses PluginBasicTests. Had to move the controller to network/ for that. (?!) --- .../network/app/controllers/hostname_controller.rb | 45 ------------------- .../app/controllers/network/hostname_controller.rb | 46 ++++++++++++++++++++ .../test/functional/hostname_controller_test.rb | 23 +++++----- 3 files changed, 58 insertions(+), 56 deletions(-) diff --git a/plugins/network/app/controllers/hostname_controller.rb b/plugins/network/app/controllers/hostname_controller.rb deleted file mode 100644 index bb2db89..0000000 --- a/plugins/network/app/controllers/hostname_controller.rb +++ /dev/null @@ -1,45 +0,0 @@ -# = Hostname controller -# Provides access to hostname settings for authenticated users. -# Main goal is checking permissions. -class HostnameController < ApplicationController - - before_filter :login_required - - # Sets hostname settings. Requires write permissions for network YaPI. - def update - unless permission_check( "org.opensuse.yast.modules.yapi.network.write") - render ErrorResult.error(403, 1, "no permission") and return - end - - root = params[:hostname] - if root == nil - render ErrorResult.error(404, 2, "format or internal error") and return - end - - @hostname = Hostname.new(root) - @hostname.save - render :show - end - - # See update - def create - update - end - - # Shows hostname settings. Requires read permission for network YaPI. - def show - - unless permission_check( "org.opensuse.yast.modules.yapi.network.read") - render ErrorResult.error( 403, 1, "no permission" ) and return - end - - @hostname = Hostname.find - - respond_to do |format| - format.html { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } - format.xml { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } - format.json { render :json => @hostname.to_json } - end - end - -end diff --git a/plugins/network/app/controllers/network/hostname_controller.rb b/plugins/network/app/controllers/network/hostname_controller.rb new file mode 100644 index 0000000..d25ec82 --- /dev/null +++ b/plugins/network/app/controllers/network/hostname_controller.rb @@ -0,0 +1,46 @@ +# = Hostname controller +# Provides access to hostname settings for authenticated users. +# Main goal is checking permissions. + +class Network::HostnameController < ApplicationController + + before_filter :login_required + + # Sets hostname settings. Requires write permissions for network YaPI. + def update + unless permission_check( "org.opensuse.yast.modules.yapi.network.write") + render ErrorResult.error(403, 1, "no permission") and return + end + + root = params[:hostname] + if root == nil + render ErrorResult.error(404, 2, "format or internal error") and return + end + + @hostname = Hostname.new(root) + @hostname.save + render :show + end + + # See update + def create + update + end + + # Shows hostname settings. Requires read permission for network YaPI. + def show + + unless permission_check( "org.opensuse.yast.modules.yapi.network.read") + render ErrorResult.error( 403, 1, "no permission" ) and return + end + + @hostname = Hostname.find + + respond_to do |format| + format.html { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } + format.xml { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } + format.json { render :json => @hostname.to_json } + end + end + +end diff --git a/plugins/network/test/functional/hostname_controller_test.rb b/plugins/network/test/functional/hostname_controller_test.rb index 76d1eba..1f26a95 100644 --- a/plugins/network/test/functional/hostname_controller_test.rb +++ b/plugins/network/test/functional/hostname_controller_test.rb @@ -1,21 +1,22 @@ require File.expand_path(File.dirname(__FILE__) + "/../test_helper") require 'test/unit' -require 'rubygems' require 'hostname' -require "scr" +require 'rubygems' require 'mocha' require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.parent ) -class HostnameControllerTest < Test::Unit::TestCase +class HostnameControllerTest < ActionController::TestCase + + def setup + @model_class = Hostname + Hostname.stubs(:find).returns(Hostname.new({"name" => "BAD", "domain" => "DOMAIN"})) + @controller = Network::HostnameController.new + @request = ActionController::TestRequest.new + # http://railsforum.com/viewtopic.php?id=1719 + @request.session[:account_id] = 1 # defined in fixtures + end - # this is test only for mocked data - not very useful - # we need to extend it to test both model and controller - # to extract hostname data from all YaPI map - # - def test_show - Hostname.expects(:find).returns({:name=>'linux', :domain=>'suse.cz'}) - Hostname.find - end + include PluginBasicTests end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

12 years, 11 months

[yast-commit] <rest-service> jr_ntp : HostnameControllerTest uses PluginBasicTests.

by Martin Vidner

ref: refs/heads/jr_ntp commit 1220c411b21b0a2c9d5bdefe6e8bf08ea2039ebf Author: Martin Vidner <martin(a)vidner.net> Date: Tue Sep 1 15:55:19 2009 +0200 HostnameControllerTest uses PluginBasicTests. Had to move the controller to network/ for that. (?!) --- .../network/app/controllers/hostname_controller.rb | 45 ------------------- .../app/controllers/network/hostname_controller.rb | 46 ++++++++++++++++++++ .../test/functional/hostname_controller_test.rb | 23 +++++----- 3 files changed, 58 insertions(+), 56 deletions(-) diff --git a/plugins/network/app/controllers/hostname_controller.rb b/plugins/network/app/controllers/hostname_controller.rb deleted file mode 100644 index bb2db89..0000000 --- a/plugins/network/app/controllers/hostname_controller.rb +++ /dev/null @@ -1,45 +0,0 @@ -# = Hostname controller -# Provides access to hostname settings for authenticated users. -# Main goal is checking permissions. -class HostnameController < ApplicationController - - before_filter :login_required - - # Sets hostname settings. Requires write permissions for network YaPI. - def update - unless permission_check( "org.opensuse.yast.modules.yapi.network.write") - render ErrorResult.error(403, 1, "no permission") and return - end - - root = params[:hostname] - if root == nil - render ErrorResult.error(404, 2, "format or internal error") and return - end - - @hostname = Hostname.new(root) - @hostname.save - render :show - end - - # See update - def create - update - end - - # Shows hostname settings. Requires read permission for network YaPI. - def show - - unless permission_check( "org.opensuse.yast.modules.yapi.network.read") - render ErrorResult.error( 403, 1, "no permission" ) and return - end - - @hostname = Hostname.find - - respond_to do |format| - format.html { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } - format.xml { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } - format.json { render :json => @hostname.to_json } - end - end - -end diff --git a/plugins/network/app/controllers/network/hostname_controller.rb b/plugins/network/app/controllers/network/hostname_controller.rb new file mode 100644 index 0000000..d25ec82 --- /dev/null +++ b/plugins/network/app/controllers/network/hostname_controller.rb @@ -0,0 +1,46 @@ +# = Hostname controller +# Provides access to hostname settings for authenticated users. +# Main goal is checking permissions. + +class Network::HostnameController < ApplicationController + + before_filter :login_required + + # Sets hostname settings. Requires write permissions for network YaPI. + def update + unless permission_check( "org.opensuse.yast.modules.yapi.network.write") + render ErrorResult.error(403, 1, "no permission") and return + end + + root = params[:hostname] + if root == nil + render ErrorResult.error(404, 2, "format or internal error") and return + end + + @hostname = Hostname.new(root) + @hostname.save + render :show + end + + # See update + def create + update + end + + # Shows hostname settings. Requires read permission for network YaPI. + def show + + unless permission_check( "org.opensuse.yast.modules.yapi.network.read") + render ErrorResult.error( 403, 1, "no permission" ) and return + end + + @hostname = Hostname.find + + respond_to do |format| + format.html { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } + format.xml { render :xml => @hostname.to_xml( :root => "hostname", :dasherize => false ) } + format.json { render :json => @hostname.to_json } + end + end + +end diff --git a/plugins/network/test/functional/hostname_controller_test.rb b/plugins/network/test/functional/hostname_controller_test.rb index 76d1eba..1f26a95 100644 --- a/plugins/network/test/functional/hostname_controller_test.rb +++ b/plugins/network/test/functional/hostname_controller_test.rb @@ -1,21 +1,22 @@ require File.expand_path(File.dirname(__FILE__) + "/../test_helper") require 'test/unit' -require 'rubygems' require 'hostname' -require "scr" +require 'rubygems' require 'mocha' require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.parent ) -class HostnameControllerTest < Test::Unit::TestCase +class HostnameControllerTest < ActionController::TestCase + + def setup + @model_class = Hostname + Hostname.stubs(:find).returns(Hostname.new({"name" => "BAD", "domain" => "DOMAIN"})) + @controller = Network::HostnameController.new + @request = ActionController::TestRequest.new + # http://railsforum.com/viewtopic.php?id=1719 + @request.session[:account_id] = 1 # defined in fixtures + end - # this is test only for mocked data - not very useful - # we need to extend it to test both model and controller - # to extract hostname data from all YaPI map - # - def test_show - Hostname.expects(:find).returns({:name=>'linux', :domain=>'suse.cz'}) - Hostname.find - end + include PluginBasicTests end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

12 years, 11 months

[yast-commit] <rest-service> master : patches module: code review

by Bjoern Geuken

ref: refs/heads/master commit a7c8610daf8fd19ddafb63a24ec9875047d05ba0 Author: Bjoern Geuken <bgeuken(a)suse.de> Date: Tue Sep 1 15:28:28 2009 +0200 patches module: code review --- .../patches/app/controllers/packages_controller.rb | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/plugins/patches/app/controllers/packages_controller.rb b/plugins/patches/app/controllers/packages_controller.rb index 38d8bfd..a9d8162 100644 --- a/plugins/patches/app/controllers/packages_controller.rb +++ b/plugins/patches/app/controllers/packages_controller.rb @@ -44,21 +44,11 @@ class PackagesController < ApplicationController package_list = ["3ddiag", "foo", "yast2-users", "yast2-network"] package_list.each {|pk_name| - p = nil - for i in 0..packages.size-1 - # package installed? - if pk_name == packages[i].name - # store package - p = packages[i] - break - end - end - if p - vendor_packages << p - else - vendor_packages << Package.new(:resolvable_id => 0, :name => pk_name, :version => "not_installed") - end + p = packages.find { |pkg| pk_name == pkg.name } + p ||= Package.new(:resolvable_id => 0, :name => pk_name, :version => "not_installed") + vendor_packages << p } + vendor_packages end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

12 years, 11 months

[yast-commit] <rest-service> network : patches module: code review

by Bjoern Geuken

ref: refs/heads/network commit a7c8610daf8fd19ddafb63a24ec9875047d05ba0 Author: Bjoern Geuken <bgeuken(a)suse.de> Date: Tue Sep 1 15:28:28 2009 +0200 patches module: code review --- .../patches/app/controllers/packages_controller.rb | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/plugins/patches/app/controllers/packages_controller.rb b/plugins/patches/app/controllers/packages_controller.rb index 38d8bfd..a9d8162 100644 --- a/plugins/patches/app/controllers/packages_controller.rb +++ b/plugins/patches/app/controllers/packages_controller.rb @@ -44,21 +44,11 @@ class PackagesController < ApplicationController package_list = ["3ddiag", "foo", "yast2-users", "yast2-network"] package_list.each {|pk_name| - p = nil - for i in 0..packages.size-1 - # package installed? - if pk_name == packages[i].name - # store package - p = packages[i] - break - end - end - if p - vendor_packages << p - else - vendor_packages << Package.new(:resolvable_id => 0, :name => pk_name, :version => "not_installed") - end + p = packages.find { |pkg| pk_name == pkg.name } + p ||= Package.new(:resolvable_id => 0, :name => pk_name, :version => "not_installed") + vendor_packages << p } + vendor_packages end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

12 years, 11 months

[yast-commit] <rest-service> basesystem : patches module: code review

by Bjoern Geuken

ref: refs/heads/basesystem commit a7c8610daf8fd19ddafb63a24ec9875047d05ba0 Author: Bjoern Geuken <bgeuken(a)suse.de> Date: Tue Sep 1 15:28:28 2009 +0200 patches module: code review --- .../patches/app/controllers/packages_controller.rb | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/plugins/patches/app/controllers/packages_controller.rb b/plugins/patches/app/controllers/packages_controller.rb index 38d8bfd..a9d8162 100644 --- a/plugins/patches/app/controllers/packages_controller.rb +++ b/plugins/patches/app/controllers/packages_controller.rb @@ -44,21 +44,11 @@ class PackagesController < ApplicationController package_list = ["3ddiag", "foo", "yast2-users", "yast2-network"] package_list.each {|pk_name| - p = nil - for i in 0..packages.size-1 - # package installed? - if pk_name == packages[i].name - # store package - p = packages[i] - break - end - end - if p - vendor_packages << p - else - vendor_packages << Package.new(:resolvable_id => 0, :name => pk_name, :version => "not_installed") - end + p = packages.find { |pkg| pk_name == pkg.name } + p ||= Package.new(:resolvable_id => 0, :name => pk_name, :version => "not_installed") + vendor_packages << p } + vendor_packages end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

12 years, 11 months

[yast-commit] <rest-service> master : status module: code review, adapting jreidingers suggestions

by Bjoern Geuken

ref: refs/heads/master commit a3bcb824d67e618485e7710eff276038ebfafd68 Author: Bjoern Geuken <bgeuken(a)suse.de> Date: Tue Sep 1 15:16:08 2009 +0200 status module: code review, adapting jreidingers suggestions --- plugins/status/lib/status.rb | 37 +++++++++++++----------------- plugins/status/test/unit/status_test.rb | 4 +++ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb index 58b7344..a5154d7 100644 --- a/plugins/status/lib/status.rb +++ b/plugins/status/lib/status.rb @@ -204,29 +204,24 @@ class Status nexttime = 9.9e+99 result["starttime"] = 9.9e+99 lines.each do |l| # each time - unless l.blank? - if l =~ /\d*:\D*/ - pair = l.split ":" - values = pair[1].split " " - column = 0 - values.each do |v| # each label - if result["interval"].nil? - if pair[0].to_i < result["starttime"].to_i - result["starttime"] = pair[0].to_i - elsif pair[0].to_i < nexttime and pair[0].to_i > result["starttime"].to_i - nexttime = pair[0].to_i - end - end - - if v != "nan" #store valid values only - result["#{labels[column]}"] ||= Hash.new - result["#{labels[column]}"].merge!({"#{pair[0].chomp(": ")}" => v}) - column += 1 - else - result["#{labels[column]}"] ||= Hash.new - result["#{labels[column]}"].merge!({"#{pair[0].chomp(": ")}" => "invalid"}) + next if l.blank? + if l =~ /\d*:\D*/ + pair = l.split ":" + values = pair[1].split " " + column = 0 + values.each do |v| # each label + unless result["interval"] # already defined? + # get the least distance to evaluate time interval + if pair[0].to_i < result["starttime"].to_i + result["starttime"] = pair[0].to_i + elsif pair[0].to_i < nexttime and pair[0].to_i > result["starttime"].to_i + nexttime = pair[0].to_i end end + v = "invalid" if v == "nan" #store valid values only + result[labels[column]] ||= Hash.new + result[labels[column]][pair[0]] = v + column += 1 end end end diff --git a/plugins/status/test/unit/status_test.rb b/plugins/status/test/unit/status_test.rb index 06eb93b..42ae54d 100644 --- a/plugins/status/test/unit/status_test.rb +++ b/plugins/status/test/unit/status_test.rb @@ -87,16 +87,20 @@ EOF expected_response = {"tx"=> {"1248092580"=>"4.3878571429e+01", + "1248093140"=>"invalid", "1248092790"=>"4.0714285714e+00", + "1248092230"=>"invalid", "1248092440"=>"4.0992857143e+01", "1248093000"=>"1.5542857143e+01", "1248092650"=>"9.7942857143e+01", "1248092860"=>"2.4142857143e+00", + "1248092090"=>"invalid", "1248092300"=>"4.0500000000e+00", "1248092510"=>"3.4264285714e+01", "1248093070"=>"2.7071428571e+00", "1248092720"=>"2.9928571429e+00", "1248092930"=>"2.8285714286e+00", + "1248092160"=>"invalid", "1248092370"=>"2.1435714286e+01"}, "rx"=> {"1248092580"=>"7.7485714286e+01", -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

12 years, 11 months

Jump to page:

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

YaST Commits September 2009