lib/active_remote/dsl.rb in active_remote-1.8.1 vs lib/active_remote/dsl.rb in active_remote-2.0.0.rc1

@@ -1,15 +1,10 @@
 require 'active_support/inflector'
 
 module ActiveRemote
   module DSL
-    def self.included(klass)
-      klass.class_eval do
-        extend ::ActiveRemote::DSL::ClassMethods
-        include ::ActiveRemote::DSL::InstanceMethods
-      end
-    end
+    extend ActiveSupport::Concern
 
     module ClassMethods
 
       # Whitelist enable attributes for serialization purposes.
       #
@@ -104,25 +99,22 @@
         underscored_name = self.name.underscore
         "#{underscored_name}_service".to_sym
       end
     end
 
-    # Convenience methods for accessing DSL methods in instances.
+  private
+
+    # Private convenience methods for accessing DSL methods in instances
     #
-    module InstanceMethods
+    def _publishable_attributes
+      self.class.publishable_attributes
+    end
 
-    private
+    def _service_name
+      self.class.service_name
+    end
 
-      def _publishable_attributes
-        self.class.publishable_attributes
-      end
-
-      def _service_name
-        self.class.service_name
-      end
-
-      def _service_class
-        self.class.service_class
-      end
+    def _service_class
+      self.class.service_class
     end
   end
 end