ez 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16c7b16c893b65e45e3261b8c9e71c7bf14da0c6
-  data.tar.gz: 546f01535e552ed763b5487176109c1b853f872a
+  metadata.gz: 4bbacb9af6fd2f80c8aed574c56265d9f7e9af8c
+  data.tar.gz: 529687c8f65652ff1c9133d0fee355cd0204cd67
 SHA512:
-  metadata.gz: 3212cb743e5346d611dd94a02aaa798e1bce0f5939debd000e326d810ac3349a7e9c4fabfc8051e40054ce87bac8fc69dc7642e255e7ad49512ff8f61f3415fe
-  data.tar.gz: 06ee3f279e4d1b6385b026ba0e10b3c3b7335b6d324913072164d04b7fc6a35ffbcf80c7b081d8b7d9bb90ecff09bcc824db36b5ea3dc15c58e2ba477e0d589a
+  metadata.gz: c36d5521426c59b5f9fbf483bedd3cff07fc24f404556f868fffc6bc402a00d2152bbd97c70bf32f3da08f2c26b88686fe1d63c25449afc6a6ab6eb13ca9fd18
+  data.tar.gz: 9dd7a0f3d63031b615be468a56a45b34319ed02226314f98e132338dde81ce5b9a0bf6cb5f1d372702e582aae1e66deb69ad45075ce9b229a8b5df6a55194b9c

data/ez.gemspec

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

data/lib/ez.rb

@@ -1,12 +1,14 @@
 require "ez/version"
-require 'ez/dispatcher.rb'
-require 'ez/mapper.rb'
+# require 'ez/dispatcher.rb'
+# require 'ez/mapper.rb'
+# require 'ez/controller.rb'
+
 require 'ez/apis.rb'
 require 'ez/domain_modeler.rb'
-# require 'ez/controller.rb'
 require 'ez/model.rb'
 require 'ez/view_helpers.rb'
-require 'hirb'
+
+require 'hirb' if Rails.env.development?
 
 module EZ
   class Railtie < Rails::Railtie
@@ -14,9 +16,8 @@ module EZ
       load "tasks/ez_tasks.rake"
     end
 
-    console do
-      Hirb.enable if Rails.env.development? && defined?(Hirb)
-      # context.back_trace_limit = 0
+    console do |app|
+      Hirb.enable(pager: false) if Rails.env.development? && defined?(Hirb)
 
       I18n.enforce_available_locales = false
       puts "Welcome to the Rails Console."

data/lib/ez/controller.rb

@@ -1,26 +1,26 @@
-# module ActionController
-#   class Base
+module ActionController
+  class Base
 
-#     helper_method :current_user
-#     helper_method :user_signed_in?
+    helper_method :current_user
+    helper_method :user_signed_in?
 
-#     def user_signed_in?
-#       session[:user_id].present?
-#     end
+    def user_signed_in?
+      session[:user_id].present?
+    end
 
-#     def sign_in_as(user)
-#       @current_user = user
-#       session[:user_id] = user.try(:id)
-#       user
-#     end
+    def sign_in_as(user)
+      @current_user = user
+      session[:user_id] = user.try(:id)
+      user
+    end
 
-#     def sign_out
-#       sign_in_as nil
-#     end
+    def sign_out
+      sign_in_as nil
+    end
 
-#     def current_user(klass = User)
-#       @current_user ||= klass.send(:find_by, id: session[:user_id])
-#     end
+    def current_user(klass = User)
+      @current_user ||= klass.send(:find_by, id: session[:user_id])
+    end
 
-#   end
-# end
+  end
+end

data/lib/ez/domain_modeler.rb

@@ -23,7 +23,7 @@ module EZ
         @spec[model] = []
         columns.each do |column|
           if column.is_a?(String) || column.is_a?(Symbol)
-            if column.to_s =~ /_id$/
+            if column.to_s =~ /_id$/ || column.to_s =~ /_count$/
               @spec[model] << { column.to_s => 'integer' }
             elsif column.to_s =~ /_at$/
               @spec[model] << { column.to_s => 'datetime' }
@@ -35,7 +35,7 @@ module EZ
           elsif column.is_a?(Hash) && column.keys.count == 1
             @spec[model] << { column.keys.first.to_s => column.values.first.to_s }
           else
-            raise "Bad syntax."
+            raise "Bad syntax around `#{column.inspect}`"
           end
         end
       end

data/lib/ez/schema_modifier.rb

@@ -17,9 +17,18 @@ module EZ
 
       add_missing_schema
       remove_dead_schema
