perry 0.6.3 → 0.7.0

data/lib/perry/adapters/bertrpc_adapter.rb

@@ -13,14 +13,71 @@ module Perry::Adapters
 
     def read(options)
       query = options[:relation].to_hash
+      query[:mode] = :read
       log(query, "RPC #{config[:service]}") {
-        self.service.call.send(self.namespace).send(self.service_name,
-                                                    query.merge(config[:default_options] || {}))
+        self.call_server(query)
+      }
+    end
+
+    def write(options)
+      query = options.dup
+      object = query.delete(:object)
+      if object
+        query[:fields] = object.attributes
+        if object.new_record?
+          query[:mode] = :create
+        else
+          query[:mode] = :update
+          query[:where] = self.where_for_primary_key(object)
+        end
+      else
+        query[:mode] = :update
+      end
+      log(query, "RPC #{config[:service]}") {
+        self.parse_response(self.call_server(query))
+      }
+    end
+
+    def delete(options)
+      query = options.dup
+      object = query.delete(:object)
+      if object
+        query[:where] = self.where_for_primary_key(object)
+      end
+      log(query, "RPC #{config[:service]}") {
+        self.parse_response(self.call_server(query))
       }
     end
 
     protected
 
+    def call_server(options)
+      service_options = (options || {}).merge(config[:default_options])
+      request = self.service.call
+      namespace = request.send(self.namespace)
+      namespace.send(self.service_name, service_options)
+    end
+
+    def parse_response(raw)
+      response = Perry::Persistence::Response.new
+      response.raw = raw
+
+      if raw.key?('fields')
+        response.success = true
+        response.parsed = raw['fields']
+      elsif raw.key?('success')
+        response.success = raw['success']
+      end
+
+      response
+    end
+
+    def where_for_primary_key(object)
+      pk_attr = self.config[:primary_key] || object.primary_key
+      pk_value = object[pk_attr]
+      [{ pk_attr => pk_value }]
+    end
+
     def namespace
       self.config[:namespace]
     end

data/lib/perry/persistence.rb

@@ -45,7 +45,7 @@ module Perry::Persistence
 
     def destroy
       raise Perry::PerryError.new("cannot destroy a frozen object") if frozen?
-      unless self.new_record? || self.send(primary_key).nil?
+      unless self.new_record? || self[primary_key].nil?
         write_adapter.call(:delete, :object => self).success
       end
     end

data/lib/perry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: perry
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
-  - 3
-  version: 0.6.3
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Travis Petticrew
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 Z
+date: 2011-10-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda