loyal_core 0.0.6 → 0.0.7

data/app/models/loyal_core/like_track.rb

@@ -6,7 +6,7 @@ module LoyalCore
 
     # self.acts_as_tiny_cached
 
-    self.loyal_passport_acts_as_creator_able
+    self.loyal_core_acts_as_creator_able
 
     belongs_to :target, :polymorphic => true, :counter_cache => :liked_count
 

data/app/models/loyal_core/rating_track.rb

@@ -5,7 +5,7 @@ module LoyalCore
 
     # self.acts_as_tiny_cached
 
-    self.loyal_passport_acts_as_creator_able
+    self.loyal_core_acts_as_creator_able
 
     # TODO: counter_cache 是否需要？
     belongs_to :target, :polymorphic => true, :counter_cache => true

data/app/models/loyal_core/skin/recipe.rb

@@ -20,7 +20,7 @@ module LoyalCore
     validates_presence_of :name
 
     # 用于作者
-    self.loyal_passport_acts_as_creator_able
+    self.loyal_core_acts_as_creator_able
 
     self.loyal_core_acts_as_has_avatar
 

data/config/routes.rb

@@ -1,12 +1,6 @@
 # -*- encoding : utf-8 -*-
 LoyalCore::Engine.routes.draw do
 
-  scope :admin, :module => :admin, :as => :admin, :path => :loyal_core do
-    namespace :skin do
-      resources :folders
-      resources :recipes
-    end
-  end
   
   namespace :ajax do
     scope :core, :as => :core, :path => :core do

data/lib/loyal_core/acts.rb

@@ -15,6 +15,8 @@ module LoyalCore
   autoload :ActsAsNamedFilterAble,      "#{File.dirname(__FILE__)}/acts/named_filter_able"
 
   autoload :ActsAsSkinDishAble,         "#{File.dirname(__FILE__)}/acts/skin_dish_able"
+
+  autoload :ActsAsCreatorAble,          "#{File.dirname(__FILE__)}/acts/creator_able"
 end
 
 if defined?(ActiveRecord::Base)
@@ -32,4 +34,6 @@ if defined?(ActiveRecord::Base)
 
   ::ActiveRecord::Base.send :include, ::LoyalCore::ActsAsNamedFilterAble
   ::ActiveRecord::Base.send :include, ::LoyalCore::ActsAsSkinDishAble
+
+  ::ActiveRecord::Base.send :include, ::LoyalCore::ActsAsCreatorAble
 end

data/lib/loyal_core/acts/creator_able.rb

@@ -0,0 +1,25 @@
+# -*- encoding : utf-8 -*-
+module LoyalCore
+  module ActsAsCreatorAble
+    def self.included base
+      base.class_eval do
+        extend ClassMethods
+      end
+    end
+
+    module ClassMethods
+      def loyal_core_acts_as_creator_able *args
+        belongs_to :creator, :class_name => "User", :foreign_key => :created_by
+
+        scope :filter_by_creator, ->(user_or_user_id) do
+          where :created_by => (user_or_user_id.is_a?(::User) ? user_or_user_id.id : user_or_user_id)
+        end
+
+        define_method :creator_is? do |__user|
+          self.created_by == __user.id
+        end
+      end
+    end
+  end
+end
+

data/lib/loyal_core/engine.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+require "protected_attributes"
 require "tiny_cache"
 # rails config
 require "rails_config"

data/lib/loyal_core/utils.rb

@@ -1,8 +1,9 @@
 # -*- encoding : utf-8 -*-
 module LoyalCore
-  autoload :ArrayUtil,   "#{File.dirname(__FILE__)}/utils/array_util"
-  autoload :DataUtil,    "#{File.dirname(__FILE__)}/utils/data_util"
-  autoload :ConfigUtil,  "#{File.dirname(__FILE__)}/utils/config_util"
-  autoload :TextUtil,    "#{File.dirname(__FILE__)}/utils/text_util"
+  autoload :ArrayUtil,      "#{File.dirname(__FILE__)}/utils/array_util"
+  autoload :DataUtil,       "#{File.dirname(__FILE__)}/utils/data_util"
+  autoload :ConfigUtil,     "#{File.dirname(__FILE__)}/utils/config_util"
+  autoload :TextUtil,       "#{File.dirname(__FILE__)}/utils/text_util"
+  autoload :PlatformUtil,   "#{File.dirname(__FILE__)}/utils/platform_util"
 end
 

data/lib/loyal_core/utils/platform_util.rb

@@ -0,0 +1,7 @@
+# -*- encoding : utf-8 -*-
+module LoyalCore
+  class PlatformUtil
+    
+  end
+end
+

data/lib/loyal_core/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module LoyalCore
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loyal_core
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,6 +11,22 @@ bindir: bin
 cert_chain: []
 date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: protected_attributes
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails_config
   requirement: !ruby/object:Gem::Requirement
@@ -247,8 +263,6 @@ files:
 - app/controllers/loyal_core/jumps_controller.rb
 - app/controllers/loyal_core/ajax_controller.rb
 - app/controllers/loyal_core/application_controller.rb
-- app/controllers/loyal_core/admin/skin/recipes_controller.rb
-- app/controllers/loyal_core/admin/skin/folders_controller.rb
 - app/controllers/loyal_core/ajax/rating_tracks_controller.rb
 - app/controllers/loyal_core/ajax/users/sessions_controller.rb
 - app/controllers/loyal_core/ajax/captchas_controller.rb
@@ -273,16 +287,6 @@ files:
 - app/models/kindeditor/image.rb
 - app/models/kindeditor/flash.rb
 - app/views/layouts/loyal_core/application.html.erb
-- app/views/loyal_core/admin/skin/recipes/new.html.erb
-- app/views/loyal_core/admin/skin/recipes/_form.html.erb
-- app/views/loyal_core/admin/skin/recipes/index.html.erb
-- app/views/loyal_core/admin/skin/recipes/edit.html.erb
-- app/views/loyal_core/admin/skin/recipes/show.html.erb
-- app/views/loyal_core/admin/skin/folders/new.html.erb
-- app/views/loyal_core/admin/skin/folders/_form.html.erb
-- app/views/loyal_core/admin/skin/folders/index.html.erb
-- app/views/loyal_core/admin/skin/folders/edit.html.erb
-- app/views/loyal_core/admin/skin/folders/show.html.erb
 - app/views/loyal_core/jumps/show.html.erb
 - app/views/loyal_core/ajax/captchas/new.html.erb
 - app/views/loyal_core/ajax/captchas/_new.html.erb
@@ -351,6 +355,7 @@ files:
 - lib/loyal_core/memoist.rb
 - lib/loyal_core/action_view.rb
 - lib/loyal_core/utils/config_util.rb
+- lib/loyal_core/utils/platform_util.rb
 - lib/loyal_core/utils/data_util.rb
 - lib/loyal_core/utils/array_util.rb
 - lib/loyal_core/utils/text_util.rb
@@ -359,6 +364,7 @@ files:
 - lib/loyal_core/utils.rb
 - lib/loyal_core/acts/content_mode_able.rb
 - lib/loyal_core/acts/content_depart_able.rb
+- lib/loyal_core/acts/creator_able.rb
 - lib/loyal_core/acts/bit_able.rb
 - lib/loyal_core/acts/uuid_ful.rb
 - lib/loyal_core/acts/skin_dish_able.rb
@@ -394,7 +400,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 550503749273658230
+      hash: -1509056482027656799
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -403,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 550503749273658230
+      hash: -1509056482027656799
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/app/controllers/loyal_core/admin/skin/folders_controller.rb

