mystic 0.0.9 → 0.1.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mystic
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Nathaniel Symer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: densify
@@ -38,9 +38,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Database management/access gem. Supports adapters, migrations, and a
-  singleton to make SQL queries.
-email: nate@ivytap.com
+description: Pooled PG singleton instance. Focus more on writing SQL than dealing
+  with a finnicky ORM. It powers the Pawky backend.
+email: nate@natesymer.com
 executables:
 - mystic
 extensions: []
@@ -49,15 +49,14 @@ files:
 - LICENSE
 - bin/mystic
 - lib/mystic.rb
-- lib/mystic/adapter.rb
-- lib/mystic/adapters/abstract.rb
-- lib/mystic/adapters/mysql.rb
-- lib/mystic/adapters/postgres.rb
-- lib/mystic/constants.rb
 - lib/mystic/extensions.rb
 - lib/mystic/migration.rb
 - lib/mystic/model.rb
+- lib/mystic/postgres.rb
 - lib/mystic/sql.rb
+- lib/mystic/sql/column.rb
+- lib/mystic/sql/index.rb
+- lib/mystic/sql/table.rb
 homepage: https://github.com/ivytap/mystic
 licenses:
 - MIT
@@ -81,6 +80,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Expressive migrations and adapters coupled with a singleton for SQL execution.
-  Heroku, rails, whatever compatible.
+summary: Pooled PG singleton instance. Focus more on writing SQL than dealing with
+  a finnicky ORM.
 test_files: []

data/lib/mystic/adapter.rb

@@ -1,145 +0,0 @@
-#!/usr/bin/env ruby
-
-require "densify"
-require "access_stack"
-
-module Mystic
-  class Adapter
-    attr_accessor :pool_size,
-									:pool_timeout,
-									:pool_expires
-  
-    @@blocks = {}
-
-    def self.create(name="",opts={})
-			name = name.to_s.downcase.strip
-			name = "postgres" if name =~ /^postg.*$/i # Includes PostGIS
-			name = "mysql" if name =~ /^mysql.*$/i
-		
-			require "mystic/adapters/" + name
-		
-			Object.const_get("Mystic::#{name.capitalize}Adapter").new opts
-    end
-    
-    def initialize(opts={})
-    	opts.symbolize.each do |k,v|
-    		k = ('@' + k.to_s).to_sym
-    		instance_variable_set k,v if instance_variables.include? k
-    	end
-    end
-	
-    # Gets the adapter name (examples: postgres, mysql)
-    def self.adapter
-      a = name.split("::").last.sub("Adapter","").downcase
-			a = "abstract" if a.empty?
-			a
-    end
-		
-		def adapter
-			self.class.adapter
-		end
-    
-    # Map a block to an adapter's block hash
-    #   This avoids cases where a subclass' class var
-    #   changes that class var on its superclass
-    def self.map_block(key, block)
-			@@blocks[adapter] ||= {}
-    	@@blocks[adapter][key] = block
-    end
-    
-    # Fetch a block for the current adapter
-    def block_for(key)
-    	b = @@blocks[adapter][key] rescue nil
-			b ||= @@blocks["abstract"][key] rescue nil
-			b ||= lambda { "" }
-			b
-    end
-    
-    #
-    # Adapter DSL
-    # Implemented using method_missing
-    #
-    
-    # example
-    # execute do |inst,sql|
-    #   inst.exec sql
-    # end
-    
-    # execute(inst,sql)
-    # Executes SQL and returns Ruby types
-    
-    # TODO: different kinds of escaping: ident & quote
-    
-    # sanitize(inst,sql)
-    # Escapes a literal
-    
-    # connect(opts)
-    # Creates an instance of the DB connection
-    
-    # disconnect(inst)
-    # Disconnects and destroys inst (a database connection)
-    
-    # validate(inst)
-    # Checks if inst is a valid connection
-
-		# Map missing methods to blocks
-		# DB ops or SQL generation
-		def self.method_missing(meth, *args, &block)
-			map_block meth, block
-		end
-		
-    #
-    # Adapter methods
-    #   These are called internally
-    #   They are called by class methods
-    #   in ../mystic.rb
-    #
-		def connect(opts)
-			disconnect unless @pool.nil?
-			@pool = AccessStack.new(
-				:size => @pool_size,
-				:timeout => @pool_timeout,
-				:expires => @pool_expires,
-				:create => lambda { block_for(:connect).call opts }
-			)
-    end
-  
-    def disconnect
-    	@pool.destroy ||= block_for :disconnect
-			@pool.empty!
-    end
-    
-    def reap
-    	@pool.validate ||= block_for :validate
-    	@pool.reap
-    end
-  
-    def execute(sql)
-			raise AdapterError, "Adapter's connection pool doesn't exist and so Mystic has not connected to the database." if @pool.nil?
-			@pool.with { |inst| block_for(:execute).call inst, sql }
-    end
-  
-    def sanitize(str)
-			@pool.with { |inst| block_for(:sanitize).call inst, str }
-    end
-		
-		def json_supported?
-			block_for(:json_supported).call
-		end
-  
-    def serialize_sql(obj)
-			return case obj
-			when SQL::Table
-				block_for(:table).call obj
-			when SQL::Index
-				block_for(:index).call obj
-			when SQL::Column
-				block_for(:column).call obj
-			when SQL::Operation
-				res = block_for(obj.kind).call obj
-				obj.callback.call unless obj.callback.nil?
-				res
-			end
-    end
-  end
-end

