morpheus 0.3.6 → 0.3.7

data/lib/morpheus/mixins/filtering.rb

@@ -1,6 +1,9 @@
 module Morpheus
   module Filtering
-    extend ActiveSupport::Concern
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
 
     module ClassMethods
 

data/lib/morpheus/mixins/finders.rb

@@ -1,6 +1,9 @@
 module Morpheus
   module Finders
-    extend ActiveSupport::Concern
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
 
     module ClassMethods
 

data/lib/morpheus/mixins/introspection.rb

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

data/lib/morpheus/mixins/persistence.rb

@@ -1,36 +1,35 @@
 module Morpheus
   module Persistence
-    extend ActiveSupport::Concern
-
-    module InstanceMethods
-
-      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
 
-      def update_attributes(new_attributes)
-        merge_attributes(new_attributes)
-        save
+    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?
       end
 
-      def destroy
-        self.class.delete(UrlBuilder.destroy(self.class, id))
+      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
+
+    def update_attributes(new_attributes)
+      merge_attributes(new_attributes)
+      save
+    end
 
+    def destroy
+      self.class.delete(UrlBuilder.destroy(self.class, id))
     end
 
     module ClassMethods

data/lib/morpheus/mixins/reflections.rb

@@ -1,6 +1,9 @@
 module Morpheus
   module Reflections
-    extend ActiveSupport::Concern
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
 
     module ClassMethods
 

data/lib/morpheus/mixins/request_handling.rb

@@ -1,6 +1,9 @@
 module Morpheus
   module RequestHandling
-    extend ActiveSupport::Concern
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
 
     module ClassMethods
 

data/lib/morpheus/mixins/response_parsing.rb

@@ -1,6 +1,9 @@
 module Morpheus
   module ResponseParsing
-    extend ActiveSupport::Concern
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
 
     module ClassMethods
 
@@ -10,18 +13,15 @@ module Morpheus
 
     end
 
-    module InstanceMethods
-
-      def build_from_response(response)
-        content = Yajl::Parser.parse(response.body)['content']
-        if content.keys.include?('type')
-          content['type'].constantize.new.merge_attributes(content)
-        else
-          merge_attributes(content)
-        end
+    def build_from_response(response)
+      content = Yajl::Parser.parse(response.body)['content']
+      if content.keys.include?('type')
+        content['type'].constantize.new.merge_attributes(content)
+      else
+        merge_attributes(content)
       end
-      private :build_from_response
-
     end
+    private :build_from_response
+
   end
 end

data/lib/morpheus/mixins/url_support.rb

@@ -1,6 +1,9 @@
 module Morpheus
   module UrlSupport
-    extend ActiveSupport::Concern
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
 
     module ClassMethods
 

data/lib/morpheus/request.rb

@@ -2,40 +2,40 @@ module Morpheus
   class Request < Typhoeus::Request
     attr_reader :path, :params, :method
 
-    def initialize(path, options = {})
-      if options[:method] == :put
-        options[:method] = :post
-        options[:params].merge!(:_method => :put)
-      end
-      
-      options[:username] = Configuration.username if Configuration.username
-      options[:password] = Configuration.password if Configuration.password
-
-      super(Configuration.host + path, options)
-    end
-
-    def cache_key
-      [method, url, params].hash
-    end
-
-    def response=(response)
-      RequestCache.cache[cache_key] = response
-      response.tag_for_caching!
-      super
-    end
-
-    def response
-      RequestQueue.run! if RequestQueue.has_request?(self)
-      RequestCache.cache[cache_key] || super
-    end
-
-    def self.enqueue(method, path, params)
-      options = { :method => method }
-      options.merge!(:params => params) if params
-      new(path, options).tap do |request|
-        RequestQueue.enqueue(request)
-      end
-    end
+   def initialize(path, options = {})
+     if options[:method] == :put
+       options[:method] = :post
+       options[:params].merge!(:_method => :put)
+     end
+
+     options[:username] = Configuration.username if Configuration.username
+     options[:password] = Configuration.password if Configuration.password
+
+     super(Configuration.host + path, options)
+   end
+
+   def cache_key
+     [method, url, params].hash
+   end
+
+   def response=(response)
+     RequestCache.cache[cache_key] = response
+     response.tag_for_caching!
+     super
+   end
+
+   def response
+     RequestQueue.run! if RequestQueue.has_request?(self)
+     RequestCache.cache[cache_key]|| super
+   end
+
+   def self.enqueue(method, path, params)
+     options = { :method => method }
+     options.merge!(:params => params) unless params.blank?
+     new(path, options).tap do |request|
+       RequestQueue.enqueue(request)
+     end
+   end
 
   end
 end

