dhatu 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fa0a222775b06b12a71c3ee569d4f7143f5d6aa
-  data.tar.gz: 9723db066cfbdec803a21f9afc085b2446672914
+  metadata.gz: 310d2306a14f602500128b494f6ee13378836145
+  data.tar.gz: ffad0ed3f1b05f4a582c282c359b827fc2dfca13
 SHA512:
-  metadata.gz: bd1d3ab466efa68e245050534e7e945fc038a167d33683944894d41f9ffdb812561050c9acf08a3c0838e1b65aeb30557d8d78351c1b979a876f44095b754dcc
-  data.tar.gz: 69a608697a1e2754d06db47e02e5d703d95a03aa4a6fc8dd97f1cf6d19040712ad443cd3c06de7e2a511ac285cdd66b751f1a946e007a5f065f6530eca38151a
+  metadata.gz: 4d206c07bb298481e3b79fb2367735f4c9525f90a856e6c0be8414452b63866b411653c63db43bab70472fc639e7c9ed8e1289b4a7dfd089ff1221ec56de73c1
+  data.tar.gz: 86edc9cd171fdeba5e76515bf0986e1fa9d89da322bb40e85d56abba41a35665255de707db64ea60a4cb8124ab25c9aaaad4d33eeef7f319d5e13c62714957f4

data/app/models/dhatu/category.rb

@@ -1,26 +1,11 @@
-class Dhatu::Category < ApplicationRecord
+class Dhatu::Category < Dhatu::ApplicationRecord
 
-  # Constants
-  PUBLISHED = "published"
-  UNPUBLISHED = "unpublished"
-  REMOVED = "removed"
-  
-  STATUS = { 
-    PUBLISHED => "Published", 
-    UNPUBLISHED => "Un-Published", 
-    REMOVED => "Removed"
-  }
-
-  STATUS_REVERSE = { 
-    "Published" => PUBLISHED,
-    "Un-Published" => UNPUBLISHED,
-    "Removed" => REMOVED
-  }
-  
-  FEATURED = {"Featured" => true, "Non Featured" => false}
-  FEATURED_REVERSE = {true => "Featured", false => "Non Featured"}
+  # Set Table Name
+  self.table_name = "categories"
 
-  EXCLUDED_JSON_ATTRIBUTES = [:created_at, :updated_at, :parent_id, :top_parent_id]
+  # Including the State Machine Methods
+  include Publishable
+  include Featureable
 
   # Callbacks
   before_validation :generate_permalink, on: :create
@@ -32,6 +17,7 @@ class Dhatu::Category < ApplicationRecord
   validate_string :name, mandatory: true, min_length: 2, format: /.*/i
   validate_string :one_liner, mandatory: false, format: /.*/i
   validate_string :permalink, mandatory: true, format: /.*/i, min_length: 4, max_length: 128
+  validates :category_type, :presence=> true, length: {maximum: 64}
   validates :status, :presence=> true, :inclusion => {:in => STATUS.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
 
   # Associations
@@ -39,11 +25,7 @@ class Dhatu::Category < ApplicationRecord
   belongs_to :top_parent, :class_name => 'Dhatu::Category', optional: true
   has_many :sub_categories, :foreign_key => "parent_id", :class_name => "Dhatu::Category"
   has_one :category_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::CategoryImage"
-  has_many :classified_attributes
-
-  has_one :category_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::CoverImage"
-  has_many :gallery_images, :as => :imageable, :dependent => :destroy, :class_name => "Image::GalleryImage"
-
+  
   # ---------------
   # Class methods
   # ---------------
@@ -120,60 +102,6 @@ class Dhatu::Category < ApplicationRecord
     # Hash[*json.map{|k, v| [k, v || ""]}.flatten]
   end
 
-  # Status methods
-  # ------------------
-
-  # * Return true if the category is published, else false.
-  # == Examples
-  #   >>> category.published?
-  #   => true
-  def published?
-    (status == PUBLISHED)
-  end
-
-  # change the status to :published
-  # Return the status
-  # == Examples
-  #   >>> category.publish!
-  #   => "published"
-  def publish!
-    self.update_attribute(:status, PUBLISHED)
-  end
-
-  # * Return true if the category is unpublished, else false.
-  # == Examples
-  #   >>> category.unpublished?
-  #   => true
-  def unpublished?
-    (status == UNPUBLISHED)
-  end
-
-  # change the status to :unpublished
-  # Return the status
-  # == Examples
-  #   >>> category.unpublish!
-  #   => "unpublished"
-  def unpublish!
-    self.update_attribute(:status, UNPUBLISHED)
-  end
-
-  # * Return true if the category is removed, else false.
-  # == Examples
-  #   >>> category.removed?
-  #   => true
-  def removed?
-    (status == REMOVED)
-  end
-
-  # change the status to :removed
-  # Return the status
-  # == Examples
-  #   >>> category.remove!
-  #   => "removed"
-  def remove!
-    self.update_attribute(:status, REMOVED)
-  end
-
   # Other Methods
   # ------------------
 
@@ -199,21 +127,6 @@ class Dhatu::Category < ApplicationRecord
     true
   end
 
-  def can_be_published?
-    unpublished? or removed?
-  end
-
-  def can_be_unpublished?
-    return false if end_node == false or self.sub_categories.any?
-    published? or removed?
-  end
-
-  def can_be_removed?
-    return false if parent.nil?
-    return false if end_node == false or self.sub_categories.any?
-    published? or unpublished?
-  end
-
   # Callback methods
   # ------------------
 

data/app/views/dhatu/categories/_form.html.erb

@@ -13,7 +13,7 @@
 
         <%
           @category.parent_id = params[:parent_id] if params[:parent_id]
-          categories = Category.select("id, name").order("name ASC").all
+          categories = Dhatu::Category.select("id, name").order("name ASC").all
         %>
 
         <% options = {assoc_collection: categories, required: false, editable: true, assoc_display_method: :name} %>

data/app/views/dhatu/categories/_index.html.erb

@@ -8,13 +8,13 @@
       
       <%= theme_button('Refresh', 'refresh', categories_path(parent_id: @current_category.try(:id)), classes: "pull-left mr-10", btn_type: "white") %>
 
-      <%  if @current_category.try(:id) && @current_user.has_create_permission?(Category) %>
+      <%  if @current_category.try(:id) && @current_user.has_create_permission?(Dhatu::Category) %>
       <%= theme_button('Add a Category', 'plus', new_category_path(parent_id: @current_category.try(:id)), classes: "pull-left mr-10", btn_type: "success") %>
       <% end %>
 
     </div>
     <div class="col-md-6">
-      <%= search_form_kuppayam(Category, categories_path, text: @filters[:query]) %>
+      <%= search_form_kuppayam(Dhatu::Category, categories_path, text: @filters[:query]) %>
     </div>
   </div>
 </div>

data/lib/dhatu/version.rb

@@ -1,3 +1,3 @@
 module Dhatu
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhatu
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails