framework 0.0.2 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17ea2a57355b495eff2e3798ed32103017673a3a
-  data.tar.gz: 01739b92621f21c8122b34a5759e5f811615842f
+  metadata.gz: 3572d9060dff548fcfe8b378ad1b25d095b36170
+  data.tar.gz: 9ae54d8c3a6a6c97046987244abf89a70527d14a
 SHA512:
-  metadata.gz: 9fe435f8328873b76556566d8fadd6ea49911dc07763f95fcc63124c0b8b8ad39a2bda4e9af9e745079226c83a3163653f30bc34ddb184d1240b2181f0f0e1f6
-  data.tar.gz: 0a7d80ceeb19c004f9823fae991f36ac0d3c2d9a212d24fcb62b4fca3a229b2dbcc70ad3dc7ad956e162b4f99737bf9bf4ee33e9adf049ea9bcaa77e88dd19f9
+  metadata.gz: 7cdf544edfd49c3df6f37b8c4855e027170319417d29475db39c6ebece5573113a33d9be8ca057ba0bff845aa47eb3750ef2b1c29bac9ef6b77205b927dcaa0c
+  data.tar.gz: 1b33ce1beac4cfbdf6203b0536870411722f7e0ebf7ce5727ca025e5cd6451f36717fbbe2a43b1601ee84df6b17abd089739a9b5e5addbcf60b10f2f3159c13e

data/README.md

@@ -69,7 +69,7 @@ Pretty similar to Rails (just a sample):
 | |____initializers
 | | |____time_zone.rb
 |____db
-| |____migrations
+| |____migrate
 | | |____.keep
 | | |____20141128085924_create_tasks.rb
 | | |____20141128090211_create_users.rb
@@ -89,8 +89,8 @@ Configurations are stored in `config/application.yml`. Note, that as opposed to
 development: &common
   enable_logging: yes
   autoload_paths:
-    - config/initializers
     - app/models
+    - app/managers
   default_timezone: 'Pacific Time (US & Canada)'
 
 test:

data/lib/framework/application.rb

@@ -1,14 +1,18 @@
+require 'framework/root'
+
 module Framework
   class Application
     CONFIG_PATH = "config/application.yml"
 
     attr_reader :env
     attr_accessor :logger
-    delegate :hint, :note, to: :logger
+    attr_reader :root
+    delegate :hint, :note, :whisper, :disappointment, to: :logger
 
     # @param [String] env Environment from configuration file
-    def initialize(env = nil)
+    def initialize(env: nil, root: nil)
       @env = env || Framework.env
+      @root = Root.new(root || Dir.pwd)
       Framework.app = self
       yield self if block_given?
     end
@@ -21,13 +25,21 @@ module Framework
       load_application_config
       load_database_config
       note "Loading #{env} environment (#{Framework::VERSION})"
-      autoload
       note "Establishing database connection"
       establish_database_connection
+      require_dependencies 'config/initializers'
+      load_application_files
       note "Application has been initialized"
       self
     end
-    alias_method :reload!, :init!
+
+    def reload!
+      @config = nil
+      disappointment "Reloading #{env}"
+      load_application_config
+      load_application_files
+      self
+    end
 
     # @return [Hash<String>]
     def config
@@ -72,11 +84,11 @@ module Framework
     end
 
     def migrate_database(version = nil)
-      ActiveRecord::Migrator.migrate "db/migrations", version.try(:to_i)
+      ActiveRecord::Migrator.migrate root.join("db/migrate"), version.try(:to_i)
     end
 
     def rollback_database(steps = 1)
-      ActiveRecord::Migrator.rollback "db/migrations", steps
+      ActiveRecord::Migrator.rollback root.join("db/migrate"), steps
     end
 
     # @return [Hash<String>]
@@ -88,7 +100,7 @@ module Framework
     def database
       adapter  = database_config['default'][env]['adapter']
       database = database_config['default'][env]['database']
-      adapter == 'sqlite3' ? "db/sqlite/#{env}/#{database}.db" : database
+      adapter == 'sqlite3' ? root.join("db/sqlite/#{env}/#{database}.db") : database
     end
 
     def self.init!
@@ -102,6 +114,64 @@ module Framework
 
     private
 
+    # Autoloads all app-specific files
+    def load_application_files
+      if %w(development test).include?(env.to_s)
+        config['autoload_paths'].each(&method(:autoreload_constants))
+        autoreload_yml
+      end
+      config['autoload_paths'].each(&method(:require_dependencies))
+    end
+
+    def autoreload_yml(path=root)
+      autoreload(path, 'yml') { @yml_reloaded = true } unless @yml_reloaded
+    end
+
+    def autoreload(path=root, ext, &block)
+      files = Dir[root.join(path, "/**/*.#{ext}")]
+
+      reloader = ActiveSupport::FileUpdateChecker.new(files) do
+        whisper "Reloading .#{ext} files"
+        block.try(:call, files)
+        Framework.app.reload!
+      end
+
+      ActionDispatch::Callbacks.to_prepare do
+        reloader.execute_if_updated
+      end
+    end
+
+    def autoreload_constants(path)
+      return if reloadable_paths.include?(path)
+
+      ActiveSupport::Dependencies.autoload_paths += [root.join(path)]
+      absolute_path = Pathname.new(root.join(path))
+
+      autoreload(path, 'rb') do |files|
+        files.each do |file_path|
+          pathname = Pathname.new(file_path)
+
+          # Get Const Name
+          const_name = pathname.basename.to_s.sub('.rb', '').camelize.to_sym
+          full_name = pathname.relative_path_from(absolute_path).sub('.rb', '').to_s.camelize
+
+          # Get Module Name
+          relative_file_path = Pathname.new(pathname.dirname).relative_path_from(absolute_path).to_s
+
+          if Object.const_defined?(full_name)
+            if relative_file_path == '.'
+              Object.send :remove_const, const_name
+            else
+              module_name = relative_file_path.camelize
+              module_name.constantize.send(:remove_const, const_name)
+            end
+          end
+        end
+      end
+
+      reloadable_paths << path
+    end
+
     def establish_database_connection
       if database_config
         database_config.each do |_, db_config|
@@ -122,34 +192,19 @@ module Framework
       end
     end
 
-    # Autoloads all app-specific files
-    def autoload
-      config['autoload_paths'].each do |path|
-        if path.end_with?('.rb')
-          load(path)
-        else
-          load_path(File.join(path, 'concerns'))
-
-          Dir["#{path}/**/*.rb"].each do |path_to_load|
-            load(path_to_load) unless path_to_load.include?('concerns/')
-          end
-        end
-      end
-    end
-
     # @return [Hash]
     def load_application_config
-      @config = YAML.load_file(CONFIG_PATH)[env]
+      @config = YAML.load_file(root.join(CONFIG_PATH))[env]
     end
 
     # @return [Hash]
     def load_database_config
-      @database_config = YAML.load_file('config/databases.yml')
+      @database_config = YAML.load_file(root.join('config/databases.yml'))
     end
 
-    # @param [String] path Relative to project root
+    # @param [String] path
     def load_path(path)
-      Dir["#{path}/**/*.rb"].each(&method(:load))
+      Dir["#{path}/**/*.rb"].each(&method(:require_dependency))
     end
 
     # @return [IO, nil]
@@ -161,5 +216,23 @@ module Framework
     def logger
       @logger ||= Framework::Logger.new(log_level)
     end
+
+    def reloadable_paths
+      @reloadable_paths ||= []
+    end
+
+    def require_dependencies(autoload_path)
+      path = root.join(autoload_path)
+
+      if path.end_with?('.rb')
+        require_dependency(path)
+      else
+        load_path(File.join(path, 'concerns'))
+
+        Dir["#{path}/**/*.rb"].each do |path_to_load|
+          require_dependency(path_to_load) unless path_to_load.include?('concerns/')
+        end
+      end
+    end
   end
 end

data/lib/framework/extensions/active_record/base_extension.rb

@@ -7,16 +7,16 @@ module Framework
         module ClassMethods
 
           # @override
-          def inherited(child_class)
-            super
-
-            unless child_class == ::ActiveRecord::SchemaMigration
-              if (chunks = child_class.name.split('::')).many?
-                child_class.store_full_sti_class = false
-                child_class.use_database(chunks.first.downcase)
-              end
-            end
-          end
+          # def inherited(child_class)
+          #   super
+          #
+          #   unless child_class == ::ActiveRecord::SchemaMigration
+          #     if (chunks = child_class.name.split('::')).many?
+          #       child_class.store_full_sti_class = false
+          #       child_class.use_database(chunks.first.downcase)
+          #     end
+          #   end
+          # end
 
           # Makes your model use different databases
           # @param [String, Symbol] db_name
@@ -26,8 +26,8 @@ module Framework
             env = env.to_s
             db_name = db_name.to_s
 
-            self.abstract_class = Framework.env != 'test'
-            self.table_name = self.name.split('::').last.tableize if self.superclass == ::ActiveRecord::Base
+            # self.abstract_class = Framework.env != 'test'
+            # self.table_name = self.name.split('::').last.tableize if self.superclass == ::ActiveRecord::Base
             establish_connection(Framework.app.database_config[db_name][env])
           end
         end