-      update_schema_version
 
-      puts "Everything is up-to-date." unless @changed
+      if @changed
+        update_schema_version
+      else
+        puts "Everything is up-to-date."
+      end
+
+      return @changed
+
+      rescue => e
+        puts e.message
+        false
     end
 
 
@@ -50,40 +59,50 @@ module EZ
       @changed = true
     end
 
-    def add_missing_columns(model_name, columns)
+    def add_missing_columns(model_name, columns, assume_missing = false)
       table_name = model_name.tableize
       columns.each do |column|
         col_name = column.keys.first
         col_type = column[col_name]
-        if db.column_exists?(table_name, col_name.to_sym)
+        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
-          display_change "Adding new column '#{col_name}' as #{col_type} for model #{model_name}"
+          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)
+          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_index table_name, col_name.to_sym
+          end
         end
       end
     end
 
     def add_model(model_name, columns)
       table_name = model_name.tableize
-      display_change "Defining model #{model_name}..."
-      ActiveRecord::Schema.define do
-        create_table table_name do |t|
-          columns.each do |column|
-            name = column.keys.first
-            col_type = column[name]
-            options = {}
-            options[:default] = false if col_type.to_sym == :boolean
-            t.send(col_type, name, options)
-          end
-          # t.timestamps
-        end
-      end
+      display_change "Defining new table for model '#{model_name}'."
+      db.create_table table_name
+      add_missing_columns model_name, columns, true
+      #     columns.each do |column|
+      #       name = column.keys.first
+      #       col_type = column[name]
+      #       options = {}
+      #       options[:default] = false if col_type.to_sym == :boolean
+      #       t.send(col_type, name, options)
+      #     end
+      #     # t.timestamps
+      #   end
+      # end
       filename = "app/models/#{model_name.underscore}.rb"
       unless Rails.env.production? || File.exists?(filename)
         display_change "Creating new model file: #{filename}"
@@ -109,7 +128,9 @@ module EZ
           end
           dead_columns = columns - spec_columns
           if dead_columns.any?
-            display_change "Removing unused columns: #{dead_columns.to_sentence} for model #{model_name}"
+            dead_columns.each do |dead_column_name|
+              display_change "Removing unused column '#{dead_column_name}' from model '#{model_name}'"
+            end
             db.remove_columns(table_name, *dead_columns)
           end
         end
@@ -117,8 +138,8 @@ module EZ
     end
 
     def update_schema_version
-      @db.initialize_schema_migrations_table
-      @db.assume_migrated_upto_version(Time.now.strftime("%Y%m%d%H%M%S"))
+      db.initialize_schema_migrations_table
+      db.assume_migrated_upto_version(Time.now.utc.strftime("%Y%m%d%H%M%S"))
     end
 
     def remove_dead_tables

data/lib/ez/version.rb

@@ -1,3 +1,3 @@
 module EZ
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/tasks/ez_tasks.rake

@@ -2,7 +2,9 @@ namespace :ez do
 
   desc "Generate models.yml if it doesn't exist yet."
   task :generate_yml do
-    File.open("db/models.yml", "w") do |f|
+    filename = "db/models.yml"
+    unless File.exist?(filename)
+      File.open(filename, "w") do |f|
         f.puts <<-EOS
 # Example table for a typical Book model.
 #
@@ -18,26 +20,27 @@ namespace :ez do
 # You can have as many models as you want in this file.
 EOS
       end
+    end
   end
 
-  desc "Reset the database schema and data from scratch."
+  desc "Erases all data, and builds all table schema from scratch."
   task :reset_tables => ['db:drop', :tables] do
   end
 
 
   desc "Attempts to update the database schema and model files with minimal data loss."
-  task :tables => :environment do
+  task :tables => [:environment, 'db:migrate'] do
     if File.exists?('db/models.yml')
-      EZ::DomainModeler.update_tables
-      Rake::Task["db:schema:dump"].invoke unless Rails.env.production?
+      if EZ::DomainModeler.update_tables
+        Rake::Task["db:schema:dump"].invoke unless Rails.env.production?
+      end
     else
-      emit_help_page
       Rake::Task["ez:generate_yml"].invoke
+      emit_help_page
     end
   end
 
   def emit_help_page
-    puts "To get started, edit the db/models.yml file to describe your table schema."
-
+    puts "You can now edit the db/models.yml file to describe your table schema."
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ez
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Jeff Cohen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hirb
@@ -17,7 +17,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: