marjoree 0.0.1 → 0.0.9

data/Marjoree.iml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="RUBY_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="Ruby SDK 1.8.6" jdkType="RUBY_SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntryProperties />
+  </component>
+  <component name="RModuleSettingsStorage">
+    <RMODULE_SETTINGS_STORAGE_ID NAME="SHOULD_USE_RSPEC_TEST_FRAMEWORK" VALUE="false" />
+    <RMODULE_SETTINGS_STORAGE_ID NAME="NUMBER" VALUE="0" />
+  </component>
+</module>
+

data/README

@@ -1,47 +1,20 @@
-Say 'Hello' to Marjoree at marjoree.rubyforge.org
+Marjoree:
 
 Release 0.0.1
+-------------
 
-Details
-
-   Marjoree is a ruby library which has been created to provide easier access to a database.
-   The main driver behind the development of Marjoree was to allow easy unit testing, and more specifically test driven development, of stored procedures.
-   When combined with rUnit, Marjoree provides a suitable unit testing environment.
-
-   Currently the only db vendor that is supported is Sybase and was developed under Ruby v1.8.5 
-
+Marjoree is a ruby library that can be used to access a database.
+The main driver behind the development of Marjoree was to allow easy unit testing, and more specifically test driven development, of stored procedures.
+When combined with rUnit this provides a suitable unit testing environment.
 
 Running Marjoree:
+-----------------
 
-   Marjoree uses ODBC to connect to a dataserver, therefore you need an (Sybase) ODBC connection setup. 
-    * To set up and ODBC connection on Windows,
+Marjoree uses ODBC to connect to a dataserver,
+    1: To set up and ODBC connection on Windows,
         Go to 'Control Panel', 'Adminstrative Tool', and select 'Data Sources (ODBC)' and enter the appropriate details of your database.
 
-
-Tests Suite:
-
-   First you will need to enter the ODBC details in marjoree\tests\all_tests.rb to allow Marjoree to connect to the dataserver.
-
-   To run the tests suite open a command prompt and move to the 'marjoree' dir and run
-
-	rake test
-
-
-Examples:
-
-   These can be found in marjoree\examples, again you will need to enter the ODBC connection details in each file you wish to run.
-
-
-Contacts:
-
-   Peter Aitken ( jiggypete@googlemail.com )
-
-
-Contributers:
-
-   Peter Aitken
-   Ian Davies
-   Angus 'Chopper' MacCuish        
+        
 
 
 

data/bin/create_marj_structure.rb

@@ -0,0 +1,75 @@
+require 'odbc_connection_finder'
+include OdbcConnectionFinder
+
+def mkdir( path )  
+  Dir.mkdir path unless File.exists? path
+end  
+
+def clean_odbc_names( odbc_names )
+  default = ["change_me_to_odbc_name"]
+  return default if odbc_names.empty?
+  
+  print "\nDo you want to import ALL of your pre-configures odbc connections for testing? "
+  print "\n\n"
+  print odbc_names.join( ', ' )
+  print "\n\ny/n "
+  if( gets.rstrip.downcase.eql? 'y' )
+    return odbc_names
+  end
+  
+  print "\nDo you want to import ANY of your pre-configures odbc connections for testing? "
+  print "\n\n"
+  print odbc_names.join( ', ' )
+  print "\n\ny/n "
+  if( !gets.rstrip.downcase.eql? 'y' )
+    return default
+  end
+  
+  #clean
+  result = []
+  odbc_names.each do |name|
+    print "Import #{name}?   y/n "
+    if( gets.rstrip.downcase.eql? 'y' )
+      result << name
+    end
+  end
+  
+  if( !result.empty? )
+    return result 
+  else
+    return default
+  end
+end  
+#
+#    Allow the user to decide if they want to create dirs for ALL odbc connections, if not let them choose.
+#
+#
+
+print "Please enter the dir of your project root: "
+project_root = gets.rstrip
+
+marj_dir = "#{project_root}/marjoree_tests"
+test_dir = "#{marj_dir}/tests"
+odbc_config_dir = "#{marj_dir}/odbc_config"
+fixtures_dir = "#{marj_dir}/fixtures"
+
+mkdir marj_dir
+
+mkdir test_dir
+mkdir odbc_config_dir
+mkdir fixtures_dir
+
+all_odbc_names = get_odbc_names
+desired_odbc_names = clean_odbc_names( all_odbc_names )
+
+desired_odbc_names.each do |odbc_name|
+  mkdir "#{fixtures_dir}/#{odbc_name}"
+end
+
+file = File.new( "#{odbc_config_dir}/connections.yml", "w+" )
+file << create_yml_for( desired_odbc_names )
+file.close
+#create odbc_config dir
+    #create connections.yml
+#create fixtures dir
+    # using the odbc_name create fixtures dirs

