ez 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27de4129826c5db63af2490801c3fa81261eeb36
-  data.tar.gz: 7a54089e8550dea5e52d53c0bd0a638fb7f36c8e
+  metadata.gz: dfa9e48c563ed020bc8231c6b28274d849afcc2f
+  data.tar.gz: cb1569d4994001adcb2efc2fb9f94620ba4be15f
 SHA512:
-  metadata.gz: c6b808ff61e3cf8b49abc2cb54bb04997fb3f5cdb899fcf9c37b6ae6a7a310abbe3cbace17fee0044d9463760e08ef379633c7f9c113a760f1e991914fed3de3
-  data.tar.gz: c06a8348edb9e3ab3765904c3bbcb0c5166d716f7f403bae7d3fb7be7d7a4cdfae7d17ce892a3f4fa4e3f6f7eef54913546eeed34f25d49ee9d232dd443a9ec1
+  metadata.gz: a5016eb92c3a6dec889b2d960ddbeabc63e6d63b01370efb64afc585ae76f0e237fd6bf8eb6879ba668d4eb79e00fd9d0aa2cde7d1bdc7bc79581fd804b36e17
+  data.tar.gz: 58399bc7f87231a35e9c0993b79b9caa35cc9315944bf2fdd468e68129ddaa3aa4d0995811792ed86bb3da8e6e08a09789ed65af719b2156fa9b2b0194aa588a

data/lib/ez.rb

@@ -2,6 +2,8 @@ require "ez/version"
 require 'ez/dispatcher.rb'
 require 'ez/mapper.rb'
 require 'ez/apis.rb'
+require 'ez/domain_modeler.rb'
+require 'ez/controller.rb'
 
 module Ez
   class MyRailtie < Rails::Railtie

data/lib/ez/controller.rb

@@ -0,0 +1,26 @@
+module ActionController
+  class Base
+
+    helper_method :current_user
+    helper_method :logged_in?
+
+    def logged_in?
+      session[:user_id].present?
+    end
+
+    def user_login(user)
+      @current_user = user
+      session[:user_id] = user ? user.id : nil
+      user
+    end
+
+    def user_logout
+      user_login nil
+    end
+
+    def current_user(klass = User)
+      @current_user ||= klass.send(:find_by, id: session[:user_id])
+    end
+
+  end
+end

data/lib/ez/domain_modeler.rb

@@ -0,0 +1,35 @@
+require_relative 'schema_modifier'
+
+class DomainModeler
+
+  def initialize
+    load_model_specs
+  end
+
+  def self.update_tables
+    self.new.update_tables
+  end
+
+  def update_tables
+    SchemaModifier.migrate(@spec)
+  end
+
+  def load_model_specs
+    @spec = YAML.load_file('db/models.yml')
+    @spec ||= {}
+
+    @spec.each do |model, columns|
+      @spec[model] = []
+      columns.each do |column|
+        if column.is_a?(String) || column.is_a?(Symbol)
+          @spec[model] << { column.to_s => 'string' }
+        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."
+        end
+      end
+    end
+  end
+
+end

data/lib/{tasks/db_modifier.rb → ez/schema_modifier.rb}

@@ -1,36 +1,31 @@
-class DbModifier
+class SchemaModifier
 
   attr_reader :db, :spec
 
-  def initialize
-    ActiveRecord::Base.establish_connection({
-      adapter:  'sqlite3',
-      database: "db/development.sqlite3",
-    })
-    @db = ActiveRecord::Base.connection
-    ActiveRecord::Migration.verbose = false
-    load_models_yml
+  def initialize(model_spec)
+    @spec = model_spec
+    connect_to_database
+  end
+
+  def self.migrate(model_spec)
+    self.new(model_spec).migrate
   end
 
   def migrate
     @changed = false
+
     add_missing_schema
     remove_dead_schema
+    update_schema_version
+
     puts "Everything is up-to-date." unless @changed
   end
 
+
   def tables
     @tables ||= (db.tables - ['schema_migrations'])
   end
 
-  def has_model?(model_name)
-    has_table?(model_name.tableize)
-  end
-
-  def has_table?(name)
-    tables.index(name).present?
-  end
-
   def missing_model?(model_name)
     missing_table?(model_name.tableize)
   end
@@ -51,7 +46,7 @@ class DbModifier
 
   def display_change(message)
     puts message
-    @change = true
+    @changed = true
   end
 
   def add_missing_columns(model_name, columns)
@@ -116,6 +111,11 @@ class DbModifier
     end
   end
 
+  def update_schema_version
+    @db.initialize_schema_migrations_table
+    @db.assume_migrated_upto_version(Time.now.strftime("%Y%m%d%H%M%S"))
+  end
+
   def remove_dead_tables
     tables_we_need = @spec.keys.map { |model| model.tableize }
     dead_tables = tables - tables_we_need
@@ -129,21 +129,16 @@ class DbModifier
     end
   end
 
-  def load_models_yml
-    @spec = YAML.load_file('db/models.yml')
-    @spec ||= {}
+  def silence_migration_output
+    ActiveRecord::Migration.verbose = false
+  end
 
-    @spec.each do |model, columns|
-      @spec[model] = []
-      columns.each do |column|
-        if column.is_a?(String) || column.is_a?(Symbol)
-          @spec[model] << { column.to_s => 'string' }
-        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."
-        end
-      end
-    end
+  def connect_to_database
+    ActiveRecord::Base.establish_connection({
+      adapter:  'sqlite3',
+      database: "db/development.sqlite3",
+    })
+    @db = ActiveRecord::Base.connection
   end
+
 end

data/lib/ez/version.rb

@@ -1,3 +1,3 @@
 module Ez
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/tasks/ez_tasks.rake

@@ -1,5 +1,3 @@
-require_relative 'db_modifier'
-
 namespace :ez do
 
   desc "Reset the database scheme from scratch."
@@ -9,10 +7,15 @@ namespace :ez do
   desc "Automatically update the database schema and model files."
   task :tables => :environment do
     if File.exists?('db/models.yml')
-      db = DbModifier.new
-      db.migrate
+      DomainModeler.update_tables
+      Rake::Task["db:schema:dump"].invoke
     else
-      puts "To get started, edit the db/models.yml file to describe your table schema."
+      emit_help_page
+    end
+  end
+
+  def emit_help_page
+    puts "To get started, edit the db/models.yml file to describe your table schema."
       File.open("db/models.yml", "w") do |f|
         f.puts <<-EOS
 # Example table for a typical Book model.
@@ -29,7 +32,5 @@ namespace :ez do
 # You can have as many models as you want in this file.
 EOS
       end
-    end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ez
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jeff Cohen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,10 +59,12 @@ files:
 - ez.gemspec
 - lib/ez.rb
 - lib/ez/apis.rb
+- lib/ez/controller.rb
 - lib/ez/dispatcher.rb
+- lib/ez/domain_modeler.rb
 - lib/ez/mapper.rb
+- lib/ez/schema_modifier.rb
 - lib/ez/version.rb
-- lib/tasks/db_modifier.rb
 - lib/tasks/ez_tasks.rake
 homepage: http://www.jeffcohenonline.com/ez
 licenses: