blacksand 2.2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85cea919a0385fa796cd17228e35f52c161c26d3
-  data.tar.gz: b1ccce8a35f8f38e7bec370076514114039c0bf7
+  metadata.gz: df2f22e7f167937074f2c7076a5d5094238b5ea2
+  data.tar.gz: b457ab9c47ee7641fba04b03f1d723feb14b9789
 SHA512:
-  metadata.gz: 4d5b6c433265729b8c4cfb79ca62bf7ae82ea49c0ae5f9dc74fd31a50132c8e08d6cd5c57a4d2df38da8070fb9e63b4e434ce1c3fb876df5fb76b051b4e87048
-  data.tar.gz: 9ef5b174ade89dae9315047d766b8df215e4eb91701922f1f99be49af6dcf98cbadcc516310de33a04ea8e92b292bc5d1725e70258f0ca6970e839022e6610c6
+  metadata.gz: cf617391fd30df099a5aede13eb77732a678803d66169bfa18db468aa6cd92ff8ad386fa700309a43a146eabb491eb7916451308a23f4f43575938a73d710efa
+  data.tar.gz: e4e27591fd4391e8dcedcb1a94299f4a88b2bf3b9fcb2a708f40ba1d7e4bac230103ca6300509aab8406639cfdea37c4728d3b17f0ec290fc52191eb077afdf8

data/app/uploaders/blacksand/base_uploader.rb

@@ -1,5 +1,6 @@
 module Blacksand
   class BaseUploader < ::CarrierWave::Uploader::Base
+    # TODO: may be optional
     include ::CarrierWave::MiniMagick
 
     def self.storage_from_config
@@ -8,7 +9,6 @@ module Blacksand
 
     storage storage_from_config
 
-    # TODO: config store_dir prefix
     def store_dir
       "#{Blacksand.carrierwave_store_dir_prefix}/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
     end

data/app/views/layouts/blacksand/_navbar.html.erb

@@ -21,7 +21,9 @@
         <% if false && can?(:create, User) %>
           <li><a href="<%= users_path %>">用户</a></li>
         <% end %>
-        <li><a href="<%= main_app.root_path %>">回首页<span class="sr-only">(current)</span></a></li>
+        <% if main_app.methods.include?(:root_path) %>
+            <li><a href="<%= main_app.root_path %>">回首页<span class="sr-only">(current)</span></a></li>
+        <% end %>
       </ul>
 
       <ul class="nav navbar-nav navbar-right">

data/config/locales/zh-CN.yml

@@ -30,7 +30,7 @@ zh-CN:
         prototype: 原型
       blacksand/page:
         title: 标题
-        en_name: 英文名
+        en_name: 标识
         content: 内容
         parent: 父页面
         template: 模板

data/lib/blacksand.rb

@@ -14,6 +14,8 @@ module Blacksand
 
   mattr_accessor :site_id
   mattr_accessor :site_name
+
+  # DEPRECATED: to be deleted
   mattr_accessor :root_path
 
   mattr_accessor :carrierwave_storage

data/lib/blacksand/engine.rb

@@ -1,7 +1,7 @@
 require 'rails'
 require 'carrierwave'
-require 'carrierwave-qiniu'
 require 'rails_kindeditor'
+# TODO: may be optional
 require 'mini_magick'
 require 'kaminari'
 require 'bootstrap-kaminari-views'

data/lib/blacksand/version.rb

@@ -1,3 +1,3 @@
 module Blacksand
-  VERSION = "2.2.2.1"
+  VERSION = "2.3.0"
 end

data/lib/generators/blacksand/install_generator.rb

@@ -8,7 +8,11 @@ module Blacksand
         create_file("config/initializers/blacksand.rb", <<-RUBY)
 Blacksand.site_id   = 'site id'
 Blacksand.site_name = 'site name'
-Blacksand.root_path = 'root path'
+
+# Config carrierwave
+#
+# Blacksand.carrierwave_storage          = :file # or :qiniu
+# Blacksand.carrierwave_store_dir_prefix = "uploads" # NOTICE: Kindeditor need config their own configuration
 
 # Setup authentication to be run as a before filter 
 # @example Devise admin
@@ -16,9 +20,6 @@ Blacksand.root_path = 'root path'
 #     authenticate_admin!
 #   end
 
-# Blacksand.carrierwave_storage = :file
-# Blacksand.carrierwave_store_dir_prefix = 'uploads' # NOTICE: Kindeditor need config by their api
-
 # Page caching
 # Blacksand.page_caching = false
         RUBY

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacksand
 version: !ruby/object:Gem::Version
-  version: 2.2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - bastengao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,20 +58,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: carrierwave-qiniu
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -534,7 +520,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: CMS base on Rails Engine.