deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject [1/4] git commit: Core: Code cleanup in ApplicationHelper
Date Tue, 20 Mar 2012 13:26:06 GMT
Updated Branches:
  refs/heads/master a0996bcd0 -> a6cf9fc2f


Core: Code cleanup in ApplicationHelper

This patch will clean method that are not longer used in
any view or code in server.rb.
Also this patch move the string helper 'truncate_words' to
String core class.


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/a6cf9fc2
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/a6cf9fc2
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/a6cf9fc2

Branch: refs/heads/master
Commit: a6cf9fc2f7e2ccf0d1fc20ca5d0a9dbc4dea12fc
Parents: adb1977
Author: Michal Fojtik <mfojtik@redhat.com>
Authored: Tue Mar 20 12:19:35 2012 +0100
Committer: Michal fojtik <mfojtik@redhat.com>
Committed: Tue Mar 20 12:23:34 2012 +0100

----------------------------------------------------------------------
 server/lib/deltacloud/core_ext/string.rb           |    7 ++
 .../lib/deltacloud/helpers/application_helper.rb   |   81 +++------------
 server/views/buckets/new.html.haml                 |    4 +-
 server/views/instances/index.html.haml             |    2 +-
 4 files changed, 27 insertions(+), 67 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/a6cf9fc2/server/lib/deltacloud/core_ext/string.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/core_ext/string.rb b/server/lib/deltacloud/core_ext/string.rb
index c0dce7b..6c04282 100644
--- a/server/lib/deltacloud/core_ext/string.rb
+++ b/server/lib/deltacloud/core_ext/string.rb
@@ -65,4 +65,11 @@ class String
   def upcase_first
     self[0, 1].upcase + self[1..-1]
   end
+
+  def truncate(length = 10)
+    return self if self.length <= length
+    end_string = "...#{self[(self.length-(length/2))..self.length]}"
+    "#{self[0..(length/2)]}#{end_string}"
+  end
+
 end

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/a6cf9fc2/server/lib/deltacloud/helpers/application_helper.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/helpers/application_helper.rb b/server/lib/deltacloud/helpers/application_helper.rb
index bdcbd73..7a0d58b 100644
--- a/server/lib/deltacloud/helpers/application_helper.rb
+++ b/server/lib/deltacloud/helpers/application_helper.rb
@@ -21,25 +21,6 @@ module ApplicationHelper
 
   include Deltacloud
 
-  def bread_crumb
-    s = "<ul class='breadcrumb'><li class='first'><a href='#{settings.root_url}'>&#948</a></li>"
-    url = request.path_info.split('?')  #remove extra query string parameters
-    levels = url[0].split('/') #break up url into different levels
-    levels.each_with_index do |level, index|
-      unless level.blank?
-        next if "/#{level}" == settings.root_url
-        if index == levels.size-1 || (level == levels[levels.size-2] && levels[levels.size-1].to_i
> 0)
-          s += "<li class='subsequent'>#{level.gsub(/_/, ' ')}</li>\n" unless
level.to_i > 0
-        else
-          link = levels.slice(2, index-1).join("/")
-          s += "<li class='subsequent'><a href=\"#{api_url_for(link)}\">#{level.gsub(/_/,
' ')}</a></li>\n"
-        end
-      end
-    end
-    s+="<li class='docs'>#{link_to_documentation}</li>"
-    s+="</ul>"
-  end
-
   def instance_action_method(action)
     action_method(action, :instances)
   end
@@ -49,7 +30,7 @@ module ApplicationHelper
   end
 
   def driver_has_feature?(feature_name, collection_name = :instances)
-    not driver.features(collection_name).select{ |f| f.name.eql?(feature_name) }.empty?
+    driver.features(collection_name).any? { |f| f.name == feature_name }
   end
 
   def driver_has_auth_features?
@@ -57,15 +38,8 @@ module ApplicationHelper
   end
 
   def driver_auth_feature_name
-    return 'key' if driver_has_feature?(:authentication_key)
-    return 'password' if driver_has_feature?(:authentication_password)
-  end
-
-  def driver_has_bucket_location_feature?
-    driver.features(:buckets).each do |feat|
-      return true if feat.name == :bucket_location
-    end
-    false
+    'key' if driver_has_feature?(:authentication_key)
+    'password' if driver_has_feature?(:authentication_password)
   end
 
   def filter_all(model)
