mystic 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c1b298d8159f75053635c7ead806af57c42b2ac
-  data.tar.gz: 208fbafe42642f540c5e7b262f35267611c3262e
+  metadata.gz: d72462dbb17bb77c1cf67fd294286f52636bd68f
+  data.tar.gz: e78d213ceb6133c03b24c00c959403bb51f3cc99
 SHA512:
-  metadata.gz: 445ec0546c15ca3da3ea6328499c65611dbd86048a790a05e3af15c35a5e881a0a963a238cf6eea2245d6e03b630fb7e057dc1fb4268dccb4956a311bdd082b9
-  data.tar.gz: fbe20de403540cb2d85d032919e7c1aa429feb97b5f52c68c26df45af01b9166ee58faa27f0ca9ef45a386de8b3c628a0d0fbf672152d327f99c7f7f36886e3c
+  metadata.gz: 3ef965891e3f3dc4c1617511707bf6af8cf3e747512cd96f44d20964142c7e81f13793dba7350a1c60eec681ae58f533e894dac57c85c8beb84e77eaf785ede9
+  data.tar.gz: 731b449bdc535b57cd0c22fd6bbc216c9f25b371b01e7a2e51e7386cf99701092c1358f93f4d0ce340915963b04e942644b712f14cf54c3e5eb81d239b57f05d

data/lib/mystic.rb

@@ -54,11 +54,17 @@ module Mystic
       conf[:user] = conf.delete :username
       raise MysticError, "Mystic only supports Postgres." unless /^postg.+$/i =~ conf[:adapter]
       
-      @postgres = Postgres.new(conf)
+      @postgres = Postgres.new conf
       
       @env
     end
     
+    def manual_conn conf={}
+      load_env
+      @env = (ENV["RACK_ENV"] || ENV["RAILS_ENV"] || "development").to_s
+      @postgres = Postgres.new(conf)
+    end
+    
 		def root path=Pathname.new(Dir.pwd)
 			raise RootError, "Failed to find the application's root." if path == path.parent
 			mystic_path = path.join "config", "database.yml"

data/lib/mystic/model.rb

@@ -8,7 +8,7 @@ module Mystic
     
     module ClassMethods
       def table_name
-        to_s.downcase
+        to_s.split("::").last.downcase
       end
 		
   		def visible_cols
@@ -26,19 +26,16 @@ module Mystic
   			plural = opts[:plural] && op != "INSERT"
 			
   			sql << " RETURNING #{visible_cols*','}" if return_rows && op != "SELECT"
-			
+        
+        return sql unless return_json
+        
   			s = []
-			
-  			if return_json
-  				s << "WITH res AS (#{sql}) SELECT"
-  				s << "array_to_json(array_agg(res))" if plural
-  				s << "row_to_json(res)" unless plural
-  				s << "AS #{Mystic::JSON_COL}"
-  				s << "FROM res"
-  			else
-  				s << sql
-  			end
-			
+				s << "WITH res AS (#{sql}) SELECT"
+				s << "array_to_json(array_agg(res))" if plural
+				s << "row_to_json(res)" unless plural
+				s << "AS #{Mystic::JSON_COL}"
+				s << "FROM res"
+        s << "LIMIT 1" unless plural
   			s*' '
   		end
 
@@ -60,7 +57,7 @@ module Mystic
   				:sql => sql.join(' '),
   				:return_rows => true,
   				:return_json => sym_opts[:return_json],
-  				:plural => count > 1
+  				:plural => sym_opts[:fetch] == false
   			)
       end
     
@@ -73,7 +70,8 @@ module Mystic
   			wrapper_sql(
   				:sql => "UPDATE #{table_name} SET #{set.sqlize*','} WHERE #{where.sqlize*' AND '}",
   				:return_rows => sym_opts[:return_rows],
-  				:return_json => sym_opts[:return_json]
+  				:return_json => sym_opts[:return_json],
+          :plural => sym_opts.member?(:plural) ? sym_opts[:plural] : true
   			)
       end
     
@@ -85,7 +83,8 @@ module Mystic
   			wrapper_sql(
   				:sql => "INSERT INTO #{table_name} (#{params.keys*','}) VALUES (#{params.values.sqlize*','})",
   				:return_rows => sym_opts[:return_rows],
-  				:return_json => sym_opts[:return_json]
+  				:return_json => sym_opts[:return_json],
+          :plural => sym_opts.member?(:plural) ? sym_opts[:plural] : true
   			)
       end
     
@@ -97,7 +96,8 @@ module Mystic
   			wrapper_sql(
   				:sql => "DELETE FROM #{table_name} WHERE #{params.sqlize*' AND '}",
   				:return_rows => sym_opts[:return_rows],
-  				:return_json => sym_opts[:return_json]
+  				:return_json => sym_opts[:return_json],
+          :plural => sym_opts.member?(:plural) ? sym_opts[:plural] : true
   			)
       end
     
@@ -106,23 +106,27 @@ module Mystic
       end
     
       def fetch params={}, opts={}
-        res = select params, opts.merge({:count => 1})
+        res = select params, opts.merge({:count => 1, :fetch => true})
   			return res if res.is_a? String
   			res.first rescue nil
       end
     
       def create params={}, opts={}
-        res = Mystic.execute insert_sql(params, opts)
+        res = Mystic.execute insert_sql(params, opts.merge({ :return_rows => true }))
   			return res if res.is_a? String
   			res.first rescue nil
       end
     
       def update where={}, set={}, opts={}
-        Mystic.execute update_sql(where, set, opts.merge({ :return_rows => true }))
+        res = Mystic.execute update_sql(where, set, opts.merge({ :return_rows => true }))
+        return res.first unless opts[:plural]
+        res
       end
     
       def delete params={}, opts={}
-  			Mystic.execute delete_sql(params, opts)
+  			res = Mystic.execute delete_sql(params, opts)
+        return res.first if !opts[:plural] && !res.nil?
+        res
       end
 		
   		def exec_func funcname, *params

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mystic
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Nathaniel Symer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: densify