morpheus 0.4.0 → 0.5.0

data/lib/morpheus/mixins/conversion.rb

@@ -1,22 +1,24 @@
 module Morpheus
-  module Conversion
+  module Mixins
+    module Conversion
 
-    def to_model
-      self
-    end
+      def to_model
+        self
+      end
 
-    def to_param
-      id.to_s unless new_record?
-    end
+      def to_param
+        id.to_s unless new_record?
+      end
 
-    def to_key
-      attributes.keys if persisted?
-    end
+      def to_key
+        attributes.keys if persisted?
+      end
 
-    def to_partial_path
-      underscored_model_name = self.class.model_name.underscore
-      "#{underscored_model_name.pluralize}/#{underscored_model_name}"
-    end
+      def to_partial_path
+        underscored_model_name = self.class.model_name.underscore
+        "#{underscored_model_name.pluralize}/#{underscored_model_name}"
+      end
 
+    end
   end
 end

data/lib/morpheus/mixins/filtering.rb

@@ -1,21 +1,23 @@
 module Morpheus
-  module Filtering
+  module Mixins
+    module Filtering
 
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
 
-    module ClassMethods
+      module ClassMethods
 
-      def filter(name, &block)
-        (@filters ||= []) << Filter.new(name, &block)
-      end
+        def filter(name, &block)
+          (@filters ||= []) << Filter.new(name, &block)
+        end
+
+        def find_filter(name)
+          (@filters ||= []).find { |filter| filter.name == name }
+        end
 
-      def find_filter(name)
-        (@filters ||= []).find { |filter| filter.name == name }
       end
 
     end
-
   end
 end

data/lib/morpheus/mixins/finders.rb

@@ -1,65 +1,67 @@
 module Morpheus
-  module Finders
+  module Mixins
+    module Finders
 
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
 
-    module ClassMethods
+      module ClassMethods
 
-      def find(*args)
-        options = args.extract_options!
-        if args.length == 1
-          case args.first
-          when Integer, String
-            attributes = [UrlBuilder.find_one(self, args.first.to_i), nil, { :id => args.first.to_i }]
-            get(*attributes)
-          when Array
-            attributes = UrlBuilder.find_some(self, args.first.sort).push({ :ids => args.first })
-            get(*attributes)
+        def find(*args)
+          options = args.extract_options!
+          if args.length == 1
+            case args.first
+            when Integer, String
+              attributes = [UrlBuilder.find_one(self, args.first.to_i), nil, { :id => args.first.to_i }]
+              get(*attributes)
+            when Array
+              attributes = UrlBuilder.find_some(self, args.first.sort).push({ :ids => args.first })
+              get(*attributes)
+            else
+              raise ArgumentError, "Unrecognized argument (#{args.first.inspect})."
+            end
           else
-            raise ArgumentError, "Unrecognized argument (#{args.first.inspect})."
+            attributes = UrlBuilder.find_some(self, args.sort).push({ :ids => args })
+            get(*attributes)
           end
-        else
-          attributes = UrlBuilder.find_some(self, args.sort).push({ :ids => args })
-          get(*attributes)
         end
-      end
 
-      def scoped
-        Relation.new(self)
-      end
+        def scoped
+          Relation.new(self)
+        end
 
-      def all
-        attributes = [UrlBuilder.find_all(self), nil, {}]
-        get(*attributes)
-      end
+        def all
+          attributes = [UrlBuilder.find_all(self), nil, {}]
+          get(*attributes)
+        end
 
-      def first
-        limit(1).first
-      end
+        def first
+          limit(1).first
+        end
 
-      def where(query_attributes)
-        Relation.new(self).where(query_attributes)
-      end
+        def where(query_attributes)
+          Relation.new(self).where(query_attributes)
+        end
 
-      def limit(amount)
-        Relation.new(self).limit(amount)
-      end
+        def limit(amount)
+          Relation.new(self).limit(amount)
+        end
 
-      def page(page_number)
-        Relation.new(self).page(page_number)
-      end
+        def page(page_number)
+          Relation.new(self).page(page_number)
+        end
 
