pluto-models 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3b576a61254285708c3a75ec3723ddf5e5e99dd
-  data.tar.gz: 34e15ef65f13fbef5457e231fa823c3bcb2a1bd2
+  metadata.gz: 3a0663eac6b904175fa19f44ef8e8cab03ace783
+  data.tar.gz: 9808033aa822c1130b10c2ad0c08022c60010c7f
 SHA512:
-  metadata.gz: 1c57e421a46116fb8c8ad93aec9bd79ee4aca87a51dbdabde900fdbdd21b3c39272e8d9d40c21974c5714c7484706926354951c7f5d17f3bd6c1cc0d14fbdb30
-  data.tar.gz: 2a65d0ede84bac1c1004161fc5573779d6edb0e3bf80e851fcd7292ba1d3a903de7fd0ef9a51fc3f4494a17f77528617a4e17415a09668da6cec8671ec73af9d
+  metadata.gz: 904c17ecd34ca841c3f82b9943f976703225ff05e60bb77e2f189a0fc4c6bc4f8582cd639b48a70fad576057016643c373ffc0174a0815695b8b512320732083
+  data.tar.gz: 248aff5771ae6f72fdd94c05b64ab4b209c493ae4fc24e0dc35c469520392f07377daab7fa1bb1edc08104faa031f1fcd0da114e8d00ec878718961de48b00df

data/lib/pluto/models/feed.rb

@@ -41,50 +41,66 @@ class Feed < ActiveRecord::Base
   ##################################
   # attribute reader aliases
   #
-  #  todo: check if we can use alias_method :name, :title   - works for non-existing/on-demand-generated method too??
-
-  def name()        title;    end  # alias    for title
-  def description() summary;  end  # alias    for summary
-  def desc()        summary;  end  # alias(2) for summary
-  def subtitle()    summary;  end  # alias(3) for summary
-  def link()        url;      end  # alias    for url
-  def feed()        feed_url; end  # alias    for feed_url
-
-  def author_name()  author;  end # alias    for author
-  def owner_name()   author;  end # alias(2) for author
-  def owner()        author;  end # alias(3) for author
-  def author_email() email;   end # alias    for email
-  def author_email() email;   end # alias(2) for email
-
-
-  def url?()           read_attribute(:url).present?;       end
-  def title?()         read_attribute(:title).present?;     end
-  def feed_url?()      read_attribute(:feed_url).present?;  end
-
-  def url()      read_attribute_w_fallbacks( :url,      :auto_url );      end
-  def title()    read_attribute_w_fallbacks( :title,    :auto_title );    end
-  def feed_url() read_attribute_w_fallbacks( :feed_url, :auto_feed_url ); end
-
-  def summary?()      read_attribute(:summary).present?;  end
-
-
-  def updated?()    read_attribute(:updated).present?;    end
-  def published?()  read_attribute(:published).present?;  end
-
-  def updated
-    ## todo/fix: use a new name - do NOT squeeze convenience lookup into existing
-    #    db backed attribute
-    read_attribute_w_fallbacks( :updated, :published )
-  end
-
-  def published
-    ## todo/fix: use a new name - do NOT squeeze convenience lookup into existing
-    #    db backed attribute
-    read_attribute_w_fallbacks( :published, :updated )
-  end
-
-
-
+  #  note: CANNOT use alias_method :name, :title 
+  #         will NOT work for non-existing/on-demand-generated methods in activerecord
+  #
+  #   use rails alias_attribute :new, :old  (incl. reader/predicate/writer)
+  #   or use alias_attr, alias_attr_reader, alias_attr_writer from activerecord/utils
+
+  alias_attr_reader :name,         :title     # alias    for title
+  alias_attr_reader :description,  :summary   # alias    for summary
+  alias_attr_reader :desc,         :summary   # alias(2) for summary
+  alias_attr_reader :subtitle,     :summary   # alias(3) for summary
+  alias_attr_reader :link,         :url       # alias    for url
+  alias_attr_reader :feed,         :feed_url  # alias    for feed_url
+
+  alias_attr_reader :author_name,  :author    # alias    for author
+  alias_attr_reader :owner_name,   :author    # alias(2) for author
+  alias_attr_reader :owner,        :author    # alias(3) for author
+  alias_attr_reader :author_email, :email     # alias    for email
+  alias_attr_reader :author_email, :email     # alias(2) for email
+
+  
+  #################
+  ## attributes with fallbacks or (auto-)backups  - use feed.data.<attribute> for "raw" / "original" access
+  def url()        read_attribute_w_fallbacks( :url,      :auto_url );      end
+  def title()      read_attribute_w_fallbacks( :title,    :auto_title );    end
+  def feed_url()   read_attribute_w_fallbacks( :feed_url, :auto_feed_url ); end
+
+  def url?()       url.present?;       end
+  def title?()     title.present?;     end
+  def feed_url?()  feed_url.present?;  end
+  
+  ## note:
+  ##   only use fallback for updated, that is, updated (or published)
+  ##    do NOT use fallback for published / created    -- why? why not?
+  ##    add items_last_updated  to updated as last fall back - why? why not?
+  def updated()    read_attribute_w_fallbacks( :updated, :published );  end
+  def updated?()   updated.present?;  end
+  
+  ## "raw"  access via data "proxy" helper
+  ## e.g. use  feed.data.updated
+  ##           feed.data.updated? etc.
+  class Data
+    def initialize( feed ) @feed = feed; end
+    
+    def url()         @feed.read_attribute( :url );      end      # "regular" url incl. auto_url fallback / (auto-)backup
+    def title()       @feed.read_attribute( :title );    end
+    def feed_url()    @feed.read_attribute( :feed_url );  end
+    def url?()        url.present?;       end
+    def title?()      title.present?;     end
+    def feed_url?()   feed_url.present?;  end
+    
+    def updated()     @feed.read_attribute(:updated); end           # "regular" updated incl. published fallback
+    def published()   @feed.read_attribute(:published); end   
+    def updated?()    updated.present?;    end
+    def published?()  published.present?;  end
+  end # class Data
+  ## use a different name for data - why? why not?
+  ##    e.g. inner, internal, readonly or r, raw, table, direct, or ???
+  def data()   @data ||= Data.new( self ); end    
+  
+  
   def deep_update_from_struct!( data )
 
     logger = LogUtils::Logger.root
@@ -158,13 +174,12 @@ class Feed < ActiveRecord::Base
       #  update  cached value last published for item
       ##  todo/check: force reload of items - why? why not??
       last_item_rec = items.latest.limit(1).first  # note limit(1) will return relation/arrar - use first to get first element or nil from ary
-      if last_item_rec.present?
-        if last_item_rec.updated?
+      if last_item_rec
+        if last_item_rec.updated?   ## note: checks for updated & published with attr_reader_w_fallback
           self.items_last_updated = last_item_rec.updated
           ## save!  ## note: will get save w/ update_from_struct!  - why? why not??
-        else # try published
-          self.items_last_updated = last_item_rec.published
-          ## save!  ## note: will get save w/ update_from_struct!  - why? why not??
+        else
+          ## skip - no updated / published present
         end
       end
     end  # check for if data.items.size > 0  (that is, feed has feed items/entries)
@@ -174,7 +189,6 @@ class Feed < ActiveRecord::Base
 
 
   def update_from_struct!( data )
-
     logger = LogUtils::Logger.root
 
 ##

data/lib/pluto/models/item.rb

@@ -26,10 +26,10 @@ class Item < ActiveRecord::Base
 
   ##################################
   # attribute reader aliases
-  def name()        title;    end  # alias for title
-  def description() summary;  end  # alias     for summary  -- also add descr shortcut??
-  def desc()        summary;  end  # alias (2) for summary  -- also add descr shortcut??
-  def link()        url;      end  # alias for url
+  alias_attr_reader :name,        :title      # alias for title
+  alias_attr_reader :description, :summary    # alias     for summary  -- also add descr shortcut??
+  alias_attr_reader :desc,        :summary    # alias (2) for summary  -- also add descr shortcut??
+  alias_attr_reader :link,        :url        # alias for url
 
 
   def self.latest
@@ -40,22 +40,27 @@ class Item < ActiveRecord::Base
     order( Arel.sql( "coalesce(items.updated,items.published,'1970-01-01') desc" ) )
   end
 
-  def updated?()    read_attribute(:updated).present?;  end
-  def published?()  read_attribute(:published).present?;  end   # note: published is basically an alias for created
-
-  def updated
-    ## todo/fix: use a new name - do NOT squeeze convenience lookup into existing
-    #    db backed attribute
-    read_attribute_w_fallbacks( :updated, :published )
-  end
-
-  def published
-    ## todo/fix: use a new name - do NOT squeeze convenience lookup into existing
-    #    db backed attribute
-    read_attribute_w_fallbacks( :published, :updated )
-  end
-
-
+  ## note:
+  ##   only use fallback for updated, that is, updated (or published)
+  ##    do NOT use fallback for published / created    -- why? why not?
+  def updated()  read_attribute_w_fallbacks( :updated, :published ); end
+  def updated?() updated.present?;  end
+
+  ## "raw"  access via data "proxy" helper
+  ## e.g. use  item.data.updated
+  ##           item.data.updated? etc.
+  class Data
+    def initialize( feed ) @item = item; end
+       
+    def updated()     @item.read_attribute(:updated); end           # "regular" updated incl. published fallback
+    def published()   @item.read_attribute(:published); end   
+    def updated?()    updated.present?;    end
+    def published?()  published.present?;  end
+  end # class Data
+  ## use a different name for data - why? why not?
+  ##    e.g. inner, internal, readonly or r, raw, table, direct, or ???
+  def data()   @data ||= Data.new( self ); end    
+  
 
   def update_from_struct!( data )
 

data/lib/pluto/models/site.rb

@@ -13,16 +13,17 @@ class Site < ActiveRecord::Base
   has_many :feeds, :through => :subscriptions
   has_many :items, :through => :feeds
 
+
   ##################################
   # attribute reader aliases
-  def name()        title;   end  # alias for title
+  alias_attr_reader  :name, :title          # alias for title
 
-  def owner_name()  author;  end  # alias    for author
-  def owner()       author;  end  # alias(2) for author
-  def author_name() author;  end  # alias(3) for author
+  alias_attr_reader  :owner_name,   :author   # alias    for author
+  alias_attr_reader  :owner,        :author   # alias(2) for author
+  alias_attr_reader  :author_name,  :author   # alias(3) for author
 
-  def owner_email()  email;  end  # alias    for email
-  def author_email() email;  end  # alias(2) for email
+  alias_attr_reader  :owner_email,  :email    # alias    for email
+  alias_attr_reader  :author_email, :email    # alias(2) for email
 
 
 

data/lib/pluto/version.rb

@@ -4,7 +4,7 @@ module Pluto
 
   MAJOR = 1
   MINOR = 5
-  PATCH = 5
+  PATCH = 6
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto-models
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props