@@ -1,54 +0,0 @@
-# -*- encoding : utf-8 -*-
-module LoyalCore
-  class Admin::Skin::FoldersController < ::LoyalAdmin::ApplicationController
-    def index
-
-    end
-
-    def show
-      @loyal_core_skin_folder = ::LoyalCore::Skin::Folder.find params[:id]
-
-      @loyal_core_skin_recipes = @loyal_core_skin_folder.recipes.page(params[:page])
-    end
-
-    def new
-      @loyal_core_skin_folder = ::LoyalCore::Skin::Folder.new
-    end
-
-    def create
-      @loyal_core_skin_folder = ::LoyalCore::Skin::Folder.new(params[:loyal_core_skin_folder])
-
-      @loyal_core_skin_folder.created_by = current_user.id
-      @loyal_core_skin_folder.created_ip = request.remote_ip
-
-      if @loyal_core_skin_folder.save
-        redirect_to loyal_core_app.admin_skin_folder_url(:id => @loyal_core_skin_folder.id)
-      else
-        render :new
-      end
-    end
-
-    def edit
-      @loyal_core_skin_folder = ::LoyalCore::Skin::Folder.find params[:id]
-    end
-
-    def update
-      @loyal_core_skin_folder = ::LoyalCore::Skin::Folder.find params[:id]
-
-      if @loyal_core_skin_folder.update_attributes(params[:loyal_core_skin_folder])
-        redirect_to loyal_core_app.admin_skin_folder_url(:id => @loyal_core_skin_folder.id)
-      else
-        render :edit
-      end
-    end
-
-    def destroy
-      @loyal_core_skin_folder = ::LoyalCore::Skin::Folder.find params[:id]
-
-      @loyal_core_skin_folder.destroy
-
-      redirect_to params[:return_to] || loyal_core_app.admin_skin_folders_url
-    end
-   
-  end
-end

data/app/controllers/loyal_core/admin/skin/recipes_controller.rb

@@ -1,52 +0,0 @@
-# -*- encoding : utf-8 -*-
-module LoyalCore
-  class Admin::Skin::RecipesController < ::LoyalAdmin::ApplicationController
-    def index
-      @loyal_core_skin_recipes = ::LoyalCore::Skin::Recipe.page(params[:page])
-    end
-
-    def show
-      @loyal_core_skin_recipe = ::LoyalCore::Skin::Recipe.find params[:id]
-    end
-
-    def new
-      @loyal_core_skin_recipe = ::LoyalCore::Skin::Recipe.new
-    end
-
-    def create
-      @loyal_core_skin_recipe = ::LoyalCore::Skin::Recipe.new(params[:loyal_core_skin_recipe])
-
-      @loyal_core_skin_recipe.created_by = current_user.id
-      @loyal_core_skin_recipe.created_ip = request.remote_ip
-
-      if @loyal_core_skin_recipe.save
-        redirect_to loyal_core_app.admin_skin_recipe_url(:id => @loyal_core_skin_recipe.id)
-      else
-        render :new
-      end
-    end
-
-    def edit
-      @loyal_core_skin_recipe = ::LoyalCore::Skin::Recipe.find params[:id]
-    end
-
-    def update
-      @loyal_core_skin_recipe = ::LoyalCore::Skin::Recipe.find params[:id]
-
-      if @loyal_core_skin_recipe.update_attributes(params[:loyal_core_skin_recipe])
-        redirect_to loyal_core_app.admin_skin_recipe_url(:id => @loyal_core_skin_recipe.id)
-      else
-        render :edit
-      end
-    end
-
-    def destroy
-      @loyal_core_skin_recipe = ::LoyalCore::Skin::Recipe.find params[:id]
-
-      @loyal_core_skin_recipe.destroy
-
-      redirect_to params[:return_to] || loyal_core_app.admin_skin_recipes_url
-    end
-   
-  end
-end

data/app/views/loyal_core/admin/skin/folders/_form.html.erb

@@ -1,9 +0,0 @@
-<%= f.nested_parent_select :parent_id, nil %>
-<%= f.text_field :name %>
-<%= f.text_field :short_name %>
-<%= f.text_field :space %>
-<%= f.text_field :permalink %>
-<%= f.text_area :instroduction, :style => "height: 50px;" %>
-<%= f.text_area :description, :style => "height: 100px;" %>
-<%= f.submit %>
-

