skiima 0.1.000 → 0.2.2

data/spec/skiima_spec.rb

@@ -2,20 +2,54 @@
 require 'spec_helper'
 
 describe Skiima do
-  describe "Module Configuration Options" do
-    it "should set the proper module defaults" do
+  subject { Skiima }
+
+  it_behaves_like "a skiima config"
+
+  it { subject.must_respond_to :config }
+  it { subject.must_respond_to :defaults }
+
+  describe "#setup" do
+    it "must set the properties in the config block" do
       Skiima.root_path.must_equal SKIIMA_ROOT
       Skiima.config_path.must_equal 'config'
-      Skiima.database_yaml.must_equal 'database.yml'
-      Skiima.scripts_path.must_equal 'db/skiima'
-      Skiima.depends_yaml.must_equal 'depends.yml'
+      Skiima.database_yml.must_equal 'database.yml'
+    end
+
+    it "must set the translation repository" do
+      Skiima.text_domain.must_equal 'skiima'
+      Skiima.locale.must_equal 'en'
     end
   end
 
-  describe "#message" do
-    it "should default to using the locale specified in config block" do
-      Skiima.msg('messages', 'create', 'start').must_equal "Creating objects for @class"
+  describe "#defaults" do
+    it "must set the following as module defaults" do
+      Skiima.root_path.must_equal SKIIMA_ROOT
+      Skiima.config_path.must_equal 'config'
+      Skiima.database_yml.must_equal 'database.yml'
+      Skiima.scripts_path.must_equal 'db/skiima'
+      Skiima.dependencies_yml.must_equal 'dependencies.yml'
     end
+
+    it "must return a config struct with the defaults for the Skiima module"
+  end
+
+  describe "#new" do
+    it "delegates to Skiima::Loader"
+  end
+
+  describe "#up" do
+    it "parses the options correctly"
+    it "delegates to a new instance of Skiima::Loader"
+  end
+
+  describe "#down" do
+    it "parses the options correctly"
+    it "delegates to a new instance of Skiima::Loader"
+  end
+
+  describe "#exe_with_connection" do
+    it "deprecates?"
   end
 
   # describe "implementation" do
@@ -34,64 +68,9 @@ describe Skiima do
   #   end
 
   #   describe "Errors: " do
-  #     it "should return a group not found error when a class/string can't be found in depends.yml" do
-
-  #     end
-  #   end
-  # end
-end
-
-describe Skiima::Loader do
-  subject { Skiima::Loader.new(:test) }
-
-  describe "#config" do
-    before(:each) { Skiima::Loader.any_instance.expects(:make_connection).returns(true) }
-  	let(:config_path) { 'config' }
-  	let(:db_yaml) { 'database.yml' }
-
-  	it "inherits module defaults" do
-      subject.root_path.must_equal SKIIMA_ROOT
-      subject.config_path.must_equal config_path
-      subject.database_yaml.must_equal db_yaml
-    end
-
-    it "overrides module defaults with options hash" do
-      ski_too = Skiima::Loader.new(:test, :logging_out => 'STDERR')
-      ski_too.logging_out.must_equal 'STDERR'
-    end
-  end
-
-  describe "Logger: " do
-    before(:each) { Skiima::Loader.any_instance.expects(:make_connection).returns(true) }
-
-    it "creates a logger with the correct options" do
-      subject.logger.class.must_equal ::Logger
-    end
-  end
-
-  # describe "Implementation: " do
-  #   let(:groups) { groups = %w(friend team_member) }
-  #   let(:scripts) do 
-  #     scripts = %w(view_friends rule_view_friends_delete rule_view_friends_insert).map {|s| Skiima::Dependency::Script.new('friend', s)} 
-  #   end
-
-  #   it "should take a list of strings and run their SQL up scripts for them" do
-  #     subject.expects(:execute_dependency_reader).with(groups).returns(scripts)
-  #     subject.expects(:execute_loader).with(:up, scripts).returns('Great Success!!')
-  #     subject.up(*groups)
-  #   end
+  #     it "should return a group not found error when a class/string can't be found in dependencies.yml" do
 
