active_remote 1.8.1 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c7f0a4fe63e5db8cf97d03eace3a0ab30b0a9d2
-  data.tar.gz: a0425f6fc8354604de9cc66b6ee328dd6e6a62c5
+  metadata.gz: 2dc9d2dd1642d99e8a275ab2abf1b7f0690c6589
+  data.tar.gz: 820834a78deb45faf1d0a3e2ec3a1b12610a8334
 SHA512:
-  metadata.gz: 0a3675fb7c06e62058d678824d4b88ac1abf10c29ab532e5d73c15893d958cc621c073c6835f8f54028dc4a840de878dd327fef02d7f2479a2467328991c8a22
-  data.tar.gz: 921cbccf554f846c6d3359ace68ff30cf618b0ef6c2059252721e380adeacdb30e69495772ac7134e5f543b23363e2cc7669e65a9cc900c074721c950e1bc909
+  metadata.gz: 820a8bb3f47437f9ed7b623317392f9ccf6b1116d1d8f26f3fd2972fc6074ae7a5f771743196425a07c4862c0db5fa164beeb1e3173f9d63708b0ac7d7ce0ed8
+  data.tar.gz: e4b17125fc1a49634bb4985112c7f76edb9e5caac9df18eefb5471a81cf18248f9c96244c0f6ace2a27b0a4f74ff7df61f056ff1edce7698fc5198cfbec1df7d

data/Gemfile

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

data/Rakefile

@@ -9,13 +9,13 @@ desc "Run specs (default)"
 task :default, [] => :spec
 
 desc "Remove protobuf definitions that have been compiled"
-task :clean do 
+task :clean do
   FileUtils.rm(Dir.glob("spec/support/protobuf/**/*.proto"))
   puts "Cleaned"
 end
 
 desc "Compile spec/support protobuf definitions"
-task :compile, [] => :clean do 
-  cmd = "rprotoc --ruby_out=spec/support/protobuf --proto_path=spec/support/definitions spec/support/definitions/*.proto"
+task :compile, [] => :clean do
+  cmd = "protoc --ruby_out=spec/support/protobuf --proto_path=spec/support/definitions spec/support/definitions/*.proto"
   sh(cmd)
 end

data/active_remote.gemspec

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

data/lib/active_remote/association.rb

@@ -1,10 +1,6 @@
 module ActiveRemote
   module Association
-    def self.included(klass)
-      klass.class_eval do
-        extend ::ActiveRemote::Association::ClassMethods
-      end
-    end
+    extend ActiveSupport::Concern
 
     module ClassMethods
       # Create a `belongs_to` association for a given remote resource.
@@ -137,7 +133,6 @@ module ActiveRemote
     private
 
       def perform_association(associated_klass, options={})
-
         define_method(associated_klass) do
           klass_name = options.fetch(:class_name){ associated_klass }
           klass = klass_name.to_s.classify.constantize
@@ -154,7 +149,6 @@ module ActiveRemote
           return value
         end
       end
-
     end
   end
 end

data/lib/active_remote/attributes.rb

@@ -8,7 +8,7 @@ module ActiveRemote
       if respond_to? name
         attribute(name)
       else
-        raise ::ActiveAttr::UnknownAttributeError, "unknown attribute: #{name}"
+        raise ActiveAttr::UnknownAttributeError, "unknown attribute: #{name}"
       end
     end
     alias_method :[], :read_attribute
@@ -21,7 +21,7 @@ module ActiveRemote
       if respond_to? "#{name}="
         __send__("attribute=", name, value)
       else
-        raise ::ActiveAttr::UnknownAttributeError, "unknown attribute: #{name}"
+        raise ActiveAttr::UnknownAttributeError, "unknown attribute: #{name}"
       end
     end
     alias_method :[]=, :write_attribute

data/lib/active_remote/base.rb

@@ -1,3 +1,6 @@
+require 'active_model/callbacks'
+require 'active_attr/model'
+
 require 'active_remote/association'
 require 'active_remote/attributes'
 require 'active_remote/bulk'
@@ -13,24 +16,24 @@ require 'active_remote/serialization'
 
 module ActiveRemote
   class Base
-    extend ::ActiveModel::Callbacks
+    extend ActiveModel::Callbacks
 
-    include ::ActiveAttr::Model
+    include ActiveAttr::Model
 
-    include ::ActiveRemote::Association
-    include ::ActiveRemote::Attributes
-    include ::ActiveRemote::Bulk
-    include ::ActiveRemote::DSL
-    include ::ActiveRemote::Integration
-    include ::ActiveRemote::Persistence
-    include ::ActiveRemote::Publication
-    include ::ActiveRemote::RPC
-    include ::ActiveRemote::Search
-    include ::ActiveRemote::Serialization
+    include Association
+    include Attributes
+    include Bulk
+    include DSL
+    include Integration
+    include Persistence
+    include Publication
+    include RPC
+    include Search
+    include Serialization
 
     # Overrides some methods, providing support for dirty tracking,
     # so it needs to be included last.
-    include ::ActiveRemote::Dirty
+    include Dirty
 
     attr_reader :last_request, :last_response
 
@@ -56,5 +59,5 @@ module ActiveRemote
     end
   end
 
-  ::ActiveSupport.run_load_hooks(:active_remote, Base)
+  ActiveSupport.run_load_hooks(:active_remote, Base)
 end

data/lib/active_remote/bulk.rb

@@ -2,16 +2,12 @@ require 'active_remote/persistence'
 
 module ActiveRemote
   module Bulk
-    def self.included(klass)
-      klass.class_eval do
-        extend ::ActiveRemote::Bulk::ClassMethods
-        include ::ActiveRemote::Persistence
-      end
+    extend ActiveSupport::Concern
+
+    included do
+      include Persistence
     end
 
-    ##
-    # Class methods
-    #
     module ClassMethods
 
       # Create multiple records at the same time. Returns a collection of active
@@ -104,7 +100,7 @@ module ActiveRemote
       #
       def parse_records(*records)
         records.flatten!
-        
+
         if records.first.respond_to?(:attributes)
           records.collect!(&:attributes)
         else

data/lib/active_remote/config.rb

@@ -2,7 +2,6 @@ require 'active_support/ordered_options'
 
 module ActiveRemote
   class Config < ::ActiveSupport::OrderedOptions
-
     def initialize(options = {})
       super
 
@@ -16,8 +15,7 @@ module ActiveRemote
 
     def include_root_in_json=(true_or_false)
       self[:include_root_in_json] = !!true_or_false
-      ::ActiveRemote::Base.include_root_in_json = self[:include_root_in_json]
+      ActiveRemote::Base.include_root_in_json = self[:include_root_in_json]
     end
-
   end
 end

data/lib/active_remote/core_ext.rb

@@ -0,0 +1,3 @@
+require 'active_remote/core_ext/date_time'
+require 'active_remote/core_ext/date'
+require 'active_remote/core_ext/integer'

data/lib/active_remote/dirty.rb

@@ -4,12 +4,12 @@ require 'active_model/dirty'
 #
 module ActiveRemote
   module Dirty
-    def self.included(klass)
-      klass.class_eval do
-        include ActiveModel::Dirty
+    extend ActiveSupport::Concern
 
-        attr_accessor :_active_remote_track_changes
-      end
+    included do
+      include ActiveModel::Dirty
+
+      attr_accessor :_active_remote_track_changes
     end
 
     def disable_dirty_tracking

data/lib/active_remote/dsl.rb

@@ -2,12 +2,7 @@ require 'active_support/inflector'
 
 module ActiveRemote
   module DSL
-    def self.included(klass)
-      klass.class_eval do
-        extend ::ActiveRemote::DSL::ClassMethods
-        include ::ActiveRemote::DSL::InstanceMethods
-      end
-    end
+    extend ActiveSupport::Concern
 
     module ClassMethods
 
@@ -106,23 +101,20 @@ module ActiveRemote
       end
     end
 
-    # Convenience methods for accessing DSL methods in instances.
-    #
-    module InstanceMethods
-
-    private
+  private
 
-      def _publishable_attributes
-        self.class.publishable_attributes
-      end
+    # Private convenience methods for accessing DSL methods in instances
+    #
+    def _publishable_attributes
+      self.class.publishable_attributes
+    end
 
-      def _service_name
-        self.class.service_name
-      end
+    def _service_name
+      self.class.service_name
+    end
 
-      def _service_class
-        self.class.service_class
-      end
+    def _service_class
+      self.class.service_class
     end
   end
 end

data/lib/active_remote/errors.rb

@@ -1,9 +1,6 @@
 # TODO: Create more specific errors
 #
 module ActiveRemote
-
-  # = Active Remote Errors
-  #
   # Generic Active Remote exception class.
   class ActiveRemoteError < StandardError
   end

data/lib/active_remote/integration.rb

@@ -1,17 +1,16 @@
 module ActiveRemote
   module Integration
-    def self.included(klass)
-      klass.class_eval do
-        unless singleton_methods.include?(:cache_timestamp_format)
-          ##
-          # :singleton-method:
-          # Indicates the format used to generate the timestamp format in the cache key.
-          # This is +:number+, by default.
-          #
-          def self.cache_timestamp_format
-            :number
-          end
+    extend ActiveSupport::Concern
 
+    included do
+      unless singleton_methods.include?(:cache_timestamp_format)
+        ##
+        # :singleton-method:
+        # Indicates the format used to generate the timestamp format in the cache key.
+        # This is +:number+, by default.
+        #
+        def self.cache_timestamp_format
+          :number
         end
       end
     end

data/lib/active_remote/persistence.rb

@@ -2,28 +2,23 @@ require 'active_remote/rpc'
 
 module ActiveRemote
   module Persistence
-    def self.included(klass)
-      klass.class_eval do
-        extend ::ActiveRemote::Persistence::ClassMethods
-        include ::ActiveRemote::Persistence::InstanceMethods
-        include ::ActiveRemote::RPC
-
-        # Allow users to create callbacks around a `save` call.
-        #
-        define_model_callbacks :save, :create, :update
-
-        # Before a save occurs, ensure that we
-        # clear out the errors list.
-        #
-        set_callback :save, :before do |remote|
-          remote.errors.clear
-        end
+    extend ActiveSupport::Concern
+
+    included do
+      include RPC
+
+      # Allow users to create callbacks around a `save` call.
+      #
+      define_model_callbacks :save, :create, :update
+
+      # Before a save occurs, ensure that we
+      # clear out the errors list.
+      #
+      set_callback :save, :before do |remote|
+        remote.errors.clear
       end
     end
 
-    ##
-    # Class methods
-    #
     module ClassMethods
 
       # Creates a remote record through the service.
@@ -73,202 +68,197 @@ module ActiveRemote
       end
     end
 
-    ##
-    # Instance methods
+    # Deletes the record from the service (the service determines if the
+    # record is hard or soft deleted) and freezes this instance to indicate
+    # that no changes should be made (since they can't be persisted). If the
+    # record was not deleted, it will have error messages indicating what went
+    # wrong. Returns the frozen instance.
     #
-    module InstanceMethods
-      # Deletes the record from the service (the service determines if the
-      # record is hard or soft deleted) and freezes this instance to indicate
-      # that no changes should be made (since they can't be persisted). If the
-      # record was not deleted, it will have error messages indicating what went
-      # wrong. Returns the frozen instance.
-      #
-      def delete
-        raise ReadOnlyRemoteRecord if readonly?
-        execute(:delete, "guid" => read_attribute("guid"))
+    def delete
+      raise ReadOnlyRemoteRecord if readonly?
+      execute(:delete, "guid" => read_attribute("guid"))
 
-        return success? ? freeze : false
-      end
+      return success? ? freeze : false
+    end
 
-      # Deletes the record from the service (the service determines if the
-      # record is hard or soft deleted) and freezes this instance to indicate
-      # that no changes should be made (since they can't be persisted). If the
-      # record was not deleted, an exception will be raised. Returns the frozen
-      # instance.
-      #
-      def delete!
-        delete
-        raise ActiveRemoteError.new(errors.to_s) if has_errors?
-      end
+    # Deletes the record from the service (the service determines if the
+    # record is hard or soft deleted) and freezes this instance to indicate
+    # that no changes should be made (since they can't be persisted). If the
+    # record was not deleted, an exception will be raised. Returns the frozen
+    # instance.
+    #
+    def delete!
+      delete
+      raise ActiveRemoteError.new(errors.to_s) if has_errors?
+    end
 
-      # Destroys (hard deletes) the record from the service and freezes this
-      # instance to indicate that no changes should be made (since they can't
-      # be persisted). If the record was not deleted, it will have error
-      # messages indicating what went wrong. Returns the frozen instance.
-      #
-      def destroy
-        raise ReadOnlyRemoteRecord if readonly?
-        execute(:destroy, "guid" => read_attribute("guid"))
+    # Destroys (hard deletes) the record from the service and freezes this
+    # instance to indicate that no changes should be made (since they can't
+    # be persisted). If the record was not deleted, it will have error
+    # messages indicating what went wrong. Returns the frozen instance.
+    #
+    def destroy
+      raise ReadOnlyRemoteRecord if readonly?
+      execute(:destroy, "guid" => read_attribute("guid"))
 
-        return success? ? freeze : false
-      end
+      return success? ? freeze : false
+    end
 
-      # Destroys (hard deletes) the record from the service and freezes this
-      # instance to indicate that no changes should be made (since they can't
-      # be persisted). If the record was not deleted, an exception will be
-      # raised. Returns the frozen instance.
-      #
-      def destroy!
-        destroy
-        raise ActiveRemoteError.new(errors.to_s) if has_errors?
-      end
+    # Destroys (hard deletes) the record from the service and freezes this
+    # instance to indicate that no changes should be made (since they can't
+    # be persisted). If the record was not deleted, an exception will be
+    # raised. Returns the frozen instance.
+    #
+    def destroy!
+      destroy
+      raise ActiveRemoteError.new(errors.to_s) if has_errors?
+    end
 
-      # Returns true if the record has errors; otherwise, returns false.
-      #
-      def has_errors?
-        return respond_to?(:errors) && errors.present?
-      end
+    # Returns true if the record has errors; otherwise, returns false.
+    #
+    def has_errors?
+      return respond_to?(:errors) && errors.present?
+    end
 
-      # Instantiate a record with the given remote attributes. Generally used
-      # when retrieving records that already exist, so @new_record is set to false.
-      #
-      def instantiate(record)
-        skip_dirty_tracking do
-          assign_attributes(record)
-        end
+    # Instantiate a record with the given remote attributes. Generally used
+    # when retrieving records that already exist, so @new_record is set to false.
+    #
+    def instantiate(record)
+      skip_dirty_tracking do
+        assign_attributes(record)
+      end
 
-        run_callbacks :initialize
+      run_callbacks :initialize
 
-        @new_record = false
-        self
-      end
+      @new_record = false
+      self
+    end
 
-      # Returns true if the remote record hasn't been saved yet; otherwise,
-      # returns false.
-      #
-      def new_record?
-        @new_record
-      end
+    # Returns true if the remote record hasn't been saved yet; otherwise,
+    # returns false.
+    #
+    def new_record?
+      @new_record
+    end
 
-      # Returns true if the remote record has been saved; otherwise, returns false.
-      #
-      def persisted?
-        return ! new_record?
-      end
+    # Returns true if the remote record has been saved; otherwise, returns false.
+    #
+    def persisted?
+      return ! new_record?
+    end
 
-      # Sets the instance to be a readonly object
-      #
-      def readonly!
-        @readonly = true
-      end
+    # Sets the instance to be a readonly object
+    #
+    def readonly!
+      @readonly = true
+    end
 
-      # Returns true if the remote class or remote record is readonly; otherwise, returns false.
-      def readonly?
-        self.class.readonly? || @readonly
-      end
+    # Returns true if the remote class or remote record is readonly; otherwise, returns false.
+    def readonly?
+      self.class.readonly? || @readonly
+    end
 
-      # Saves the remote record.
-      #
-      # If it is a new record, it will be created through the service, otherwise
-      # the existing record gets updated.
-      #
-      # The service will run any validations and if any of them fail, will return
-      # the record with error messages indicating what went wrong.
-      #
-      # Also runs any before/after save callbacks that are defined.
-      #
-      def save
-        run_callbacks :save do
-          create_or_update
-        end
+    # Saves the remote record.
+    #
+    # If it is a new record, it will be created through the service, otherwise
+    # the existing record gets updated.
+    #
+    # The service will run any validations and if any of them fail, will return
+    # the record with error messages indicating what went wrong.
+    #
+    # Also runs any before/after save callbacks that are defined.
+    #
+    def save
+      run_callbacks :save do
+        create_or_update
       end
+    end
 
