ddr-alerts 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bccb5289094adadc06ce25919db16539b09d98e
-  data.tar.gz: b8f64c0ce75d55fc86b97e24c9aef02bd95b1429
+  metadata.gz: 6b590d7401408eae1859827c6563648c83cf8545
+  data.tar.gz: d8cd1844a137ddb6700a6baa5924685a6f5f3e57
 SHA512:
-  metadata.gz: e52c260a0904c74658b4736a134e9eb7ae9247a51d726106224eaf9255e44f9702a2a4d367a3137795c0523d61097e22457e6b15cb1004b0f04c03821c87a6ca
-  data.tar.gz: 19db82669702d92e0257238c41c394f4e6018d91d8775b06004ebab5de194ad6e1e3090b66beab986b6a539ff488062de615a8edd02d86d089d80b4d641c7057
+  metadata.gz: 92b64450b0f0ddc7460236975ee19f4d9efa145fc26cc1a3ce8336e7dbce86b2b2b22422583c341ca1b5b73a150ddbffcd2be05ab13c4d5d6078b7d0d68fb1d1
+  data.tar.gz: 6e068337f78316a1ea5909f2f93dad2a3999d559b71b7256f6d2f4e2760088351046138f6414d143abc13c4932838c16a9551d54d291dba391fd9dc47147a271

data/README.md

@@ -37,14 +37,14 @@ then
 Ddr::Alerts contains a view partial (ddr/alerts/message/_alert_message.html.erb) that displays the alert messages.  This partial depends on
 the local 'alert_messages' to contain an array of Ddr::Alert::Message which are to be displayed.  Render this partial in the desired
 view / layout of your application, passing in the appropriate value for the 'alert_messages' local.  For example, override Blacklight's
-shared/_flash_messages.html.erb as shown below to include all active alert messages in the 'repository' context above the application's
+shared/_flash_messages.html.erb as shown below to include all active alert messages above the application's
 flash messages on each page:
 
 ```
 <div class="row">
   <div class="col-md-12">
     <div id="main-flashes">
-	  <%= render partial: '/ddr/alerts/message/alert_message', locals: { alert_messages: Ddr::Alerts::Message.active.repository } %>
+	  <%= render partial: '/ddr/alerts/message/alert_message', locals: { alert_messages: Ddr::Alerts::Message.active } %>
       <%= yield %>
     </div>
   </div>

data/db/migrate/20150130204030_drop_message_contexts_table.rb

@@ -0,0 +1,13 @@
+class DropMessageContextsTable < ActiveRecord::Migration
+
+  def up
+    if table_exists?("ddr_alerts_message_contexts")
+      drop_table "ddr_alerts_message_contexts"
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+
+end

data/lib/ddr/alerts.rb

@@ -8,7 +8,6 @@ module Ddr
     extend ActiveSupport::Autoload
 
     autoload :Message
-    autoload :MessageContext
 
     def self.table_name_prefix
       'ddr_alerts_'

data/lib/ddr/alerts/message.rb

@@ -2,17 +2,11 @@ module Ddr
   module Alerts
     class Message < ActiveRecord::Base
 
-      has_many :contexts, class_name: "Ddr::Alerts::MessageContext", inverse_of: :message, dependent: :destroy
-
       scope :active, -> { where(active: true) }
 
-      scope :ddr, -> { joins(:contexts).where(ddr_alerts_message_contexts: { context: Ddr::Alerts::MessageContext::CONTEXT_DDR }) }
-      scope :repository, -> { joins(:contexts).where(ddr_alerts_message_contexts: { context: Ddr::Alerts::MessageContext::CONTEXT_REPOSITORY }) }
-
       def to_s
         actv = active ? 'ACTIVE' : 'INACTIVE'
-        ctxs = contexts.map { |context| context.context }
-        "[#{id}] [#{ctxs.join(';')}] [#{actv}] [\"#{message}\"]"
+        "[#{id}] [#{actv}] [\"#{message}\"]"
       end
     end
   end

data/lib/ddr/alerts/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Alerts
-    VERSION = "0.3.0"
+    VERSION = "1.0.0"
   end
 end

data/lib/tasks/ddr_alerts.rake

@@ -3,17 +3,9 @@ namespace :ddr_alerts do
   desc "Create an alert message"
   task :create => :environment do
     puts "ERROR: Must specify message text.  Ex.: MESSAGE='This is an alert message.'" unless ENV['MESSAGE']
-    puts "ERROR: Must specify at least one context. Ex.: CONTEXT=repository" unless ENV['CONTEXT']
-    if ENV['MESSAGE'] && ENV['CONTEXT']
+    if ENV['MESSAGE']
       active = ENV['ACTIVE'] == 'true' ? true : false
-      contexts = ENV['CONTEXT'].split(';').map(&:strip)
-      contexts.each do |context|
-        raise "Invalid context: #{context}" unless Ddr::Alerts::MessageContext::CONTEXTS.include?(context)
-      end
       msg = Ddr::Alerts::Message.new(message: ENV['MESSAGE'], active: active)
-      contexts.each do |context|
-        msg.contexts << Ddr::Alerts::MessageContext.new(context: context)
-      end
       if msg.save
         puts "Created Alert Message"
         msg.reload
@@ -27,20 +19,7 @@ namespace :ddr_alerts do
   desc "List alert messages"
   task :list => :environment do
     active = ENV['ACTIVE'] == 'true' ? true : false
-    if ENV['CONTEXT']
-      contexts = ENV['CONTEXT'].split(';').map(&:strip)
-      contexts.each do |context|
-        raise "Invalid context: #{context}" unless Ddr::Alerts::MessageContext::CONTEXTS.include?(context)
-      end
-    end
-    active_filter_msgs = active ? Ddr::Alerts::Message.active : Ddr::Alerts::Message.all
-    if contexts.blank? || contexts.to_set == Ddr::Alerts::MessageContext::CONTEXTS
-      msgs = active_filter_msgs
-    else
-      context_filter_msgs = []
-      contexts.each { |context| context_filter_msgs << active_filter_msgs.send(context) }
-      msgs = SortedSet.new(context_filter_msgs.flatten)
-    end
+    msgs = active ? Ddr::Alerts::Message.active : Ddr::Alerts::Message.all
     msgs.each { |msg| puts msg }
   end
 

data/spec/dummy/db/schema.rb

@@ -11,16 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141215161516) do
-
-  create_table "ddr_alerts_message_contexts", force: true do |t|
-    t.integer  "message_id"
-    t.string   "context"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "ddr_alerts_message_contexts", ["message_id"], name: "index_ddr_alerts_message_contexts_on_message_id"
+ActiveRecord::Schema.define(version: 20150130204030) do
 
   create_table "ddr_alerts_messages", force: true do |t|
     t.text     "message"

data/spec/factories/message_factories.rb

@@ -10,14 +10,6 @@ FactoryGirl.define do
       active false
     end
 
-    trait :ddr do
-      contexts { [ FactoryGirl.create(:message_context, :ddr) ] }
-    end
-
-    trait :repository do
-      contexts { [ FactoryGirl.create(:message_context, :repository) ] }
-    end
-
   end
 
 end

data/spec/models/message_spec.rb

@@ -14,16 +14,6 @@ module Ddr
             expect(Message.active).to_not include(inactive_msg)
           end
         end
-        context "contexts" do
-          let(:ddr_msg) { FactoryGirl.create(:message, :ddr) }
-          let(:repository_msg) { FactoryGirl.create(:message, :repository) }
-          it "should return the correct entries" do
-            expect(Message.ddr).to include(ddr_msg)
-            expect(Message.ddr).to_not include(repository_msg)
-            expect(Message.repository).to include(repository_msg)
-            expect(Message.repository).to_not include(ddr_msg)
-          end
-        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddr-alerts
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jim Coble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,12 +136,12 @@ files:
 - config/routes.rb
 - db/migrate/20141215160128_create_ddr_alerts_messages.rb
 - db/migrate/20141215161516_create_ddr_alerts_message_contexts.rb
+- db/migrate/20150130204030_drop_message_contexts_table.rb
 - ddr-alerts.gemspec
 - lib/ddr-alerts.rb
 - lib/ddr/alerts.rb
 - lib/ddr/alerts/engine.rb
 - lib/ddr/alerts/message.rb
-- lib/ddr/alerts/message_context.rb
 - lib/ddr/alerts/version.rb
 - lib/tasks/ddr_alerts.rake
 - spec/dummy/README.rdoc
@@ -185,7 +185,6 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/factories/message_context_factories.rb
 - spec/factories/message_factories.rb
 - spec/models/message_spec.rb
 - spec/spec_helper.rb
@@ -256,7 +255,6 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/factories/message_context_factories.rb
 - spec/factories/message_factories.rb
 - spec/models/message_spec.rb
 - spec/spec_helper.rb

data/lib/ddr/alerts/message_context.rb

@@ -1,15 +0,0 @@
-module Ddr
-  module Alerts
-    class MessageContext < ActiveRecord::Base
-
-      CONTEXT_DDR = 'ddr'.freeze
-      CONTEXT_REPOSITORY = 'repository'.freeze
-      CONTEXTS = Set.new([ CONTEXT_DDR, CONTEXT_REPOSITORY  ]).freeze
-
-      validates :context, inclusion: { in: CONTEXTS }
-
-      belongs_to :message, inverse_of: :contexts
-
-    end
-  end
-end

data/spec/factories/message_context_factories.rb

@@ -1,15 +0,0 @@
-FactoryGirl.define do
-
-  factory :message_context, class: Ddr::Alerts::MessageContext do
-
-    trait :ddr do
-      context Ddr::Alerts::MessageContext::CONTEXT_DDR
-    end
-
-    trait :repository do
-      context Ddr::Alerts::MessageContext::CONTEXT_REPOSITORY
-    end
-    
-  end
-
-end