data/lib/framework/generators/application_generator.rb

@@ -20,8 +20,8 @@ module Framework
       create_file 'lib/.keep'
 
       empty_directory 'db'
-      empty_directory 'db/migrations'
-      create_file 'db/migrations/.keep'
+      empty_directory 'db/migrate'
+      create_file 'db/migrate/.keep'
     end
 
     def create_application_config
@@ -30,7 +30,6 @@ module Framework
         development: &common
           enable_logging: yes
           autoload_paths:
-            - config/initializers
             - app/models
           default_timezone: 'Pacific Time (US & Canada)'
 

data/lib/framework/generators/migration_generator.rb

@@ -10,7 +10,7 @@ module Framework
       @db_name = db_name.underscore
       @migration_name = migration_name.underscore
       @timestamp = Time.now.utc.strftime("%Y%m%d%H%M%S")
-      @path = "db/migrations/#{@timestamp}_#@migration_name.rb"
+      @path = "db/migrate/#{@timestamp}_#@migration_name.rb"
     end
 
     def generate
@@ -44,7 +44,7 @@ module Framework
       end
 
       def load_migrations
-        Dir["./db/migrations/**/*.rb"].each(&method(:load))
+        Dir["./db/migrate/**/*.rb"].each(&method(:load))
       rescue
         raise 'An error was occurred'
       end

data/lib/framework/root.rb

@@ -0,0 +1,24 @@
+module Framework
+  class Root < String
+
+    # @param path [String]
+    def initialize(path=Dir.pwd)
+      super(path)
+      self.freeze
+    end
+
+    # @param args [Array<String>]
+    # @return [String]
+    def join(*args)
+      File.join(self, *args)
+    end
+
+    def inspect
+      to_s
+    end
+
+    def to_s
+      self
+    end
+  end
+end

data/lib/framework/tasks/console.rake

@@ -2,13 +2,13 @@ desc "Runs irb console and initializes the application"
 task :console, :env do |_, args|
   require 'irb'
 
-  unless env = ENV['FRAMEWORK_ENV']
+  unless env = ENV['FRAMEWORK_ENV'] || ENV['RAILS_ENV']
     env = args[:env] || Framework::DEFAULT_ENV
   end
 
   system "mkdir -p #{Dir.pwd}/db/#{env}"
 
-  Framework::Application.new(env) do |app|
+  Framework::Application.new(env: env) do |app|
     app.init!
     app.hint("Use `Framework.app` variable to deal with application API")
 

data/lib/framework/tasks/db.rake

@@ -28,22 +28,22 @@ namespace :db do
     task :create, :name do |_, args|
       env = 'test'
       puts "Loading #{env.inspect}"
-      Framework::Application.new(env).create_database!(args[:name])
+      Framework::Application.new(env: env).create_database!(args[:name])
     end
 
     desc "Drops test database"
     task :drop, :name do |_, args|
       env = 'test'
       puts "Loading #{env.inspect}"
-      Framework::Application.new(env).drop_database!(args[:name])
+      Framework::Application.new(env: env).drop_database!(args[:name])
     end
 
     desc "Runs test migrations"
     task :migrate do
       env = 'test'
       puts "Loading #{env.inspect}"
-      Framework::Application.new(env).init!
-      ActiveRecord::Migrator.migrate('db/migrations/')
+      Framework::Application.new(env: env).init!
+      ActiveRecord::Migrator.migrate('db/migrate/')
     end
   end
 end

data/lib/framework/version.rb

@@ -1,3 +1,3 @@
 module Framework
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.5'.freeze
 end

data/lib/framework.rb

@@ -21,7 +21,12 @@ module Framework
   end
 
   def self.env
-    @app ? @app.env : (ENV['FRAMEWORK_ENV'] || DEFAULT_ENV)
+    @app ? @app.env : (ENV['FRAMEWORK_ENV'] || ENV['RAILS_ENV'] || DEFAULT_ENV)
   end
-end
 
+  # Returns current work dir String
+  # @return [Framework::Root]
+  def self.root
+    @app.try(:root)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: framework
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - Sergei Nikolaevich Zinin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.2.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.2.16
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.2.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.2.16
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +172,7 @@ files:
 - lib/framework/logger.rb
 - lib/framework/migration.rb
 - lib/framework/rake.rb
+- lib/framework/root.rb
 - lib/framework/tasks/console.rake
 - lib/framework/tasks/db.rake
 - lib/framework/tasks/engine/environment.rake