-      # Saves the remote record.
-      #
-      # If it is a new record, it will be created through the service, otherwise
-      # the existing record gets updated.
-      #
-      # The service will run any validations. If any of them fail (e.g. error
-      # messages are returned), an ActiveRemote::RemoteRecordNotSaved is raised.
-      #
-      # Also runs any before/after save callbacks that are defined.
-      #
-      def save!
-        save || raise(RemoteRecordNotSaved)
-      end
+    # Saves the remote record.
+    #
+    # If it is a new record, it will be created through the service, otherwise
+    # the existing record gets updated.
+    #
+    # The service will run any validations. If any of them fail (e.g. error
+    # messages are returned), an ActiveRemote::RemoteRecordNotSaved is raised.
+    #
+    # Also runs any before/after save callbacks that are defined.
+    #
+    def save!
+      save || raise(RemoteRecordNotSaved)
+    end
 
-      # Returns true if the record doesn't have errors; otherwise, returns false.
-      #
-      def success?
-        return ! has_errors?
-      end
+    # Returns true if the record doesn't have errors; otherwise, returns false.
+    #
+    def success?
+      return ! has_errors?
+    end
 
-      # Updates the attributes of the remote record from the passed-in hash and
-      # saves the remote record. If the object is invalid, it will have error
-      # messages and false will be returned.
-      #
-      def update_attributes(attributes)
-        assign_attributes(attributes)
-        save
-      end
+    # Updates the attributes of the remote record from the passed-in hash and
+    # saves the remote record. If the object is invalid, it will have error
+    # messages and false will be returned.
+    #
+    def update_attributes(attributes)
+      assign_attributes(attributes)
+      save
+    end
 
-      # Updates the attributes of the remote record from the passed-in hash and
-      # saves the remote record. If the object is invalid, an
-      # ActiveRemote::RemoteRecordNotSaved is raised.
-      #
-      def update_attributes!(attributes)
-        assign_attributes(attributes)
-        save!
-      end
+    # Updates the attributes of the remote record from the passed-in hash and
+    # saves the remote record. If the object is invalid, an
+    # ActiveRemote::RemoteRecordNotSaved is raised.
+    #
+    def update_attributes!(attributes)
+      assign_attributes(attributes)
+      save!
+    end
 
-    private
+  private
 
-      # Handles creating a remote object and serializing it's attributes and
-      # errors from the response.
-      #
-      def create
-        run_callbacks :create do
-          # Use the getter here so we get the type casting.
-          new_attributes = attributes
-          new_attributes.delete("guid")
+    # Handles creating a remote object and serializing it's attributes and
+    # errors from the response.
+    #
+    def create
+      run_callbacks :create do
+        # Use the getter here so we get the type casting.
+        new_attributes = attributes
+        new_attributes.delete("guid")
 
-          execute(:create, new_attributes)
+        execute(:create, new_attributes)
 
-          assign_attributes(last_response.to_hash)
-          add_errors_from_response
+        assign_attributes(last_response.to_hash)
+        add_errors_from_response
 
-          @new_record = has_errors?
-          success?
-        end
+        @new_record = has_errors?
+        success?
       end
+    end
 
-      # Deterines whether the record should be created or updated. New records
-      # are created, existing records are updated. If the record is marked as
-      # readonly, an ActiveRemote::ReadOnlyRemoteRecord is raised.
-      #
-      def create_or_update
-        raise ReadOnlyRemoteRecord if readonly?
-        new_record? ? create : update
-      end
+    # Deterines whether the record should be created or updated. New records
+    # are created, existing records are updated. If the record is marked as
+    # readonly, an ActiveRemote::ReadOnlyRemoteRecord is raised.
+    #
+    def create_or_update
+      raise ReadOnlyRemoteRecord if readonly?
+      new_record? ? create : update
+    end
 
-      # Handles updating a remote object and serializing it's attributes and
-      # errors from the response. Only attributes with the given attribute names
-      # (plus :guid) will be updated. Defaults to all attributes.
-      #
-      def update(attribute_names = @attributes.keys)
-        run_callbacks :update do
-          # Use the getter here so we get the type casting.
-          updated_attributes = attributes
-          updated_attributes.slice!(*attribute_names)
-          updated_attributes.merge!("guid" => self[:guid])
+    # Handles updating a remote object and serializing it's attributes and
+    # errors from the response. Only attributes with the given attribute names
+    # (plus :guid) will be updated. Defaults to all attributes.
+    #
+    def update(attribute_names = @attributes.keys)
+      run_callbacks :update do
+        # Use the getter here so we get the type casting.
+        updated_attributes = attributes
+        updated_attributes.slice!(*attribute_names)
+        updated_attributes.merge!("guid" => self[:guid])
 