data/lib/mystic/adapters/abstract.rb

@@ -1,90 +0,0 @@
-#!/usr/bin/env ruby
-
-require "mystic"
-require "mystic/adapter"
-require "mystic/sql"
-
-#
-# This adapter is designed to hold
-# basic, spec-adherent SQL generation
-#	so adapters can be more DRY
-#
-
-module Mystic
-	class Adapter
-		
-		json_supported { false }
-		
-		table do |obj|
-			sql = []
-      sql.push "CREATE TABLE #{obj.name} (#{obj.columns.map(&:to_sql)*","})" if obj.create?
-      sql.push "ALTER TABLE #{obj.name} #{obj.columns.map{|c| "ADD COLUMN #{c.to_sql}" }*', '}" unless obj.create?
-			sql.push *(obj.indeces.map(&:to_sql)) unless obj.indeces.empty?
-	    sql.push *(obj.operations.map(&:to_sql)) unless obj.operations.empty?
-			sql*"; "
-		end
-		
-		column do |obj|
-			sql = []
-			sql << obj.name
-			sql << obj.kind.downcase
-			sql << "(#{obj.size})" if obj.size && !obj.size.empty? && !obj.geospatial?
-			sql << "(#{obj.geom_kind}, #{obj.geom_srid})" if obj.geospatial?
-      sql << (obj.constraints[:null] ? "NULL" : "NOT NULL") if obj.constraints.member?(:null)
-			sql << "UNIQUE" if obj.constraints[:unique]
-			sql << "PRIMARY KEY" if obj.constraints[:primary_key]
-			sql << "REFERENCES " + obj.constraints[:references] if obj.constraints.member?(:references)
-			sql << "DEFAULT " + obj.constraints[:default] if obj.constraints.member?(:default)
-			sql << "CHECK(#{obj.constraints[:check]})" if obj.constraints.member?(:check)
-			sql*" "
-		end
-		
-		index do |index|
-			sql = []
-			sql << "CREATE"
-			sql << "UNIQUE" if index.unique
-			sql << "INDEX"
-		  sql << index.name if index.name
-		  sql << "ON"
-			sql << index.table_name
-			sql << "(#{index.columns.map(&:to_s).join(',')})"
-			sql*" "
-		end
-		
-		#
-		## Operations
-		#
-		
-		drop_columns do |obj|
-			"ALTER TABLE #{obj.table_name} #{obj.column_names.map{|c| "DROP COLUMN #{c.to_s}" }*', '}"
-		end
-		
-		rename_column do |obj|
-			"ALTER TABLE #{obj.table_name} RENAME COLUMN #{obj.old_name} TO #{obj.new_name}"
-		end
-		
-		create_view do |obj|
-			"CREATE VIEW #{obj.name} AS #{obj.sql}"
-		end
-		
-		drop_view do |obj|
-			"DROP VIEW #{obj.name}"
-		end
-		
-		drop_table do |obj|
-			"DROP TABLE #{obj.table_name} #{obj.cascade? ? "CASCADE" : "RESTRICT" }"
-		end
-		
-		rename_table do |obj|
-			"ALTER TABLE #{obj.old_name} RENAME TO #{obj.new_name}"
-		end
-		
-		#
-		## Transaction Operations
-		#
-		
-		start_transaction { "BEGIN" }
-		commit_transaction { "COMMIT" }
-		rollback_transaction { "ROLLBACK" }
-	end
-end

data/lib/mystic/adapters/mysql.rb

