maily_herald 0.8.0 → 0.9.1

data/spec/models/maily_herald/subscription_spec.rb

@@ -11,10 +11,10 @@ describe MailyHerald::Subscription do
 
   describe "Associations" do
     it "should have valid associations" do
-      @subscription.entity.should eq(@entity)
-      @subscription.list.should eq(@list)
-      @subscription.should be_valid
-      @subscription.should_not be_a_new_record
+      expect(@subscription.entity).to eq(@entity)
+      expect(@subscription.list).to eq(@list)
+      expect(@subscription).to be_valid
+      expect(@subscription).not_to be_a_new_record
     end
   end
 
@@ -29,4 +29,21 @@ describe MailyHerald::Subscription do
       expect {@mailing.render_template(@entity)}.to raise_error
     end
   end
+
+  it "should instantiate subscription object from joined attributes" do
+    list = MailyHerald.list(:generic_list)
+    list.subscribe!(@entity)
+
+    entity = list.subscribers.first
+
+    expect(entity).to be_a(User)
+    expect(entity).to have_attribute(:maily_subscription_id)
+    expect(entity.maily_subscription_active).to be_truthy
+
+    subscription = MailyHerald::Subscription.get_from(entity)
+
+    expect(subscription).to be_a(MailyHerald::Subscription)
+    expect(subscription).to be_readonly
+    expect(subscription).to be_active
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maily_herald
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Łukasz Jachymczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -206,7 +206,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Email marketing solution for Ruby on Rails applications
+description: Email processing solution for Ruby on Rails applications
 email:
 - lukasz@sology.eu
 executables:
@@ -216,6 +216,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -226,6 +227,7 @@ files:
 - app/controllers/maily_herald/tokens_controller.rb
 - app/helpers/maily_herald/tokens_helper.rb
 - app/mailers/maily_herald/mailer.rb
+- app/models/maily_herald/ad_hoc_mailing.rb
 - app/models/maily_herald/dispatch.rb
 - app/models/maily_herald/list.rb
 - app/models/maily_herald/log.rb
@@ -243,6 +245,7 @@ files:
 - db/migrate/20150205120443_create_maily_herald_tables.rb
 - db/migrate_legacy/20130711124555_create_maily_herald_tables.rb
 - db/migrate_legacy/20140612101023_create_lists.rb
+- doc/webui.png
 - lib/generators/maily_herald/install_generator.rb
 - lib/generators/templates/README
 - lib/generators/templates/maily_herald.rb
@@ -252,8 +255,6 @@ files:
 - lib/maily_herald/capistrano/tasks.cap
 - lib/maily_herald/capistrano/tasks2.rb
 - lib/maily_herald/cli.rb
-- lib/maily_herald/condition_evaluator.rb
-- lib/maily_herald/config.rb
 - lib/maily_herald/context.rb
 - lib/maily_herald/engine.rb
 - lib/maily_herald/logging.rb
@@ -274,7 +275,8 @@ files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
-- spec/dummy/app/mailers/test_mailer.rb
+- spec/dummy/app/mailers/ad_hoc_mailer.rb
+- spec/dummy/app/mailers/custom_one_time_mailer.rb
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/product.rb
 - spec/dummy/app/models/user.rb
@@ -301,9 +303,11 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/locales/maily_herald.en.yml
+- spec/dummy/config/maily_herald.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20130723074347_create_users.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/db/seeds.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
 - spec/dummy/public/404.html
@@ -317,6 +321,7 @@ files:
 - spec/lib/maily_herald_spec.rb
 - spec/lib/utils_spec.rb
 - spec/mailers/maily_herald/mailer_spec.rb
+- spec/models/maily_herald/ad_hoc_mailing_spec.rb
 - spec/models/maily_herald/list_spec.rb
 - spec/models/maily_herald/log_spec.rb
 - spec/models/maily_herald/mailing_spec.rb
@@ -349,7 +354,7 @@ rubyforge_project:
 rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
-summary: Email marketing solution for Ruby on Rails applications
+summary: Email processing solution for Ruby on Rails applications
 test_files:
 - spec/controllers/maily_herald/tokens_controller_spec.rb
 - spec/dummy/Guardfile
