active_content 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95694815bebd13b3b30d8b1d065d6b04dce20877
-  data.tar.gz: 6cc2f2055d69201c469dafd1c8cac6e989b57930
+  metadata.gz: d60c817352bd84ece447640c005b19fa387d2949
+  data.tar.gz: cd81840e8c606e71f216a3aef698635f78f55bc6
 SHA512:
-  metadata.gz: eb88e592627b511a9a56641cb1ff48e7a88fbb22ba3446fc7fe588c92850ee3d8379163b92aada99a2afb5e905d05934befb04b209679ec550f33537cfba09f8
-  data.tar.gz: 57618528440456b8cfaf98a388115dc1d425b247185fb318670f4c97a7bbc7f91152bec1fb72abf169c0e123f7c74fcdde4cd709ef020e616ffc70e2c9ddf516
+  metadata.gz: a7f591a16993b72bb4c9a1f404bd08363f61c7c482db47861b7c663535bcb8aa5e64d8ac5d967f1d2b4e0bc154ace717788a1856e5079ff3459e380edf3f2a00
+  data.tar.gz: 23d890828c76d054afa886cba0d61bb0c505b38e076e31533957d28590413f8136cf4d1ad7a9c98f0557dbbb4fccea63ca84a199426f9b259dddb09631eb28ac

data/lib/active_content/metable.rb

@@ -8,14 +8,14 @@ module ActiveContent
 
         assoc_opts = { as: :metable, class_name: 'ActiveContent::Metum', autosave: true, dependent: :destroy }
         assoc_proc = -> { where field: field }
-        value_opts = { to: :"#{field}_metum", prefix: field, alias: field, default: options[:default] }
+        value_opts = options.merge(to: :"#{field}_metum", prefix: field, alias: field)
 
         has_one :"#{field}_metum", assoc_proc, assoc_opts
         delegate_attribute :value, cast_type, value_opts
 
         before_save do
           current = send(field)
-          default = self.class.column_defaults["#{field}"]
+          default = self.class.try(:"_attribute_#{field}_value_default")
 
           if current.blank? or current == default
             send :"#{field}_metum=", nil

data/lib/active_content/models/profile.rb

@@ -7,4 +7,11 @@ class ActiveContent::Profile < ApplicationRecord
 
   # Mount carrierwave uploader
   mount_uploader :image
+
+  # Name composed by first and last name
+  def name
+    if first_name or last_name
+      "#{first_name} #{last_name}".strip
+    end
+  end
 end

data/lib/active_content/models/taxonomy.rb

@@ -4,4 +4,7 @@ class ActiveContent::Taxonomy < ApplicationRecord
 
   # Define validations
   validates :name, presence: true
+
+  # Has associations
+  has_many :taxonomizations
 end

data/lib/active_content/profileable.rb

@@ -20,12 +20,6 @@ module ActiveContent
           end
         end
 
-        define_method :name do
-          if first_name or last_name
-            "#{first_name} #{last_name}".strip
-          end
-        end
-
         define_method :gravatar do |size=48, default='mm'|
           mail = try(:email)
           hash = Digest::MD5::hexdigest(mail) unless mail.nil?

data/lib/active_content/relatable.rb

@@ -8,16 +8,17 @@ module ActiveContent
         assoc_opts = { as: :relatable, class_name: 'ActiveContent::Relation', autosave: true, dependent: :destroy }
         assoc_proc = -> { where field: field }
 
+        default  = options.delete(:default)
         multiple = options.delete(:multiple)
-        defaults = options.reverse_merge(class_name: "#{name}".classify, source: :item, source_type: assoc_type)
+        options  = options.reverse_merge(class_name: "#{name}".classify, source: :item, source_type: assoc_type)
 
         if multiple
-          options = defaults.merge(through: :"#{field}_relations")
+          options = options.merge(through: :"#{field}_relations")
 
           has_many options[:through], assoc_proc, assoc_opts
           has_many :"#{field}", options
         else
-          options = defaults.merge(through: :"#{field}_relation")
+          options = options.merge(through: :"#{field}_relation")
 
           has_one options[:through], assoc_proc, assoc_opts
           has_one :"#{field}", options
@@ -30,6 +31,21 @@ module ActiveContent
             send :"#{field}=", "#{name}".classify.constantize.find_by_id(value)
           end
         end
+
+        if default
+          relation_method  = :"_relation_#{field}_default"
+          relation_default = default
+
+          define_singleton_method relation_method do
+            relation_default
+          end
+
+          after_initialize do |record|
+            if record.try(:"#{field}").blank?
+              record.send(:"#{field}=", self.class.try(relation_method))
+            end
+          end
+        end
       end
     end
   end

data/lib/active_content/taxonomizable.rb

@@ -4,7 +4,7 @@ module ActiveContent
 
     class_methods do
       def has_taxonomy(name, options={})
-        options = options.reverse_merge(class_name: name.to_s.classify, source: :taxonomy)
+        options = options.reverse_merge(class_name: "#{name}".classify, source: :taxonomy)
         options = options.merge(through: :"#{name}_taxonomizations")
         setting = { as: :taxonomizable, class_name: 'ActiveContent::Taxonomization', autosave: true, dependent: :destroy }
 
@@ -37,6 +37,13 @@ module ActiveContent
           ids.empty? ? query.where(blank) : query.where(blank).or(query.where.not(id))
         end
       end
+
+      def has_taxonomized(name, options={})
+        assoc_name = "#{name}".pluralize
+        assoc_type = (options[:class_name] || "#{name}".classify).constantize.base_class.name
+
+        has_many :"#{assoc_name}", through: :taxonomizations, source: :taxonomizable, source_type: "#{assoc_type}"
+      end
     end
   end
 end

data/lib/active_content/templatable.rb

@@ -10,24 +10,11 @@ module ActiveContent
         enumerize :template, in: templates, predicates: { prefix: true }
 
         has_one :view_template, as: :templatable, class_name: 'ActiveContent::Template', autosave: true, dependent: :destroy
-        delegate_attribute :name, :string, to: :view_template, prefix: 'template', alias: :template
+        delegate_attribute :name, :string, to: :view_template, prefix: 'template', alias: :template, finder: true, scope: true
 
         before_save do
           self.view_template = nil if template.blank?
         end
-
-        query = self.includes(:view_template)
-        blank = { templates: { name: nil } }
-
-        scope :with_template, -> (*names) do
-          named = { templates: { name: names } }
-          names.empty? ? query.where.not(blank) : query.where(named)
-        end
-
-        scope :without_template, -> (*names) do
-          named = { templates: { name: names } }
-          names.empty? ? query.where(blank) : query.where(blank).or(query.where.not(named))
-        end
       end
     end
   end

data/lib/active_content/version.rb

@@ -1,3 +1,3 @@
 module ActiveContent
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_content
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Olibia Tsati
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord