active_remote 1.4.1 → 1.5.0

data/lib/active_remote/base.rb

@@ -4,6 +4,7 @@ require 'active_remote/bulk'
 require 'active_remote/dirty'
 require 'active_remote/dsl'
 require 'active_remote/persistence'
+require 'active_remote/publication'
 require 'active_remote/rpc'
 require 'active_remote/search'
 require 'active_remote/serialization'
@@ -19,6 +20,7 @@ module ActiveRemote
     include ::ActiveRemote::Bulk
     include ::ActiveRemote::DSL
     include ::ActiveRemote::Persistence
+    include ::ActiveRemote::Publication
     include ::ActiveRemote::RPC
     include ::ActiveRemote::Search
     include ::ActiveRemote::Serialization

data/lib/active_remote/persistence.rb

@@ -75,7 +75,7 @@ module ActiveRemote
       #
       def delete
         raise ReadOnlyRemoteRecord if readonly?
-        execute(:delete, attributes.slice("guid"))
+        execute(:delete, @attributes.slice("guid"))
 
         return success? ? freeze : false
       end
@@ -98,7 +98,7 @@ module ActiveRemote
       #
       def destroy
         raise ReadOnlyRemoteRecord if readonly?
-        execute(:destroy, attributes.slice("guid"))
+        execute(:destroy, @attributes.slice("guid"))
 
         return success? ? freeze : false
       end
@@ -197,10 +197,9 @@ module ActiveRemote
       # errors from the response.
       #
       def create
-        new_attributes = attributes.deep_dup
-        new_attributes.delete("guid")
+        @attributes.delete("guid")
 
-        execute(:create, new_attributes)
+        execute(:create, @attributes)
 
         assign_attributes(last_response.to_hash)
         add_errors_from_response
@@ -222,7 +221,7 @@ module ActiveRemote
       # (plus :guid) will be updated. Defaults to all attributes.
       #
       def update(attribute_names = @attributes.keys)
-        updated_attributes = attributes.slice(*attribute_names)
+        updated_attributes = @attributes.slice(*attribute_names)
         updated_attributes.merge!("guid" => self[:guid])
 
         execute(:update, updated_attributes)

data/lib/active_remote/publication.rb

@@ -0,0 +1,54 @@
+module ActiveRemote
+  module Publication
+    # Returns a hash of publishable attributes.
+    #
+    def publishable_hash
+      keys = _publishable_attributes_or_attribute_keys
+
+      attributes_hash = keys.inject({}) do |publishable_hash, key|
+        value = respond_to?(key) ? __send__(key) : @attributes[key]
+
+        publishable_hash[key] = case
+                                when value.respond_to?(:map) then
+                                  _map_value(value)
+                                when value.respond_to?(:publishable_hash) then
+                                  value.publishable_hash
+                                when value.respond_to?(:to_hash) then
+                                  value.to_hash
+                                else
+                                  value
+                                end
+
+        publishable_hash
+      end
+
+      attributes_hash
+    end
+
+    def _publishable_json_attributes
+      _publishable_attributes_or_attribute_keys - _publishable_json_methods
+    end
+
+    def _publishable_json_methods
+      _publishable_attributes_or_attribute_keys.reject { |attribute| @attributes.key?(attribute) }
+    end
+
+  private
+
+    def _map_value(value)
+      case
+      when value.any? { |obj| obj.respond_to?(:publishable_hash) } then
+        value.map(&:publishable_hash)
+      when value.any? { |obj| obj.respond_to?(:to_hash) } then
+        value.map(&:to_hash)
+      else
+        value
+      end
+    end
+
+    def _publishable_attributes_or_attribute_keys
+      @_publishable_attributes_or_attribute_keys = _publishable_attributes
+      @_publishable_attributes_or_attribute_keys ||= @attributes.keys
+    end
+  end
+end

data/lib/active_remote/serializers/json.rb

@@ -2,13 +2,9 @@ module ActiveRemote
   module Serializers
     module JSON
       # Returns a json representation of the whitelisted publishable attributes.
+      #
       def as_json(options = {})
-        json_attributes = _publishable_attributes || attributes.keys
-
-        json_methods = json_attributes.reject { |attribute| attributes.key?(attribute) }
-        json_attributes -= json_methods
-
-        default_options = { :only => json_attributes, :methods => json_methods }
+        default_options = { :only => _publishable_json_attributes, :methods => _publishable_json_methods }
         default_options.merge!(options)
 
         super(default_options)

data/lib/active_remote/version.rb

@@ -1,3 +1,3 @@
 module ActiveRemote
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 end

data/spec/lib/active_remote/dsl_spec.rb

@@ -21,15 +21,6 @@ describe ActiveRemote::DSL do
     end
   end
 
-  describe ".auto_paging_size" do
-    context "when given a value" do
-      it "sets @auto_paging_size to the value" do
-        Tag.auto_paging_size 100
-        Tag.auto_paging_size.should eq 100
-      end
-    end
-  end
-
   describe ".namespace" do
     context "when given a value" do
       it "sets @namespace to the value" do

data/spec/lib/active_remote/publication_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe ActiveRemote::Publication do
+  let(:attributes) { { :guid => 'foo', :name => 'bar' } }
+
+  subject { Tag.new(attributes) }
+
+  context "with publishable attributes defined" do
+    let(:expected_hash) { attributes.slice(:name) }
+
+    before { Tag.attr_publishable :name }
+    after { reset_publishable_attributes(Tag) }
+
+    it "serializes to a hash with only the publishable attributes" do
+      subject.publishable_hash.should eq expected_hash
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_remote
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -164,6 +164,7 @@ files:
 - lib/active_remote/dsl.rb
 - lib/active_remote/errors.rb
 - lib/active_remote/persistence.rb
+- lib/active_remote/publication.rb
 - lib/active_remote/rpc.rb
 - lib/active_remote/search.rb
 - lib/active_remote/serialization.rb
@@ -181,6 +182,7 @@ files:
 - spec/lib/active_remote/dirty_spec.rb
 - spec/lib/active_remote/dsl_spec.rb
 - spec/lib/active_remote/persistence_spec.rb
+- spec/lib/active_remote/publication_spec.rb
 - spec/lib/active_remote/rpc_spec.rb
 - spec/lib/active_remote/search_spec.rb
 - spec/lib/active_remote/serialization_spec.rb
@@ -219,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2023512064389771027
+      hash: -3057893291356198545
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -228,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2023512064389771027
+      hash: -3057893291356198545
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -243,6 +245,7 @@ test_files:
 - spec/lib/active_remote/dirty_spec.rb
 - spec/lib/active_remote/dsl_spec.rb
 - spec/lib/active_remote/persistence_spec.rb
+- spec/lib/active_remote/publication_spec.rb
 - spec/lib/active_remote/rpc_spec.rb
 - spec/lib/active_remote/search_spec.rb
 - spec/lib/active_remote/serialization_spec.rb