data/app/views/loyal_core/admin/skin/folders/edit.html.erb

@@ -1,11 +0,0 @@
-<%= form_for(
-  @loyal_core_skin_folder,
-  :url => loyal_core_app.admin_skin_folder_url(:id => @loyal_core_skin_folder.id),
-  :builder => ::LoyalCore::ActionView::LabeledBuilder,
-  :as => :loyal_core_skin_folder
-) do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f } %>
-<% end %>
-
-<%= link_to "新建", loyal_core_app.new_admin_skin_folder_url %>
-

data/app/views/loyal_core/admin/skin/folders/index.html.erb

@@ -1,25 +0,0 @@
-<h1>皮肤分类列表</h1>
-
-<table>
-  <tr>
-    <th>
-      ID
-    </th>
-    <th>名称</th>
-    <th col='3'>操作</th>
-  </tr>
-  <% ::LoyalCore::Skin::Folder.nested_set_options do |folder| %>
-    <tr>
-      <td><%= folder.id %></td>
-      <td><%= link_to "#{'- ' * folder.level} #{folder.name}", loyal_core_app.admin_skin_folder_url(
-        :id => folder.id
-      ) %></td>
-      <td>
-        <%= link_to "编辑", loyal_core_app.edit_admin_skin_folder_url(:id => folder.id) %>
-        <%= link_to "删除", loyal_core_app.admin_skin_folder_url(:id => folder.id), :method => :delete, :confirm => '确定要删除吗？' %>
-      </td>
-    </tr>
-  <% end %>
-</table>
-
-<%= link_to "新建", loyal_core_app.new_admin_skin_folder_url %>

data/app/views/loyal_core/admin/skin/folders/new.html.erb

@@ -1,11 +0,0 @@
-<h1>新建新分区</h1>
-
-<%= form_for(
-  @loyal_core_skin_folder,
-  :url => loyal_core_app.admin_skin_folders_url,
-  :builder => ::LoyalCore::ActionView::LabeledBuilder,
-  :as => :loyal_core_skin_folder
-) do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f } %>
-<% end %>
-

data/app/views/loyal_core/admin/skin/folders/show.html.erb

@@ -1,32 +0,0 @@
-<h1>【皮肤分类】 <%= @loyal_core_skin_folder.name %></h1>
-
-<div>
-  <b>短标题</b><%= @loyal_core_skin_folder.short_name %><br/>
-  <b>简介</b><%= @loyal_core_skin_folder.instroduction %><br/>
-  <b>描述</b><%= @loyal_core_skin_folder.description %><br/>
-</div>
-
-
-<%= link_to "编辑", loyal_core_app.edit_admin_skin_folder_url(:id => @loyal_core_skin_folder.id) %>
-<%= link_to "返回列表", loyal_core_app.admin_skin_folders_url %>
-
-<div>
-  <h3>皮肤</h3>
-  <%= paginate @loyal_core_skin_recipes %>
-
-  <ul>
-    <% @loyal_core_skin_recipes.each do |recipe| %>
-      <li>
-        <%= link_to "#{recipe.name}", loyal_core_app.admin_skin_recipe_url(
-          :id => recipe.id
-        ) %> 
-      </li>
-    <% end %>
-  </ul>
-
-  <% if @loyal_core_skin_recipes.empty? %>
-    为空
-  <% end %>
-
-  <%= paginate @loyal_core_skin_recipes %>
-</div>

data/app/views/loyal_core/admin/skin/recipes/_form.html.erb

@@ -1,25 +0,0 @@
-<%= f.text_field :name %>
-<%= f.text_field :short_name %>
-<%= f.text_field :stored_tags %>
-
-<p>
-  <%= f.label :avatar %>
-  <%= image_tag(f.object.avatar_url :small) if f.object.avatar? %>
-  <%= f.file_field :avatar %>
-  <%= f.hidden_field :avatar_cache %>
-</p>
-
-<%= f.nested_belongs_to_select :folder_id,
-  ::LoyalCore::Skin::Folder,
-  ::LoyalCore::Skin::Folder
-%>
-
-<%= f.text_field :assets_path %>
-
-<%= f.text_area :stylesheet_text, :style => 'height: 500px;' %>
-
-<%= f.text_area :instroduction, :style => 'height: 100px;' %>
-<%= f.text_area :description, :style => 'height: 100px;' %>
-
-<%= f.submit %>
-

