blacksand 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74d1649cb446b7ac9f4e60adaa665d4a8f6e570a
-  data.tar.gz: ad697c256d0cf90ca18f537234232fecddf8e822
+  metadata.gz: bbb79dbfee63a76f5004d6d090ecf88aaf821d37
+  data.tar.gz: 07b9659e3a1eb6f675d0df2db27109c9d7ede3b0
 SHA512:
-  metadata.gz: 660928b6a5b1ff83bebbf8b07ded40cece1e19a32efb56d28ee4acee8ad7d8e573f33c81c9c416877bef6b79b829aa0449e8a7016a06db68153286c823f06e81
-  data.tar.gz: f4191f1f460abc60f833690f18319e81227625b4a165da75f07d737622824ff661c1f0c2d65a05ef3a4a7583b7962295b7e7d998361fa2b8b27a8b21151ea252
+  metadata.gz: ab9910cd2a9a323e739aac62b0d9f1009dc51a19354c087823f4b51d489b1f7b84733ef1e4bd873c62ef480385a0724d5bc9959c2f53bdd2fb5f625cad7a50d2
+  data.tar.gz: a113c68689401a6c6326c964337cb847da3b6ca7424c65bec93af4dd8fa9f3c65d6c4d04fa71b055e4751f09c3525f4baf73fbe704b4e845ec021fe0b7bbf8d9

data/app/models/blacksand/navigation.rb

@@ -1,6 +1,6 @@
 module Blacksand
   class Navigation < ActiveRecord::Base
-    belongs_to :page
+    belongs_to :page, required: false
 
     # ActiveRecord attribute api changed, see http://api.rubyonrails.org/classes/ActiveRecord/Attributes/ClassMethods.html#method-i-attribute
     if ActiveRecord::VERSION::MAJOR >= 5

data/app/models/blacksand/page.rb

@@ -2,12 +2,12 @@ require 'uri'
 
 module Blacksand
   class Page < ActiveRecord::Base
-    belongs_to :parent, class_name: Page, foreign_key: 'parent_id'
+    belongs_to :parent, class_name: Page, foreign_key: 'parent_id', required: false
     has_many :children, class_name: Page, foreign_key: 'parent_id', :dependent => :destroy
     has_one :navigation, :dependent => :destroy
 
-    belongs_to :template
-    belongs_to :prototype
+    belongs_to :template, required: false
+    belongs_to :prototype, required: false
 
     has_many :properties, :dependent => :destroy
     has_many_kindeditor_assets :attachments, :dependent => :destroy

data/lib/blacksand/engine.rb

@@ -1,7 +1,6 @@
 require 'rails'
 require 'carrierwave'
 require 'rails_kindeditor'
-# TODO: may be optional
 require 'mini_magick'
 require 'kaminari'
 require 'bootstrap-kaminari-views'
@@ -11,6 +10,7 @@ require 'bootstrap-sass'
 require 'bootstrap_form'
 require 'cocoon'
 require 'font-awesome-rails'
+require 'jquery-rails'
 require 'enumerize'
 require 'ransack'
 require 'themes_on_rails'

data/lib/blacksand/migrations.rb

@@ -0,0 +1,18 @@
+require 'thor/group'
+
+module Blacksand
+  class Migrations < Thor
+    include Thor::Actions
+
+    # 修正 migration 的父类，默认是 ActiveRecord::Migration, 但是 Rails 5.1 以后，
+    # 必须指定版本，例如 ActiveRecord::Migration[5.1]
+    def fix_migration_super_class
+      if ActiveRecord::VERSION::MAJOR > 5 || ( ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR >= 1 )
+        puts "Fix migration super class"
+        Dir.glob("db/migrate/*.blacksand.rb") do |file|
+          gsub_file(file, /ActiveRecord::Migration$/, "ActiveRecord::Migration[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]")
+        end
+      end
+    end
+  end
+end

data/lib/blacksand/version.rb

@@ -1,3 +1,3 @@
 module Blacksand
-  VERSION = "2.4.1"
+  VERSION = "2.5.0"
 end

data/lib/generators/blacksand/install_generator.rb

@@ -1,4 +1,5 @@
 require 'rails/generators'
+require 'blacksand/migrations'
 
 module Blacksand
   module Generators
@@ -24,7 +25,22 @@ Blacksand.site_name = 'site name'
 # Blacksand.page_caching = false
         RUBY
 
+        copy_migrations
+      end
+
+      private
+      def copy_migrations
         rake 'railties:install:migrations'
+
+        Blacksand::Migrations.new.fix_migration_super_class
+        # # 修正 migration 的父类，默认是 ActiveRecord::Migration, 但是 Rails 5.1 以后，
+        # # 必须指定版本，例如 ActiveRecord::Migration[5.1]
+        # if ActiveRecord::VERSION::MAJOR > 5 || ( ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR >= 1 )
+        #   puts "Fix migration super class"
+        #   Dir.glob("db/migrate/*.blacksand.rb") do |file|
+        #     gsub_file(file, /ActiveRecord::Migration$/, "ActiveRecord::Migration[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]")
+        #   end
+        # end
       end
     end
   end

data/lib/tasks/blacksand_tasks.rake

@@ -1,7 +1,4 @@
-# desc "Explaining what the task does"
-# task :blacksand do
-#   # Task goes here
-# end
+require 'blacksand/migrations'
 
 namespace :blacksand do
   desc "Clean unsued kindeditor assets"
@@ -69,4 +66,10 @@ namespace :blacksand do
       p.destroy!
     end
   end
+
+  desc "update migrations"
+  task :update_migrations do
+    Rake::Task["blacksand:install:migrations"].invoke
+    Blacksand::Migrations.new.fix_migration_super_class
+  end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: blacksand
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - bastengao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -19,7 +33,7 @@ dependencies:
         version: 4.2.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +43,21 @@ dependencies:
         version: 4.2.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching
   requirement: !ruby/object:Gem::Requirement
@@ -493,6 +521,7 @@ files:
 - lib/blacksand/controller_helper.rb
 - lib/blacksand/engine.rb
 - lib/blacksand/expire_pages.rb
+- lib/blacksand/migrations.rb
 - lib/blacksand/my_json_type.rb
 - lib/blacksand/routing.rb
 - lib/blacksand/version.rb