fl 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6df4009a629d9db83169fb3d47784e071783970a
-  data.tar.gz: 86340fdd4b5d44f5425f8d58362c13f030d4ce85
+  metadata.gz: 8ae5c44263b4e75e9d1e436402dabda5af828e20
+  data.tar.gz: 782964b24d98bab2104e05ff6a7849180d7ad08b
 SHA512:
-  metadata.gz: f3db9a11352a6114a673bf6b813b4ea9f112d3f21a0dad614072141af8f5f99ac4dd72c21c1409f7af37cf9e0f4ed5b0efdaacf0b0f6be948bbb2aa02f88cb4e
-  data.tar.gz: 2fd72d1ba84d1e006cc60fad2f384c9411299218976c3d24a2ef3db18ac8c53f0b61b195b75a484b9843f32cc5d6b3662ed8882c30b5e27e8e887528cde4677f
+  metadata.gz: 91f844e94458168ff5f87fd7729f7873a00a0ebd354c15684be52ea686b843d2ff49e052d3ff57324e4d05c41c0245149a5a705ed6c87ca1038c0554f7e56a1f
+  data.tar.gz: 8ff4f548e3858f017e47fcc80504bcb0966a6f5d16d0464abfa6ce0e53813622c256ed6b75f3816f37c7da1a948e120c19e5d3ee42f4957d53e63088b88dd977

data/app/controllers/application_controller.rb

@@ -14,7 +14,7 @@ class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
 
     # => Layout
-    layout Proc.new { |c| Rails.application.secrets[:app][:layout] unless c.request.xhr? }
+    layout Proc.new { |c| 'base' unless c.request.xhr? }
 
     # => Maintenance
     before_action Proc.new { @maintenance = Node.find_by(ref: "maintenance").try(:val) }, only: :show

data/app/lib/active_record/concerns/base.rb

@@ -11,14 +11,22 @@ module ActiveRecord
           ENV["DATABASE_ADAPTER"]
         end
 
+      #########################################
+      #########################################
+
         # Down
         def down
          drop_table table, if_exists: true
         end
 
         # UUID
-        def uuid(key=:id)
-          adapter == "sqlite3" ? {} : { key => :uuid }
+        def options(key=:id)
+          case adapter
+          when "mysql2"
+            { options: 'DEFAULT CHARSET=utf8' }
+          else
+            {}
+          end
         end
 
         # Table

data/db/migrate/20160616060637_create_nodes.rb

@@ -5,12 +5,8 @@ class CreateNodes < ActiveRecord::Migration::Current
   #########################################
 
     # => Up
-    # => enable_extension for Ruby 2.4.0 on Heroku
     def up
-      enable_extension 'uuid-ossp' if adapter == "postgresql" # => http://theworkaround.com/2015/06/12/using-uuids-in-rails.html#postgresql
-
-      # => Table
-      create_table table, uuid do |t| # => users stored through "associations"
+      create_table table, options do |t| # => users stored through "associations"
         t.references :user
         t.string		 :type
         t.string     :slug

data/db/migrate/20160707080248_create_users.rb

@@ -6,7 +6,7 @@ class CreateUsers < ActiveRecord::Migration::Current
 
     # Up
     def up
-      create_table table do |t|
+      create_table table, options do |t|
 
         ## Database authenticatable
         t.string :email,              null: false, default: ""

data/db/migrate/20160707094704_create_slugs.rb

@@ -14,7 +14,7 @@ class CreateSlugs < ActiveRecord::Migration::Current
 
     # Up
     def up
-      create_table table do |t|
+      create_table table, options do |t|
         t.string   :slug,           :null  => false
         t.integer  :sluggable_id,   :null  => false
         t.string   :sluggable_type, :limit => 50

data/db/migrate/20160710095916_create_associations.rb

@@ -6,10 +6,9 @@ class CreateAssociations < ActiveRecord::Migration::Current
 
     # Up
     def up
-      setup_uuid
-      create_table table, uuid do |t|
-    		t.references  :associatiable, { polymorphic: true }.merge!(uuid(:type)) # => http://stackoverflow.com/a/29257570/1143732
-    		t.references  :associated, 	  { polymorphic: true }.merge!(uuid(:type)) # => http://stackoverflow.com/a/29257570/1143732
+      create_table table, options do |t|
+    		t.references  :associatiable, { polymorphic: true } # => http://stackoverflow.com/a/29257570/1143732
+    		t.references  :associated, 	  { polymorphic: true } # => http://stackoverflow.com/a/29257570/1143732
     		t.timestamps
     	end
     end

data/db/migrate/20160713061948_create_profiles.rb

@@ -3,11 +3,10 @@ class CreateProfiles < ActiveRecord::Migration::Current
 
     # Up
     def up
-      setup_uuid
-      create_table table, uuid do |t|
+      create_table table, options do |t|
 
         # => General
-        t.references :user, { references: :user }.merge!(uuid(:type)) # => Should be used to create custom references but always adds "_id" to name
+        t.references :user, { references: :user } # => Should be used to create custom references but always adds "_id" to name
         t.string     :slug
         t.string     :name
         t.integer    :role, default: 0

data/db/migrate/20161115101221_create_assets.rb

@@ -6,7 +6,7 @@ class CreateAssets < ActiveRecord::Migration::Current
 
     # => Up
     def up
-      create_table table do |t|
+      create_table table, options do |t|
         t.references  :assetable, polymorphic: true
         t.string      :data_file_name, null: false
         t.integer     :data_file_size

data/db/migrate/20170725060408_create_active_admin_comments.rb

@@ -6,7 +6,7 @@ class CreateActiveAdminComments < ActiveRecord::Migration::Current
 
     # => Up
     def up
-      create_table table do |t|
+      create_table table, options do |t|
         t.references :resource, polymorphic: true
         t.references :author,   polymorphic: true
         t.string     :namespace

data/lib/fl/constants.rb

@@ -42,7 +42,7 @@ module FL
     module VERSION
       MAJOR = 0
       MINOR = 3
-      TINY  = 8
+      TINY  = 9
       PRE   = nil
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fl
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - R.Peck