data/app/views/loyal_core/admin/skin/recipes/edit.html.erb

@@ -1,11 +0,0 @@
-<%= form_for(
-  @loyal_core_skin_recipe,
-  :url => loyal_core_app.admin_skin_recipe_url(:id => @loyal_core_skin_recipe.id),
-  :builder => ::LoyalCore::ActionView::LabeledBuilder,
-  :as => :loyal_core_skin_recipe
-) do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f } %>
-<% end %>
-
-<%= link_to "新建", loyal_core_app.new_admin_skin_recipe_url %>
-

data/app/views/loyal_core/admin/skin/recipes/index.html.erb

@@ -1,37 +0,0 @@
-<h1>皮肤列表</h1>
-
-<%= paginate @loyal_core_skin_recipes %>
-
-<table>
-  <tr>
-    <th>ID</th>
-    <th>文章标题</th>
-    <th>作者</th>
-    <th>操作</th>
-  </tr>
-  <% if @loyal_core_skin_recipes.to_a.any? %>
-    <% @loyal_core_skin_recipes.each do |recipe| %>
-      <tr>
-        <td><%= recipe.id %></td>
-        <td><%= link_to "#{recipe.name}", loyal_core_app.admin_skin_recipe_url(:id => recipe.id) %></td>
-        <td>
-          <% if recipe.creator %>
-            <%= link_to "#{recipe.creator.nick_name}", loyal_passport_app.admin_user_url(:id => recipe.creator.id) %>
-          <% else %>
-              未知
-          <% end %>
-        </td>
-        <td>
-          <%= link_to "编辑", loyal_core_app.edit_admin_skin_recipe_url(:id => recipe.id) %>
-          <%= link_to "删除", loyal_core_app.admin_skin_recipe_url(:id => recipe.id), :method => :delete, :confirm => '确定要删除吗？' %>
-        </td>
-      </tr>
-    <% end %>
-  <% else %>
-    列表为空
-  <% end %>
-</table>
-
-<%= paginate @loyal_core_skin_recipes %>
-
-<%= link_to "new", loyal_core_app.new_admin_skin_recipe_url %>

data/app/views/loyal_core/admin/skin/recipes/new.html.erb

@@ -1,11 +0,0 @@
-<h1>新建新皮肤</h1>
-
-<%= form_for(
-  @loyal_core_skin_recipe,
-  :url => loyal_core_app.admin_skin_recipes_url,
-  :builder => ::LoyalCore::ActionView::LabeledBuilder,
-  :as => :loyal_core_skin_recipe
-) do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f } %>
-<% end %>
-

data/app/views/loyal_core/admin/skin/recipes/show.html.erb

@@ -1,16 +0,0 @@
-<h1>【皮肤】 <%= @loyal_core_skin_recipe.name %></h1>
-
-<div>
-  <b>短标题</b><%= @loyal_core_skin_recipe.short_name %><br/>
-  <b>路径</b><%= @loyal_core_skin_recipe.assets_path %><br/>
-  <b>样式表</b><%= @loyal_core_skin_recipe.stylesheet_text %><br/>
-  <b>简介</b><%= @loyal_core_skin_recipe.instroduction %><br/>
-  <b>描述</b><%= @loyal_core_skin_recipe.description %><br/>
-
-  <b>描述</b>
-  <%= image_tag @loyal_core_skin_recipe.avatar.url(:small) %>
-</div>
-
-
-<%= link_to "编辑", loyal_core_app.edit_admin_skin_recipe_url(:id => @loyal_core_skin_recipe.id) %>
-<%= link_to "返回列表", loyal_core_app.admin_skin_recipes_url %>