-          execute(:update, updated_attributes)
+        execute(:update, updated_attributes)
 
-          assign_attributes(last_response.to_hash)
-          add_errors_from_response
+        assign_attributes(last_response.to_hash)
+        add_errors_from_response
 
-          success?
-        end
+        success?
       end
     end
   end

data/lib/active_remote/railtie.rb

@@ -1,5 +1,5 @@
 module ActiveRemote
-  class Railtie < ::Rails::Railtie
-    config.active_remote = ::ActiveRemote.config
+  class Railtie < Rails::Railtie
+    config.active_remote = ActiveRemote.config
   end
 end

data/lib/active_remote/rpc.rb

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

data/lib/active_remote/search.rb

@@ -3,14 +3,13 @@ require 'active_remote/rpc'
 
 module ActiveRemote
   module Search
-    def self.included(klass)
-      klass.class_eval do
-        extend ::ActiveRemote::Search::ClassMethods
-        include ::ActiveRemote::Persistence
-        include ::ActiveRemote::RPC
+    extend ActiveSupport::Concern
 
-        define_model_callbacks :search
-      end
+    included do
+      include Persistence
+      include RPC
+
+      define_model_callbacks :search
     end
 
     module ClassMethods

data/lib/active_remote/serialization.rb

@@ -2,10 +2,10 @@ require 'active_remote/serializers/json'
 
 module ActiveRemote
   module Serialization
-    def self.included(klass)
-      klass.class_eval do
-        include ::ActiveRemote::Serializers::JSON
-      end
+    extend ActiveSupport::Concern
+
+    included do
+      include Serializers::JSON
     end
 
     # Examine the given response and add any errors to our internal errors

data/lib/active_remote/version.rb

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

data/lib/active_remote.rb

@@ -1,25 +1,17 @@
 require 'active_attr'
 require 'active_model'
+require 'active_support'
 require 'protobuf'
 
-require 'active_support/core_ext/array'
-require 'active_support/core_ext/hash'
-require 'active_support/inflector'
-require 'active_support/json'
-
-require 'active_remote/core_ext/date_time'
-require 'active_remote/core_ext/date'
-require 'active_remote/core_ext/integer'
-
 require 'active_remote/base'
 require 'active_remote/config'
+require 'active_remote/core_ext'
 require 'active_remote/errors'
-
 require 'active_remote/version'
 
 module ActiveRemote
   def self.config
-    @config ||= ::ActiveRemote::Config.new
+    @config ||= Config.new
   end
 
   # Initialize the config

data/spec/core_ext/date_time_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
 
 describe DateTime do
-
   describe "#to_i" do
     it "does not raise errors bj" do
-      expect {subject.to_i }.to_not raise_error
+      expect { subject.to_i }.to_not raise_error
     end
   end
 end

data/spec/lib/active_remote/rpc_spec.rb

@@ -22,11 +22,9 @@ describe ActiveRemote::RPC do
 
   describe ".request" do
     let(:attributes) { Hash.new }
-    let(:message) { double(:message) }
 
     it "builds an RPC request" do
-      Tag.should_receive(:build_message).with(Generic::Remote::Tag, attributes)
-      Tag.request(:create, attributes)
+      Tag.request(:create, attributes).should eq Generic::Remote::Tag.new(attributes)
     end
   end
 

data/spec/support/definitions/support/protobuf/category.proto