-  #   it "should take a list of strings and run their SQL down scripts for them" do
-  #     subject.expects(:execute_dependency_reader).with(groups).returns(scripts)
-  #     subject.expects(:execute_loader).with(:down, scripts).returns('Great Success!!')
-  #     subject.down('friend', 'team_member')
-  #   end
-
-  #   describe "Errors: " do
-  #     it "should return a group not found error when a class/string can't be found in depends.yml" do
-  #       proc { subject.up('friendz', 'team_memberz') }.must_raise(Skiima::SqlGroupNotFound)
   #     end
   #   end
   # end
 end
-

data/spec/spec_helper.rb

@@ -10,6 +10,20 @@ require "minitest/pride"
 require "mocha"
 require "pry"
 
+# To Test:
+# TODO: finish skiima_spec.rb
+# TODO: finish loader_spec.rb
+# TODO: finish struct_spec.rb
+# TODO: finish config_spec.rb
+# TODO: finish resolver_spec.rb
+
+# Integration:
+# TODO: update mysql_spec.rb
+# TODO: update mysql2_spec.rb
+# TODO: update postgresql_spec.rb
+
+Bundler.require(:active_record)
+
 require "skiima"
 
 SKIIMA_ROOT = File.dirname(__FILE__)
@@ -24,12 +38,32 @@ end
 def ensure_closed(s, &block)
   yield s
 ensure
-  s.connection.close
+  s.connector.disconnect!
 end
 
 def within_transaction(s, &block)
-  s.connection.begin_db_transaction
+  s.connector.begin_db_transaction
   yield s
 ensure
-  s.connection.rollback_db_transaction
-end
+  s.connector.rollback_db_transaction
+end
+
+# minitest config for shared examples
+MiniTest::Spec.class_eval do
+  def self.shared_examples
+    @shared_examples ||= {}
+  end
+end
+
+module MiniTest::Spec::SharedExamples
+  def shared_examples_for(desc, &block)
+    MiniTest::Spec.shared_examples[desc] = block
+  end
+
+  def it_behaves_like(desc)
+    self.instance_eval(&MiniTest::Spec.shared_examples[desc])
+  end
+end
+
+Object.class_eval { include(MiniTest::Spec::SharedExamples) }
+require 'shared_examples/config_shared_example'

metadata

@@ -1,115 +1,142 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: skiima
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.000
+version: !ruby/object:Gem::Version
+  version: 0.2.2
 platform: ruby
-authors: 
+authors:
 - David Conner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fast_gettext
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: erubis
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.21
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.9.1
+      - !ruby/object:Gem::Version
+        version: 4.6.2
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: minitest-matchers
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.1.3
+      - !ruby/object:Gem::Version
+        version: 4.6.2
+- !ruby/object:Gem::Dependency
+  name: minitest-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.10.0
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.2
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.2
 description: Skiima helps to manage SQL objects like views and functions
-email: 
+email:
 - dconner.pro@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGELOG
 - Gemfile
 - Guardfile
+- LICENSE
+- Procfile.example
 - README.md
 - Rakefile
 - lib/skiima.rb
-- lib/skiima/db_adapters.rb
-- lib/skiima/db_adapters/base_mysql_adapter.rb
-- lib/skiima/db_adapters/mysql2_adapter.rb
-- lib/skiima/db_adapters/mysql_adapter.rb
-- lib/skiima/db_adapters/postgresql_adapter.rb
-- lib/skiima/dependency.rb
+- lib/skiima/config.rb
+- lib/skiima/config/struct.rb
+- lib/skiima/db/connector.rb
+- lib/skiima/db/connector/active_record.rb
+- lib/skiima/db/connector/active_record/base_connector.rb
+- lib/skiima/db/connector/active_record/mysql2_connector.rb
+- lib/skiima/db/connector/active_record/mysql_connector.rb
+- lib/skiima/db/connector/active_record/postgresql_connector.rb
+- lib/skiima/db/helpers/mysql.rb
+- lib/skiima/db/helpers/postgresql.rb
+- lib/skiima/db/resolver.rb
+- lib/skiima/dependency/reader.rb
+- lib/skiima/dependency/script.rb
+- lib/skiima/i18n.rb
+- lib/skiima/loader.rb
 - lib/skiima/locales/en.yml
 - lib/skiima/locales/fr.yml
