bbs 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53f3093c331e334c5e6195734bed223cdc4e9e1a
-  data.tar.gz: '067806696393bb6e1efecaf9c491f04ff34b0786'
+  metadata.gz: 9d40fe869ca12a1eee1a92d410bec8b1cb37d04b
+  data.tar.gz: 237334dccf67bea241b9f9d4a38c4831bc926f62
 SHA512:
-  metadata.gz: d4627da3dd64d6b6e8e063c92ad15793c857f1f9c2d84cc6cf45bcdc5b8136b0185c9ac01a37a8e6c21211d8dec99e97b5a2793c8ff12d0e5d62612612627b8f
-  data.tar.gz: 63770c6ef0462fa226835cfd24c5cf30210f8f85f6e714ed329c4d51dd6393a81de53aa9cda07c49d8bc78c20e3a58c628a6a9aab29efc43935f90260561a1e6
+  metadata.gz: ff4e4e63e06e86f6e901c08b2715da18c557540d1328462e4f3926f87974c189782cb6c14a8507d3dd4402ce0fcbc762e9bc3deb08b893ccf1066ce56d69d8ee
+  data.tar.gz: 18e7d916f9647c1d52ed44f0e0f89bea0bd7a9fe28afc0f6afe91ca3e2d436519775fa9aecfc9776af38a422568cda9b0ed59c98d7827797351fc1ff2e61a7bf

data/README.md

@@ -48,6 +48,20 @@ Execute the above command will copy following files into your
 * config/locales/bbs.ja.yml
 * config/locales/bbs.en.yml
 
+### Generate User/UserProfile/Avatar models
+
+```bash
+$ rails g active_record:bbs User
+```
+
+Execute the above command will generate models(User, UserProfile and Avatar) and its migrations.
+
+Uncomment bbs config and specify user model name arbitrary.
+
+```ruby
+config.user_class = 'User'
+```
+
 ## View Components
 ### List categories
 

data/app/controllers/bbs/profiles_controller.rb

@@ -29,7 +29,7 @@ module Bbs
     private
 
     def profile_params
-      params.require(:user_profile).permit(Bbs::UserProfile.permitted_attributes)
+      params.require(:user_profile).permit(UserProfile.attribute_names.without(%w(id created_at updated_at)))
     end
   end
 end

data/app/models/bbs/comment.rb

@@ -1,7 +1,7 @@
 module Bbs
   class Comment < ::Bbs::ApplicationRecord
     belongs_to :topic, class_name: 'Bbs::Topic'
-    belongs_to :author, class_name: 'Bbs::User'
+    belongs_to :author, class_name: "::#{Bbs.config.user_class_name}"
 
     validates :title, :body, presence: true, allow_blank: false
   end

data/app/models/bbs/topic.rb

@@ -3,7 +3,7 @@ module Bbs
     has_many :comments, class_name: 'Bbs::Comment', dependent: :delete_all
 
     belongs_to :category, class_name: 'Bbs::Category'
-    belongs_to :author, class_name: 'Bbs::User'
+    belongs_to :author, class_name: "::#{Bbs.config.user_class_name}"
 
     validates :title, :body, presence: true, allow_blank: false
   end

data/app/views/bbs/profiles/edit.html.haml

@@ -2,7 +2,7 @@
   .bbs-form-group
     = f.label :avatar_url
 
-    = f.collection_radio_buttons :avatar_id, Bbs::Avatar.all, :id, :id do |r|
+    = f.collection_radio_buttons :avatar_id, Avatar.all, :id, :id do |r|
       = r.label { r.radio_button(style: 'width: 1em') + image_tag(r.object.image.url(:medium)) }
 
   .bbs-form-group

data/db/migrate/20170201092549_remove_bbs_user_profiles.rb

@@ -0,0 +1,5 @@
+class RemoveBbsUserProfiles < ActiveRecord::Migration[5.0]
+  def change
+    drop_table :bbs_user_profiles
+  end
+end

