promiscuous 0.8.4 → 0.8.5

data/lib/promiscuous/common.rb

@@ -1,4 +1,5 @@
 module Promiscuous::Common
-  autoload :Options, 'promiscuous/common/options'
-  autoload :Lint,    'promiscuous/common/lint'
+  autoload :Options,      'promiscuous/common/options'
+  autoload :Lint,         'promiscuous/common/lint'
+  autoload :ClassHelpers, 'promiscuous/common/class_helpers'
 end

data/lib/promiscuous/common/class_helpers.rb

@@ -0,0 +1,12 @@
+module Promiscuous::Common::ClassHelpers
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def guess_class_name(separator)
+      class_name = name.split("::").reverse.take_while { |name| name != separator }.reverse.join('::')
+      class_name = "::#{class_name}"
+      class_name = $1 if class_name =~ /^(.+)#{separator.singularize}$/
+      class_name
+    end
+  end
+end

data/lib/promiscuous/publisher/class.rb

@@ -1,5 +1,6 @@
 module Promiscuous::Publisher::Class
   extend ActiveSupport::Concern
+  include Promiscuous::Common::ClassHelpers
 
   included { use_option :class, :as => :klass }
 
@@ -26,15 +27,8 @@ module Promiscuous::Publisher::Class
       if super
         "::#{super}".constantize
       elsif name
-        class_name = name.split("::").reverse.take_while { |name| name != 'Publishers' }.reverse.join('::')
-        class_name = "::#{class_name}"
-        class_name = $1 if class_name =~ /^(.+)Publisher$/
-        class_name.constantize
+        guess_class_name('Publishers').constantize
       end
     end
   end
 end
-
-    #define_constant('Scoped::NameScopedPublisherModel', PublisherModel) do
-      #field :field_4
-    #end

data/lib/promiscuous/publisher/mock.rb

@@ -1,4 +1,6 @@
 class Promiscuous::Publisher::Mock
+  include Promiscuous::Common::ClassHelpers
+
   def self.publish(options)
     if defined?(attributes)
       if options[:attributes]
@@ -21,9 +23,7 @@ class Promiscuous::Publisher::Mock
     if self.klass
       self.klass
     elsif name
-      class_name = "#{name.split('::').last}"
-      class_name = $1 if class_name =~ /^(.+)Publisher$/
-      class_name
+      guess_class_name('Publishers')
     end
   end
 

data/lib/promiscuous/subscriber/class.rb

@@ -1,5 +1,6 @@
 module Promiscuous::Subscriber::Class
   extend ActiveSupport::Concern
+  include Promiscuous::Common::ClassHelpers
 
   def instance
     @instance ||= fetch
@@ -12,10 +13,7 @@ module Promiscuous::Subscriber::Class
       if super
         "::#{super}".constantize
       elsif name
-        class_name = name.split("::").reverse.take_while { |name| name != 'Subscribers' }.reverse.join('::')
-        class_name = "::#{class_name}"
-        class_name = $1 if class_name =~ /^(.+)Subscriber$/
-        class_name.constantize
+        guess_class_name('Subscribers').constantize
       end
     end
   end

data/lib/promiscuous/subscriber/lint/attributes.rb

@@ -11,6 +11,7 @@ module Promiscuous::Subscriber::Lint::Attributes
     attributes.each { |attr| instance.respond_to?("#{attr}=") or instance.__send__("#{attr}=") }
 
     if check_publisher
+      raise "The publisher of #{subscriber} does not exist" if publisher.nil?
       missing_attributes = subscriber.attributes - publisher.attributes
       if missing_attributes.present?
         raise "#{publisher} subscribes to non published attributes: #{missing_attributes.join(", ")}"

data/lib/promiscuous/subscriber/polymorphic.rb

@@ -1,6 +1,7 @@
 module Promiscuous::Subscriber::Polymorphic
   extend ActiveSupport::Concern
   include Promiscuous::Subscriber::Envelope
+  include Promiscuous::Common::ClassHelpers
 
   included do
     class_attribute :polymorphic_map
@@ -12,9 +13,7 @@ module Promiscuous::Subscriber::Polymorphic
       return super if super
 
       if name
-        class_name = "#{name.split('::').last}"
-        class_name = $1 if class_name =~ /^(.+)Subscriber$/
-        class_name
+        guess_class_name('Subscribers')
       end
     end
 

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,6 +126,7 @@ files:
 - lib/promiscuous/subscriber/base.rb
 - lib/promiscuous/subscriber/polymorphic.rb
 - lib/promiscuous/common/lint.rb
+- lib/promiscuous/common/class_helpers.rb
 - lib/promiscuous/common/options.rb
 - lib/promiscuous/common/lint/base.rb
 - lib/promiscuous/worker.rb