better_record 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b34680cbdfc9ffc808911351efc1e7694a8ba71d7b3cfb8420cfed2af6cbc2ef
-  data.tar.gz: f0940956cf68e9043664be86359be4c0fe60a0c01165ab0e8c430547a2ee1957
+  metadata.gz: 803f9edf13136798110fca60d3190054e93b256ef2287e3ee9743ea6ae50c930
+  data.tar.gz: 30d0949b3e9b30188c701a733217066eeb16ad785a9a4bcbf5f243d449d7dca0
 SHA512:
-  metadata.gz: 826c96881eeb3caaa6cc37bf72adfc9dbba9a78a30854a63954295c57717e41bf96e7013de9f5c5d6700d4f61c6fd50a22eeb117d3752e60d9bdace03dce4d41
-  data.tar.gz: a1a368f27c284f95b99639cd839d17fde9b2e6d9331f4101262658b08b29a77c7d42cab718fd4671ae86f5ac5d3d37e24acd113ed7846912b65f9cedda4af0ba
+  metadata.gz: cadeb2d9eef8f3d021710c349a0d2f7816b49f64735ee261a7a9ccc8db542338fcadac3587417e4c5640cb2a49f8e64628f8abb85a55125fbe55a50efd9dd591
+  data.tar.gz: d94df2c8f318fa7bccd97b1ebb31b4cdabcafd37ea07cbbec0be27febe2ba4d729a1d4dfa061d26afd59d23f7cc76ac0f57739f6a09b921007f2c7afb3cc7646

data/Rakefile

@@ -10,7 +10,7 @@ load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
 
-Dir[File.join(File.dirname(__FILE__), 'lib/tasks/**/*.rake')].each {|f| load f }
+Dir[File.join(File.dirname(__FILE__), 'lib/better_record/tasks/**/*.rake')].each {|f| load f }
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/lib/better_record.rb

@@ -32,3 +32,9 @@ ActiveSupport.on_load(:active_record) do
   end
   include BetterRecord::NullifyBlankAttributes
 end
+# !centered[## [Men's Results](/assets/pdfs/2018-golf-international-results-male.pdf)--br--[![Mens Results](/assets/images/2018-golf-international-results-male.jpg)](/assets/pdfs/2018-golf-international-results-male.pdf)]
+# !centered[## [Women's Results](/assets/pdfs/2018-golf-international-results-female.pdf)--br--[![Womens Results](/assets/images/2018-golf-international-results-female.jpg)](/assets/pdfs/2018-golf-international-results-female.pdf)]
+# !centered[## [Team Results](/assets/pdfs/2018-golf-international-results-team.pdf)--br--[![Team Results](/assets/images/2018-golf-international-results-team)](/assets/pdfs/2018-golf-international-results-team.pdf)]
+#
+# !centered[## [Team Results](/assets/pdfs/2018-golf-international-results-summary.pdf)--br--[![Team Results](/assets/images/2018-golf-international-results-summary.jpg)](/assets/pdfs/2018-golf-international-results-summary.pdf)]
+# !centered[## [Individual Results](/assets/pdfs/2018-golf-international-results.pdf)--br--[![Team Results](/assets/images/2018-golf-international-results.jpg)](/assets/pdfs/2018-golf-international-results.pdf)]

data/lib/better_record/engine.rb

@@ -1,6 +1,7 @@
 module BetterRecord
   class Engine < ::Rails::Engine
     isolate_namespace BetterRecord
+    
     config.generators do |g|
       g.templates.unshift File::expand_path("../templates", File.dirname(__FILE__))
       g.test_framework :rspec, :fixture => false

data/lib/better_record/railtie.rb

@@ -1,4 +1,9 @@
 module BetterRecord
   class Railtie < ::Rails::Railtie
+    rake_tasks do
+      Dir[File.expand_path('/tasks/**/*.rake', __dir__)].each do |f|
+        load f
+      end
+    end
   end
 end

data/lib/better_record/tasks/better_record/install.rake

@@ -0,0 +1,6 @@
+namespace :better_record do
+  desc 'run better record setup'
+  task install: :environment do |t, args|
+    sh 'rails generate better_record:setup'
+  end
+end

data/lib/better_record/version.rb

@@ -1,3 +1,3 @@
 module BetterRecord
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/generators/better_record/setup/setup_generator.rb

@@ -6,52 +6,51 @@ class BetterRecord::SetupGenerator < ActiveRecord::Generators::Base
   argument :name, type: :string, default: 'testes'
   class_option :eject, type: :boolean, default: false
 
-  def copy_migrations
-    rake("better_record:install:migrations")
+  def run_generator
+    copy_templates
+    copy_migrations
+    gsub_files
   end
 
-  def copy_templates
-    template 'gitattributes', '.gitattributes'
-    template 'gitignore', '.gitignore'
-    template 'irbrc', '.irbrc'
-    template 'jsbeautifyrc', '.jsbeautifyrc'
-    template 'pryrc', '.pryrc'
-    template 'rspec', '.rspec'
-    template 'ruby-version', '.ruby-version'
-    template 'initializer.rb', 'config/initializers/better_record.rb'
-    directory "#{BetterRecord::Engine.root}/lib/templates", 'lib/templates'
-    template "#{BetterRecord::Engine.root}/spec/method_helper.rb", 'spec/method_helper.rb'
-    directory "#{BetterRecord::Engine.root}/spec/method_helper", 'spec/method_helper'
-    directory "tasks", 'lib/tasks'
-
-    eject_files if !!options['eject']
-  end
-
-  def gsub_files
-    eager_line = 'config.eager_load_paths += Dir["#{config.root}/lib/modules/**/"]'
-    structure_line = 'config.active_record.schema_format'
-
-    gsub_file 'config/application.rb', /([ \t]*?(#{Regexp.escape(eager_line)}|#{Regexp.escape(structure_line)})[ ='":]*?(rb|sql)?['"]?[ \t0-9\.]*?)\n/mi do |match|
-      ""
+  private
+    def audit_schema
+      @audit_schema ||= options['audit_schema'].presence || 'auditing'
     end
 
-    gsub_file 'config/application.rb', /#{Regexp.escape("config.load_defaults")}[ 0-9\.]+\n/mi do |match|
-      "#{match}    #{eager_line}\n    #{structure_line} = :sql"
+    def copy_migrations
+      rake("better_record:install:migrations")
     end
 
-    gsub_file 'app/models/application_record.rb', /(#{Regexp.escape("class ApplicationRecord < ActiveRecord::Base")})/mi do |match|
-      p match
-      "class ApplicationRecord < BetterRecord::Base"
+    def copy_templates
+      template 'gitattributes', '.gitattributes'
+      template 'gitignore', '.gitignore'
+      template 'irbrc', '.irbrc'
+      template 'jsbeautifyrc', '.jsbeautifyrc'
+      template 'pryrc', '.pryrc'
+      template 'rspec', '.rspec'
+      template 'ruby-version', '.ruby-version'
+      template 'initializer.rb', 'config/initializers/better_record.rb'
+      directory "#{BetterRecord::Engine.root}/lib/templates", 'lib/templates'
+
+      eject_files if !!options['eject']
     end
-  end
 
-  def copy_migrations
-    rake("better_record:install:migrations")
-  end
+    def gsub_files
+      eager_line = 'config.eager_load_paths += Dir["#{config.root}/lib/modules/**/"]'
+      structure_line = 'config.active_record.schema_format'
 
-  private
-    def audit_schema
-      @audit_schema ||= options['audit_schema'].presence || 'auditing'
+      gsub_file 'config/application.rb', /([ \t]*?(#{Regexp.escape(eager_line)}|#{Regexp.escape(structure_line)})[ ='":]*?(rb|sql)?['"]?[ \t0-9\.]*?)\n/mi do |match|
+        ""
+      end
+
+      gsub_file 'config/application.rb', /#{Regexp.escape("config.load_defaults")}[ 0-9\.]+\n/mi do |match|
+        "#{match}    #{eager_line}\n    #{structure_line} = :sql\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 eject_files

data/lib/generators/better_record/setup/templates/gitignore

@@ -9,16 +9,25 @@
 # Ignore the default SQLite database.
 /db/*.sqlite3
 /db/*.sqlite3-journal
+/**/db/*.sqlite3
+/**/db/*.sqlite3-journal
 
 # Ignore all logfiles and tempfiles.
-/log/*
 /tmp/*
-!/log/.keep
+/**/tmp/*
 !/tmp/.keep
+!/**/tmp/.keep
+/log/*
+/**/log/*
+!/log/.keep
+!/**/log/.keep
+/**/yarn-error.log
 
 # Ignore uploaded files in development and files that will be compiled in production
 /public/*
+/**/dummy/public/*
 /storage/*
+/**/dummy/storage/*
 !/public/.keep
 !/storage/.keep
 
@@ -42,3 +51,6 @@
 *.log*
 *.rdb
 !Gemfile.lock
+
+.bundle/
+pkg/

data/lib/generators/better_record/setup/templates/initializer.rb

@@ -13,7 +13,7 @@ module BetterRecord
   # uncomment the following line to use table_names instead of model names
   # as the 'type' value in polymorphic relationships
 
-  # self.default_polymorphic_method = :polymorphic_name
+  # self.default_polymorphic_method = :table_name
 
   # uncomment the following line to use change the database schema
   # for auditing functions and logged_actions. DEFAULT - 'auditing'

data/lib/generators/better_record/setup/templates/pryrc

@@ -1,42 +1,46 @@
 og_print = Pry.config.print
 
 Pry.config.print = proc do |output, value, *args|
-  if (ActiveRecord::Base === value) ||
-    (ActiveRecord::Relation === value)
-    is_relation = ActiveRecord::Relation === value
-    base = (is_relation ? value.limit(1).first : value)
-    i = 0
-    idx = {'   #' => ->(*args) { "   #{i += 1}" }}
-    keys = [
-      idx, *(
-        (
-          base ? (
-            (
-              (base.class.first).present? &&
-              (base.class.first.attributes.keys - base.attributes.keys).present?
-            ) ?
-            base.attributes.keys :
-            (base.class.respond_to?(:default_print) ? base.class.default_print : base.class.column_names)
-          ) : (value.klass.respond_to?(:default_print) ? value.klass.default_print : value.klass.column_names)
+  begin
+    if (ActiveRecord::Base === value) ||
+      (ActiveRecord::Relation === value)
+      is_relation = ActiveRecord::Relation === value
+      base = (is_relation ? value.limit(1).first : value)
+      i = 0
+      idx = {'   #' => ->(*args) { "   #{i += 1}" }}
+      keys = [
+        idx, *(
+          (
+            base ? (
+              (
+                (base.class.first).present? &&
+                (base.class.first.attributes.keys - base.attributes.keys).present?
+              ) ?
+              base.attributes.keys :
+              (base.class.respond_to?(:default_print) ? base.class.default_print : base.class.column_names)
+            ) : (value.klass.respond_to?(:default_print) ? value.klass.default_print : value.klass.column_names)
+          )
         )
-      )
-    ]
-    puts "\n"
-    if is_relation
-      sz = 0
-      begin
-        tp value, keys if value.size > 0
-        sz = value.size
-      rescue
-        tp value, keys if value.size.size > 0
-        sz = value.size.size
+      ]
+      puts "\n"
+      if is_relation
+        sz = 0
+        begin
+          tp value, keys if value.size > 0
+          sz = value.size
+        rescue
+          tp value, keys if value.size.size > 0
+          sz = value.size.size
+        end
+        puts "\n   #{sz} rows returned" if is_relation
+      else
+        tp value, keys
       end
-      puts "\n   #{sz} rows returned" if is_relation
+      puts "\n"
     else
-      tp value, keys
+      og_print.call output, value, *args
     end
-    puts "\n"
-  else
+  rescue
     og_print.call output, value, *args
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Sampson Crowley
@@ -201,6 +201,8 @@ files:
 - lib/better_record/rspec/extensions/has_valid_factory.rb
 - lib/better_record/rspec/extensions/optional_column.rb
 - lib/better_record/rspec/extensions/required_column.rb
+- lib/better_record/tasks/better_record/install.rake
+- lib/better_record/tasks/spec/attributes.rake
 - lib/better_record/version.rb
 - lib/generators/better_record/eject_rspec_extensions/USAGE
 - lib/generators/better_record/eject_rspec_extensions/eject_rspec_extensions_generator.rb
@@ -214,7 +216,6 @@ files:
 - lib/generators/better_record/setup/templates/pryrc
 - lib/generators/better_record/setup/templates/rspec
 - lib/generators/better_record/setup/templates/ruby-version
-- lib/tasks/spec/attributes.rake
 - lib/templates/active_record/model/model.rb
 - lib/templates/migration/templates/create_table_migration.rb
 - lib/templates/rspec/model/model_spec.rb