pluto-models 1.5.6 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a0663eac6b904175fa19f44ef8e8cab03ace783
-  data.tar.gz: 9808033aa822c1130b10c2ad0c08022c60010c7f
+  metadata.gz: 9ad742c8fd3f916716ace3acb90d1c1a7371b77e
+  data.tar.gz: fc7a5f6e1b85585b9efb2c34848b04274f80f528
 SHA512:
-  metadata.gz: 904c17ecd34ca841c3f82b9943f976703225ff05e60bb77e2f189a0fc4c6bc4f8582cd639b48a70fad576057016643c373ffc0174a0815695b8b512320732083
-  data.tar.gz: 248aff5771ae6f72fdd94c05b64ab4b209c493ae4fc24e0dc35c469520392f07377daab7fa1bb1edc08104faa031f1fcd0da114e8d00ec878718961de48b00df
+  metadata.gz: 17db570f9d9987f8aa6fdc5addeca4eebad1d4a9aeef59b244a2dd8c7e7c25f3bf13018290b300583ea50c08d069ea591894de8367ad441e3907a0c679cdf233
+  data.tar.gz: 870555443a637ee053c2eeb164998f35f8007cce25930c948bae3615f9d7948fcd6712a9b0a12459f369b97ba45a8ef2f1e93bc155586aa323586d78a949a8a3

data/Rakefile

@@ -18,11 +18,12 @@ Hoe.spec 'pluto-models' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['props',         '>= 1.2.0'],
-    ['logutils',      '>= 0.6.1'],
-    ['feedparser',    '>= 2.1.2'],
-    ['feedfilter',    '>= 1.1.1'],
-    ['textutils',     '>= 1.4.0'],
+    ['props',          '>= 1.2.0'],
+    ['logutils',       '>= 0.6.1'],
+    ['feedparser',     '>= 2.1.2'],
+    ['feedfilter',     '>= 1.1.1'],
+    ['date-formatter', '>= 0.1.1'],
+    ['textutils',      '>= 1.4.0'],
     ['activerecord'],
     ['logutils-activerecord', '>= 0.2.1'],
     ['props-activerecord',    '>= 0.2.0'],

data/lib/pluto/models.rb

@@ -8,6 +8,7 @@ require 'uri'
 require 'pp'
 require 'fileutils'
 require 'date'
+require 'time'
 require 'digest/md5'
 
 require 'logger'             # Note: use for ActiveRecord::Base.logger = Logger.new( STDOUT ) for now
@@ -22,6 +23,7 @@ require 'logutils'
 require 'textutils'
 require 'feedparser'
 require 'feedfilter'
+require 'date/formatter'
 
 
 ## add more activerecords addons/utils
@@ -110,7 +112,7 @@ module Pluto
   #########################################
   ## let's put test configuration in its own namespace / module
   class Test    ## todo/check: works with module too? use a module - why? why not?
-  
+
     ####
     #  todo/fix:  find a better way to configure shared test datasets - why? why not?
     #    note: use one-up (..) directory for now as default - why? why not?

data/lib/pluto/models/feed.rb

@@ -41,7 +41,7 @@ class Feed < ActiveRecord::Base
   ##################################
   # attribute reader aliases
   #
-  #  note: CANNOT use alias_method :name, :title 
+  #  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)
@@ -60,7 +60,7 @@ class Feed < ActiveRecord::Base
   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
@@ -70,37 +70,58 @@ class Feed < ActiveRecord::Base
   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?
+  ##    ~~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()    read_attribute_w_fallbacks( :updated,   :published );  end
+  def published()  read_attribute_w_fallbacks( :published, :updated, );   end
+
   def updated?()   updated.present?;  end
-  
+  def published?() published.present?;  end
+
+  #############
+  #  add convenience date attribute helpers / readers
+  #  - what to return if date is nil? - return nil or empty string or 'n/a' or '?' - why? why not?
+  #
+  # date
+  # date_iso   |  date_iso8601
+  # date_822   |  date_rfc2822 | date_rfc822
+
+  def date()        updated; end
+
+  def date_iso()    date ? date.iso8601 : ''; end
+  alias_method :date_iso8601, :date_iso
+
+  def date_822()    date ? date.rfc822 : ''; end
+  alias_method :date_rfc2822, :date_822
+  alias_method :date_rfc822,  :date_822
+
+
   ## "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 published()   @feed.read_attribute(:published); end         # "regular" published incl. updated fallback
     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 data()   @data ||= Data.new( self ); end
+
+
   def deep_update_from_struct!( data )
 
     logger = LogUtils::Logger.root
@@ -207,8 +228,8 @@ class Feed < ActiveRecord::Base
         published:      data.published,
         summary:        data.summary,
         generator:      data.generator.to_s,    ## note: use single-line/string generator stringified -- might return null (if no data)
- 
-        ## note: always auto-update auto_* fields for now 
+
+        ## note: always auto-update auto_* fields for now
         auto_title:     data.title,
         auto_url:       data.url,
         auto_feed_url:  data.feed_url,

data/lib/pluto/models/item.rb

@@ -42,25 +42,47 @@ class Item < ActiveRecord::Base
 
   ## 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
+  ##    ~~do NOT use fallback for published / created    -- why? why not?~~
+  def updated()    read_attribute_w_fallbacks( :updated, :published ); end
+  def published()  read_attribute_w_fallbacks( :published, :updated ); end
+
+  def updated?()   updated.present?;   end
+  def published?() published.present?; end
+
+  #############
+  #  add convenience date attribute helpers / readers
+  #  - what to return if date is nil? - return nil or empty string or 'n/a' or '?' - why? why not?
+  #
+  # date
+  # date_iso   |  date_iso8601
+  # date_822   |  date_rfc2822 | date_rfc822
+
+  def date()        updated; end
+
+  def date_iso()    date ? date.iso8601 : ''; end
+  alias_method :date_iso8601, :date_iso
+
+  def date_822()    date ? date.rfc822 : ''; end
+  alias_method :date_rfc2822, :date_822
+  alias_method :date_rfc822,  :date_822
+
 
   ## "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 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 data()   @data ||= Data.new( self ); end
+
 
   def update_from_struct!( data )
 

data/lib/pluto/version.rb

@@ -3,8 +3,8 @@
 module Pluto
 
   MAJOR = 1
-  MINOR = 5
-  PATCH = 6
+  MINOR = 6
+  PATCH = 0
   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.6
+  version: 1.6.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: date-formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: textutils
   requirement: !ruby/object:Gem::Requirement