better_record 0.1.0 → 0.1.1

data/lib/better_record.rb

@@ -1,24 +1,18 @@
 require "active_support"
 
-class Boolean
-  def self.parse(value)
-    ActiveRecord::Type::Boolean.new.cast(value)
-  end
-end
-
-class Object
-  def yes_no_to_s
-    !!self == self ? (self ? 'yes' : 'no') : to_s
-  end
-end
-
 module BetterRecord
   class << self
-    attr_accessor :default_polymorphic_method, :db_audit_schema, :has_audits_by_default
+    attr_accessor :default_polymorphic_method,
+                  :db_audit_schema,
+                  :has_audits_by_default,
+                  :audit_relation_name,
+                  :layout_template
   end
   self.default_polymorphic_method = :polymorphic_name
   self.db_audit_schema = ENV.fetch('DB_AUDIT_SCHEMA') { 'auditing' }
-  self.has_audits_by_default = Boolean.parse(ENV.fetch('BR_ADD_HAS_MANY') { false })
+  self.has_audits_by_default = ActiveRecord::Type::Boolean.new.cast(ENV.fetch('BR_ADD_HAS_MANY') { false })
+  self.audit_relation_name = (ENV.fetch('BR_AUDIT_RELATION_NAME') { 'audits' }).to_sym
+  self.layout_template = (ENV.fetch('BR_LAYOUT_TEMPLATE') { 'better_record/layout' }).to_s
 end
 
 Dir.glob("#{File.expand_path(__dir__)}/better_record/*").each do |d|
@@ -27,11 +21,12 @@ end
 
 ActiveSupport.on_load(:active_record) do
   module ActiveRecord
-    include BetterRecord::Associations
-    include BetterRecord::Batches
-    include BetterRecord::Migration
-    include BetterRecord::Reflection
-    include BetterRecord::Relation
+    module Batches
+      include BetterRecord::Batches
+    end
+    class Migration
+      include BetterRecord::Migration
+    end
   end
   include BetterRecord::NullifyBlankAttributes
 end

data/lib/better_record/version.rb

@@ -1,3 +1,3 @@
 module BetterRecord
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/tasks/spec/attributes.rake