@@ -7,9 +7,9 @@ message Category {
   optional string name = 2;
   repeated Error errors = 3;
   optional string user_guid = 4;
-  optional string author_guid = 4;
-  optional string chief_editor_guid = 4;
-  optional string editor_guid = 4;
+  optional string author_guid = 5;
+  optional string chief_editor_guid = 6;
+  optional string editor_guid = 7;
 }
 
 message Categories {

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

@@ -25,10 +25,10 @@ module Generic
     # Message Fields
     #
     class Author
-      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 ::Protobuf::Field::StringField, :user_guid, 4
+      optional :string, :user_guid, 4
     end
 
     class Authors
@@ -36,8 +36,8 @@ module Generic
     end
 
     class AuthorRequest
-      repeated ::Protobuf::Field::StringField, :guid, 1
-      repeated ::Protobuf::Field::StringField, :name, 2
+      repeated :string, :guid, 1
+      repeated :string, :name, 2
     end
 
 

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

@@ -26,12 +26,12 @@ module Generic
     # Message Fields
     #
     class Post
-      optional ::Protobuf::Field::StringField, :guid, 1
-      optional ::Protobuf::Field::StringField, :name, 2
-      optional ::Protobuf::Field::StringField, :author_guid, 3
+      optional :string, :guid, 1
+      optional :string, :name, 2
+      optional :string, :author_guid, 3
       optional ::Generic::Remote::Category, :category, 4
       repeated ::Generic::Error, :errors, 5
-      optional ::Protobuf::Field::StringField, :user_guid, 6
+      optional :string, :user_guid, 6
     end
 
     class Posts
@@ -39,10 +39,10 @@ module Generic
     end
 
     class PostRequest
-      repeated ::Protobuf::Field::StringField, :guid, 1
-      repeated ::Protobuf::Field::StringField, :name, 2
-      repeated ::Protobuf::Field::StringField, :author_guid, 3
-      repeated ::Protobuf::Field::StringField, :user_guid, 4
+      repeated :string, :guid, 1
+      repeated :string, :name, 2
+      repeated :string, :author_guid, 3
+      repeated :string, :user_guid, 4
     end
 
 

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

@@ -25,8 +25,8 @@ module Generic
     # Message Fields
     #
     class Tag
-      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
     end
 
@@ -35,8 +35,8 @@ module Generic
     end
 
     class TagRequest
-      repeated ::Protobuf::Field::StringField, :guid, 1
-      repeated ::Protobuf::Field::StringField, :name, 2
+      repeated :string, :guid, 1
+      repeated :string, :name, 2
     end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_remote
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.0.alpha
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.0.alpha
 - !ruby/object:Gem::Dependency
   name: better_receive
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +172,7 @@ files:
 - lib/active_remote/base.rb
 - lib/active_remote/bulk.rb
 - lib/active_remote/config.rb
+- lib/active_remote/core_ext.rb
 - lib/active_remote/core_ext/date.rb
 - lib/active_remote/core_ext/date_time.rb
 - lib/active_remote/core_ext/integer.rb
@@ -186,7 +187,6 @@ 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,7 +201,6 @@ 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/post.proto
@@ -235,9 +234,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.1
@@ -258,7 +257,6 @@ 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/post.proto

data/lib/active_remote/serializers/protobuf.rb

@@ -1,98 +0,0 @@
-module ActiveRemote
-  module Serializers
-    module Protobuf
-      ATTRIBUTE_TYPES = {
-        ::Protobuf::Field::DoubleField => Float,
-        ::Protobuf::Field::FloatField => Float,
-        ::Protobuf::Field::Int32Field => Integer,
-        ::Protobuf::Field::Int64Field => Integer,
-        ::Protobuf::Field::Uint32Field => Integer,
-        ::Protobuf::Field::Uint64Field => Integer,
-        ::Protobuf::Field::Sint32Field => Integer,
-        ::Protobuf::Field::Sint64Field => Integer,
-        ::Protobuf::Field::Fixed32Field => Float,
-        ::Protobuf::Field::Fixed64Field => Float,
-        ::Protobuf::Field::Sfixed32Field => Float,
-        ::Protobuf::Field::Sfixed64Field => Float,
-        ::Protobuf::Field::StringField => String,
-        ::Protobuf::Field::BytesField => String,
-        ::Protobuf::Field::BoolField => ::ActiveAttr::Typecasting::Boolean,
-        :bool => ::ActiveAttr::Typecasting::Boolean,
-        :double => Float,
-        :float => Float,
-        :int32 => Integer,
-        :int64 => Integer,
-        :string => String
-      }.freeze
-
-      def self.included(klass)
-        klass.extend ::ActiveRemote::Serializers::Protobuf::ClassMethods
-      end
-
-      module ClassMethods
-        # Recursively build messages from a hash of attributes.
-        # TODO: Pull this functionality into the protobuf gem.
-        #
-        def build_message(message_class, attributes)
-          attributes.inject(message_class.new) do |message, (key, value)|
-            if field = message.get_field_by_name(key) || message.get_ext_field_by_name(key)
-
-              # Override the value based on the field type where issues
-              # exist in the protobuf gem.
-              #
-              if field.repeated?
-                collection = [ value ]
-                collection.flatten!
-                collection.compact!
-                collection.map! { |value| coerce(value, field) }
-                value = collection
-              else
-                value = coerce(value, field)
-              end
-
-              if field.message? && field.repeated?
-                value = value.map do |attributes|
-                  attributes.is_a?(Hash) ? build_message(field.type, attributes) : attributes
-                end
-              elsif field.message?
-                value = value.is_a?(Hash) ? build_message(field.type, value) : value
-              end
-
-              message.method("#{key}=").call(value)
-            end
-
-            message
-          end
-        end
-
-        def coerce(value, field)
-          return value if value.nil?
-          return value.to_i if field.enum?
-
-          protobuf_field_type = ::ActiveRemote::Serializers::Protobuf::ATTRIBUTE_TYPES[field.type]
-
-          case 
-          when protobuf_field_type == ::ActiveAttr::Typecasting::Boolean then
-            if value == 1
-              return true
-            elsif value == 0
-              return false
-            end
-          when protobuf_field_type == Integer then
-            return value.to_i
-          when protobuf_field_type == Float then
-            return value.to_f
-          when protobuf_field_type == String then
-            return value.to_s
-          end
-
-          return value
-        end
-      end
-
-      def build_message(message_class, attributes)
-        self.class.build_message(message_class, attributes)
-      end
-    end
-  end
-end

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

@@ -1,95 +0,0 @@
-require 'spec_helper'
-
-describe ActiveRemote::Serializers::Protobuf do
-  describe ".build_message" do
-    it "coerces the attribute value to a compatible type"
-
-    it "builds a protobuf message"
-
-    context "when the message doesn't have a field matching a given attribute" do
-      it "skips the attribute"
-    end
-
-    context "when a field is repeated" do
-      it "converts the attribute to a collection"
-      it "coerces the attribute value(s) to a compatible type"
-    end
-
-    context "when the field is an enum" do
-      it "converts the attribute into an integer"
-    end
-
-    context "when a field is a message" do
-      let(:attributes) { { :category => category } }
-      let(:category) { { :name  => 'foo' } }
-      let(:category_message) { Generic::Remote::Category.new(category) }
-
-      context "and the value is a hash" do
-        it "builds new messages with the value(s)" do
-          message = ::ActiveRemote::Base.build_message(Generic::Remote::Post, attributes)
-          message.category.should eq (category_message)
-        end
-      end
-
-      context "and the value is a message" do
-        let(:attributes) { { :category => category_message } }
-
-        it "returns the value" do
-          message = ::ActiveRemote::Base.build_message(Generic::Remote::Post, attributes)
-          message.category.should eq (category_message)
-        end
-      end
-
-      context "and the field is repeated" do
-        context "and the value is a hash" do
-          let(:attributes) { { :records => [ tag ] } }
-          let(:tag) { { :name  => 'foo' } }
-          let(:tag_message) { Generic::Remote::Tag.new(tag) }
-
-          it "builds new messages with the value(s)" do
-            message = ::ActiveRemote::Base.build_message(Generic::Remote::Tags, attributes)
-            message.records.first.should eq (tag_message)
-          end
-        end
-
-        context "and the value is a message" do
-          let(:attributes) { { :records => [ tag_message ] } }
-          let(:tag_message) { Generic::Remote::Tag.new }
-
-          it "returns the value" do
-            message = ::ActiveRemote::Base.build_message(Generic::Remote::Tags, attributes)
-            message.records.first.should eq (tag_message)
-          end
-        end
-      end
-    end
-  end
-
-  describe ".coerce" do
-    context "when field_type is :bool" do
-      context "and value is 1" do
-        it "returns true"
-      end
-
-      context "and value is 0" do
-        it "returns false"
-      end
-    end
-
-    context "when the field_type is :int32" do
-      it "returns an integer"
-    end
-
-    context "when the field_type is :int64" do
-      it "returns an integer"
-    end
-
-    context "when the field_type is :double" do
-      it "returns a float"
-    end
-
-    context "when the field_type is :string" do
-      it "returns a string"
-    end
-  end
-end