@@ -1,51 +0,0 @@
-#!/usr/bin/env ruby
-
-require "mysql2"
-
-# TODO:
-# 1. Implement geometry
-
-module Mystic
-	class MysqlAdapter < Mystic::Adapter
-		ALGORITHMS = [:default, :inplace, :copy]
-		LOCKS = [:default, :none, :shared, :exclusive]
-		
-		connect { |opts| Mysql2::client.new opts }
-		disconnect { |mysql| mysql.close }
-		validate { |mysql| mysql.ping }
-		execute { |mysql, sql| mysql.query(sql).to_a }
-		sanitize { |mysql, str| mysql.escape str }
-		
-		drop_index do |index|
-			"DROP INDEX #{index.name} ON #{index.table_name}"
-		end
-		
-		index do |index|
-			sql = []
-			sql << "CREATE"
-			sql << "UNIQUE" if index.unique
-			sql << "INDEX"
-		  sql << index.name if index.name
-		  sql << "ON"
-			sql << index.table_name
-			sql << "USING #{obj.type.to_s.capitalize}" if index.type
-			sql << "(#{index.columns.map(&:to_s).join ',' })"
-			sql << "COMMENT #{index.comment.truncate 1024}" if index.comment
-			sql << "ALGORITHM #{index.algorithm.to_s.upcase}" if !index.lock && ALGORITHMS.include? index.algorithm
-			sql << "LOCK #{index.lock.to_s.upcase}" if !index.algorithm && LOCKS.include? index.lock
-			sql*" "
-		end
-		
-		# Leverage MySQL savepoints to make up for transactions' flaws
-		start_transaction { <<-sql
-			BEGIN;
-			SAVEPOINT mystic_migration8889;
-			DECLARE EXIT HANDLER FOR SQLWARNING ROLLBACK TO mystic_migration8889;
-			DECLARE EXIT HANDLER FOR NOT FOUND ROLLBACK TO mystic_migration8889;
-			DECLARE EXIT HANDLER FOR SQLEXCEPTION ROLLBACK TO mystic_migration8889;
-			sql
-		}
-		commit_transaction { "RELEASE SAVEPOINT mystic_migration8889;COMMIT" }
-		rollback_transaction { "ROLLBACK TO mystic_migration8889; RELEASE SAVEPOINT mystic_migration8889; ROLLBACK" }
-	end
-end

data/lib/mystic/adapters/postgres.rb

@@ -1,95 +0,0 @@
-#!/usr/bin/env ruby
-
-require "mystic/adapters/abstract"
-require "pg"
-
-# Mystic adapter for Postgres, includes PostGIS
-
-module Mystic
-	class PostgresAdapter < Mystic::Adapter
-		INDEX_TYPES = [
-			:btree,
-			:hash,
-			:gist,
-			:spgist,
-			:gin
-		].freeze
-		
-		CONNECT_FIELDS = [
-			:host,
-			:hostaddr,
-			:port,
-			:dbname,
-			:user,
-			:password,
-			:connect_timeout,
-			:options,
-			:tty,
-			:sslmode,
-			:krbsrvname,
-			:gsslib
-		].freeze
-		
-		connect { |opts| PG.connect opts.subhash(*CONNECT_FIELDS) }
-		disconnect { |pg| pg.close }
-		validate { |pg| pg.status == CONNECTION_OK }
-		sanitize { |pg, str| pg.escape_string str }
-		json_supported { true }
-		
-		execute do |pg, sql|
-			res = pg.exec sql
-			v = res[0][Mystic::JSON_COL] if res.ntuples == 1 && res.nfields == 1
-			v ||= res.ntuples.times.map { |i| res[i] } unless res.nil?
-			v ||= []
-			v
-		end
-		
-		drop_index do |index| 
-			"DROP INDEX #{index.index_name}"
-		end
-		
-		create_ext do |ext| 
-			"CREATE EXTENSION \"#{ext.name}\""
-		end
-		
-		drop_ext do |ext|
-			"DROP EXTENSION \"#{ext.name}\"" 
-		end
-		
-		index do |index|
-			storage_params = index.opts.subhash :fillfactor, :buffering, :fastupdate
-			
-			sql = []
-			sql << "CREATE"
-			sql << "UNIQUE" if index.unique
-			sql << "INDEX"
-			sql << "CONCURENTLY" if index.concurrently
-		  sql << index.name unless index.name.nil?
-		  sql << "ON #{index.table_name}"
-			sql << "USING #{index.type}" if INDEX_TYPES.include? index.type
-			sql << "(#{index.columns.map(&:to_s).join ',' })"
-			sql << "WITH (#{storage_params.sqlize})" unless storage_params.empty?
-			sql << "TABLESPACE #{index.tablespace}" unless index.tablespace.nil?
-			sql << "WHERE #{index.where}" unless index.where.nil?
-			sql*' '
-		end
-
-		table do |table|
-			sql = []
-			
-			if table.create?
-				tbl = []
-				tbl << "CREATE TABLE #{table.name} (#{table.columns.map(&:to_sql)*","})"
-				tbl << "INHERITS #{table.inherits}" if table.inherits
-				tbl << "TABLESPACE #{table.tablespace}" if table.tablespace
-				sql << tbl*' '
-			else
-				sql << "ALTER TABLE #{table.name} #{table.columns.map{ |c| "ADD COLUMN #{c.to_sql}" }*', ' }"
-			end
-      
-			sql.push(*table.indeces.map(&:to_sql)) unless table.indeces.empty?
-	    sql.push(*table.operations.map(&:to_sql)) unless table.operations.empty?
-			sql*'; '
-		end
-	end
-end

data/lib/mystic/constants.rb

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-
-module Mystic
-	MysticError = Class.new StandardError
-	RootError = Class.new StandardError
-	EnvironmentError = Class.new StandardError
-	AdapterError = Class.new StandardError
-	CLIError = Class.new StandardError
-	MIG_REGEX = /(?<num>\d+)_(?<name>[a-z]+)\.rb$/i # matches migration files (ex '1_MigrationClassName.rb')
-	JSON_COL = "mystic_return_json89788"
-end