data/db/migrate/20170201092550_remove_bbs_users.rb

@@ -0,0 +1,5 @@
+class RemoveBbsUsers < ActiveRecord::Migration[5.0]
+  def change
+    drop_table :bbs_users
+  end
+end

data/db/migrate/20170201093926_remove_bbs_avatars.rb

@@ -0,0 +1,5 @@
+class RemoveBbsAvatars < ActiveRecord::Migration[5.0]
+  def change
+    drop_table :bbs_avatars
+  end
+end

data/lib/bbs/configuration.rb

@@ -2,7 +2,7 @@ module Bbs
   class Configuration
     attr_accessor :clamp_article_body, :login_path, :latest_topics_count,
                   :topics_per_page, :comments_per_page, :current_user,
-                  :authenticate_user
+                  :authenticate_user, :user_class, :user_profile_class, :avatar_class
 
     def clamp_article_body
       @clamp_article_body ||= 100
@@ -24,6 +24,9 @@ module Bbs
       @comments_per_page ||= 10
     end
 
+    def user_class; @user_class.constantize end
+    def user_class_name; @user_class end
+
     def current_user
       @current_user ||= :current_user
     end

data/lib/bbs/version.rb

@@ -1,3 +1,3 @@
 module Bbs
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/lib/generators/active_record/bbs_generator.rb

@@ -0,0 +1,69 @@
+require 'rails/generators/active_record'
+
+module ActiveRecord
+  module Generators
+    class BbsGenerator < ActiveRecord::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+
+      def generate_user
+        return unless invoke?
+
+        invoke('active_record:model', [@name]) unless model_file_exists?(@name) # we need blank User model
+        inject_into_user
+      end
+
+      def generate_user_profile
+        return unless invoke?
+
+        migration_template user_profile_migration_filename, "db/migrate/#{user_profile_migration_filename}"
+        template 'user_profile.rb', 'app/models/user_profile.rb' unless model_file_exists?('UserProfile')
+      end
+
+      def generate_avatar
+        return unless invoke?
+
+        migration_template avatar_migration_filename, "db/migrate/#{avatar_migration_filename}"
+        template 'avatar.rb', 'app/models/avatar.rb' unless model_file_exists?('Avatar')
+      end
+
+      private
+
+      def inject_into_user
+        inject_into_class model_path(@name), @name do
+          <<-RUBY
+  has_one :profile, class_name: 'UserProfile', dependent: :destroy
+
+  accepts_nested_attributes_for :profile
+
+  validates_associated :profile
+  validates_presence_of :profile
+          RUBY
+        end
+      end
+
+      def invoke?; behavior == :invoke end
+
+      def model_exists?(const)
+        Object.const_defined?(const) && const.constantize.ancestors.include?(ActiveRecord::Base)
+      end
+
+      def model_file_exists?(const)
+        File.exist?(model_path(const))
+      end
+
+      def user_profile_migration_filename
+        model_exists?('UserProfile') ? 'change_profile.rb' : 'create_profile.rb'
+      end
+
+      def avatar_migration_filename
+        model_exists?('Avatar') ? 'change_avatar.rb' : 'create_avatar.rb'
+      end
+
+      def model_path(model_name)
+        Rails.root.join('app', 'models', "#{model_name.underscore}.rb")
+      end
+
+      def user_model_name; @name.underscore end
+    end
+  end
+end

data/lib/generators/active_record/change_avatar.rb

@@ -0,0 +1,7 @@
+class ChangeAvatar < ActiveRecord::Migration<%= ["#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}"] %>
+  def self.up
+    change_table :avatars do |t|
+      t.attachment :avatar
+    end
+  end
+end

data/lib/generators/active_record/create_avatar.rb

@@ -0,0 +1,9 @@
+class CreateAvatar < ActiveRecord::Migration<%= "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" %>
+  def change
+    create_table :avatars do |t|
+      t.attachment :avatar
+
+      t.timestamps
+    end
+  end
+end

data/lib/generators/active_record/templates/avatar.rb

@@ -0,0 +1,7 @@
+class Avatar < ApplicationRecord
+  has_many :user_profiles, class_name: 'UserProfile'
+
+  has_attached_file :image, styles: {medium: '48x48>', thumb: '48x48>'}
+
+  validates_attachment_content_type :image, content_type: /\Aimage\/.*\z/
+end

data/lib/generators/active_record/templates/change_profile.rb

@@ -0,0 +1,14 @@
+class ChangeProfile < ActiveRecord::Migration<%= "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" %>
+  def up
+    change_table :user_profiles do |t|
+      t.integer :<%= user_model_name %>_id, null: false
+      t.string :avatar_url
+      t.string :nickname
+    end
+
+    add_foreign_key :user_profiles, :<%= user_model_name.pluralize %>, column: :<%= user_model_name %>_id
+  end
+
+  def down
+  end
+end

data/lib/generators/active_record/templates/create_avatar.rb

@@ -0,0 +1,9 @@
+class CreateAvatar < ActiveRecord::Migration<%= "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" %>
+  def change
+    create_table :avatars do |t|
+      t.attachment :image
+
+      t.timestamps
+    end
+  end
+end

data/lib/generators/active_record/templates/create_profile.rb

@@ -0,0 +1,13 @@
+class CreateProfile < ActiveRecord::Migration<%= "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" %>
+  def change
+    create_table :user_profiles do |t|
+      t.integer :<%= user_model_name %>_id, null: false
+      t.integer :avatar_id, null: false
+      t.string :nickname
+
+      t.timestamps
+    end
+
+    add_foreign_key :user_profiles, :<%= user_model_name.pluralize %>, column: :<%= user_model_name %>_id
+  end
+end

data/lib/generators/active_record/templates/user_profile.rb

@@ -0,0 +1,6 @@
+class UserProfile < ApplicationRecord
+  belongs_to :<%= user_model_name %>, class_name: '<%= @name %>'
+  belongs_to :avatar, class_name: 'Avatar'
+
+  validates :avatar_id, :nickname, presence: true, allow_blank: false
+end

data/lib/generators/bbs/templates/bbs.rb

@@ -6,7 +6,7 @@ Bbs.configure do |config|
   # If you set value `false`, never clamp line.
   #config.clamp_article_body = 10
 
-  # spedify sign in path
+  # specify sign in path
   #config.login_path = '/users/sign_in'
 
   # set number of latest topics inside component
@@ -18,6 +18,9 @@ Bbs.configure do |config|
   # set number of topics per page
   #config.comments_per_page = 10
 
+  # required: set user class name
+  #config.user_class = 'User'
+
   # set current_user method
   config.current_user = :current_user
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbs
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - ''
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -249,10 +249,21 @@ files:
 - db/migrate/20160928082713_create_bbs_avatars.rb
 - db/migrate/20160930093905_add_avatar_id_to_user.rb
 - db/migrate/20161028081055_rename_avatar_column.rb
+- db/migrate/20170201092549_remove_bbs_user_profiles.rb
+- db/migrate/20170201092550_remove_bbs_users.rb
+- db/migrate/20170201093926_remove_bbs_avatars.rb
 - lib/bbs.rb
 - lib/bbs/configuration.rb
 - lib/bbs/engine.rb
 - lib/bbs/version.rb
+- lib/generators/active_record/bbs_generator.rb
+- lib/generators/active_record/change_avatar.rb
+- lib/generators/active_record/create_avatar.rb
+- lib/generators/active_record/templates/avatar.rb
+- lib/generators/active_record/templates/change_profile.rb
+- lib/generators/active_record/templates/create_avatar.rb
+- lib/generators/active_record/templates/create_profile.rb
+- lib/generators/active_record/templates/user_profile.rb
 - lib/generators/bbs/config_generator.rb
 - lib/generators/bbs/templates/bbs.rb
 - lib/generators/bbs/views_generator.rb
@@ -277,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Summary of Bbs.