@@ -360,7 +365,8 @@ test_files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
-- spec/dummy/app/mailers/test_mailer.rb
+- spec/dummy/app/mailers/ad_hoc_mailer.rb
+- spec/dummy/app/mailers/custom_one_time_mailer.rb
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/product.rb
 - spec/dummy/app/models/user.rb
@@ -387,9 +393,11 @@ test_files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/locales/maily_herald.en.yml
+- spec/dummy/config/maily_herald.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20130723074347_create_users.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/db/seeds.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
 - spec/dummy/public/404.html
@@ -403,6 +411,7 @@ test_files:
 - spec/lib/maily_herald_spec.rb
 - spec/lib/utils_spec.rb
 - spec/mailers/maily_herald/mailer_spec.rb
+- spec/models/maily_herald/ad_hoc_mailing_spec.rb
 - spec/models/maily_herald/list_spec.rb
 - spec/models/maily_herald/log_spec.rb
 - spec/models/maily_herald/mailing_spec.rb

data/lib/maily_herald/condition_evaluator.rb

@@ -1,82 +0,0 @@
-module MailyHerald
-  #module ConditionEvaluator
-    #class DummyDrop < Liquid::Drop
-      #def has_key?(name)
-        #true
-      #end
-
-      #def invoke_drop name
-        #true
-      #end
-
-      #alias :[] :invoke_drop
-    #end
-
-    #def self.included(base)
-      #base.validate :validate_conditions
-
-      #base.send :include, MailyHerald::ConditionEvaluator::InstanceMethods
-    #end
-
-    #module InstanceMethods
-      #def has_conditions?
-        #self.conditions && !self.conditions.empty?
-      #end
-
-      #def evaluate_conditions_for entity
-        #if has_conditions?
-          #condition = create_liquid_condition self.conditions
-          #template = Liquid::Template.parse(self.conditions)
-          #drop = context.drop_for entity, subscription_for(entity)
-
-          #liquid_context = Liquid::Context.new([drop, template.assigns], template.instance_assigns, template.registers, true, {})
-          #drop.context = liquid_context
-
-          #condition.evaluate liquid_context
-        #else
-          #true
-        #end
-      #end
-
-      #def test_conditions
-        #return true unless self.conditions
-
-        #condition = create_liquid_condition self.conditions
-        #template = Liquid::Template.parse(self.conditions)
-        #return false unless template.errors.empty?
-
-        #drop = DummyDrop.new
-        #liquid_context = Liquid::Context.new([drop, template.assigns], template.instance_assigns, template.registers, true, {})
-        #drop.context = liquid_context
-
-        #condition.evaluate liquid_context
-      #end
-
-      #private
-
-      #def create_liquid_condition markup
-        #expressions = markup.scan(Liquid::If::ExpressionsAndOperators).reverse
-        #raise(Liquid::SyntaxError, Liquid::SyntaxHelp) unless expressions.shift =~ Liquid::If::Syntax
-
-        #condition = Liquid::Condition.new($1, $2, $3)
-        #while not expressions.empty?
-          #operator = (expressions.shift).to_s.strip
-
-          #raise(Liquid::SyntaxError, Liquid::SyntaxHelp) unless expressions.shift.to_s =~ Liquid::If::Syntax
-
-          #new_condition = Liquid::Condition.new($1, $2, $3)
-          #new_condition.send(operator.to_sym, condition)
-          #condition = new_condition
-        #end
-
-        #condition
-      #end
-
-      #def validate_conditions
-        #test_conditions
-      #rescue StandardError => e
-        #errors.add(:conditions, e.to_s) 
-      #end
-    #end
-  #end
-end

data/lib/maily_herald/config.rb

@@ -1,5 +0,0 @@
-require 'maily_herald'
-module MailyHerald
-	module Config
-	end
-end

data/spec/dummy/app/mailers/test_mailer.rb

@@ -1,11 +0,0 @@
-class TestMailer < MailyHerald::Mailer
-  default from: "no-reply@flossmarket.com"
-
-  def sample_mail user
-    mail to: user.email, subject: "Test"
-  end
-
-  def sample_mail_error user
-    mail to: user.email, subject: "Test"
-  end
-end