pluto-models 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dc5aa4141dc5811830ce90d548dc3b05ae5ff4c
-  data.tar.gz: 4d6bfc0a9a620004e7e09215468312c72a2e51fc
+  metadata.gz: 130a00b3f9926f5fa58ef2ebe579cb8385470fbf
+  data.tar.gz: 18370f946a0c4b75f55e9e44dc05413eecfa5249
 SHA512:
-  metadata.gz: 3f3cf79712f23621db6c6233f5a7a9f9d298500a180c89799f277ec7b057a99b94608b860a679da120525c84ba0bd1a4d371d98e1170fc3551db8b8244099bbc
-  data.tar.gz: 7827e45cd16a5e18aecd77f322143bf82b61e86a0312b47c9cf275fb45404eaddeee1772413494e175ed3e016a0e51f67e84c99aae286edd3a6fc72a6a6c9a9e
+  metadata.gz: 2eface997f389867f36ace7f5808cdde94414f1602afec1f1364f9a54557974230a2c4573410e2435927e33476755ca2cb331ce08fd3670932f62a157bfb55eb
+  data.tar.gz: 3422e1d6aaeb21241a7ed94d9463d5cdedc8526657a95b4ff1637710f56e0dad427fe9f559b4098f8b64508068b36237736b122a56ede00e2a138f7392521016

data/Manifest.txt

@@ -2,7 +2,6 @@ HISTORY.md
 Manifest.txt
 README.md
 Rakefile
-lib/pluto/activerecord.rb
 lib/pluto/connecter.rb
 lib/pluto/models.rb
 lib/pluto/models/feed.rb

data/Rakefile

@@ -26,6 +26,7 @@ Hoe.spec 'pluto-models' do
     ['logutils-activerecord', '>= 0.2.0'],
     ['props-activerecord',    '>= 0.1.0'],
     ['activityutils',         '>= 0.1.0'],
+    ['activerecord-utils',    '>= 0.2.0'],
   ]
 
 

data/lib/pluto/models.rb

@@ -23,6 +23,7 @@ require 'feedutils'
 require 'textutils'
 
 ## add more activerecords addons/utils
+require 'activerecord/utils'     # add macros e.g. read_attr_w_fallbacks etc.
 require 'activityutils'
 require 'props/activerecord'
 require 'logutils/activerecord'

data/lib/pluto/models/feed.rb

@@ -7,8 +7,6 @@ module Pluto
 class Feed < ActiveRecord::Base
   self.table_name = 'feeds'
 
-  include Pluto::ActiveRecordMethods  # e.g. read_attribute_w_fallbacks
-
   has_many :items
   has_many :subscriptions
   has_many :sites, :through => :subscriptions

data/lib/pluto/models/item.rb

@@ -6,8 +6,6 @@ module Pluto
 class Item < ActiveRecord::Base
   self.table_name = 'items'
 
-  include Pluto::ActiveRecordMethods  # e.g. read_attribute_w_fallbacks
-
   belongs_to :feed
 
   ##################################

data/lib/pluto/version.rb

@@ -4,7 +4,7 @@ module Pluto
 
   MAJOR = 1
   MINOR = 2
-  PATCH = 1
+  PATCH = 2
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -16,10 +16,6 @@ module Pluto
     "pluto-models/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
   end
 
-  def self.generator   # convenience alias for banner (matches HTML generator meta tag)
-    "Pluto #{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-  end
-
   def self.root
     "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pluto-models
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Gerald Bauer
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: activerecord-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +178,6 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
-- lib/pluto/activerecord.rb
 - lib/pluto/connecter.rb
 - lib/pluto/models.rb
 - lib/pluto/models/feed.rb

data/lib/pluto/activerecord.rb

@@ -1,18 +0,0 @@
-module Pluto
-
-module ActiveRecordMethods
-
-  def read_attribute_w_fallbacks( *keys )
-    ### todo: use a different name e.g.:
-    ##   read_attribute_cascade ??  - does anything like this exists already?
-    ## why? why not?
-    keys.each do |key|
-      value = read_attribute( key )
-      return value unless value.nil?
-    end
-    value # fallthrough? return latest value (will be nil)
-  end
-
-
-end # module ActiveRecordMethods
-end # module Pluto