homeland-site 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d1b94bb5556d9af3cc47d69d51a73730473dc3713c74e1cd0e8c6a5a3743632
-  data.tar.gz: fe10814918a2471d20f423a30aa5764669c36b454bd2d2d7c5199d7d0e6c09cb
+  metadata.gz: 40c71bf6deffd894bf5261deb02a8ec60b106f3a066afd16d2b8504af0385234
+  data.tar.gz: a9603686ccf52a4abfc0bcbd542e340f0ae39126c1b126555aaa1ced2ff07549
 SHA512:
-  metadata.gz: d880752a1d77960818fff5290007a9070352a9091dad078a89abe846d92806435d1bb5178e23f5eead04a6ff56b8ca31b9b459d7340aa8f4a50ac4311a967c00
-  data.tar.gz: 8ffec9aa3b4fa0a9ff78384be5f9713b95491ba2fb1bf6fa0d8106ece9e44db6512d62294d848ccd495a31018a42481ef86395a2428009025e074b900428ebf0
+  metadata.gz: 4e258f8bc22fdfb98fb95b1f1c7abb001275b29dec6b68639f797613569384be4fc50ee241646882656fa882e1d4f5d53ebfaa28261beab10ce35914b0474eb3
+  data.tar.gz: 4449d9f8e0b0f3b44216bb3c10c0488f4fc316e973a3435c534ba86e10850bc6399530d6dbc4007e2d1bfbf600bf691c37d6d41969f26a03b70f2a57387580c0

data/Rakefile

@@ -1,34 +1,36 @@
+# frozen_string_literal: true
+
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 
-require 'rdoc/task'
+require "rdoc/task"
 
 RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Homeland::Site'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title    = "Homeland::Site"
+  rdoc.options << "--line-numbers"
+  rdoc.rdoc_files.include("README.md")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
 APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
+load "rails/tasks/engine.rake"
 
 
-load 'rails/tasks/statistics.rake'
+load "rails/tasks/statistics.rake"
 
 
 
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 
-require 'rake/testtask'
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
   t.verbose = false
 end
 

data/app/controllers/homeland/site/admin/site_nodes_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Homeland::Site
   module Admin
     class SiteNodesController < ::Admin::ApplicationController
@@ -22,34 +24,34 @@ module Homeland::Site
         @site_node = SiteNode.new(site_node_params)
 
         if @site_node.save
-          redirect_to(admin_site_nodes_path, notice: 'Site node 创建成功。')
+          redirect_to(admin_site_nodes_path, notice: "Site node 创建成功。")
         else
-          render action: 'new'
+          render action: "new"
         end
       end
 
       def update
         if @site_node.update(site_node_params)
-          redirect_to(admin_site_nodes_path, notice: 'Site node 更新成功。')
+          redirect_to(admin_site_nodes_path, notice: "Site node 更新成功。")
         else
-          render action: 'edit'
+          render action: "edit"
         end
       end
 
       def destroy
         @site_node.destroy
-        redirect_to(admin_site_nodes_path, notice: '删除成功。')
+        redirect_to(admin_site_nodes_path, notice: "删除成功。")
       end
 
       private
 
-      def site_node_params
-        params[:site_node].permit!
-      end
+        def site_node_params
+          params[:site_node].permit!
+        end
 
-      def set_site_node
-        @site_node = SiteNode.find(params[:id])
-      end
+        def set_site_node
+          @site_node = SiteNode.find(params[:id])
+        end
     end
   end
 end

data/app/controllers/homeland/site/admin/sites_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Homeland::Site
   module Admin
     class SitesController < ::Admin::ApplicationController
@@ -7,7 +9,7 @@ module Homeland::Site
       def index
         @sites = ::Site.unscoped.recent.includes(:user, :site_node)
         if params[:q].present?
-          @sites = @sites.where('name LIKE ?', "%#{params[:q]}%")
+          @sites = @sites.where("name LIKE ?", "%#{params[:q]}%")
         end
         @sites = @sites.page(params[:page])
       end
@@ -26,17 +28,17 @@ module Homeland::Site
         @site = ::Site.new(params[:site].permit!)
 
         if @site.save
-          redirect_to(admin_sites_path, notice: 'Site 创建成功。')
+          redirect_to(admin_sites_path, notice: "Site 创建成功。")
         else
-          render action: 'new'
+          render action: "new"
         end
       end
 
       def update
         if @site.update(params[:site].permit!)
-          redirect_to(admin_sites_path, notice: 'Site 更新成功。')
+          redirect_to(admin_sites_path, notice: "Site 更新成功。")
         else
-          render action: 'edit'
+          render action: "edit"
         end
       end
 
@@ -52,9 +54,9 @@ module Homeland::Site
 
       private
 
-      def set_site
-        @site = ::Site.unscoped.find(params[:id])
-      end
+        def set_site
+          @site = ::Site.unscoped.find(params[:id])
+        end
     end
   end
 end