data/bin/create_odbc_connections.rb

@@ -0,0 +1,39 @@
+def create_odbc_connection( details )
+  
+  `odbcconf /A {configdsn "SYBASE ASE ODBC Driver" "DSN=#{details[:odbc_name]}|NA=#{details[:hostname]},#{details[:port]}|Uid=#{details[:username]}|Pwd=#{details[:password]}|Database=#{details[:db_name]}"}`
+end
+
+def prompt_for_connection_details
+  result = {}
+  print "Please enter the odbc name you want to create: "
+  result[:odbc_name] = gets.rstrip
+
+  print "Please enter the hostname of the database you want to connect to: "
+  result[:hostname] = gets.rstrip
+
+  print "Please enter the port number to connect to on #{result[:hostname]}: "
+  result[:port] = gets.rstrip
+
+  print "Please enter db name on #{result[:hostname]}:#{result[:port]} to connect to: "
+  result[:db_name] = gets.rstrip
+  
+  print "Please enter the username for #{result[:db_name]}: "
+  result[:username] = gets.rstrip
+  
+  print "Please enter the password for #{result[:db_name]}: "
+  result[:password] = gets.rstrip
+  
+  return result  
+end
+
+@more_connections_prompt = "\n\nAlright Chopper, are you ready to create some ODBC connections? y/n "
+def prompt_for_another_connection?
+  print @more_connections_prompt
+  return gets.rstrip.eql?( 'y' )
+end
+
+while( prompt_for_another_connection? )
+  @more_connections_prompt = "\n\nWant to create some more ODBC connections? y/n "
+  details = prompt_for_connection_details
+  create_odbc_connection( details )
+end

data/bin/odbc_connection_finder.rb

@@ -0,0 +1,46 @@
+require 'odbc'
+
+module OdbcConnectionFinder
+  
+  def get_odbc_names
+    odbc_names = []
+    ODBC.datasources.each do |datasource|
+      if( datasource.descr.upcase.include?( "SYBASE" ) )
+        odbc_names << datasource.name
+      end  
+    end  
+    
+    return odbc_names
+  end
+  
+  def create_yml_for( odbc_names )
+    output = []
+    odbc_names = [ "<ODBC_NAME_HERE>" ] if odbc_names.empty?
+    odbc_names.each do |odbc_name|
+      output << connection_template( odbc_name )
+    end
+
+    output << default_template( odbc_names.first )
+
+    return output
+  end
+  
+  private 
+  
+  def connection_template( odbc_name )
+    return <<TEMPLATE
+#{odbc_name}:
+    username:
+    password:
+    
+TEMPLATE
+  end  
+
+  def default_template( default_odbc_name )
+    return <<TEMPLATE
+default:
+  odbc_connection: #{default_odbc_name}
+TEMPLATE
+  end    
+
+end

data/examples/contains_example.rb

@@ -1,7 +1,7 @@
 require 'marjoree'
 include Marjoree
 
-connect('ODBC_DATASOURCE_NAME', 'USERNAME', 'PASSWORD' )
+connect( 'EMT_LOCAL', 'sa', '' )
 Kernel.at_exit { disconnect }
 puts
 

data/examples/count_and_insert_example.rb

@@ -1,7 +1,7 @@
 require 'marjoree'
 include Marjoree
 