+- lib/skiima/logger.rb
+- lib/skiima/railtie.rb
+- lib/skiima/railties/skiima.rake
 - lib/skiima/version.rb
-- lib/skiima_helpers.rb
 - skiima.gemspec
-- spec/config/database.yml
-- spec/db/skiima/depends.yml
-- spec/db/skiima/empty_depends.yml
+- spec/config/database.yml.example
+- spec/config/database.yml.travis
+- spec/db/skiima/dependencies.yml
+- spec/db/skiima/empty_dependencies.yml
 - spec/db/skiima/init_test_db/database.skiima_test.mysql.current.sql
 - spec/db/skiima/init_test_db/database.skiima_test.postgresql.current.sql
 - spec/db/skiima/test_column_names/table.test_column_names.mysql.current.sql
@@ -130,43 +157,50 @@ files:
 - spec/mysql2_spec.rb
 - spec/mysql_spec.rb
 - spec/postgresql_spec.rb
-- spec/skiima/db_adapters/mysql_adapter_spec.rb
-- spec/skiima/db_adapters/postgresql_adapter_spec.rb
-- spec/skiima/db_adapters_spec.rb
-- spec/skiima/dependency_spec.rb
+- spec/shared_examples/config_shared_example.rb
+- spec/skiima/config/struct_spec.rb
+- spec/skiima/config_spec.rb
+- spec/skiima/db/connector/active_record/base_connector_spec.rb
+- spec/skiima/db/connector/active_record/mysql2_connector_spec.rb
+- spec/skiima/db/connector/active_record/mysql_connector_spec.rb
+- spec/skiima/db/connector/active_record/postgresql_connector_spec.rb
+- spec/skiima/db/connector_spec.rb
+- spec/skiima/db/resolver_spec.rb
+- spec/skiima/dependency/reader_spec.rb
+- spec/skiima/dependency/script_spec.rb
+- spec/skiima/i18n_spec.rb
+- spec/skiima/loader_spec.rb
+- spec/skiima/logger_spec.rb
 - spec/skiima_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/dcunited001/skiima
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: skiima
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A SQL object manager for Rails projects
-test_files: 
-- spec/config/database.yml
-- spec/db/skiima/depends.yml
-- spec/db/skiima/empty_depends.yml
+test_files:
+- spec/config/database.yml.example
+- spec/config/database.yml.travis
+- spec/db/skiima/dependencies.yml
+- spec/db/skiima/empty_dependencies.yml
 - spec/db/skiima/init_test_db/database.skiima_test.mysql.current.sql
 - spec/db/skiima/init_test_db/database.skiima_test.postgresql.current.sql
 - spec/db/skiima/test_column_names/table.test_column_names.mysql.current.sql
@@ -187,9 +221,19 @@ test_files:
 - spec/mysql2_spec.rb
 - spec/mysql_spec.rb
 - spec/postgresql_spec.rb
-- spec/skiima/db_adapters/mysql_adapter_spec.rb
-- spec/skiima/db_adapters/postgresql_adapter_spec.rb
-- spec/skiima/db_adapters_spec.rb
-- spec/skiima/dependency_spec.rb
+- spec/shared_examples/config_shared_example.rb
+- spec/skiima/config/struct_spec.rb
+- spec/skiima/config_spec.rb
+- spec/skiima/db/connector/active_record/base_connector_spec.rb
+- spec/skiima/db/connector/active_record/mysql2_connector_spec.rb
+- spec/skiima/db/connector/active_record/mysql_connector_spec.rb
+- spec/skiima/db/connector/active_record/postgresql_connector_spec.rb
+- spec/skiima/db/connector_spec.rb
+- spec/skiima/db/resolver_spec.rb
+- spec/skiima/dependency/reader_spec.rb
+- spec/skiima/dependency/script_spec.rb
+- spec/skiima/i18n_spec.rb
+- spec/skiima/loader_spec.rb
+- spec/skiima/logger_spec.rb
 - spec/skiima_spec.rb
 - spec/spec_helper.rb