ez 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d449963f12ea32f503884e2724536171d3a60406
-  data.tar.gz: d9ec82e7a73e827c5f515f32f63fb2a9203ad434
+  metadata.gz: 46f68c1557debf7db379e3240a76ffad307d12f4
+  data.tar.gz: 3c88b18298f9e8c7d24bc0d6ce2e800b5c32f26c
 SHA512:
-  metadata.gz: e396c4c062e446c78c3883da24fe501aed94b0c80e9996c49550bac0e5bfc581397d75307bcc5ad86e4a8b9c4ef2ea0de493509d76ab6968a6564581036a88fe
-  data.tar.gz: ab3b3e4f867a8f4b55621886c8269e3d88fad5bf7c56b0c5939d3fa0ee0e9fe016e79722f7b298c38b53dbac4c122c5280a1307e0dafb8c8555923c0e8754915
+  metadata.gz: 43c5759b7b0236b82bc8c063dcc84176cad6249d11156b18b42b466a1e8e3f18a666a9273112880aacb5917e79cc784ba88b9dfe08e5ae32fa8a47026cfc77da
+  data.tar.gz: f60d613d29cb36d4cf12ac59c7d53003f9634aa8ce26fc20edbaf8e97e2d081381228ebfd83144daab73491001f854757fddae672a1735f8f85f45593b0c434c

data/ez.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = []
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'hirb', '~> 0.7.1'
+  spec.add_runtime_dependency 'hirb', '~> 0.7'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", '~> 10.0', '>= 10.0.0'

data/lib/ez/domain_modeler.rb

@@ -1,10 +1,15 @@
 require_relative 'schema_modifier'
 
 module EZ
+  # The DomainModeler class implements the db/models.yml file syntax
+  # and provides a hash of the domain model specification.
+
   class DomainModeler
 
+    # Valid formats for default values
     DEFAULT_VALUE_REGEXES = [/\s*\((.+)?\)/, /\s+(.+)?\s*/, /,\s*default:\s*(.+)?\s*/]
 
+    # Get the domain model as a hash
     attr_reader :spec
 
     def initialize
@@ -113,6 +118,7 @@ module EZ
       default_column_value = default_column_value.to_f if column_type == 'float'
 
       @spec[model][column_name] = { type: column_type, default: default_column_value}
+      @spec[model][column_name][:index] = true if column_name =~ /_id$/
     end
   end
 

data/lib/ez/schema_modifier.rb

@@ -1,4 +1,7 @@
 module EZ
+
+  # The SchemaModifier class receives a DomainModeler specification
+  # and applies any necessary db schema changes.
   class SchemaModifier
 
     attr_reader :db, :spec
@@ -29,6 +32,7 @@ module EZ
 
       rescue => e
         puts e.message
+        puts e.backtrace.first
         false
     end
 
@@ -62,29 +66,34 @@ module EZ
 
     def add_missing_columns(model_name, columns, assume_missing = false)
       table_name = model_name.tableize
-      # {"nickname"=>{:type=>"string", :default=>nil}, "password_digest"=>{:type=>"string", :default=>nil}, "created_at"=>{:type=>"datetime", :default=>nil}, "updated_at"=>{:type=>"datetime", :default=>nil}, "course_id"=>{:type=>"integer", :default=>"(0)"}, "email"=>{:type=>"string", :default=>nil}, "full_name"=>{:type=>"string", :default=>nil}, "admin"=>{:type=>"boolean", :default=>true}}
+      db_columns = db.columns(table_name)
+
       columns.each do |col_name, data|
-        col_type = data[:type]
-        if !assume_missing && db.column_exists?(table_name, col_name.to_sym)
-          unless db.column_exists?(table_name, col_name.to_sym, col_type.to_sym)
-            display_change "Changing column type for '#{col_name}' to #{col_type}"
-            db.change_column(table_name, col_name.to_sym, col_type.to_sym)
-            if col_name.to_s =~ /_id$/
-              display_change "  (adding foreign_key index for '#{col_name}')"
-              db.add_index table_name, col_name.to_sym
-            end
-          end
-        else
+        col_type = data[:type].to_sym
+        col_default = data[:default]
+        db_col = !assume_missing && (db_columns.detect { |dbc| dbc.name == col_name })
+
+        if !db_col
           if !assume_missing
             display_change "Adding new column '#{col_name}' as #{col_type} for model #{model_name}"
           end
-          options = {}
-          options[:default] = false if col_type.to_sym == :boolean
-          db.add_column(table_name, col_name.to_sym, col_type.to_sym, options)
-          if col_name.to_s =~ /_id$/
-            display_change "  (adding foreign_key index for '#{col_name}')"
+          db.add_column(table_name, col_name.to_sym, col_type.to_sym, default: col_default)
+          if data[:index]
+            display_change "  (adding database index for '#{col_name}')"
             db.add_index table_name, col_name.to_sym
           end
+        else
+          if db_col.type != col_type
+            display_change "Changing column type for #{col_name} to #{col_type} for model #{model_name}"
+          end
+
+          if db_col.default != col_default
+            display_change "Applying new default value #{col_default} for #{col_name} for model #{model_name}"
+          end
+
+          if (db_col.type != col_type) || (db_col.default != col_default)
+            db.change_column(table_name, col_name.to_sym, col_type.to_sym, default: col_default)
+          end
         end
       end
     end

data/lib/ez/version.rb

@@ -1,3 +1,3 @@
 module EZ
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ez
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Jeff Cohen
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
-  type: :development
+        version: '0.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement