sapphire 0.6.5 → 0.6.7

data/lib/sapphire/Adapters/Selenium/RubySeleniumWebDriver.rb

@@ -69,7 +69,7 @@ module Sapphire
       end
 
       def CurrentUrl
-        wait = Selenium::WebDriver::Wait.new(:timeout => 30)
+        wait = Selenium::WebDriver::Wait.new(:timeout => 20)
         url = wait.until { x = self.browser.current_url
             x unless x == nil
         }
@@ -88,7 +88,7 @@ module Sapphire
           nav = page
         end
 
-        wait = Selenium::WebDriver::Wait.new(:timeout => 30)
+        wait = Selenium::WebDriver::Wait.new(:timeout => 20)
         begin
           found = wait.until {
             x = self.CurrentUrl.upcase.start_with?("HTTP://" + nav.Url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + nav.Url.upcase)
@@ -133,7 +133,7 @@ module Sapphire
       end
 
       def FindItem(array)
-        masterWait = Selenium::WebDriver::Wait.new(:timeout => 30)
+        masterWait = Selenium::WebDriver::Wait.new(:timeout => 5)
 
         element = masterWait.until {
           x = nil
@@ -161,7 +161,7 @@ module Sapphire
       end
 
       def FindAllItems(array)
-        masterWait = Selenium::WebDriver::Wait.new(:timeout => 30)
+        masterWait = Selenium::WebDriver::Wait.new(:timeout => 5)
 
         element = masterWait.until {
           x = nil

data/lib/sapphire/DSL.rb

@@ -1,3 +1,4 @@
+Dir[File.dirname(__FILE__) + '/DSL/TestPlans/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/DSL/Browser/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/DSL/Browser/Fluff/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/DSL/Browser/Extensions/*.rb'].each {|file| require file }
@@ -7,4 +8,3 @@ Dir[File.dirname(__FILE__) + '/DSL/Browser/Keys/*.rb'].each {|file| require file
 Dir[File.dirname(__FILE__) + '/DSL/Configuration/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/DSL/Data/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/DSL/Scenarios/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/TestPlans/*.rb'].each {|file| require file }

data/lib/sapphire/DSL/Browser/Extensions/String.rb

@@ -0,0 +1,20 @@
+class String
+
+  alias_method :"plus", :"+"
+
+   def underscore
+       self.gsub(/::/, '/').
+       gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+       gsub(/([a-z\d])([A-Z])/,'\1_\2').
+       tr("-", "_").
+       downcase
+   end
+
+  def +(item)
+    return plus(Parameter(item)) if Sapphire::DSL::TestPlans::Parameters.instance.Contains(item)
+    raise "No Parameter defined for: " << item.to_s if item.is_a? Symbol
+
+    plus(item)
+  end
+
+end

data/lib/sapphire/DSL/Browser/Extensions/Symbol.rb

@@ -29,9 +29,9 @@ class Symbol
   end
 
   def Set(hash)
-      ExecuteHashAgainstControl(hash, @page) do |control, arg|
-        control.Set arg
-      end
+    ExecuteHashAgainstControl(hash, @page) do |control, arg|
+      control.Set arg
     end
+  end
 
 end

data/lib/sapphire/DSL/Browser/Should.rb

@@ -1,42 +1,56 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Should(item)
-        results = item.execute()
-
-        if results.is_a? Hash
-          @page = results[:page] if results[:page] != nil
-          value = results[:value]
-          modifier = results[:modifier]
-
-          if value.is_a? Hash
-            @page = value[:page] if value[:page] != nil
-            sub_value = value[:value]
-            modifier.Evaluate(sub_value)
-            return
-          end
-          modifier.Evaluate(value)
-
-          return
-        end
-
-        if(results.is_a? Evaluation)
-          if(results.left != results.right)
-            messages = []
-
-            messages << "expected: (nil)" if results.left == nil
-            messages << "expected: " + results.left.to_s if results.left != nil
-            messages << "got: (nil)" if results.right == nil
-            messages << "got: " + results.right.to_s if results.right != nil
-
-            raise ExpectationException.new(messages)
-          end
-          return
-        end
-
-        raise "Cannot act upon result " + results.to_s + " for page " + @page.to_s
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Should(item)
+        results = item.execute()
+
+        if results.is_a? Hash
+          @page = results[:page] if results[:page] != nil
+          value = results[:value]
+          modifier = results[:modifier]
+
+          if value.is_a? Hash
+            @page = value[:page] if value[:page] != nil
+            sub_value = value[:value]
+            modifier.Evaluate(sub_value)
+            return
+          end
+          modifier.Evaluate(value)
+
+          return
+        end
+
+        if(results.is_a? Evaluation)
+          if(results.left != results.right)
+            messages = []
+
+            messages << "expected: (nil)" if results.left == nil
+            messages << "expected: " + results.left.to_s if results.left != nil
+            messages << "got: (nil)" if results.right == nil
+            messages << "got: " + results.right.to_s if results.right != nil
+
+            raise ExpectationException.new(messages)
+          end
+          return
+        end
+
+        if(results.is_a? ContainsEvaluation)
+          if(!results.left.include? results.right)
+            messages = []
+
+            messages << "expected to contain: (nil)" if results.left == nil
+            messages << "expected to contain: " + results.left.to_s if results.left != nil
+            messages << "got: (nil)" if results.right == nil
+            messages << "got: " + results.right.to_s if results.right != nil
+
+            raise ExpectationException.new(messages)
+          end
+          return
+        end
+
+        raise "Cannot act upon result " + results.to_s + " for page " + @page.to_s
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/Verbs/Attempt.rb

@@ -0,0 +1,14 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Attempt(page)
+        if(page.is_a? Class)
+          temp = page.new
+          @page = temp.Attempt
+        else
+          @page = page.Attempt
+        end
+      end
+    end
+  end
+end

data/lib/sapphire/DSL/Browser/Verbs/Contain.rb

@@ -0,0 +1,25 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Contain(item)
+        ContainsNullModifier.new(Contain.new(item, @page))
+      end
+
+      class Contain
+        def initialize(item, page)
+          @item = item
+          @page = page
+        end
+
+        def ModifyWith(item)
+          @modifier = item
+        end
+
+        def execute
+          return { :value => SapphireConfig.Current.GetBy(@item.class).new(@page).Contain(@item, @modifier), :modifier => @modifier }
+        end
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/Verbs/Count.rb

@@ -0,0 +1,24 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Count(item)
+        NullModifier.new(Count.new(item, @page))
+      end
+
+      class Count
+        def initialize(item, page)
+          @item = item
+          @page = page
+        end
+
+        def ModifyWith(item)
+          @modifier = item
+        end
+
+        def execute
+          return { :value => SapphireConfig.Current.GetBy(@item.class).new(@page).Count(@item, @modifier), :modifier => @modifier }
+        end
+      end
+    end
+  end
+end

data/lib/sapphire/DSL/TestPlans/Parameter.rb

@@ -0,0 +1,38 @@
+module Sapphire
+  module DSL
+    module TestPlans
+
+      def Parameter(item)
+        Parameters.instance.Add(item) if item.is_a? Hash
+        return Parameters.instance.Get(item) if item.is_a? Symbol
+      end
+
+      class Parameters
+        def self.create
+          @@instance ||= Parameters.new
+        end
+
+        def self.instance
+          @@instance ||= self.create
+        end
+
+        def initialize()
+          $parameters ||= {}
+        end
+
+        def Add(item)
+          $parameters.merge! item
+        end
+
+        def Contains(item)
+          $parameters.has_key? item
+        end
+
+        def Get(item)
+          $parameters[item]
+        end
+      end
+
+    end
+  end
+end

data/lib/sapphire/Strategies/ContainsEvaluation.rb

@@ -0,0 +1,16 @@
+module Sapphire
+  module DSL
+    module Strategies
+      class ContainsEvaluation
+
+        attr_reader :left
+        attr_reader :right
+
+        def initialize(left, right)
+          @left = left
+          @right = right
+        end
+      end
+    end
+  end
+end

data/lib/sapphire/Strategies/ContainsNullModifier.rb

@@ -0,0 +1,34 @@
+class ContainsNullModifier
+  def initialize(item)
+    @item = item
+    @item.ModifyWith self
+  end
+
+  def ModifyWith(item)
+    @modifier = item
+  end
+
+  def Modify(item)
+    return @modifier.Modify(item) if @modifier != nil
+    item if @modifier == nil
+  end
+
+  def Evaluate(evaluation)
+    return @modifier.Evaluate(evaluation) if @modifier != nil
+
+    if(!evaluation.left.include? evaluation.right)
+      messages = []
+
+      messages << "expected to contain: (nil)" if evaluation.right == nil
+      messages << "expected to contain: " + evaluation.right.to_s if evaluation.right != nil
+      messages << "got: (nil)" if evaluation.left == nil
+      messages << "got: " + evaluation.left.to_s if evaluation.left != nil
+
+      raise ExpectationException.new(messages)
+    end
+  end
+
+  def execute
+    @item.execute
+  end
+end

data/lib/sapphire/Strategies/HashStrategy.rb

@@ -4,7 +4,7 @@ module Sapphire
       class HashStrategy < Strategy
         def Show(item, modifier)
            ExecuteHashAgainstControl(item, @page) do |control, arg|
-              wait = Selenium::WebDriver::Wait.new(:timeout => 30)
+              wait = Selenium::WebDriver::Wait.new(:timeout => 5)
               begin
                 evaluation = wait.until { x = control
                   val = x.Equals(arg)
@@ -20,6 +20,43 @@ module Sapphire
            end
         end
 
+        def Contain(item, modifier)
+           ExecuteHashAgainstControl(item, @page) do |control, arg|
+              wait = Selenium::WebDriver::Wait.new(:timeout => 5)
+              begin
+                evaluation = wait.until { x = control
+                  val = x.Contain(arg)
+                  if (val.left.include? val.right)
+                    return val
+                  end
+                }
+              rescue
+                return ContainsEvaluation.new(control.Text, arg)
+              end
+
+              return evaluation
+           end
+        end
+
+        def Count(item, modifier)
+          ExecuteHashAgainstControl(item, @page) do |control, arg|
+            wait = Selenium::WebDriver::Wait.new(:timeout => 5)
+            count = 0
+            begin
+              evaluation = wait.until { x = control
+                count = x.Count
+                if x.Count == arg
+                  return Evaluation.new(count, arg)
+                end
+              }
+            rescue
+              return Evaluation.new(count, arg)
+            end
+
+            return evaluation
+          end
+        end
+
         def Validate(hash)
           Evaluation.new(hash.keys.first.to_s, hash[hash.keys.first].to_s)
         end

data/lib/sapphire/Strategies/SymbolStrategy.rb

@@ -10,7 +10,7 @@ module Sapphire
                 x = field[field_key].Find
                 if(x)
                   begin
-                    wait = Selenium::WebDriver::Wait.new(:timeout => 30)
+                    wait = Selenium::WebDriver::Wait.new(:timeout => 5)
                     result = wait.until { y = modifier.Modify(x.displayed?)
                       y unless y == false
                     }
@@ -34,7 +34,7 @@ module Sapphire
             field.keys.each do |field_key|
               if(field_key == item)
                 begin
-                  wait = Selenium::WebDriver::Wait.new(:timeout => 30)
+                  wait = Selenium::WebDriver::Wait.new(:timeout => 5)
                   element = wait.until { x = field[field_key].Find
                       x and modifier.Modify(!x.displayed?)
                   }

data/lib/sapphire/Testing/Executable.rb

@@ -11,12 +11,6 @@ module Sapphire
             Report do |x| x.TestPending(result) end
             return
           end
-          if(self.value.is_a? Problematic)
-            result = ResultTree.new(self.text, TestResult.new("problematic", self, "Problematic", "", Time.now - start))
-            self.AddResult(result)
-            Report do |x| x.TestProblematic(result) end
-            return
-          end
           self.block.call
           result = ResultTree.new(self.text, TestResult.new("pass", self, "Success", "", Time.now - start))
           self.AddResult(result)
@@ -25,9 +19,15 @@ module Sapphire
           stack = msg.backtrace
           message = msg.messages if (msg.is_a? ExpectationException)
           message ||= msg.message
-          result = ResultTree.new(self.text, TestResult.new("fail", self, message, stack, Time.now - start))
-          self.AddResult(result)
-          Report do |x| x.TestFailed(result) end
+          if(self.value.is_a? Problematic)
+            result = ResultTree.new(self.text, TestResult.new("problematic", self, message, stack, Time.now - start))
+            self.AddResult(result)
+            Report do |x| x.TestProblematic(result) end
+          else
+            result = ResultTree.new(self.text, TestResult.new("fail", self, message, stack, Time.now - start))
+            self.AddResult(result)
+            Report do |x| x.TestFailed(result) end
+          end
         end
       end
 

data/lib/sapphire/WebAbstractions/Controls/Base/Control.rb

@@ -1,58 +1,62 @@
-module Sapphire
-  module WebAbstractions
-    class Control
-      def initialize(hash)
-          @hash = hash
-      end
-
-      def Find
-        $browser.FindItem(@hash)
-      end
-
-      def FindAll
-        $browser.FindAllItems(@hash)
-      end
-
-      def FindWithoutWait
-        $browser.FindElement @hash[0].keys.first, @hash[0].fetch(@hash[0].keys.first)
-      end
-
-      def Text
-        text = self.Find
-        text.text
-      end
-
-      def Click
-        control = self.Find
-        control.click
-      end
-
-      def MouseOver
-        if @hash.is_a? Hash
-          if(@hash.has_key?(:id))
-            $browser.ExecuteScript("document.getElementById('"+ @hash.fetch(:id) +"').style.visibility = 'visible'; ")
-          elsif (@hash.has_key?(:name))
-            $browser.ExecuteScript("document.getElementByName('"+ @hash.fetch(:name) +"').style.visibility = 'visible'; ")
-          elsif (@hash.has_key?(:xpath))
-            $browser.ExecuteScript("document.evaluate( '" + @hash.fetch(:xpath) + "', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.visibility = 'visible'; ")
-          end
-        elsif @hash.is_a? Array
-          if(@hash[0].has_key?(:id))
-            $browser.ExecuteScript("document.getElementById('"+ @hash[0].fetch(:id) +"').style.visibility = 'visible'; ")
-          elsif (@hash[0].has_key?(:name))
-            $browser.ExecuteScript("document.getElementByName('"+ @hash[0].fetch(:name) +"').style.visibility = 'visible'; ")
-          elsif (@hash[0].has_key?(:xpath))
-            $browser.ExecuteScript("document.evaluate( '" + @hash[0].fetch(:xpath) + "', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.visibility = 'visible'; ")
-          end
-        end
-
-        sleep(1)
-      end
-
-      def Equals(value)
-         Evaluation.new(self.Text, value)
-      end
-    end
-  end
-end
-
+module Sapphire
+  module WebAbstractions
+    class Control
+      def initialize(hash)
+          @hash = hash
+      end
+
+      def Find
+        $browser.FindItem(@hash)
+      end
+
+      def FindAll
+        $browser.FindAllItems(@hash)
+      end
+
+      def FindWithoutWait
+        $browser.FindElement @hash[0].keys.first, @hash[0].fetch(@hash[0].keys.first)
+      end
+
+      def Text
+        text = self.Find
+        text.text
+      end
+
+      def Click
+        control = self.Find
+        control.click
+      end
+
+      def MouseOver
+        if @hash.is_a? Hash
+          if(@hash.has_key?(:id))
+            $browser.ExecuteScript("document.getElementById('"+ @hash.fetch(:id) +"').style.visibility = 'visible'; ")
+          elsif (@hash.has_key?(:name))
+            $browser.ExecuteScript("document.getElementByName('"+ @hash.fetch(:name) +"').style.visibility = 'visible'; ")
+          elsif (@hash.has_key?(:xpath))
+            $browser.ExecuteScript("document.evaluate( '" + @hash.fetch(:xpath) + "', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.visibility = 'visible'; ")
+          end
+        elsif @hash.is_a? Array
+          if(@hash[0].has_key?(:id))
+            $browser.ExecuteScript("document.getElementById('"+ @hash[0].fetch(:id) +"').style.visibility = 'visible'; ")
+          elsif (@hash[0].has_key?(:name))
+            $browser.ExecuteScript("document.getElementByName('"+ @hash[0].fetch(:name) +"').style.visibility = 'visible'; ")
+          elsif (@hash[0].has_key?(:xpath))
+            $browser.ExecuteScript("document.evaluate( '" + @hash[0].fetch(:xpath) + "', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.visibility = 'visible'; ")
+          end
+        end
+
+        sleep(1)
+      end
+
+      def Equals(value)
+         return Evaluation.new(self.Text, value)
+      end
+
+      def Contain(value)
+         return ContainsEvaluation.new(self.Text, value)
+      end
+    end
+  end
+end
+

data/lib/sapphire/WebAbstractions/Controls/Base/Page.rb

@@ -56,6 +56,10 @@ module Sapphire
         @fields << { args.first => Date.new(args[1]) }
       end
 
+      def Contains(item)
+        @fields.has_key? item
+      end
+
     end
   end
 end

data/lib/sapphire/WebAbstractions/Controls/List.rb

@@ -2,6 +2,11 @@ module Sapphire
   module WebAbstractions
     class List < Control
 
+      def initialize(hash)
+        @hash = hash
+        @retryAttempts = 0
+      end
+
       def Equals(value)
         x = self.FindAll
         x.each do |item|
@@ -11,6 +16,35 @@ module Sapphire
         end
         return Evaluation.new("Value not found in list", value)
       end
+
+      def Click
+        wait = Selenium::WebDriver::Wait.new(:timeout => 3)
+        begin
+          clicked = wait.until { items = self.FindAll
+            if items.empty? == false
+              if items.first.displayed? == true
+                items.first.click
+                return true
+              end
+            end
+          }
+          return nil
+        rescue
+          #retry a few times because in strange events from finding all the elements to trying to click one, it can become
+          #unavailable
+          if(@retryAttempts < 2)
+            @retryAttempts = @retryAttempts + 1
+            self.Click
+          else
+            return nil
+          end
+        end
+      end
+
+      def Count
+        items = self.FindAll
+        return items.count
+      end
     end
   end
 end

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.6.5"
+  VERSION = "0.6.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-09 00:00:00.000000000Z
+date: 2012-01-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &9932004 !ruby/object:Gem::Requirement
+  requirement: &10068828 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9932004
+  version_requirements: *10068828
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &9931752 !ruby/object:Gem::Requirement
+  requirement: &10068576 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9931752
+  version_requirements: *10068576
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &9931500 !ruby/object:Gem::Requirement
+  requirement: &10068324 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9931500
+  version_requirements: *10068324
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
@@ -69,6 +69,7 @@ files:
 - lib/sapphire/DSL/Browser/Extensions/Class.rb
 - lib/sapphire/DSL/Browser/Extensions/Hash.rb
 - lib/sapphire/DSL/Browser/Extensions/Numeric.rb
+- lib/sapphire/DSL/Browser/Extensions/String.rb
 - lib/sapphire/DSL/Browser/Extensions/Symbol.rb
 - lib/sapphire/DSL/Browser/Fluff/By.rb
 - lib/sapphire/DSL/Browser/Fluff/To.rb
@@ -84,12 +85,15 @@ files:
 - lib/sapphire/DSL/Browser/Should.rb
 - lib/sapphire/DSL/Browser/Tracker.rb
 - lib/sapphire/DSL/Browser/Verbs/Accept.rb
+- lib/sapphire/DSL/Browser/Verbs/Attempt.rb
 - lib/sapphire/DSL/Browser/Verbs/Check.rb
 - lib/sapphire/DSL/Browser/Verbs/Clear.rb
 - lib/sapphire/DSL/Browser/Verbs/Click.rb
 - lib/sapphire/DSL/Browser/Verbs/Close.rb
 - lib/sapphire/DSL/Browser/Verbs/Compare.rb
 - lib/sapphire/DSL/Browser/Verbs/Complete.rb
+- lib/sapphire/DSL/Browser/Verbs/Contain.rb
+- lib/sapphire/DSL/Browser/Verbs/Count.rb
 - lib/sapphire/DSL/Browser/Verbs/Differ.rb
 - lib/sapphire/DSL/Browser/Verbs/Disable.rb
 - lib/sapphire/DSL/Browser/Verbs/Error.rb
@@ -113,7 +117,6 @@ files:
 - lib/sapphire/DSL/Data/Exist.rb
 - lib/sapphire/DSL/Data/Find.rb
 - lib/sapphire/DSL/Data/GetPageField.rb
-- lib/sapphire/DSL/Data/Underscore.rb
 - lib/sapphire/DSL/Data/Validate.rb
 - lib/sapphire/DSL/Data/Verify.rb
 - lib/sapphire/DSL/Data/Write.rb
@@ -131,12 +134,15 @@ files:
 - lib/sapphire/DSL/Scenarios/when.rb
 - lib/sapphire/DSL/TestPlans/Covers.rb
 - lib/sapphire/DSL/TestPlans/FileHandler.rb
+- lib/sapphire/DSL/TestPlans/Parameter.rb
 - lib/sapphire/DSL/TestPlans/PathHandler.rb
 - lib/sapphire/DSL/TestPlans/Run.rb
 - lib/sapphire/DSL/TestPlans/TestPlan.rb
 - lib/sapphire/DSL.rb
 - lib/sapphire/JobAbstractions/Job.rb
 - lib/sapphire/Strategies/ClassStrategy.rb
+- lib/sapphire/Strategies/ContainsEvaluation.rb
+- lib/sapphire/Strategies/ContainsNullModifier.rb
 - lib/sapphire/Strategies/DefaultStrategy.rb
 - lib/sapphire/Strategies/Evaluation.rb
 - lib/sapphire/Strategies/HashStrategy.rb

data/lib/sapphire/DSL/Data/Underscore.rb

@@ -1,9 +0,0 @@
-class String
-   def underscore
-       self.gsub(/::/, '/').
-       gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-       gsub(/([a-z\d])([A-Z])/,'\1_\2').
-       tr("-", "_").
-       downcase
-   end
-end