data/lib/morpheus/response.rb

@@ -11,11 +11,11 @@ module Morpheus
         @cached = tagged_for_caching?
       end
     end
-    
+
     def tag_for_caching!
       @tagged_for_caching = true
     end
-    
+
     def tagged_for_caching?
       @tagged_for_caching ||= false
     end

data/lib/morpheus/response_parser.rb

@@ -10,8 +10,13 @@ module Morpheus
 
     def self.parse(owner, request, metadata)
       parser = new(owner, request, metadata)
-
-      ActiveSupport::Notifications.instrument('request.morpheus', :url => request.url, :params => request.params, :method => request.method, :class => owner, :response => request.response) do
+      ActiveSupport::Notifications.instrument('request.morpheus',
+        :url      => request.url,
+        :params   => request.params,
+        :method   => request.method,
+        :class    => owner,
+        :response => request.response
+      ) do
         @parsed_response = parser.parse
       end
       RequestCache.cache.clear unless request.method == :get
@@ -40,7 +45,7 @@ module Morpheus
     def content
       @content ||= Yajl::Parser.parse(@response.body).try(:[], 'content')
     end
-    
+
     def response_errors
       @response_errors ||= Yajl::Parser.parse(@response.body).try(:[], 'errors')
     end
@@ -56,7 +61,7 @@ module Morpheus
         end
       end
     end
-    
+
     def build_object_with_attributes(attributes)
       if attributes.keys.include?('type')
         attributes['type'].constantize.new(attributes)

data/lib/morpheus/version.rb

@@ -1,3 +1,3 @@
 module Morpheus
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

data/morpheus.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'yajl-ruby',     '~> 0.8.2'
   gem.add_dependency 'typhoeus',      '~> 0.2.4'
-  gem.add_dependency 'activemodel',   '~> 3.0.0'
-  gem.add_dependency 'activesupport', '~> 3.0.0'
-  gem.add_dependency 'i18n',          '~> 0.5.0'
+  gem.add_dependency 'activemodel',   '> 3.0.0'
+  gem.add_dependency 'activesupport', '> 3.0.0'
+  gem.add_dependency 'i18n',          '> 0.5.0'
 
-  gem.add_development_dependency 'rails',               '~> 3.0.0'
+  gem.add_development_dependency 'rails',               '> 3.0.0'
   gem.add_development_dependency 'sqlite3',             '~> 1.3.3'
   gem.add_development_dependency 'rspec-rails',         '~> 2.7.0'
   gem.add_development_dependency 'rcov',                '~> 0.9.11'

data/spec/dummy/app/resources/author.rb

@@ -1,5 +1,4 @@
 class Author < Morpheus::Base
   property :name
-
   has_many :books
 end

data/spec/dummy/app/resources/book.rb

@@ -1,5 +1,4 @@
 class Book < Morpheus::Base
   property :title
-  
   belongs_to :author
 end

data/spec/dummy/app/resources/dog.rb

@@ -1,10 +1,10 @@
 class Dog < Morpheus::Base
   property :name
   property :breed
-  
   validates_presence_of :name
-  
+
   def bark!
-    "Bow-wow-wow"
+    'Bow-wow-wow'
   end
+
 end

data/spec/dummy/app/resources/meeting.rb

@@ -1,6 +1,5 @@
 class Meeting < Morpheus::Base
-  property :title
-  
+  property   :title
   belongs_to :conference
   has_many   :attendees
   has_one    :speaker

data/spec/dummy/config/application.rb

@@ -1,45 +1,16 @@
 require File.expand_path('../boot', __FILE__)
 
-require "active_model/railtie"
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_view/railtie"
-require "action_mailer/railtie"
+require 'active_model/railtie'
+require 'active_record/railtie'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+require 'action_mailer/railtie'
 
 Bundler.require
-require "morpheus"
+require 'morpheus'
 
 module Dummy
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths += %W(#{config.root}/resources)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
+    config.encoding = 'utf-8'
   end
 end

data/spec/dummy/config/environments/production.rb

@@ -10,7 +10,7 @@ Dummy::Application.configure do
   config.action_controller.perform_caching = true
 
   # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  config.action_dispatch.x_sendfile_header = 'X-Sendfile'
 
   # For nginx:
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'