whales_orm 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3309c2612eab5e7c0526d04c31e469b558b968fd
-  data.tar.gz: 2732dff17cf167e1afb89814e5c43482ea6d032e
+  metadata.gz: 4304e046b4280a726e5131ce4877e2dc01219635
+  data.tar.gz: 75250a9cb97e2a45b440d3ea5717c23161e56cba
 SHA512:
-  metadata.gz: a54b0252d7db972e1cea9bd6b91918a660288d9f1d0da080f2e16985a2b18588b2fb4a396133914e03f26d5d3e662b9e496dfd77c7c0efccb069e999703e367b
-  data.tar.gz: e3c89a4e33d9394de4c1acc1c0f71554b07671407bfb5a6b0333648b48054142f88f41ea2aea82c930749fa9dcca49615f7193968131fe135757d6ff2967a616
+  metadata.gz: 2c5b1423176d19fcb720b9e0ecfe3d3d2d8697b1a7e2340ae235563372b844545c2af7e267a38290f11174df556f4c212bf48c00cdfef4de97bd85ddf256e5da
+  data.tar.gz: ecb1e239e90567c38380e6d9acf7c6f046bfae9ef7ea15f53f15a2153fb0e58c5fcbdf3e8f1e240b1997d7e884cafc928d20aad85afbc2e8cd2027544be3b609

data/lib/base.rb

@@ -42,6 +42,26 @@ module WhalesORM
       end
     end
 
+    def self.destroy_all(conditions = {})
+      if conditions.empty?
+        deleted = self.all
+        where_line = nil
+      else
+        deleted = self.where(conditions)
+        where_line = conditions.keys.map do |key|
+          "#{ key } = :#{ key }"
+        end.join(" AND ").insert(0, "WHERE ")
+      end
+
+      DBConnection.execute(<<-SQL, conditions)
+      DELETE FROM
+        #{ self.table_name }
+        #{ where_line }
+      SQL
+
+      deleted
+    end
+
     def self.table_name=(table_name)
       @table_name = table_name
     end
@@ -94,6 +114,17 @@ module WhalesORM
       self.class.columns.map { |attr_name| send(attr_name) }
     end
 
+    def destroy
+      DBConnection.execute(<<-SQL, id)
+        DELETE FROM
+          #{self.class.table_name}
+        WHERE
+          id = ?
+      SQL
+
+      self
+    end
+
     def insert
       col_names = self.class.columns.drop(1).join(',')
       question_marks = (["?"] * (self.class.columns.length - 1)).join(',')
@@ -109,6 +140,10 @@ module WhalesORM
       self
     end
 
+    def save
+      id.nil? ? insert : update
+    end
+
     def update
       set_line = self.class.columns.map { |attr_name| "#{attr_name} = ?" }
       set_line = set_line.join(', ')
@@ -125,39 +160,5 @@ module WhalesORM
       self
     end
 
-    def save
-      id.nil? ? insert : update
-    end
-
-    def destroy
-      DBConnection.execute(<<-SQL, id)
-        DELETE FROM
-          #{self.class.table_name}
-        WHERE
-          id = ?
-      SQL
-
-      self
-    end
-
-    def self.destroy_all(conditions = {})
-      if conditions.empty?
-        deleted = self.all
-        where_line = nil
-      else
-        deleted = self.where(conditions)
-        where_line = conditions.keys.map do |key|
-          "#{ key } = :#{ key }"
-        end.join(" AND ").insert(0, "WHERE ")
-      end
-
-      DBConnection.execute(<<-SQL, conditions)
-      DELETE FROM
-        #{ self.table_name }
-        #{ where_line }
-      SQL
-
-      deleted
-    end
   end
 end

data/lib/whales_orm/version.rb

@@ -1,3 +1,3 @@
 module WhalesORM
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whales_orm
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - William Horton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The ORM for the Whales Framework