@@ -0,0 +1,42 @@
+namespace :spec do
+  desc 'add attribute comments to model spec'
+  task attributes: :environment do |t, args|
+    raise 'No Model Given' unless ARGV[1].present?
+    model_name = ARGV[1]
+    file_path = Rails.root.join('spec', 'models', "#{model_name.underscore}_spec.rb")
+    if File.exists?(file_path)
+      file = File.read(file_path)
+
+      model = model_name.constantize
+
+      attr_line_regex = /([ ]+describe \'Attributes\' do\n)/
+
+      s_idx = (file =~ attr_line_regex)
+
+      if s_idx
+        e_idx = file.index(/describe/, s_idx) - 1
+
+        prefix = "#{file[s_idx..e_idx]}  "
+
+        existance_regex = /[ ]+# run \`rails spec:attributes .*?\` to replace this line\n/
+
+        if file =~ existance_regex
+          file.sub!(existance_regex, model.column_comments(prefix))
+        else
+          attributes = model.column_comments.split("\n")
+          attributes.each do |attribute|
+            file.sub!(/[ ]*?#{Regexp.escape(attribute)}[ ]*?\n/, '')
+          end
+          file.sub!(attr_line_regex, "\\0#{model.column_comments(prefix)}")
+        end
+
+        File.open(file_path, 'w') {|f| f.puts file}
+      else
+        puts 'Attributes section not found'
+      end
+    else
+      puts "#{file_path} not found"
+    end
+    task ARGV[1].to_sym do ; end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sampson Crowley
@@ -15,6 +15,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
   type: :runtime
@@ -22,22 +25,91 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: store_as_int
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.15
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.15
+- !ruby/object:Gem::Dependency
+  name: pry-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.6
+- !ruby/object:Gem::Dependency
+  name: table_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.6
 description: |2
     This app extends active record to allow you to change the polymorphic type value in relationships.
     It also extends active record batching functions to be able to order records while batching.
@@ -53,16 +125,32 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/better_record_manifest.js
+- app/assets/stylesheets/scaffold.css
 - app/controllers/better_record/application_controller.rb
+- app/controllers/better_record/table_sizes_controller.rb
 - app/helpers/better_record/application_helper.rb
+- app/helpers/better_record/table_sizes_helper.rb
 - app/jobs/better_record/application_job.rb
 - app/mailers/better_record/application_mailer.rb
-- app/models/better_record/audit.rb
 - app/models/better_record/base.rb
+- app/models/better_record/current.rb
+- app/models/better_record/logged_action.rb
 - app/models/better_record/table_size.rb
+- config/initializers/active_record/associations.rb
+- config/initializers/active_record/reflection.rb
+- config/initializers/boolean.rb
+- config/initializers/content_security_policy.rb
+- config/initializers/filter_parameter_logging.rb
+- config/initializers/inflections.rb
+- config/initializers/integer.rb
+- config/initializers/jazz_fingers.rb
+- config/initializers/mime_types.rb
+- config/initializers/money_type.rb
 - config/routes.rb
+- db/migrate/20180725160802_create_better_record_db_functions.rb
+- db/migrate/20180725201614_create_better_record_table_sizes.rb
+- db/postgres-audit-trigger.psql
 - lib/better_record.rb
-- lib/better_record/associations.rb
 - lib/better_record/batches.rb
 - lib/better_record/engine.rb
 - lib/better_record/migration.rb
@@ -71,9 +159,7 @@ files:
 - lib/better_record/reflection.rb
 - lib/better_record/relation.rb
 - lib/better_record/version.rb
-- lib/generators/create_helper_functions/USAGE
-- lib/generators/create_helper_functions/create_helper_functions_generator.rb
-- lib/tasks/db/create_audits.rake
+- lib/tasks/spec/attributes.rake
 homepage: https://github.com/SampsonCrowley/multi_app_active_record
 licenses:
 - MIT
@@ -94,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Fix functions that are lacking in Active record to be compatible with multi-app

data/lib/generators/create_helper_functions/USAGE

@@ -1,9 +0,0 @@
-Description:
-    Explain the generator
-
-Example:
-    rails generate create_helper_functions --schema_name audit
-
-    This will create:
-      db/migrate/*_create_database_helper_functions.rb
-      db/postgres-audit-trigger.psql

data/lib/generators/create_helper_functions/create_helper_functions_generator.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails/generators/active_record'
-
-class CreateHelperFunctionsGenerator < ActiveRecord::Generators::Base
-  source_root File.expand_path('templates', __dir__)
-  argument :name, type: :string, default: 'testes'
-  class_option :audit_schema, type: :string, default: 'audit'
-  class_option :eject, type: :boolean, default: false
-
-  def copy_initializer
-    template 'gitattributes', '.gitattributes'
-    template 'gitignore', '.gitignore'
-    template 'jsbeautifyrc', '.jsbeautifyrc'
-    template 'pryrc', '.pryrc'
-    template 'ruby-version', '.ruby-version'
-    template 'postgres-audit-trigger.psql', 'db/postgres-audit-trigger.psql'
-    if !!options['eject']
-      template 'initializer.rb', 'config/initializers/better_record.rb'
-    else
-      template 'initializer.rb', 'config/initializers/better_record.rb'
-    end
-    migration_template "migration.rb", "#{migration_path}/create_database_helper_functions.rb", migration_version: migration_version, force: true
-    application ''
-
-    eager_line = 'config.eager_load_paths += Dir["#{config.root}/lib/modules/**/"]'
-
-    gsub_file 'config/application.rb', /([ \t]*?#{Regexp.escape(eager_line)}[ \t0-9\.]*?)\n/mi do |match|
-      ""
-    end
-
-    gsub_file 'config/application.rb', /#{Regexp.escape("config.load_defaults")}[ 0-9\.]+\n/mi do |match|
-      "#{match}    #{'config.eager_load_paths += Dir["#{config.root}/lib/modules/**/"]'}\n"
-    end
-
-    gsub_file 'app/models/application_record.rb', /(#{Regexp.escape("class ApplicationRecord < ActiveRecord::Base")})/mi do |match|
-      p match
-      "class ApplicationRecord < BetterRecord::Base"
-    end
-  end
-
-  def audit_schema
-    @audit_schema ||= options['audit_schema'].presence || 'audit'
-  end
-
-  private
-
-    def migration_path
-      if Rails.version >= '5.0.3'
-        db_migrate_path
-      else
-        @migration_path ||= File.join("db", "migrate")
-      end
-    end
-
-    def migration_version
-      if Rails.version.start_with? '5'
-        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-      end
-    end
-end