unidom-category 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e41e4d7a1eeed5e84e2fd0cda7254154d4f0b3e8
-  data.tar.gz: cbd399798cdcf795b4a06a6b5b531056dc47aa0a
+  metadata.gz: 93576c414117bd512f8cc34e2f744098d23f4306
+  data.tar.gz: 17bae303105dae01da620ec1f3a43d9ed7f96e9d
 SHA512:
-  metadata.gz: 107829d2a32ade295954b14eb752dc3330a362c0fb4489a283599aab99a41649e5252476b4c373256afe1bfa248232f9aadc0d1eb1426cf4421838f6f1ed4300
-  data.tar.gz: e7512d4c70d4a17194c887933689477b895fea5e7d11db676c24f419345a4f970f7fab2e6e2f957037038b9dcb0435ee6f520aa17b373f02259245f29e0c7009
+  metadata.gz: e98a45ffb2ce9c06fcdadbc17ef584de584bd21f71f856dd2bdefce3c0757691aed825f671f83f72df4ec6da0c6416ed8256a285ae508ef47b730afb47a6b6d2
+  data.tar.gz: 15decf5e34ddb8572a3069179f82b5838cd47deca2a65e2701e0daf29cc78b4df05be965033f601446c26f7d947b68f6056f64156cfaceee85b9345ee05e70de

data/README.md

@@ -35,9 +35,18 @@ Unidom::Category::CategoryRollup.roll_up! child_category, into: parent_category,
 ## Include the Concerns
 ```ruby
 include Unidom::Category::Concerns::AsCategorized
+include Unidom::Category::Concerns::AsCategory
 ```
 
+### As Category concern
+The As Category concern do the following tasks for the includer automatically:  
+1. Define the has_many :categorizings macro as: ``has_many :categorizings, class_name: 'Category::Categorizing'``
+2. Define the #categorize! method as: ``categorize!(categorized, at: Time.now, primary: true)``
+3. Define the #categorize? method as: ``categorize?(categorized, at: Time.now, primary: true)``
+
 ### As Categorized concern
 The As Categorized concern do the following tasks for the includer automatically:  
 1. Define the has_many :categorizings macro as: ``has_many :categorizings, class_name: 'Unidom::Category::Categorizing', as: :categorized``
 2. Define the has_many :categories macro as: ``has_many :categories, through: :categorizings, source: :category``
+3. Define the #is_categorized! method as: ``is_categorized!(into: nil, at: Time.now, primary: true)``
+4. Define the #is_categorized? method as: ``is_categorized?(into: nil, at: Time.now, primary: true)``

data/app/models/unidom/category/categorizing.rb

@@ -17,7 +17,7 @@ class Unidom::Category::Categorizing < ActiveRecord::Base
   #end
 
   def self.categorize!(categorized, into: nil, at: Time.now)
-    self.categorized_is(categorized).category_is(into).valid_at.alive.first_or_create! elemental: true, opened_at: at
+    categorized_is(categorized).category_is(into).valid_at.alive.first_or_create! elemental: true, opened_at: at
   end
 
 end

data/app/models/unidom/category/category.rb

@@ -5,6 +5,7 @@ class Unidom::Category::Category < ActiveRecord::Base
   self.table_name = 'unidom_categories'
 
   include Unidom::Common::Concerns::ModelExtension
+  include Unidom::Category::Concerns::AsCategory
 
   validates :name,         presence:    true, length: { in: 2..self.columns_hash['name'].limit         }
   validates :abbreviation, allow_blank: true, length: { in: 2..self.columns_hash['abbreviation'].limit }
@@ -17,16 +18,8 @@ class Unidom::Category::Category < ActiveRecord::Base
   has_many :descendant_category_rollups, class_name: 'Unidom::Category::CategoryRollup', foreign_key: :ancestor_category_id, source: :ancestor_category
   has_many :descendant_categories,       class_name: 'Unidom::Category::Category',       through:     :descendant_category_rollups
 
-  has_many :categorizings, class_name: 'Category::Categorizing'
-
   scope :scheme_is,          ->(scheme) { where scheme_id: (scheme.respond_to?(:id) ? scheme.id : scheme )    }
   scope :code_length_is,     ->(length) { where 'LENGTH(code) = :code_length',  code_length:       length     }
   scope :code_starting_with, ->(prefix) { where 'code LIKE :prefix_expression', prefix_expression: prefix+'%' }
 
-  def categorize!(categorized, primary: false, at: Time.now)
-    raise ArgumentError('The categorized argument is required.') if categorized.blank?
-    raise ArgumentError('The at argument is required.'         ) if at.blank?
-    categorizings.create! categorized: categorized, elemental: primary, opened_at: at
-  end
-
 end

data/app/models/unidom/category/concerns/as_categorized.rb

@@ -2,11 +2,29 @@ module Unidom::Category::Concerns::AsCategorized
 
   extend ActiveSupport::Concern
 
-  self.included do |includer|
+  included do |includer|
 
     has_many :categorizings, class_name: 'Unidom::Category::Categorizing', as:     :categorized
     has_many :categories,    through:    :categorizings,                   source: :category
 
+    def is_categorized!(into: nil, at: Time.now, primary: true)
+
+      raise ArgumentError('The into argument is required.') if into.blank?
+      raise ArgumentError('The at argument is required.'  ) if at.blank?
+
+      categorizings.category_is(into).valid_at(now: at).alive.first_or_create! elemental: primary, opened_at: at
+
+    end
+
+    def is_categorized?(into: nil, at: Time.now, primary: true)
+
+      raise ArgumentError('The into argument is required.') if into.blank?
+      raise ArgumentError('The at argument is required.'  ) if at.blank?
+
+      categorizings.category_is(into).valid_at(now: at).alive.primary(primary).exists?
+
+    end
+
   end
 
 end

data/app/models/unidom/category/concerns/as_category.rb

@@ -0,0 +1,29 @@
+module Unidom::Category::Concerns::AsCategory
+
+  extend ActiveSupport::Concern
+
+  included do |includer|
+
+    has_many :categorizings, class_name: 'Category::Categorizing'
+
+    def categorize!(categorized, at: Time.now, primary: true)
+
+      raise ArgumentError('The categorized argument is required.') if categorized.blank?
+      raise ArgumentError('The at argument is required.'         ) if at.blank?
+
+      categorizings.categorized_is(categorized).valid_at(now: at).alive.first_or_create! elemental: primary, opened_at: at
+
+    end
+
+    def categorize?(categorized, at: Time.now, primary: true)
+
+      raise ArgumentError('The categorized argument is required.') if categorized.blank?
+      raise ArgumentError('The at argument is required.'         ) if at.blank?
+
+      categorizings.categorized_is(categorized).valid_at(now: at).alive.primary(primary).exists?
+
+    end
+
+  end
+
+end

data/lib/unidom/category/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Category
-    VERSION = '1.1'.freeze
+    VERSION = '1.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-category
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -45,6 +45,7 @@ files:
 - app/models/unidom/category/category_rollup.rb
 - app/models/unidom/category/category_scheme.rb
 - app/models/unidom/category/concerns/as_categorized.rb
+- app/models/unidom/category/concerns/as_category.rb
 - app/views/layouts/unidom/category/application.html.erb
 - config/routes.rb
 - db/migrate/20000301000000_create_unidom_category_schemes.rb