protobuf-activerecord 2.1.0 → 3.0.0.pre

data/spec/{protoable → protobuf/active_record}/scope_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Protoable::Scope do
+describe Protobuf::ActiveRecord::Scope do
   before do
     @field_parsers = User.instance_variable_get("@_searchable_field_parsers")
     @fields = User.instance_variable_get("@_searchable_fields")
@@ -48,13 +48,6 @@ describe Protoable::Scope do
   end
 
   describe ".field_scope" do
-    context "when scope is passed in the old style" do
-      it "defines the given field as searchable using the given scope" do
-        User.field_scope :guid, :by_guid
-        User.searchable_fields[:guid].should eq :by_guid
-      end
-    end
-
     context "when :scope is not defined" do
       it "defines the given field as searchable using the `by_[:field]` as the scope" do
         User.field_scope :guid

data/spec/{protoable → protobuf/active_record}/serialization_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Protoable::Serialization do
+describe Protobuf::ActiveRecord::Serialization do
   let(:protobuf_message) { UserMessage }
 
   describe "._protobuf_convert_attributes_to_fields" do
@@ -71,7 +71,7 @@ describe Protoable::Serialization do
 
     context "when the given converter is not callable" do
       it "raises an exception" do
-        expect { User.field_from_record :name, nil }.to raise_exception(Protoable::FieldTransformerError)
+        expect { User.field_from_record :name, nil }.to raise_exception(Protobuf::ActiveRecord::FieldTransformerError)
       end
     end
 

data/spec/{protoable → protobuf/active_record}/transformation_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Protoable::Transformation do
+describe Protobuf::ActiveRecord::Transformation do
   let(:user) { User.new(user_attributes) }
   let(:user_attributes) { { :first_name => 'foo', :last_name => 'bar', :email => 'foo@test.co' } }
   let(:proto_hash) { { :name => 'foo bar', :email => 'foo@test.co' } }
@@ -24,7 +24,7 @@ describe Protoable::Transformation do
     end
   end
   
-  describe "._protobuf_convert_fields_to_columns" do
+  describe "._protobuf_convert_fields_to_attributes" do
     context "when the given field's corresponding column type is :date" do
       let(:date) { Date.current }
       let(:value) { date.to_time.to_i }
@@ -32,7 +32,7 @@ describe Protoable::Transformation do
       before { User.stub(:_protobuf_date_column?).and_return(true) }
 
       it "converts the given value to a Date object" do
-        User._protobuf_convert_fields_to_columns(:foo_date, value).should eq date
+        User._protobuf_convert_fields_to_attributes(:foo_date, value).should eq date
       end
     end
 
@@ -43,11 +43,11 @@ describe Protoable::Transformation do
       before { User.stub(:_protobuf_datetime_column?).and_return(true) }
 
       it "converts the given value to a DateTime object" do
-        User._protobuf_convert_fields_to_columns(:foo_datetime, value).should be_a(DateTime)
+        User._protobuf_convert_fields_to_attributes(:foo_datetime, value).should be_a(DateTime)
       end
 
       it "converts the given value to a DateTime object of the same value" do
-        User._protobuf_convert_fields_to_columns(:foo_datetime, value).should be_within(1).of(datetime)
+        User._protobuf_convert_fields_to_attributes(:foo_datetime, value).should be_within(1).of(datetime)
       end
     end
 
@@ -58,11 +58,11 @@ describe Protoable::Transformation do
       before { User.stub(:_protobuf_time_column?).and_return(true) }
 
       it "converts the given value to a Time object" do
-        User._protobuf_convert_fields_to_columns(:foo_time, value).should be_a(Time)
+        User._protobuf_convert_fields_to_attributes(:foo_time, value).should be_a(Time)
       end
 
       it "converts the given value to a Time object of the same value" do
-        User._protobuf_convert_fields_to_columns(:foo_time, value).should be_within(1).of(time)
+        User._protobuf_convert_fields_to_attributes(:foo_time, value).should be_within(1).of(time)
       end
     end
 
