opal_orm 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1cd945fd3b9484b0580826d90a4d9bcd537ca4b
-  data.tar.gz: 0ba5cb818f4320bfce0660722fec1cab525dc0d1
+  metadata.gz: de724970761475a02838dfbb324c487411a88404
+  data.tar.gz: b938bb3db8d8b24ff01b0951282306199c81460f
 SHA512:
-  metadata.gz: c25f6c0b2496dc42e5d3429132290b191d587438b6ab77ba4747a3ce36b36bbe5fb9f6164d54958f7ed70e014e34fe581c511347956b63730f87037e0f515fa6
-  data.tar.gz: 11ef2d0c87d8a977877320b1e579f48ac15924b00207ab932c399dcabf2728ae0919264c429a8c2392d61f05dafe065fbc7dad06202134a4be038c5352eccc4b
+  metadata.gz: d94ad0e10e2e7e1105f85f71708d56eb11f96d372605d58b981d0d3b685419aad51d827fd1075c7ea6327e94110e60880a3b6ef00c2c371c84382b333ad7a5bc
+  data.tar.gz: c17881b5f537257552fb36d85cc14b9b7f9699a7084c3c7403ef62844620c118af5c0c90a904d7a18eaf20fd5d93c2435d94ada64939683523f8742d38f061e1

data/README.md

@@ -37,7 +37,7 @@ load "#{spec.gem_dir}/lib/tasks/opal_db.rake"
 
 To start, run:
 
-    $ opal_orm create DATABASE_NAME
+    $ opal_orm new DATABASE_NAME
 
 which will create an empty Sqlite database in `./db/DATABASE_NAME.db`.
 
@@ -59,6 +59,7 @@ For example,
 create_table("cats") do |t|
   t.string :name
   t.integer :toy_count
+  t.float :weight
 end
 ```
 
@@ -69,6 +70,7 @@ CREATE TABLE cats (
   id INTEGER PRIMARY KEY,
   name VARCHAR(255),
   toy_count INTEGER
+  weight REAL
 );
 ```
 

data/lib/opal_orm/associatable.rb

@@ -48,7 +48,8 @@ module Associatable
   def has_many(name, options = {})
     define_method(name) do
       @options = HasManyOptions.new(name,self.class.to_s,options)
-      cats = @options.model_class.where(@options.foreign_key => id)
+      # TODO: why is this here?
+      # cats = @options.model_class.where(@options.foreign_key => id)
     end
   end
 
@@ -60,7 +61,7 @@ module Associatable
     define_method(name) do
       through_options = self.class.assoc_options[through_name]
       source_options = through_options.model_class.assoc_options[source_name]
-      pk = 1
+
       through =
         through_options.model_class
         .where(through_options.primary_key => id)

data/lib/opal_orm/query_builder.rb

@@ -2,6 +2,13 @@ require 'active_support/inflector'
 
 module OpalORM
   class QueryBuilder
+    DATATYPES = {
+    string: "VARCHAR(255)",
+    integer: "INTEGER",
+    float: "REAL",
+    text: "TEXT"
+    }
+
     def self.create_table_query(name, &prc)
       manager = new(name)
       prc.call(manager)
@@ -25,29 +32,35 @@ module OpalORM
       @columns << {type: :integer, name: name, options: options}
     end
 
+    def float(name, *options)
+      @columns << {type: :float, name: name, options: options}
+    end
+
+    def text(name, *options)
+      @columns << {type: :text, name: name, options: options}
+    end
+
     # def foreign_key(ref_name)
     #   @foreign_keys << ref_name
     # end
 
     def build!
       query_start = "CREATE TABLE #{@table_name} ("
+      
       column_queries = @columns.map do |col_info|
-        result = []
-        case col_info[:type]
-        when :string
-          result = "#{col_info[:name]} VARCHAR(255) "
-        when :integer
-          result = "#{col_info[:name]} INTEGER "
-        end
+        result = ["#{col_info[:name]}"]
+        result << get_datatype_string(col_info[:type])
+
         unless col_info[:options].nil?
           col_info[:options].each do |key|
             case col_info[:options]
             when :null
-              result += "NOT NULL" unless col_info[:options][:null]
+              result << "NOT NULL" unless col_info[:options][:null]
             end
           end
         end
-        result
+
+        result.join(" ")
       end
       column_queries.unshift("id INTEGER PRIMARY KEY")
 
@@ -55,7 +68,7 @@ module OpalORM
         if foreign_key_valid?(ref_name)
           "FOREIGN KEY(#{ref_name}) REFERENCES #{@table_name.singularize}(id)"
         else
-          raise ForeignKeyMissingError, "Error adding foreign key contsraint for #{ref_name}: couldn't find column named #{ref_name}."
+          raise ForeignKeyMissingError, "Error adding foreign key constraint for #{ref_name}: couldn't find column named #{ref_name}."
         end
       end
 
@@ -65,6 +78,10 @@ module OpalORM
       @query
     end
 
+    def get_datatype_string(type)
+      DATATYPES[type]
+    end
+
     def foreign_key_valid?(key)
       @columns.any? {|col| key == col[:name]}
     end
@@ -72,4 +89,7 @@ module OpalORM
 
   class ForeignKeyMissingError < StandardError
   end
+
+  class DatatypeMissingError < StandardError
+  end
 end

data/lib/opal_orm/schema_manager.rb

@@ -39,7 +39,7 @@ end
       RB
     end
 
-    def comment_string
+    def self.comment_string
       <<-RB
 # Example usage:
 # create_table 'table_name' do |t|

data/lib/opal_orm/version.rb

@@ -1,3 +1,3 @@
 module OpalOrm
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal_orm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nathan Matteson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3