@@ -133,7 +107,11 @@ module ApplicationHelper
       return report_error(405)
     end
 
-    @instance = driver.send(:"#{name}_instance", credentials, params[:id])
+    @benchmark = Benchmark.measure do
+      @instance = driver.send(:"#{name}_instance", credentials, params[:id])
+    end
+
+    headers['X-Backend-Runtime'] = @benchmark.real.to_s
 
     if name == :reboot
       status 202
@@ -180,47 +158,22 @@ module ApplicationHelper
   end
 
   def link_to_format(format)
-    return '' unless request.env['REQUEST_URI']
+    return unless request.env['REQUEST_URI']
     uri = request.env['REQUEST_URI']
     return if uri.include?('format=')
-    if uri.include?('?')
-      uri+="&format=#{format}"
-    else
-      uri+="?format=#{format}"
-    end
-    '<a data-ajax="false" data-icon="grid" href="%s">%s</a>' % [uri, "#{format}".upcase]
-  end
-
-  def link_to_documentation
-    return '' unless request.env['REQUEST_URI']
-    uri = request.env['REQUEST_URI'].dup
-    uri.gsub!(settings.root_url,
-              api_url_for(:docs)) unless uri.include?("docs") #i.e. if already serving under
/api/docs, leave it be
-    '<a href="%s">[ Documentation ]</a>' % uri
-  end
-
-  def action_url
-    if [:index].include?(@operation.name)
-      api_url_for("#{@collection.name.to_s}")
-    elsif [:show, :stop, :start, :reboot, :attach, :detach].include?(@operation.name)
-      api_url_for("#{@collection.name.to_s}/:id/#{@operation.name}")
-    elsif [:destroy].include?(@operation.name)
-      api_url_for("#{@collection.name.to_s}/:id")
-    else
-      api_url_for("#{@collection.name}/#{@operation.name}")
+    uri += uri.include?('?') ? "&format=#{format}" : "?format=#{format}"
+    capture_haml do
+      haml_tag :a, :href => uri, :'data-ajax' => 'false', :'data-icon' => 'grid'
do
+        haml_concat format.to_s.upcase
+      end
     end
   end
 
   def image_for_state(state)
     state_img = "stopped" if (state!='RUNNING' or state!='PENDING')
-    "<img src='/images/#{state.downcase}.png' title='#{state}'/>"
-  end
-
-  def truncate_words(text, length = 10)
-    return nil unless text
-    return text if text.length<=length
-    end_string = "...#{text[(text.length-(length/2))..text.length]}"
-    "#{text[0..(length/2)]}#{end_string}"
+    capture_haml do
+      haml_tag :img, :src => "/images/#{state}" % state.downcase, :title => state
+    end
   end
 
   # Reverse the entrypoints hash for a driver from drivers.yaml; note that

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/a6cf9fc2/server/views/buckets/new.html.haml
----------------------------------------------------------------------
diff --git a/server/views/buckets/new.html.haml b/server/views/buckets/new.html.haml
index e53b7ea..2abaa96 100644
--- a/server/views/buckets/new.html.haml
+++ b/server/views/buckets/new.html.haml
@@ -1,12 +1,12 @@
 =header "New bucket"
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
-  %form{ :action => buckets_url, :method => :post }
+  %form{ :action => buckets_url, :method => :post, :'data-ajax' => 'false' }
     %label
       Bucket Name:
       %input{ :name => 'name', :size => 250}/
       %br
-    -if driver_has_bucket_location_feature?
+    -if driver_has_feature?(:bucket_location, :buckets)
       %p
         %label
           Location: (optional)

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/a6cf9fc2/server/views/instances/index.html.haml
----------------------------------------------------------------------
diff --git a/server/views/instances/index.html.haml b/server/views/instances/index.html.haml
index dc42a7d..f7efee2 100644
--- a/server/views/instances/index.html.haml
+++ b/server/views/instances/index.html.haml
@@ -8,7 +8,7 @@
       %li
         %a{ :href => instance_url(instance.id), :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/machine.png'}
-          %h3=truncate_words(instance.id)
+          %h3=instance.id.to_s.truncate
           %p
             %strong=instance.name
           %p=[instance.owner_id, instance.image_id, instance.hardware_profile].join(', ')


Mime
View raw message