-      def results_per_page
-        @results_per_page || 10
-      end
+        def results_per_page
+          @results_per_page || 10
+        end
+
+        def results_per_page=(_results_per_page)
+          @results_per_page = _results_per_page
+        end
 
-      def results_per_page=(_results_per_page)
-        @results_per_page = _results_per_page
       end
 
     end
-
   end
 end

data/lib/morpheus/mixins/introspection.rb

@@ -1,21 +1,23 @@
 module Morpheus
-  module Introspection
+  module Mixins
+    module Introspection
 
-    def persisted?
-      !id.nil?
-    end
+      def persisted?
+        !id.nil?
+      end
 
-    def new_record?
-      !persisted?
-    end
+      def new_record?
+        !persisted?
+      end
 
-    def destroyed?
-      false
-    end
+      def destroyed?
+        false
+      end
 
-    def respond_to?(method, include_private = false)
-      attributes.include?(method) ? true : super
-    end
+      def respond_to?(method, include_private = false)
+        attributes.include?(method) ? true : super
+      end
 
+    end
   end
 end

data/lib/morpheus/mixins/persistence.rb

@@ -1,45 +1,47 @@
 module Morpheus
-  module Persistence
+  module Mixins
+    module Persistence
 
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    def save(with_validations = true)
-      attributes_for_save = { self.class.attributes_root => attributes_without_basic_attributes.reject { |k,v| v.nil? } }
-
-      if with_validations
-        return false unless valid?
+      def self.included(base)
+        base.extend(ClassMethods)
       end
 
-      if new_record?
-        built_object = self.class.post(*UrlBuilder.save(self.class, nil, attributes_for_save))
-      else
-        built_object = self.class.put(*UrlBuilder.save(self.class, id, attributes_for_save))
+      def save(with_validations = true)
+        attributes_for_save = { self.class.attributes_root => attributes_without_basic_attributes.reject { |k,v| v.nil? } }
+
+        if with_validations
+          return false unless valid?
+        end
+
+        if new_record?
+          built_object = self.class.post(*UrlBuilder.save(self.class, nil, attributes_for_save))
+        else
+          built_object = self.class.put(*UrlBuilder.save(self.class, id, attributes_for_save))
+        end
+        built_object.instance_variables.each do |iv|
+          self.instance_variable_set(iv, built_object.instance_variable_get(iv))
+        end
+        @valid
       end
-      built_object.instance_variables.each do |iv|
-        self.instance_variable_set(iv, built_object.instance_variable_get(iv))
+
+      def update_attributes(new_attributes)
+        merge_attributes(new_attributes)
+        save
       end
-      @valid
-    end
 
-    def update_attributes(new_attributes)
-      merge_attributes(new_attributes)
-      save
-    end
+      def destroy
+        self.class.delete(UrlBuilder.destroy(self.class, id))
+      end
 
-    def destroy
-      self.class.delete(UrlBuilder.destroy(self.class, id))
-    end
+      module ClassMethods
 
-    module ClassMethods
+        def create(new_attributes = {})
+          new(new_attributes).tap { |new_instance| new_instance.save }
+        end
+        alias :create! :create
 
-      def create(new_attributes = {})
-        new(new_attributes).tap { |new_instance| new_instance.save }
       end
-      alias :create! :create
 
     end
-
   end
 end

data/lib/morpheus/mixins/reflections.rb

@@ -1,27 +1,29 @@
 module Morpheus
-  module Reflections
+  module Mixins
+    module Reflections
 
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
 
-    module ClassMethods
+      module ClassMethods
 
-      def create_reflection(macro, name, options)
-        Reflection.new(macro, name, options).tap do |reflection|
-          reflections.merge!(name => reflection)
+        def create_reflection(macro, name, options)
+          Reflection.new(macro, name, options).tap do |reflection|
+            reflections.merge!(name => reflection)
+          end
         end
-      end
 
-      def reflections
-        @reflections ||= {}
-      end
+        def reflections
+          @reflections ||= {}
+        end
+
+        def reflect_on_association(association)
+          reflections[association.to_sym].is_a?(Reflection) ? reflections[association.to_sym] : nil
+        end
 
-      def reflect_on_association(association)
-        reflections[association.to_sym].is_a?(Reflection) ? reflections[association.to_sym] : nil
       end
 
     end
-
   end
 end

data/lib/morpheus/mixins/request_handling.rb

@@ -1,37 +1,39 @@
 module Morpheus
-  module RequestHandling
+  module Mixins
+    module RequestHandling
 
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
 
-    module ClassMethods
+      module ClassMethods
 
-      def get(path, params = nil, metadata = {}, &block)
-        request = Request.enqueue(:get, path, params)
-        request.on_complete = block if block_given?
-        response_from_request(request, metadata)
-      end
+        def get(path, params = nil, metadata = {}, &block)
+          request = Request.enqueue(:get, path, params)
+          request.on_complete = block if block_given?
+          response_from_request(request, metadata)
+        end
 
-      def post(path, params = nil, metadata = {}, &block)
-        request = Request.enqueue(:post, path, params)
-        request.on_complete = block if block_given?
-        response_from_request(request, metadata)
-      end
+        def post(path, params = nil, metadata = {}, &block)
+          request = Request.enqueue(:post, path, params)
+          request.on_complete = block if block_given?
+          response_from_request(request, metadata)
+        end
 
-      def put(path, params = nil, metadata = {}, &block)
-        request = Request.enqueue(:put, path, params)
-        request.on_complete = block if block_given?
-        response_from_request(request, metadata)
-      end
+        def put(path, params = nil, metadata = {}, &block)
+          request = Request.enqueue(:put, path, params)
+          request.on_complete = block if block_given?
+          response_from_request(request, metadata)
+        end
+
+        def delete(path, params = nil, metadata = {}, &block)
+          request = Request.enqueue(:delete, path, params)
+          request.on_complete = block if block_given?
+          response_from_request(request, metadata)
+        end
 
-      def delete(path, params = nil, metadata = {}, &block)
-        request = Request.enqueue(:delete, path, params)
-        request.on_complete = block if block_given?
-        response_from_request(request, metadata)
       end
 
     end
-
   end
 end

data/lib/morpheus/mixins/response_parsing.rb

@@ -1,16 +1,18 @@
 module Morpheus
-  module ResponseParsing
+  module Mixins
+    module ResponseParsing
 
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
 
-    module ClassMethods
+      module ClassMethods
 
-      def response_from_request(request, metadata)
-        ResponseParser.parse(self, request, metadata)
-      end
+        def response_from_request(request, metadata)
+          ResponseParser.parse(self, request, metadata)
+        end
 
+      end
     end
   end
 end

data/lib/morpheus/mixins/url_support.rb

@@ -1,39 +1,41 @@
 module Morpheus
-  module UrlSupport
+  module Mixins
+    module UrlSupport
 
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
 
-    module ClassMethods
+      module ClassMethods
 
-      def url_name
-        @url_name ||= model_name.underscore
-      end
-      alias_method :singular_url_name, :url_name
+        def url_name
+          @url_name ||= model_name.underscore
+        end
+        alias_method :singular_url_name, :url_name
 
-      def plural_url_name
-        url_name.pluralize
-      end
+        def plural_url_name
+          url_name.pluralize
+        end
 
-      def set_base_url(url_name)
-        @url_name = url_name
-      end
+        def set_base_url(url_name)
+          @url_name = url_name
+        end
 
-      def attributes_root
-        @attributes_root ||= model_name.underscore
-      end
+        def attributes_root
+          @attributes_root ||= model_name.underscore
+        end
 
-      def set_attributes_root(name)
-        @attributes_root = name
-      end
+        def set_attributes_root(name)
+          @attributes_root = name
+        end
+
+        def set_base_model_name(name)
+          set_base_url(name)
+          set_attributes_root(name)
+        end
 
-      def set_base_model_name(name)
-        set_base_url(name)
-        set_attributes_root(name)
       end
 
     end
-
   end
 end