data/app/controllers/homeland/site/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Homeland::Site
   class ApplicationController < ::ApplicationController
     protect_from_forgery with: :exception

data/app/controllers/homeland/site/sites_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Homeland::Site
   class SitesController < Homeland::Site::ApplicationController
     def index
@@ -14,16 +16,16 @@ module Homeland::Site
       @site = ::Site.new(site_params)
       @site.user_id = current_user.id
       if @site.save
-        redirect_to(sites_path, notice: '提交成功。谢谢。')
+        redirect_to(sites_path, notice: "提交成功。谢谢。")
       else
-        render action: 'new'
+        render action: "new"
       end
     end
 
     private
 
-    def site_params
-      params.require(:site).permit(:name, :desc, :url, :favorite, :site_node_id)
-    end
+      def site_params
+        params.require(:site).permit(:name, :desc, :url, :favorite, :site_node_id)
+      end
   end
 end

data/app/helpers/homeland/site/application_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Homeland
   module Site
     module ApplicationHelper

data/app/models/homeland/site/ability.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Homeland::Site
   class Ability
     include CanCan::Ability
@@ -17,20 +19,20 @@ module Homeland::Site
 
     protected
 
-    # 普通会员权限
-    def roles_for_site_editors
-      can :create, ::Site
-      basic_read_only
-    end
+      # 普通会员权限
+      def roles_for_site_editors
+        can :create, ::Site
+        basic_read_only
+      end
 
-    # 未登录用户权限
-    def roles_for_anonymous
-      cannot :manage, ::Site
-      basic_read_only
-    end
+      # 未登录用户权限
+      def roles_for_anonymous
+        cannot :manage, ::Site
+        basic_read_only
+      end
 
-    def basic_read_only
-      can :read, ::Site
-    end
+      def basic_read_only
+        can :read, ::Site
+      end
   end
 end

data/app/models/site.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Site < ApplicationRecord
   include SoftDelete
 
@@ -5,7 +7,7 @@ class Site < ApplicationRecord
   belongs_to :user
 
   validates :url, :name, :site_node_id, presence: true
-  validates :url, uniqueness: true
+  validates :url, format: { with: /https?:\/\/[\S]+/ }, uniqueness: true
 
   after_save :update_cache_version
   after_destroy :update_cache_version
@@ -14,17 +16,9 @@ class Site < ApplicationRecord
     CacheVersion.sites_updated_at = Time.now.to_i
   end
 
-  before_validation :fix_urls
-  def fix_urls
-    unless url.blank?
-      url = self.url.gsub(%r{http[s]{0,1}://}, '').split('/').join('/')
-      self.url = "http://#{url}"
-    end
-  end
-
   def favicon_url
-    return '' if url.blank?
-    domain = url.gsub('http://', '')
-    "https://favicon.b0.upaiyun.com/ip2/#{domain}.ico"
+    return "" if url.blank?
+    domain = URI.parse(url).host.sub("www.", "")
+    "https://favicon.ruby-china.com/ip2/#{domain}.ico"
   end
 end

data/app/models/site_node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SiteNode < ApplicationRecord
   second_level_cache expires_in: 2.weeks
 

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Homeland::Site::Engine.routes.draw do
   resources :sites
   namespace :admin do

data/lib/homeland/site.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "homeland/site/version"
 require "homeland/site/engine"
 

data/lib/homeland/site/engine.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module Homeland::Site
   class Engine < ::Rails::Engine
     isolate_namespace Homeland::Site
 
-    initializer 'homeland.site.init' do |app|
-      next unless Setting.has_module?(:site)
+    initializer "homeland.site.init" do |app|
+      next unless (defined? Setting) && Setting.has_module?(:site)
       Homeland.register_plugin do |plugin|
         plugin.name = Homeland::Site::NAME
-        plugin.display_name = '酷站'
+        plugin.display_name = "酷站"
         plugin.version = Homeland::Site::VERSION
         plugin.description = Homeland::Site::DESCRIPTION
         plugin.navbar_link = true
@@ -16,7 +18,7 @@ module Homeland::Site
       end
 
       app.routes.prepend do
-        mount Homeland::Site::Engine => '/'
+        mount Homeland::Site::Engine => "/"
       end
       app.config.paths["db/migrate"].concat(config.paths["db/migrate"].expanded)
     end

data/lib/homeland/site/version.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Homeland
   module Site
-    VERSION     = '0.2.1'
-    NAME        = 'site'
-    DESCRIPTION = 'Site for Homeland.'
+    VERSION     = "0.3.0"
+    NAME        = "site"
+    DESCRIPTION = "Site for Homeland."
   end
 end

data/lib/tasks/homeland/site_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :homeland_site do
 #   # Task goes here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: homeland-site
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2019-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -98,8 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Site plugin for Homeland