perry 0.5.2 → 0.5.3

data/lib/perry/adapters/abstract_adapter.rb

@@ -134,11 +134,14 @@ class Perry::Adapters::AbstractAdapter
 
   # runs the adapter in the specified type mode -- designed to work with the middleware stack
   def call(mode, options)
-    @stack ||= self.stack_items.inject(self.method(mode)) do |below, (above_klass, above_config)|
+    @stack ||= self.stack_items.inject(self.method(:execute)) do |below, (above_klass, above_config)|
       above_klass.new(below, above_config)
     end
 
     options[:mode] = mode.to_sym
+    if options[:relation] && options[:relation].modifiers_value[:noop]
+      options[:noop] = options[:relation].modifiers_value[:noop]
+    end
     @stack.call(options)
   end
 
@@ -152,6 +155,13 @@ class Perry::Adapters::AbstractAdapter
     self.config[:processors] || []
   end
 
+  # Proxy method for the stack and the actual adapter action.  This method passes the call on to the
+  # appropriate method based on options[:mode] unless the query has a :noop modifier in which case
+  # it returns nil.
+  def execute(options)
+    self.send(options[:mode], options) unless options[:noop]
+  end
+
   # Abstract read method -- overridden by subclasses
   def read(options)
     raise(NotImplementedError,
@@ -160,14 +170,14 @@ class Perry::Adapters::AbstractAdapter
   end
 
   # Abstract write method -- overridden by subclasses
-  def write(object)
+  def write(options)
     raise(NotImplementedError,
           "You must not use the abstract adapter.  Implement an adapter that extends the " +
           "Perry::Adapters::AbstractAdapter class and overrides this method.")
   end
 
   # Abstract delete method -- overridden by subclasses
-  def delete(object)
+  def delete(options)
     raise(NotImplementedError,
           "You must not use the abstract adapter.  Implement an adapter that extends the " +
           "Perry::Adapters::AbstractAdapter class and overrides this method.")

data/lib/perry/adapters/restful_http_adapter.rb

@@ -13,6 +13,14 @@ module Perry::Adapters
 
     attr_reader :last_response
 
+    def read(options)
+      get_http(options[:relation]).parsed.tap do |result|
+        unless result.is_a?(Array)
+          raise Perry::MalformedResponse, "Expected instance of Array got #{result.inspect}"
+        end
+      end
+    end
+
     def write(options)
       object = options[:object]
       params = build_params_from_attributes(object)
@@ -25,6 +33,10 @@ module Perry::Adapters
 
     protected
 
+    def get_http(relation)
+      http_call(relation, :get, relation.to_hash.merge(relation.modifiers_value[:query] || {}))
+    end
+
     def post_http(object, params)
       http_call(object, :post, params)
     end
@@ -39,19 +51,19 @@ module Perry::Adapters
 
     def http_call(object, method, params={})
       request_klass = case method
+      when :get     then Net::HTTP::Get
       when :post    then Net::HTTP::Post
       when :put     then Net::HTTP::Put
       when :delete  then Net::HTTP::Delete
       end
 
-      req_uri = self.build_uri(object, method)
+      req_uri = self.build_uri(object, method, params || {})
 
-      request = if method == :delete
+      if [:get, :delete].include?(method)
         request = request_klass.new([req_uri.path, req_uri.query].join('?'))
       else
         request = request_klass.new(req_uri.path)
-        request.set_form_data(params) unless method == :delete
-        request
+        request.set_form_data(params)
       end
 
       self.log(params, "#{method.to_s.upcase} #{req_uri}") do
@@ -97,18 +109,20 @@ module Perry::Adapters
       end
     end
 
-    def build_uri(object, method)
+    def build_uri(object, method, params={})
       url = [self.config[:host].gsub(%r{/$}, ''), self.config[:service]]
-      unless object.new_record?
+      if object.is_a?(Perry::Base) && !object.new_record?
         primary_key = self.config[:primary_key] || object.primary_key
         pk_value = object.send(primary_key) or raise KeyError
         url << pk_value
       end
+
       uri = URI.parse "#{url.join('/')}#{self.config[:format]}"
 
-      # TRP: method DELETE has no POST body so we have to append any default options onto the query string
-      if method == :delete
-        uri.query = (self.config[:default_options] || {}).collect { |key, value| "#{key}=#{value}" }.join('&')
+      # TRP: method GET and DELETE have no POST body so we have to append any default options onto
+      # the query string
+      if [:get, :delete].include?(method)
+        uri.query = (self.config[:default_options] || {}).merge(params).to_query
       end
 
       uri

data/lib/perry/base.rb

@@ -17,7 +17,7 @@ class Perry::Base
 
   DEFAULT_PRIMARY_KEY = :id
 
-  attr_accessor :attributes, :new_record, :saved, :read_options, :write_options
+  attr_accessor :attributes, :new_record, :saved, :write_options
   alias :new_record? :new_record
   alias :saved? :saved
   alias :persisted? :saved?
@@ -120,7 +120,7 @@ class Perry::Base
     protected
 
     def fetch_records(relation)
-      self.read_adapter.call(:read, :relation => relation).compact
+      self.read_adapter.call(:read, :relation => relation)
     end
 
     def read_with(adapter_type)

data/lib/perry/errors.rb

@@ -16,6 +16,11 @@ module Perry
   class RecordNotSaved < PerryError
   end
 
+  # Raised when the adapter returns or detects a response that Perry does not understand
+  #
+  class MalformedResponse < PerryError
+  end
+
   # Used for all association related errors
   #
   class AssociationError < PerryError

data/lib/perry/middlewares/cache_records.rb

@@ -52,7 +52,7 @@ class Perry::Middlewares::CacheRecords
       cached_values
     else
       fresh_values = @adapter.call(options)
-      self.cache_store.write(key, fresh_values) if should_store_in_cache?(fresh_values)
+      self.cache_store.write(key, fresh_values) if should_store_in_cache?(fresh_values, options)
       fresh_values
     end
   end
@@ -61,7 +61,8 @@ class Perry::Middlewares::CacheRecords
     Digest::MD5.hexdigest(self.class.to_s + query_hash.to_a.sort { |a,b| a.to_s.first <=> b.to_s.first }.inspect)
   end
 
-  def should_store_in_cache?(fresh_values)
-    !self.record_count_threshold || fresh_values.size <= self.record_count_threshold
+  def should_store_in_cache?(fresh_values, options)
+    (!self.record_count_threshold || fresh_values.size <= self.record_count_threshold) &&
+      !options[:noop]
   end
 end

data/lib/perry/middlewares/model_bridge.rb

@@ -25,7 +25,7 @@ class Perry::Middlewares::ModelBridge
   protected
 
   def build_models_from_records(records, options)
-    if options[:relation]
+    if options[:relation] && records
       records.collect do |attributes|
         options[:relation].klass.new_from_data_store(attributes)
       end
@@ -37,13 +37,17 @@ class Perry::Middlewares::ModelBridge
   def update_model_after_save(response, model)
     model.saved = response.success
     if model.saved
-      if model.new_record? && !model.read_adapter.nil?
+      if model.new_record? && model.read_adapter
         key = response.model_attributes[model.primary_key]
         raise Perry::PerryError.new('primary key not included in response') if key.nil?
         model.send("#{model.primary_key}=", key)
       end
       model.new_record = false
-      model.reload unless model.read_adapter.nil?
+      if model.read_adapter
+        # Clear out cache for this model
+        model.class.modifiers(:reset_cache => true, :noop => true).first
+        model.reload
+      end
     else
       add_errors_to_model(response, model, 'not saved')
     end
@@ -51,6 +55,7 @@ class Perry::Middlewares::ModelBridge
 
   def update_model_after_delete(response, model)
     if response.success
+      model.class.scoped.modifiers(:reset_cache => true, :noop => true).first
       model.freeze!
     else
       add_errors_to_model(response, model, 'not deleted')

data/lib/perry/processors/preload_associations.rb

@@ -25,7 +25,7 @@ class Perry::Processors::PreloadAssociations
   def call(options)
     results = @adapter.call(options)
 
-    unless results.empty?
+    if results && !results.empty?
       relation = options[:relation]
       (includes = relation.to_hash[:includes] || {}).keys.each do |association_id|
         association = relation.klass.defined_associations[association_id.to_sym]

data/lib/perry/relation.rb

@@ -77,7 +77,7 @@ class Perry::Relation
   end
 
   def to_a
-    @records ||= fetch_records
+    @records ||= fetch_records || []
   end
 
   def eager_load?

data/lib/perry/version.rb

@@ -3,7 +3,7 @@ module Perry
 
     MAJOR = 0
     MINOR = 5
-    TINY  = 2
+    TINY  = 3
 
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

data/lib/perry.rb

@@ -3,14 +3,17 @@ require 'active_support/core_ext/array'
 require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext/hash/deep_merge'
 require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/hash/conversions'
 begin
   require 'active_support/core_ext/duplicable' #ActiveSupport 2.3.x
   Hash.send(:include, ActiveSupport::CoreExtensions::Hash::DeepMerge) unless Hash.instance_methods.include?('deep_merge')
+  Hash.send(:include, ActiveSupport::CoreExtensions::Hash::Conversions) unless Hash.instance_methods.include?('to_query')
   Hash.send(:include, ActiveSupport::CoreExtensions::Hash::Keys) unless Hash.instance_methods.include?('symbolize_keys')
 rescue LoadError => exception
   require 'active_support/core_ext/object/duplicable' #ActiveSupport 3.0.x
 end
 require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/object/conversions'
 
 # TRP: Used for pretty logging
 autoload :Benchmark, 'benchmark'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: perry
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Travis Petticrew
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 -05:00
+date: 2011-05-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency