protobuf-activerecord 3.1.0.alpha2 → 3.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e93c8167f34b38c4158dd3d82db152c09e416627
-  data.tar.gz: 555cce2e9b32877a021ae999bf1218cc6ebf9ac1
+  metadata.gz: f42ba3a9157a8f65d92959c296f5bb19fa168ee2
+  data.tar.gz: e468d159988120ea8ea0fedc6e38078c0713f568
 SHA512:
-  metadata.gz: 9c68fe645bc4fc2bc77f3fbf71695f48f927314e5fff2c870431cc3e8a22f39c003d354de5c39b887255bcdd75751004ef1f2dc952e33d1522ae81908a519010
-  data.tar.gz: 24aa0aacbcc8fe1fa5c8e4c8f88752e133ae32cbc819d58ff237e5416a8f18bbb22b641c4e62314b6e1991681ffb5b3b1c172df4d425f4ae290f378951e361af
+  metadata.gz: 59c81886e81abc07b51488a85edc4d27f5a5025d1444e3790893c2bfd47696b67c4208a98abaabbd06ca3236c3f8e885b2a021c6fd4b0e48a6f770defa6c3bf6
+  data.tar.gz: ea61d1a46bb287bf3880b9c9345f4c4bd9bc96c5474e221d036f28bf817c7630656d9c7f4453d65701fe0ab11f35b2745bbca378ca822f310eee3fa8fe5b222c

data/Rakefile

@@ -15,6 +15,6 @@ 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"
+  cmd = "protoc --ruby_out=spec/support/protobuf --proto_path=spec/support/definitions spec/support/definitions/*.proto"
   sh(cmd)
 end

data/lib/protobuf-activerecord.rb

@@ -12,8 +12,9 @@ rescue LoadError
 end
 
 require 'protobuf/active_record/config'
+require 'protobuf/active_record/middleware/connection_management'
+require 'protobuf/active_record/middleware/query_cache'
 require 'protobuf/active_record/model'
-require 'protobuf/active_record/service_filters'
 require 'protobuf/active_record/version'
 
 module Protobuf

data/lib/protobuf/active_record/middleware/connection_management.rb

@@ -0,0 +1,17 @@
+module Protobuf
+  module ActiveRecord
+    module Middleware
+      class ConnectionManagement
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          @app.call(env)
+        ensure
+          ::ActiveRecord::Base.clear_active_connections!
+        end
+      end
+    end
+  end
+end

data/lib/protobuf/active_record/middleware/query_cache.rb

@@ -0,0 +1,29 @@
+module Protobuf
+  module ActiveRecord
+    module Middleware
+      class QueryCache
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          enabled = ::ActiveRecord::Base.connection.query_cache_enabled
+          connection_id = ::ActiveRecord::Base.connection_id
+          ::ActiveRecord::Base.connection.enable_query_cache!
+
+          @app.call(env)
+        ensure
+          restore_query_cache_settings(connection_id, enabled)
+        end
+
+      private
+
+        def restore_query_cache_settings(connection_id, enabled)
+          ::ActiveRecord::Base.connection_id = connection_id
+          ::ActiveRecord::Base.connection.clear_query_cache
+          ::ActiveRecord::Base.connection.disable_query_cache! unless enabled
+        end
+      end
+    end
+  end
+end

data/lib/protobuf/active_record/railtie.rb

@@ -10,9 +10,8 @@ module Protobuf
       end
 
       ActiveSupport.on_load(:protobuf_rpc_service) do
-        on_inherit do
-          include Protobuf::ActiveRecord::ServiceFilters
-        end
+        Protobuf::Rpc.middleware.insert_after Protobuf::Rpc::Middleware::Logger, Middleware::ConnectionManagement
+        Protobuf::Rpc.middleware.insert_after Middleware::ConnectionManagement, Middleware::QueryCache
       end
     end
   end

data/lib/protobuf/active_record/scope.rb

@@ -74,7 +74,7 @@ module Protobuf
           end
 
           values = [ value ].flatten
-          values.map!(&:to_i) if proto.get_field_by_name(field).enum?
+          values.map!(&:to_i) if proto.class.get_field(field, true).enum?
           values
         end
 

data/lib/protobuf/active_record/transformation.rb

@@ -28,7 +28,7 @@ module Protobuf
         def _filter_attribute_fields(proto)
           fields = proto.to_hash
           fields.select! do |key, value|
-            field = proto.get_field_by_name(key) || proto.get_ext_field_by_name(key)
+            field = proto.class.get_field(key, true)
             proto.has_field?(key) && !field.repeated?
           end
 

data/lib/protobuf/active_record/validations.rb

@@ -30,7 +30,7 @@ module Protobuf
           raise ArgumentError, ":with must be specified" if enumerable.nil?
 
           if enumerable < ::Protobuf::Enum
-            options[:in] = enumerable.values.values.map(&:value)
+            options[:in] = enumerable.all_tags
           end
 
           args << options

data/lib/protobuf/active_record/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module ActiveRecord
-    VERSION = "3.1.0.alpha2"
+    VERSION = "3.1.0.rc1"
   end
 end

data/protobuf-activerecord.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activerecord", ">= 3.2.0"
   spec.add_dependency "activesupport", ">= 3.2.0"
   spec.add_dependency "heredity", ">= 0.1.1"
-  spec.add_dependency "protobuf", ">= 2.2.0"
+  spec.add_dependency "protobuf", ">= 3.0.0.rc1"
 
   ##
   # Development dependencies

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

@@ -15,15 +15,15 @@ class UserSearchMessage < ::Protobuf::Message; end
 # Message Fields
 #
 class UserMessage
-  optional ::Protobuf::Field::StringField, :guid, 1
-  optional ::Protobuf::Field::StringField, :name, 2
-  optional ::Protobuf::Field::StringField, :email, 3
-  optional ::Protobuf::Field::StringField, :email_domain, 4, :deprecated => true
-  optional ::Protobuf::Field::StringField, :password, 5
+  optional :string, :guid, 1
+  optional :string, :name, 2
+  optional :string, :email, 3
+  optional :string, :email_domain, 4, :deprecated => true
+  optional :string, :password, 5
 end
 
 class UserSearchMessage
-  repeated ::Protobuf::Field::StringField, :guid, 1
-  repeated ::Protobuf::Field::StringField, :email, 2
+  repeated :string, :guid, 1
+  repeated :string, :email, 2
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-activerecord
 version: !ruby/object:Gem::Version
-  version: 3.1.0.alpha2
+  version: 3.1.0.rc1
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -186,13 +186,14 @@ files:
 - lib/protobuf/active_record/mass_assignment_security.rb
 - lib/protobuf/active_record/mass_assignment_security/persistence.rb
 - lib/protobuf/active_record/mass_assignment_security/transformation.rb
+- lib/protobuf/active_record/middleware/connection_management.rb
+- lib/protobuf/active_record/middleware/query_cache.rb
 - lib/protobuf/active_record/model.rb
 - lib/protobuf/active_record/nested_attributes.rb
 - lib/protobuf/active_record/persistence.rb
 - lib/protobuf/active_record/railtie.rb
 - lib/protobuf/active_record/scope.rb
 - lib/protobuf/active_record/serialization.rb
-- lib/protobuf/active_record/service_filters.rb
 - lib/protobuf/active_record/transformation.rb
 - lib/protobuf/active_record/validations.rb
 - lib/protobuf/active_record/version.rb
@@ -230,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers integration for Active Record

data/lib/protobuf/active_record/service_filters.rb

@@ -1,15 +0,0 @@
-module Protobuf
-  module ActiveRecord
-    module ServiceFilters
-      extend ::ActiveSupport::Concern
-
-      included do
-        after_filter :_protobuf_active_record_clear_active_connections
-      end
-
-      def _protobuf_active_record_clear_active_connections
-        ::ActiveRecord::Base.clear_active_connections!
-      end
-    end
-  end
-end