actn-db 0.0.3 → 0.0.4

data/db/lib/{_4_builder.js → _5_builder.js}

@@ -1,7 +1,7 @@
 // Generated by CoffeeScript 1.6.3
 (function() {
-  var Builder;
-
+  var Builder, root;
+  root = this;
   Builder = (function() {
     function Builder(schema_name, table_name, search_path, query) {
       var _base;
@@ -212,7 +212,5 @@
     return Builder;
 
   })();
-
-  actn.Builder = Builder;
-
+  return root.actn.Builder = Builder;
 }).call(this);

data/lib/actn/db/tasks/db.rake

@@ -4,8 +4,8 @@ namespace :db do
 
   desc "erases and rewinds all dbs"
   task :reset do
-    Rake::Task["db:drop"].execute 
-    Rake::Task["db:create"].execute 
+    Rake::Task["db:drop_schema"].execute 
+    Rake::Task["db:create_schema"].execute 
     Rake::Task["db:migrate"].execute 
   end
   
@@ -14,8 +14,6 @@ namespace :db do
     
     puts "Db Migrating... #{db_config[:dbname]}"        
     pg = PG::EM::Client.new(db_config)
-    
-
           
     Actn::DB.paths.uniq.each do |path|
       
@@ -24,15 +22,18 @@ namespace :db do
       pg.exec(File.read("#{path}/db/__setup.sql")) if File.exists?("#{path}/db/__setup.sql")
 
       if File.exists?("#{path}/db/lib")
-       `coffee --compile --output #{path}/db/lib #{path}/db/lib` rescue nil        
+       `coffee --bare --compile --output #{path}/db/lib #{path}/db/lib` rescue nil        
        
         Dir.glob("#{path}/db/lib/*.js").each do |js|
-          name = File.basename(js,".js").split("_").last
+          # name = File.basename(js,".js").split("_").last
+          name = File.basename(js,".js")[1..-1]
           sql = "INSERT INTO plv8_modules values ($1,true,$2)"
           pg.exec_params(sql,[name,File.read(js)])
         end  
       end
       
+      pg.exec "SELECT plv8_startup();"
+      
       pg.exec(File.read("#{path}/db/__functions.sql")) if File.exists?("#{path}/db/__functions.sql")      
       
       if File.exists?("#{path}/db/")
@@ -59,22 +60,34 @@ namespace :db do
           
           puts "#{name} inserted:#{inserted} updated:#{updated}"  
         end   
-        
-        pg.exec "SELECT plv8_startup();"
-        
+  
       end
       
-      
     end    
 
   end
+  
+  desc 'Drops all schemas'
+  task :drop_schema  do
+    puts "Db Dropping... #{db_config[:dbname]}"        
+    pg = PG::EM::Client.new(db_config)
+    pg.exec "drop schema public cascade;"
+    pg.exec "drop schema if exists core cascade;"  
+  end
+
+  desc 'Creates public schema'
+  task :create_schema do         
+    puts "Db Creating... #{db_config[:dbname]}"            
+    pg = PG::EM::Client.new(db_config)
+    pg.exec "create schema public;"
+  end
 
   desc 'Drops the database'
   task :drop  do
     puts "Db Dropping... #{db_config[:dbname]}"        
     pg = PG::EM::Client.new(pg_config)
     sql = "DROP DATABASE IF EXISTS \"%s\";" % [db_config[:dbname]]
-    pg.exec(sql).error_message
+    pg.exec(sql)
   end
 
   desc 'Creates the database'

data/lib/actn/db/version.rb

@@ -1,5 +1,5 @@
 module Actn
   module DB
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/test/actn/test_model.rb

@@ -34,7 +34,7 @@ module Actn
         assert_equal "ModelName", model.name
 
         samenamedmodel =  Model.create(data)
-        puts samenamedmodel.errors.inspect
+        # puts samenamedmodel.errors.inspect
         refute samenamedmodel.persisted?
 
         model.destroy

data/test/minitest_helper.rb

@@ -5,7 +5,7 @@ require 'minitest/autorun'
 require 'minitest/pride'
 
 ENV['RACK_ENV'] = "test"
-ENV['DATABASE_URL'] = "postgres://localhost:5432/actn_test" 
+ENV['DATABASE_URL'] ||= "postgres://localhost:5432/actn_test" 
 
 I18n.enforce_available_locales = false
 
@@ -15,4 +15,4 @@ class  MiniTest::Test
   def random_str
     (0...8).map { (65 + rand(26)).chr }.join
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actn-db
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Onur Uyar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,12 +153,14 @@ files:
 - db/1_db.sql
 - db/__functions.sql
 - db/__setup.sql
-- db/lib/_0_actn.js
-- db/lib/_1_underscore.js
+- db/lib/_0_underscore.js
+- db/lib/_1_inflections.js
 - db/lib/_2_jjv.js
-- db/lib/_3_inflections.js
-- db/lib/_4_builder.coffee
-- db/lib/_4_builder.js
+- db/lib/_3_actn.js
+- db/lib/_4_functions.coffee
+- db/lib/_4_functions.js
+- db/lib/_5_builder.coffee
+- db/lib/_5_builder.js
 - db/schemas/model.json
 - lib/actn/core_ext/hash.rb
 - lib/actn/core_ext/kernel.rb

data/db/lib/_0_actn.js

@@ -1,23 +0,0 @@
-global = (function() {
-  return this;
-}).call(null);
-
-var Actn = (function() {
-  function Actn() {}
-
-  Actn.prototype.valueAt = function(data, key) {
-    var i, keys;
-    keys = key.split(".");
-    for (i in keys) {
-      if (data != null) {
-        data = data[keys[i]];
-      }
-    }
-    return data;
-  };
-
-  return Actn;
-
-})();
-
-actn = new Actn();

data/db/lib/_4_builder.coffee

@@ -1,136 +0,0 @@
-class Builder
-  
-  constructor: (@schema_name, @table_name, @search_path, @query) ->
-    @query.select ?= "*"
-    @params = []
-    @i = 0
-  
-  qm: -> "$#{@i += 1}"
-  
-  make_select: ->
-    if @query?.select?.indexOf('COUNT') > -1
-      @query.select
-    else
-      if @query.select is "*" 
-        "data" 
-      else  
-        @params.push _.flatten([@query.select]).join(".")
-        "__select(data, #{@qm()}) as data" #::text
-  
-  
-  make_where: (q, join_by = 'AND') ->
-    sql = []
-    for k, subquery of q
-      switch k
-        when 'and', 'AND', '&', '&&'
-          sql.push "(#{make_where(subquery, 'AND')})"
-        when  'or',  'OR', '|', '||'
-          sql.push "(#{make_where(subquery, 'OR')})"
-        when 'not', 'NOT', '!'
-          sql.push "NOT (#{make_where(subquery, 'AND')})"
-        else
-          if _.isArray(subquery)
-            @params.push k
-            @params.push subquery[1]
-            sql.push "#{@plv8_key(subquery[1])} #{subquery[0]} #{@plv8_qm(subquery[1])}"
-          else if _.isObject(subquery)
-            comparisons = []
-            for symbol, value in subquery
-              comparisons.push "#{symbol} #{@plv8_qm(value)}"
-              @params.push k                    
-              @params.push value
-            sql.push _.map(comparisons, (comparison) -> "#{@plv8_key(value)} #{comparison}").join(" AND ")
-          else
-            @params.push k
-            @params.push subquery
-            sql.push "#{@plv8_key(subquery)} = #{@plv8_qm(subquery)}"
-
-    sql.join "\n#{join_by} "
-
-  
-  make_order_by: () ->
-    ord = @query.order_by
-    str = []
-    if _.isArray(ord)
-      @params.push ord[0]
-      str.push "#{@plv8_key(ord[1])} #{ord[1].toUpperCase()}"
-    else if _.isObject(ord)
-      for k,v in ord
-        @params.push v
-        str.push "#{@plv8_key(k)} #{k.toUpperCase()}"
-    else
-      @params.push ord
-      str.push @qm()
-    str.join(",")  
-  
-  
-  make_limit: ->
-    @params.push @query.limit
-    @qm()
-
-
-  make_offset: ->
-    @params.push @query.offset
-    @qm()
-    
-
-  build_select: ->
-    sql = []
-    sql.push "SET search_path TO #{@search_path};"
-    sql.push "SELECT #{@make_select()} FROM #{@schema_name}.#{@table_name}"
-    sql.push "WHERE #{@make_where(@query.where)}" unless _.isEmpty(@query.where)
-    sql.push "ORDER BY #{@make_order()}" if @query.order_by?
-    sql.push "LIMIT #{@make_limit()}" if @query.limit?
-    sql.push "OFFSET #{@make_offset()}" if @query.offset?
-    [sql.join("\n"), @params]
-
-  build_delete: ->
-    sql = []
-    sql.push "SET search_path TO #{@search_path};"
-    sql.push "DELETE FROM #{@schema_name}.#{@table_name}"
-    sql.push "WHERE #{@make_where(@query.where)}" unless _.isEmpty(@query.where)
-    sql.push "RETURNING data::json;"
-    [sql.join("\n"), @params]
-    
-  build_update: (data, merge = true) ->
-    
-    @params.push data
-    @params.push merge
-    sql = []
-    sql.push "SET search_path TO #{@search_path};"
-    sql.push "UPDATE #{@schema_name}.#{@table_name} SET data = __patch(data,#{@qm()},#{@qm()})"
-    sql.push "WHERE #{@make_where(@query.where)}" unless _.isEmpty(@query.where)
-    sql.push "RETURNING data::json;"    
-    [sql.join("\n"), @params]  
-  
-  build_insert: (data, merge = true) ->
-    @params.push data
-    @params.push merge
-    sql = []
-    sql.push "SET search_path TO #{@search_path};" 
-    sql.push "INSERT INTO #{@schema_name}.#{@table_name} (data) VALUES (__patch(__defaults(),#{@qm()},#{@qm()}))"
-    sql.push "RETURNING data::json;"
-    [sql.join("\n"), @params] 
-
-  plv8_key: (value) -> "#{@typecast(value,true)}(data, #{@qm()}::text)" #::text
-
-  plv8_qm: (value) -> "#{@qm()}::#{@typecast(value)}"
-    
-  typecast: (value, is_func = false) ->
-    type = if is_func then "__" else ""
-    if _.isBoolean(value)
-      type += "bool"
-    else if _.isDate(value)
-      type += "timestamp"
-    else if _.isNumber(value)  
-      type += "integer"
-    else if _.isObject(value)
-      type += (if is_func then "text" else "json")
-    else if _.isArray(value)
-      type += (if is_func then "text" else "array")
-    else
-      type += (if is_func then "string" else "text")
-    type
-
-
-actn.Builder = Builder