-connect('ODBC_DATASOURCE_NAME', 'USERNAME', 'PASSWORD' )
+connect( 'EMT_LOCAL', 'sa', '' )
 Kernel.at_exit { disconnect }
 puts
 

data/examples/select_example.rb

@@ -1,7 +1,7 @@
 require 'marjoree'
 include Marjoree
 
-connect('ODBC_DATASOURCE_NAME', 'USERNAME', 'PASSWORD' )
+connect( 'EMT_LOCAL', 'sa', '' )
 Kernel.at_exit { disconnect }
 puts
 

data/html/classes/ExpectedResultSet.html

@@ -78,21 +78,6 @@
 
   <div id="contextContent">
 
-    <div id="description">
-      <p>
-A class, as the name suggests, to setup and expected result set.
-</p>
-<p>
-Typical usage
-</p>
-<pre>
-   expected = ExpectedResultSet.new
-   expected.columns = ['first_column_name', 'second_column_name']
-   expected.rows &lt;&lt;   [ 'first item',                  1 ]
-   expected.rows &lt;&lt;   [ 'second item',                 2 ]
-</pre>
-
-    </div>
 
 
    </div>
@@ -101,10 +86,13 @@ Typical usage
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000002">columns=</a>&nbsp;&nbsp;
-      <a href="#M000001">new</a>&nbsp;&nbsp;
-      <a href="#M000003">row_hash</a>&nbsp;&nbsp;
-      <a href="#M000004">row_hashes</a>&nbsp;&nbsp;
+      <a href="#M000006">add_fixture</a>&nbsp;&nbsp;
+      <a href="#M000003">columns=</a>&nbsp;&nbsp;
+      <a href="#M000007">get_value_from_maps</a>&nbsp;&nbsp;
+      <a href="#M000002">new</a>&nbsp;&nbsp;
+      <a href="#M000004">row_hash</a>&nbsp;&nbsp;
+      <a href="#M000005">row_hashes</a>&nbsp;&nbsp;
+      <a href="#M000008">with_row</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -144,13 +132,13 @@ Typical usage
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000001" class="method-detail">
-        <a name="M000001"></a>
+      <div id="method-M000002" class="method-detail">
+        <a name="M000002"></a>
 
         <div class="method-heading">
-          <a href="ExpectedResultSet.src/M000001.html" target="Code" class="method-signature"
-            onclick="popupCode('ExpectedResultSet.src/M000001.html');return false;">
-          <span class="method-name">new</span><span class="method-args">()</span>
+          <a href="ExpectedResultSet.src/M000002.html" target="Code" class="method-signature"
+            onclick="popupCode('ExpectedResultSet.src/M000002.html');return false;">
+          <span class="method-name">new</span><span class="method-args">(*names)</span>
           </a>
         </div>
       
@@ -160,20 +148,17 @@ Typical usage
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000002" class="method-detail">
-        <a name="M000002"></a>
+      <div id="method-M000006" class="method-detail">
+        <a name="M000006"></a>
 
         <div class="method-heading">
-          <a href="ExpectedResultSet.src/M000002.html" target="Code" class="method-signature"
-            onclick="popupCode('ExpectedResultSet.src/M000002.html');return false;">
-          <span class="method-name">columns=</span><span class="method-args">(value)</span>
+          <a href="ExpectedResultSet.src/M000006.html" target="Code" class="method-signature"
+            onclick="popupCode('ExpectedResultSet.src/M000006.html');return false;">
+          <span class="method-name">add_fixture</span><span class="method-args">( *fixture_map )</span>
           </a>
         </div>
       
         <div class="method-description">
-          <p>
-columns should be given an array of strings.
-</p>
         </div>
       </div>
 
@@ -183,7 +168,21 @@ columns should be given an array of strings.
         <div class="method-heading">
           <a href="ExpectedResultSet.src/M000003.html" target="Code" class="method-signature"
             onclick="popupCode('ExpectedResultSet.src/M000003.html');return false;">
