protobuf-activerecord 1.0.4 → 1.0.5

data/Rakefile

@@ -5,4 +5,4 @@ desc "Run specs"
 RSpec::Core::RakeTask.new(:spec)
 
 desc "Run specs (default)"
-task :default => :spec
+task :default => :spec

data/lib/protoable/fields.rb

@@ -1,10 +1,10 @@
-require 'protoable/inheritable_class_instance_variables'
+require 'heredity/inheritable_class_instance_variables'
 
 module Protoable
   module Fields
     def self.extended(klass)
       klass.extend Protoable::Fields::ClassMethods
-      klass.__send__(:include, Protoable::InheritableClassInstanceVariables)
+      klass.__send__(:include, ::Heredity::InheritableClassInstanceVariables)
 
       klass.class_eval do
         class << self

data/lib/protoable/serialization.rb

@@ -1,8 +1,10 @@
+require 'heredity/inheritable_class_instance_variables'
+
 module Protoable
   module Serialization
     def self.included(klass)
       klass.extend Protoable::Serialization::ClassMethods
-      klass.__send__(:include, Protoable::InheritableClassInstanceVariables)
+      klass.__send__(:include, ::Heredity::InheritableClassInstanceVariables)
 
       klass.class_eval do
         class << self
@@ -14,8 +16,7 @@ module Protoable
         @_protobuf_column_converters = {}
         @protobuf_fields = []
 
-        # NOTE: Make sure each inherited object has the database layout
-        inheritable_attributes :protobuf_fields, :_protobuf_column_converters
+        inheritable_attributes :_protobuf_column_converters, :protobuf_fields, :protobuf_message
       end
     end
 
@@ -77,9 +78,9 @@ module Protoable
       #
       def protobuf_message(message = nil)
         unless message.nil?
-          @_protobuf_message = message.to_s.classify.constantize
+          @protobuf_message = message.to_s.classify.constantize
 
-          self.protobuf_fields = @_protobuf_message.fields.compact.map do |field|
+          self.protobuf_fields = @protobuf_message.fields.compact.map do |field|
             field.name.to_sym
           end
 
@@ -92,7 +93,7 @@ module Protoable
           end
         end
 
-        @_protobuf_message
+        @protobuf_message
       end
     end
 

data/lib/protobuf/activerecord/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module ActiveRecord
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   end
-end
+end

data/protobuf-activerecord.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   # Dependencies
   #
   gem.add_dependency "activerecord"
+  gem.add_dependency "heredity"
   gem.add_dependency "protobuf", ">= 2.0"
 
   ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: heredity
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +206,6 @@ files:
 - lib/protoable/convert.rb
 - lib/protoable/errors.rb
 - lib/protoable/fields.rb
-- lib/protoable/inheritable_class_instance_variables.rb
 - lib/protoable/persistence.rb
 - lib/protoable/serialization.rb
 - lib/protobuf-activerecord.rb
@@ -198,7 +213,6 @@ files:
 - protobuf-activerecord.gemspec
 - spec/protoable/convert_spec.rb
 - spec/protoable/fields_spec.rb
-- spec/protoable/inheritable_class_instance_variables_spec.rb
 - spec/protoable/persistence_spec.rb
 - spec/protoable/serialization_spec.rb
 - spec/spec_helper.rb
@@ -222,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3415879493130708479
+      hash: -2949215824244847758
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -231,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3415879493130708479
+      hash: -2949215824244847758
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -241,7 +255,6 @@ summary: Google Protocol Buffers integration for Active Record
 test_files:
 - spec/protoable/convert_spec.rb
 - spec/protoable/fields_spec.rb
-- spec/protoable/inheritable_class_instance_variables_spec.rb
 - spec/protoable/persistence_spec.rb
 - spec/protoable/serialization_spec.rb
 - spec/spec_helper.rb

data/lib/protoable/inheritable_class_instance_variables.rb

@@ -1,54 +0,0 @@
-require 'thread'
-
-module Protoable
-  module InheritableClassInstanceVariables
-    def self.included(klass)
-      Thread.exclusive do
-        klass.extend(Protoable::InheritableClassInstanceVariables::ClassMethods)
-
-        klass.class_eval do
-          @_inheritable_class_instance_variables = [ :_inheritable_class_instance_variables ]
-        end
-      end
-    end
-
-    module ClassMethods
-      def inheritable_attributes(*args)
-        Thread.exclusive do
-          args.flatten.compact.uniq.each do |class_instance_variable|
-            unless @_inheritable_class_instance_variables.include?(class_instance_variable)
-              @_inheritable_class_instance_variables << class_instance_variable
-            end
-          end
-
-          @_inheritable_class_instance_variables.each do |attr_symbol|
-            unless self.respond_to?("#{attr_symbol}")
-              class_eval %Q{
-                class << self; attr_reader :#{attr_symbol}; end
-              }
-            end
-
-            unless self.respond_to?("#{attr_symbol}=")
-              class_eval %Q{
-                class << self; attr_writer :#{attr_symbol}; end
-              }
-            end
-          end
-
-          @_inheritable_class_instance_variables
-        end
-      end
-
-      def inherited(klass)
-        super # ActiveRecord needs the inherited hook to setup fields
-
-        Thread.exclusive do
-          @_inheritable_class_instance_variables.each do |attribute|
-            attr_sym = :"@#{attribute}"
-            klass.instance_variable_set(attr_sym, self.instance_variable_get(attr_sym))
-          end
-        end
-      end
-    end
-  end
-end

data/spec/protoable/inheritable_class_instance_variables_spec.rb

@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe Protoable::InheritableClassInstanceVariables do
-  pending
-end