active_remote 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dc9d2dd1642d99e8a275ab2abf1b7f0690c6589
-  data.tar.gz: 820834a78deb45faf1d0a3e2ec3a1b12610a8334
+  metadata.gz: 0d6e02a3ab83ed4e3c630985ea0b75c2aedad442
+  data.tar.gz: 187cdc2bb2963e4b9a90cb880736b744e5142397
 SHA512:
-  metadata.gz: 820a8bb3f47437f9ed7b623317392f9ccf6b1116d1d8f26f3fd2972fc6074ae7a5f771743196425a07c4862c0db5fa164beeb1e3173f9d63708b0ac7d7ce0ed8
-  data.tar.gz: e4b17125fc1a49634bb4985112c7f76edb9e5caac9df18eefb5471a81cf18248f9c96244c0f6ace2a27b0a4f74ff7df61f056ff1edce7698fc5198cfbec1df7d
+  metadata.gz: 7356615e05f98ab9380a6d8e41338d8bc583a73410b1ea38980e62348795f769fa65ce1c96d3957d7780b9f08139eb636fb5cfce6c55ccb44edfad026f6190a6
+  data.tar.gz: 4f0b79da09e06d4f054319fde42e77f83feff5579f438111ca1db8897413726fbb7f1b6a3f797d87503e6de710db21b4071fa548f95f27eb4cb3fdc40299ebb6

data/Gemfile

@@ -3,5 +3,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in active_remote.gemspec
 gemspec
-
-gem 'protobuf', github: 'localshred/protobuf'

data/active_remote.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   #
   s.add_dependency "active_attr", ">= 0.8"
   s.add_dependency "activesupport", ">= 3.2"
-  s.add_dependency "protobuf", ">= 3.0.0.alpha"
+  s.add_dependency "protobuf", ">= 3.0.0.rc2"
 
   ##
   # Development Dependencies

data/lib/active_remote/rpc.rb

@@ -1,7 +1,13 @@
+require 'active_remote/serializers/protobuf'
+
 module ActiveRemote
   module RPC
     extend ActiveSupport::Concern
 
+    included do
+      include Serializers::Protobuf
+    end
+
     module ClassMethods
 
       # Execute an RPC call to the remote service and return the raw response.
@@ -17,7 +23,9 @@ module ActiveRemote
       def request(rpc_method, request_args)
         return request_args unless request_args.is_a?(Hash)
 
-        request_type(rpc_method).new(request_args)
+        message_class = request_type(rpc_method)
+        fields = fields_from_attributes(message_class, request_args)
+        message_class.new(fields)
       end
 
       # Return the class applicable to the request for the given rpc method.

data/lib/active_remote/serializers/protobuf.rb

@@ -0,0 +1,103 @@
+module ActiveRemote
+  module Serializers
+    module Protobuf
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def fields_from_attributes(message_class, attributes)
+          Fields.from_attributes(message_class, attributes)
+        end
+      end
+
+      def fields_from_attributes(message_class, attributes)
+        Fields.from_attributes(message_class, attributes)
+      end
+
+      class Fields
+        attr_reader :attributes, :message_class
+
+        ##
+        # Constructor!
+        #
+        def initialize(message_class, attributes = {})
+          @attributes = attributes
+          @message_class = message_class
+        end
+
+        ##
+        # Class methods
+        #
+        def self.from_attributes(message_class, attributes)
+          fields = self.new(message_class, attributes)
+          fields.from_attributes
+        end
+
+        ##
+        # Instance methods
+        #
+        def from_attributes
+          attributes.inject({}) do |hash, (key, value)|
+            field = message_class.get_field(key, true) # Check extension fields, too
+            value = Field.from_attribute(field, value) if field
+
+            hash[key] = value
+            hash
+          end
+        end
+      end
+
+      class Field
+        attr_reader :field, :value
+
+        ##
+        # Constructor!
+        #
+        def initialize(field, value)
+          @field = field
+          @value = value
+        end
+
+        ##
+        # Class methods
+        #
+        def self.from_attribute(field, value)
+          field = self.new(field, value)
+          field.from_attribute
+        end
+
+        ##
+        # Instance methods
+        #
+        def from_attribute
+          case
+          when field.repeated_message? then
+            repeated_message_value
+          when field.message? then
+            message_value
+          when field.repeated? then
+            repeated_value
+          else
+            value
+          end
+        end
+
+      private
+
+        def message_value(attributes = nil)
+          attributes ||= value
+          attributes.is_a?(Hash) ? Fields.from_attributes(field.type_class, attributes) : attributes
+        end
+
+        def repeated_message_value
+          repeated_value.map do |attributes|
+            message_value(attributes)
+          end
+        end
+
+        def repeated_value
+          value.is_a?(Array) ? value : [ value ]
+        end
+      end
+    end
+  end
+end

