hyperion-mysql 0.0.1.alpha5 → 0.1.0

data/lib/hyperion/mysql.rb

@@ -8,7 +8,7 @@ module Hyperion
   module Mysql
 
     def self.new(opts={})
-      Sql::Datastore.new(DbStrategy.new, QueryExecutorStrategy.new, QueryBuilderStrategy.new)
+      Sql::Datastore.new(opts[:connection_url], DbStrategy.new, QueryExecutorStrategy.new, QueryBuilderStrategy.new)
     end
 
   end

data/lib/hyperion/mysql/db_strategy.rb

@@ -1,11 +1,11 @@
-require 'hyperion/api'
+require 'hyperion'
 
 module Hyperion
   module Mysql
     class DbStrategy
 
       def process_result(given_record, result)
-        if API.new?(given_record)
+        if Hyperion.new?(given_record)
           given_record.merge('id' => result.insert_id)
         else
           given_record

data/spec/hyperion/mysql_spec.rb

@@ -5,6 +5,8 @@ require 'hyperion/mysql'
 
 describe Hyperion::Mysql do
 
+  CONNECTION_URL = 'mysql://localhost/hyperion_ruby'
+
   def execute(query)
     Hyperion::Sql.connection.create_command(query).execute_non_query
   end
@@ -25,54 +27,64 @@ describe Hyperion::Mysql do
     execute "DROP TABLE IF EXISTS #{table_name};"
   end
 
+  TABLES = ['testing', 'other_testing']
+
   around :each do |example|
-    Hyperion::Sql.with_connection_and_ds('mysql://localhost/hyperion_ruby', :mysql) do
+    Hyperion.with_datastore(:mysql, :connection_url => CONNECTION_URL) do
       example.run
     end
   end
 
-  context 'Datastore' do
+  before :each do |example|
+    Hyperion::Sql.with_connection(CONNECTION_URL) do
+      TABLES.each { |table| create_table(table) }
+    end
+  end
+
+  after :each do |example|
+    Hyperion::Sql.with_connection(CONNECTION_URL) do
+      TABLES.each { |table| drop_table(table) }
+    end
+  end
+
+  include_examples 'Datastore'
+
+  context 'Transactions' do
     around :each do |example|
-      tables = ['testing', 'other_testing']
-      begin
-        tables.each { |table| create_table(table) }
+      Hyperion::Sql.with_connection(CONNECTION_URL) do
         example.run
-      ensure
-        tables.each { |table| drop_table(table) }
       end
     end
 
-    include_examples 'Datastore'
+    include_examples 'Sql Transactions'
+  end
 
-    context 'Sql Injection' do
-      it 'escapes strings to be inserted' do
-        evil_name = "my evil name' --"
-        record = Hyperion::API.save(:kind => 'testing', :name => evil_name)
-        found_record = Hyperion::API.find_by_key(record[:key])
-        found_record[:name].should == evil_name
-      end
+  context 'Sql Injection' do
+    it 'escapes strings to be inserted' do
+      evil_name = "my evil name' --"
+      record = Hyperion.save(:kind => 'testing', :name => evil_name)
+      found_record = Hyperion.find_by_key(record[:key])
+      found_record[:name].should == evil_name
+    end
 
-      it 'escapes table names' do
-        error_message = ""
-        begin
-          Hyperion::API.save(:kind => 'my evil name` --', :name => 'value')
-        rescue Exception => e
-          error_message = e.message
-        end
-        error_message.should include("Table 'hyperion_ruby.my_evil_name`___' doesn't exist")
+    it 'escapes table names' do
+      error_message = ""
+      begin
+        Hyperion.save(:kind => 'my evil name` --', :name => 'value')
+      rescue Exception => e
+        error_message = e.message
       end
+      error_message.should include("Table 'hyperion_ruby.my_evil_name`___' doesn't exist")
+    end
 
-      it 'escapes column names' do
-        error_message = ""
-        begin
-          Hyperion::API.save(:kind => 'testing', 'my evil name` --' => 'value')
-        rescue Exception => e
-          error_message = e.message
-        end
-        error_message.should include("Unknown column 'my_evil_name`___' in 'field list'")
+    it 'escapes column names' do
+      error_message = ""
+      begin
+        Hyperion.save(:kind => 'testing', 'my evil name` --' => 'value')
+      rescue Exception => e
+        error_message = e.message
       end
+      error_message.should include("Unknown column 'my_evil_name`___' in 'field list'")
     end
   end
-
-  it_behaves_like 'Sql Transactions'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hyperion-mysql
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha5
-  prerelease: 6
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
-- 8th Light, Inc.
+- Myles Megyesi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha5
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha5
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: do_mysql
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +62,6 @@ dependencies:
 description: MySQL Datastore for Hyperion
 email:
 - myles@8thlight.com
-- skim@8thlight.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -88,9 +87,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24