@@ -73,11 +73,11 @@ describe Protoable::Transformation do
       before { User.stub(:_protobuf_timestamp_column?).and_return(true) }
 
       it "converts the given value to a Time object" do
-        User._protobuf_convert_fields_to_columns(:foo_time, value).should be_a(Time)
+        User._protobuf_convert_fields_to_attributes(:foo_time, value).should be_a(Time)
       end
 
       it "converts the given value to a Time object of the same value" do
-        User._protobuf_convert_fields_to_columns(:foo_timestamp, value).should be_within(1).of(time)
+        User._protobuf_convert_fields_to_attributes(:foo_timestamp, value).should be_within(1).of(time)
       end
     end
 
@@ -85,7 +85,7 @@ describe Protoable::Transformation do
       let(:value) { "Foo" }
 
       it "returns the given value" do
-        User._protobuf_convert_fields_to_columns(:foo, value).should eq value
+        User._protobuf_convert_fields_to_attributes(:foo, value).should eq value
       end
     end
   end
@@ -128,7 +128,7 @@ describe Protoable::Transformation do
 
     context "when a transformer is not defined for the attribute" do
       before {
-        User.stub(:_protobuf_convert_fields_to_columns) do |key, value|
+        User.stub(:_protobuf_convert_fields_to_attributes) do |key, value|
           value
         end
       }
@@ -154,7 +154,7 @@ describe Protoable::Transformation do
 
     context "when the given transformer is not callable" do
       it "raises an exception" do
-        expect { User.attribute_from_proto :name, nil }.to raise_exception(Protoable::AttributeTransformerError)
+        expect { User.attribute_from_proto :name, nil }.to raise_exception(Protobuf::ActiveRecord::AttributeTransformerError)
       end
     end
 

data/spec/support/models/user.rb

@@ -1,5 +1,5 @@
 class User < ActiveRecord::Base
-  include Protoable
+  include Protobuf::ActiveRecord::Model
 
   scope :by_guid, lambda { |*guids| where(:guid => guids) }
   scope :by_email, lambda { |*emails| where(:email => emails) }

metadata

@@ -1,181 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0.pre
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: heredity
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.2.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: geminabox
-  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: 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'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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: timecop
   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: Provides the ability to create Active Record objects from Protocol Buffer
@@ -193,22 +179,27 @@ files:
 - README.md
 - Rakefile
 - lib/protobuf-activerecord.rb
-- lib/protobuf/activerecord/protoable.rb
-- lib/protobuf/activerecord/protoable/columns.rb
-- lib/protobuf/activerecord/protoable/errors.rb
-- lib/protobuf/activerecord/protoable/persistence.rb
-- lib/protobuf/activerecord/protoable/scope.rb
-- lib/protobuf/activerecord/protoable/serialization.rb
-- lib/protobuf/activerecord/protoable/transformation.rb
-- lib/protobuf/activerecord/protoable/validations.rb
-- lib/protobuf/activerecord/protobuf_ext/message.rb
-- lib/protobuf/activerecord/version.rb
+- lib/protobuf/active_record/attribute_methods.rb
+- lib/protobuf/active_record/columns.rb
+- lib/protobuf/active_record/config.rb
+- lib/protobuf/active_record/errors.rb
+- 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/model.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/transformation.rb
+- lib/protobuf/active_record/validations.rb
+- lib/protobuf/active_record/version.rb
 - protobuf-activerecord.gemspec
-- spec/protoable/columns_spec.rb
-- spec/protoable/persistence_spec.rb
-- spec/protoable/scope_spec.rb
-- spec/protoable/serialization_spec.rb
-- spec/protoable/transformation_spec.rb
+- spec/protobuf/active_record/columns_spec.rb
+- spec/protobuf/active_record/persistence_spec.rb
+- spec/protobuf/active_record/scope_spec.rb
+- spec/protobuf/active_record/serialization_spec.rb
+- spec/protobuf/active_record/transformation_spec.rb
 - spec/spec_helper.rb
 - spec/support/db.rb
 - spec/support/db/setup.rb
@@ -226,26 +217,26 @@ 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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers integration for Active Record
 test_files:
-- spec/protoable/columns_spec.rb
-- spec/protoable/persistence_spec.rb
-- spec/protoable/scope_spec.rb
-- spec/protoable/serialization_spec.rb
-- spec/protoable/transformation_spec.rb
+- spec/protobuf/active_record/columns_spec.rb
+- spec/protobuf/active_record/persistence_spec.rb
+- spec/protobuf/active_record/scope_spec.rb
+- spec/protobuf/active_record/serialization_spec.rb
+- spec/protobuf/active_record/transformation_spec.rb
 - spec/spec_helper.rb
 - spec/support/db.rb
 - spec/support/db/setup.rb

data/lib/protobuf/activerecord/protoable.rb

@@ -1,19 +0,0 @@
-require 'protobuf/activerecord/protoable/columns'
-require 'protobuf/activerecord/protoable/errors'
-require 'protobuf/activerecord/protoable/persistence'
-require 'protobuf/activerecord/protoable/scope'
-require 'protobuf/activerecord/protoable/serialization'
-require 'protobuf/activerecord/protoable/transformation'
-require 'protobuf/activerecord/protoable/validations'
-
-module Protoable
-  def self.included(klass)
-    klass.extend Protoable::Scope
-
-    klass.__send__(:include, Protoable::Columns)
-    klass.__send__(:include, Protoable::Persistence)
-    klass.__send__(:include, Protoable::Serialization)
-    klass.__send__(:include, Protoable::Transformation)
-    klass.__send__(:include, Protoable::Validations)
-  end
-end

data/lib/protobuf/activerecord/protoable/columns.rb

@@ -1,56 +0,0 @@
-require 'heredity/inheritable_class_instance_variables'
-
-module Protoable
-  module Columns
-    def self.included(klass)
-      klass.extend Protoable::Columns::ClassMethods
-      klass.__send__(:include, ::Heredity::InheritableClassInstanceVariables)
-
-      klass.class_eval do
-        class << self
-          attr_accessor :_protobuf_columns, :_protobuf_column_types
-        end
-
-        @_protobuf_columns = {}
-        @_protobuf_column_types = Hash.new { |h,k| h[k] = [] }
-
-        # NOTE: Make sure each inherited object has the database layout
-        inheritable_attributes :_protobuf_columns, :_protobuf_column_types
-      end
-
-      _protobuf_map_columns(klass)
-    end
-
-    # Map out the columns for future reference on type conversion
-    #
-    def self._protobuf_map_columns(klass)
-      return unless klass.table_exists?
-      klass.columns.map do |column|
-        klass._protobuf_columns[column.name.to_sym] = column
-        klass._protobuf_column_types[column.type.to_sym] << column.name.to_sym
-      end
-    end
-
-    module ClassMethods
-      # :nodoc:
-      def _protobuf_date_column?(key)
-        _protobuf_column_types.fetch(:date, false) && _protobuf_column_types[:date].include?(key)
-      end
-
-      # :nodoc:
-      def _protobuf_datetime_column?(key)
-        _protobuf_column_types.fetch(:datetime, false) && _protobuf_column_types[:datetime].include?(key)
-      end
-
-      # :nodoc:
-      def _protobuf_time_column?(key)
-        _protobuf_column_types.fetch(:time, false) && _protobuf_column_types[:time].include?(key)
-      end
-
-      # :nodoc:
-      def _protobuf_timestamp_column?(key)
-        _protobuf_column_types.fetch(:timestamp, false) && _protobuf_column_types[:timestamp].include?(key)
-      end
-    end
-  end
-end