-          <span class="method-name">row_hash</span><span class="method-args">(index)</span>
+          <span class="method-name">columns=</span><span class="method-args">(value)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+        </div>
+      </div>
+
+      <div id="method-M000007" class="method-detail">
+        <a name="M000007"></a>
+
+        <div class="method-heading">
+          <a href="ExpectedResultSet.src/M000007.html" target="Code" class="method-signature"
+            onclick="popupCode('ExpectedResultSet.src/M000007.html');return false;">
+          <span class="method-name">get_value_from_maps</span><span class="method-args">( key, fixture_maps)</span>
           </a>
         </div>
       
@@ -197,6 +196,20 @@ columns should be given an array of strings.
         <div class="method-heading">
           <a href="ExpectedResultSet.src/M000004.html" target="Code" class="method-signature"
             onclick="popupCode('ExpectedResultSet.src/M000004.html');return false;">
+          <span class="method-name">row_hash</span><span class="method-args">(index)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+        </div>
+      </div>
+
+      <div id="method-M000005" class="method-detail">
+        <a name="M000005"></a>
+
+        <div class="method-heading">
+          <a href="ExpectedResultSet.src/M000005.html" target="Code" class="method-signature"
+            onclick="popupCode('ExpectedResultSet.src/M000005.html');return false;">
           <span class="method-name">row_hashes</span><span class="method-args">()</span>
           </a>
         </div>
@@ -205,6 +218,20 @@ columns should be given an array of strings.
         </div>
       </div>
 
+      <div id="method-M000008" class="method-detail">
+        <a name="M000008"></a>
+
+        <div class="method-heading">
+          <a href="ExpectedResultSet.src/M000008.html" target="Code" class="method-signature"
+            onclick="popupCode('ExpectedResultSet.src/M000008.html');return false;">
+          <span class="method-name">with_row</span><span class="method-args">(row_hash)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+        </div>
+      </div>
+
 
     </div>
 

data/html/classes/ExpectedResultSet.src/M000002.html

@@ -5,14 +5,15 @@
 
 <html>
 <head>
-  <title>columns= (ExpectedResultSet)</title>
+  <title>new (ExpectedResultSet)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/expected_result_set.rb, line 16</span>
-    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">columns=</span>(<span class="ruby-identifier">value</span>)
-        <span class="ruby-ivar">@columns</span> = <span class="ruby-identifier">value</span>.<span class="ruby-identifier">map</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">entry</span><span class="ruby-operator">|</span> <span class="ruby-identifier">entry</span>.<span class="ruby-identifier">to_s</span>}
-    <span class="ruby-keyword kw">end</span></pre>
+  <pre><span class="ruby-comment cmt"># File lib/expected_result_set.rb, line 4</span>
+  <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">names</span>)
+    <span class="ruby-ivar">@columns</span> = <span class="ruby-identifier">names</span>.<span class="ruby-identifier">map</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">column</span><span class="ruby-operator">|</span> <span class="ruby-identifier">column</span>.<span class="ruby-identifier">to_s</span>}
+    <span class="ruby-ivar">@rows</span> = []
+  <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/html/classes/ExpectedResultSet.src/M000003.html

@@ -5,14 +5,14 @@
 
 <html>
 <head>
-  <title>row_hash (ExpectedResultSet)</title>
+  <title>columns= (ExpectedResultSet)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/expected_result_set.rb, line 20</span>
-    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">row_hash</span>(<span class="ruby-identifier">index</span>)
-        <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">to_hash</span>( <span class="ruby-ivar">@rows</span>[<span class="ruby-identifier">index</span>] )
-    <span class="ruby-keyword kw">end</span></pre>
+  <pre><span class="ruby-comment cmt"># File lib/expected_result_set.rb, line 9</span>
+  <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">columns=</span>(<span class="ruby-identifier">value</span>)
+    <span class="ruby-ivar">@columns</span> = <span class="ruby-identifier">value</span>.<span class="ruby-identifier">map</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">entry</span><span class="ruby-operator">|</span> <span class="ruby-identifier">entry</span>.<span class="ruby-identifier">to_s</span>}
+  <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>