data/lib/active_remote/version.rb

@@ -1,3 +1,3 @@
 module ActiveRemote
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 end

data/spec/lib/active_remote/serializers/protobuf_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe ActiveRemote::Serializers::Protobuf::Fields do
+  describe ".from_attributes" do
+    let(:ready_value) { { :records => [ { :name => 'Cool Post', :errors => [ { :message => 'Boom!' } ] } ] } }
+    let(:value) { { :records => { :name => 'Cool Post', :errors => { :message => 'Boom!' } } } }
+
+    it "gets protobuf-ready fields from attributes" do
+      described_class.from_attributes(Generic::Remote::Posts, value).should eq ready_value
+    end
+  end
+end
+
+describe ActiveRemote::Serializers::Protobuf::Field do
+  describe ".from_attribute" do
+    context "when field is a repeated message" do
+      let(:field) { Generic::Remote::Posts.get_field(:records) }
+
+      context "and the value is not an array" do
+        let(:ready_value) { [ { :name => 'Cool Post', :errors => [ { :message => 'Boom!' } ] } ] }
+        let(:value) { { :name => 'Cool Post', :errors => { :message => 'Boom!' } } }
+
+        it "gets protobuf-ready fields from the value" do
+          described_class.from_attribute(field, value).should eq ready_value
+        end
+      end
+    end
+
+    context "when field is a message" do
+      let(:field) { Generic::Remote::Post.get_field(:category) }
+
+      context "and value is a hash" do
+        let(:ready_value) { { :name => 'Film', :errors => [ { :message => 'Boom!' } ] } }
+        let(:value) { { :name => 'Film', :errors => { :message => 'Boom!' } } }
+
+        it "gets protobuf-ready fields from the value" do
+          described_class.from_attribute(field, value).should eq ready_value
+        end
+      end
+    end
+
+    context "when field is repeated" do
+      let(:field) { Generic::Remote::PostRequest.get_field(:name) }
+
+      context "and the value is not an array" do
+        let(:ready_value) { [ 'Cool Post' ] }
+        let(:value) { 'Cool Post' }
+
+        it "gets protobuf-ready fields from the value" do
+          described_class.from_attribute(field, value).should eq ready_value
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -10,7 +10,10 @@ Bundler.require(:default, :development, :test)
 
 require 'protobuf/rspec'
 require 'support/helpers'
+
+$LOAD_PATH << ::File.expand_path('../support/protobuf', __FILE__)
 require 'support/protobuf'
+require 'support/models'
 
 RSpec.configure do |config|
   config.include Protobuf::RSpec::Helpers

data/spec/support/definitions/author.proto

@@ -1,8 +1,8 @@
 package generic.remote;
 
-import "support/protobuf/error.proto";
+import "error.proto";
 
-message Author { 
+message Author {
   optional string guid = 1;
   optional string name = 2;
   repeated Error errors = 3;

data/spec/support/definitions/{support/protobuf/category.proto → category.proto}

@@ -1,6 +1,6 @@
 package generic.remote;
 
-import "support/protobuf/error.proto";
+import "error.proto";
 
 message Category {
   optional string guid = 1;

data/spec/support/definitions/post.proto

@@ -1,7 +1,7 @@
 package generic.remote;
 
-import "support/protobuf/error.proto";
-import "support/protobuf/category.proto";
+import "error.proto";
+import "category.proto";
 
 message Post {
   optional string guid = 1;

data/spec/support/definitions/tag.proto

@@ -1,8 +1,8 @@
 package generic.remote;
 
-import "support/protobuf/error.proto";
+import "error.proto";
 
-message Tag { 
+message Tag {
   optional string guid = 1;
   optional string name = 2;
   repeated Error errors = 3;

data/spec/support/helpers.rb

@@ -1,5 +1,3 @@
-require 'support/models'
-
 ##
 # Reset all DSL variables so specs don't interfere with each other.
 #

data/spec/support/protobuf/author.pb.rb

@@ -8,7 +8,7 @@ require 'protobuf/rpc/service'
 ##
 # Imports
 #
-require 'support/protobuf/error.pb'
+require 'error.pb'
 
 module Generic
   module Remote

data/spec/support/protobuf/category.pb.rb

@@ -4,41 +4,48 @@
 require 'protobuf/message'
 require 'protobuf/rpc/service'
 
+
 ##
 # Imports
 #
-require 'support/protobuf/error.pb'
+require 'error.pb'
 
 module Generic
   module Remote
-    
+
     ##
     # Message Classes
     #
     class Category < ::Protobuf::Message; end
     class Categories < ::Protobuf::Message; end
     class CategoryRequest < ::Protobuf::Message; end
-    
+
+
     ##
     # Message Fields
     #
     class Category
-      optional ::Protobuf::Field::StringField, :guid, 1
-      optional ::Protobuf::Field::StringField, :name, 2
+      optional :string, :guid, 1
+      optional :string, :name, 2
       repeated ::Generic::Error, :errors, 3
+      optional :string, :user_guid, 4
+      optional :string, :author_guid, 5
+      optional :string, :chief_editor_guid, 6
+      optional :string, :editor_guid, 7
     end
-    
+
     class Categories
       repeated ::Generic::Remote::Category, :records, 1
     end
-    
+
     class CategoryRequest
-      repeated ::Protobuf::Field::StringField, :guid, 1
-      repeated ::Protobuf::Field::StringField, :name, 2
+      repeated :string, :guid, 1
+      repeated :string, :name, 2
     end
-    
+
+
     ##
-    # Services
+    # Service Classes
     #
     class CategoryService < ::Protobuf::Rpc::Service
       rpc :search, ::Generic::Remote::CategoryRequest, ::Generic::Remote::Categories
@@ -50,5 +57,8 @@ module Generic
       rpc :delete_all, ::Generic::Remote::Categories, ::Generic::Remote::Categories
       rpc :destroy_all, ::Generic::Remote::Categories, ::Generic::Remote::Categories
     end
+
   end
+
 end
+

data/spec/support/protobuf/error.pb.rb

@@ -4,18 +4,20 @@
 require 'protobuf/message'
 
 module Generic
-  
+
   ##
   # Message Classes
   #
   class Error < ::Protobuf::Message; end
-  
+
+
   ##
   # Message Fields
   #
   class Error
-    optional ::Protobuf::Field::StringField, :field, 1
-    optional ::Protobuf::Field::StringField, :message, 2
+    optional :string, :field, 1
+    optional :string, :message, 2
   end
-  
+
 end
+

data/spec/support/protobuf/post.pb.rb

@@ -8,8 +8,8 @@ require 'protobuf/rpc/service'
 ##
 # Imports
 #
-require 'support/protobuf/error.pb'
-require 'support/protobuf/category.pb'
+require 'error.pb'
+require 'category.pb'
 
 module Generic
   module Remote

data/spec/support/protobuf/tag.pb.rb

@@ -8,7 +8,7 @@ require 'protobuf/rpc/service'
 ##
 # Imports
 #
-require 'support/protobuf/error.pb'
+require 'error.pb'
 
 module Generic
   module Remote

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: active_remote
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.alpha
+        version: 3.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.alpha
+        version: 3.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: better_receive
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-pride
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: protobuf-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Active Remote provides Active Record-like object-relational mapping over
@@ -159,8 +159,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE
 - README.md
@@ -187,6 +187,7 @@ files:
 - lib/active_remote/search.rb
 - lib/active_remote/serialization.rb
 - lib/active_remote/serializers/json.rb
+- lib/active_remote/serializers/protobuf.rb
 - lib/active_remote/version.rb
 - spec/core_ext/date_time_spec.rb
 - spec/lib/active_remote/association_spec.rb
@@ -201,11 +202,12 @@ files:
 - spec/lib/active_remote/search_spec.rb
 - spec/lib/active_remote/serialization_spec.rb
 - spec/lib/active_remote/serializers/json_spec.rb
+- spec/lib/active_remote/serializers/protobuf_spec.rb
 - spec/spec_helper.rb
 - spec/support/definitions/author.proto
+- spec/support/definitions/category.proto
+- spec/support/definitions/error.proto
 - spec/support/definitions/post.proto
-- spec/support/definitions/support/protobuf/category.proto
-- spec/support/definitions/support/protobuf/error.proto
 - spec/support/definitions/tag.proto
 - spec/support/helpers.rb
 - spec/support/models.rb
@@ -229,12 +231,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
@@ -257,11 +259,12 @@ test_files:
 - spec/lib/active_remote/search_spec.rb
 - spec/lib/active_remote/serialization_spec.rb
 - spec/lib/active_remote/serializers/json_spec.rb
+- spec/lib/active_remote/serializers/protobuf_spec.rb
 - spec/spec_helper.rb
 - spec/support/definitions/author.proto
+- spec/support/definitions/category.proto
+- spec/support/definitions/error.proto
 - spec/support/definitions/post.proto
-- spec/support/definitions/support/protobuf/category.proto
-- spec/support/definitions/support/protobuf/error.proto
 - spec/support/definitions/tag.proto
 - spec/support/helpers.rb
 - spec/support/models.rb