protobuf-activerecord 2.1.0.rc2 → 2.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWVlMmI0NmI3ODc3MjI1NDk3NTUyMDhlODIyZDE0ODg3NGNmODlhZQ==
+  data.tar.gz: !binary |-
+    NjEwNzFlMTAyZGE1Yzk5NGZjNDVjZmJlYmU5ODExYjFkNWIwMTVjOA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NzkzN2ZkMGY3YzdiN2NlZjAwZTAwZjMzZDc0NTQzMjMwNzgzOWY2NDg1MWQ5
+    YzBhZTI3ZmFjMGIzOWRlYjgxMmRhN2Y1NDZlNGE4MzI5OTY3NWVjZjljNzc1
+    NjU4MjUxZjRlNGE5NmI3MzMzMzc0YWM1YTRmYTQxMDQwYTMzMDA=
+  data.tar.gz: !binary |-
+    ZmY0YWY3OGRkNTdkNzAwYzQ1YTkzZjVhZjk5ZDAwMGUzMDdkNjUyNGY2MzBk
+    ODY4ZGZlYWQ2NmFmOGQyNjdiZjY4MmI4NDI1YWZhNzEzY2MwYWQyZWFkZGUx
+    OWM0NDc5MWRmYjhhYjYwMGQ4YzE5NzE4ZjgzNjkxNDY4NGFjOTM=

data/README.md

@@ -202,11 +202,25 @@ class User < ActiveRecord::Base
 
   scope :by_name, lambda { |*values| where(:name => values) }
 
-  field_scope :name, :by_name
+  field_scope :name, :scope => :by_name
 end
 ```
 
-This tells Protoable that the name field should be searchable and that the scope with the given name should be used to build the search scope.
+This tells Protoable that the name field should be searchable and that the :scope with the given name should be used to build the search scope.
+
+`field_scope` can also be called with just a field name:
+
+```Ruby
+class User < ActiveRecord::Base
+  include Protoable
+
+  scope :by_name, lambda { |*values| where(:name => values) }
+
+  field_scope :name
+end
+```
+
+If no scope is given, Protoable assumes that a scope matching the given field prefixed with `by_`, in this case `by_name`.
 
 Now that your class is configured with some searchable fields, you can use the `search_scope` method to build ARel scopes from a protobuf message.
 

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

@@ -48,6 +48,7 @@ module Protoable
 
       scope_name = case
                    when args.present? then
+                     warn "WARNING: Passing scopes directly to field_scope is deprecated and will be removed in 3.0. Use :scope => xxx instead."
                      args.first
                    when options.include?(:scope) then
                      options[:scope]

data/lib/protobuf/activerecord/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module ActiveRecord
-    VERSION = "2.1.0.rc2"
+    VERSION = "2.1.0"
   end
 end

data/protobuf-activerecord.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |gem|
   ##
   # Dependencies
   #
-  gem.add_dependency "activerecord"
-  gem.add_dependency "activesupport"
+  gem.add_dependency "activerecord", "~> 3.1"
+  gem.add_dependency "activesupport", "~> 3.1"
   gem.add_dependency "heredity"
   gem.add_dependency "protobuf", ">= 2.1.3"
 

data/spec/protoable/scope_spec.rb

@@ -1,6 +1,17 @@
 require 'spec_helper'
 
 describe Protoable::Scope do
+  before do
+    @field_parsers = User.instance_variable_get("@_searchable_field_parsers")
+    @fields = User.instance_variable_get("@_searchable_fields")
+  end
+
+  after do
+    User.instance_variable_set("@_searchable_field_parsers", @field_parsers)
+    User.instance_variable_set("@_searchable_fields", @fields)
+  end
+
+
   describe ".search_scope" do
     let(:request) { UserSearchMessage.new(:guid => ["foo"], :email => ["foo@test.co"]) }
 
@@ -37,9 +48,6 @@ describe Protoable::Scope do
   end
 
   describe ".field_scope" do
-    before { @fields = User.instance_variable_get("@_searchable_fields") }
-    after { User.instance_variable_set("@_searchable_fields", @fields) }
-
     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
@@ -69,9 +77,6 @@ describe Protoable::Scope do
     end
 
     context "when :parser is defined" do
-      before { @field_parsers = User.instance_variable_get("@_searchable_field_parsers") }
-      after { User.instance_variable_set("@_searchable_field_parsers", @field_parsers) }
-
       it "defines the given field as parseable using the given :parser" do
         User.field_scope :guid, :parser => :parser
         User.searchable_field_parsers[:guid].should eq :parser
@@ -80,20 +85,51 @@ describe Protoable::Scope do
   end
 
   describe ".parse_search_values" do
-    it "converts single values to collections"
+
+    it "converts single values to collections" do
+      proto = UserMessage.new(:email => "the.email@test.in")
+
+      User.field_scope :email
+      User.parse_search_values(proto, :email).should eq ["the.email@test.in"]
+    end
 
     context "when a field parser is defined" do
+      before { User.field_scope :guid, :parser => parser }
+
+      let(:proto) { UserSearchMessage.new(:guid => ["foo"]) }
+
       context "and the parser responds to :to_sym" do
-        it "calls `send`, passing it the parser and value"
+        let(:parser) { double('parser', :to_sym => :parser_to_sym) }
+
+        it "passes the value to the parser" do
+          User.should_receive(:parser_to_sym).with([ "foo" ])
+          User.parse_search_values(proto, :guid)
+        end
       end
 
       context "and the parser does not respond to :to_sym" do
-        it "calls the parser, passing it the value"
+        let(:parser) { double('parser') }
+
+        it "passes the value to the parser" do
+          parser.should_receive(:call).with(["foo"])
+          User.parse_search_values(proto, :guid)
+        end
       end
     end
 
     context "when the field is an enum" do
-      it "maps values to integers"
+      it "maps values to integers" do
+        TheEnum = Class.new(::Protobuf::Enum) do
+          define :VALUE, 1
+        end
+
+        TheMessage = Class.new(::Protobuf::Message) do
+          optional TheEnum, :the_enum_value, 1
+        end
+
+        proto = TheMessage.new(:the_enum_value => TheEnum::VALUE)
+        User.parse_search_values(proto, :the_enum_value)[0].should be 1
+      end
     end
   end
 end

data/spec/protoable/serialization_spec.rb

@@ -219,7 +219,7 @@ describe Protoable::Serialization do
         end
 
         it "converts attributes values for protobuf messages" do
-          user.should_receive(:_protobuf_convert_attributes_to_fields).any_number_of_times
+          user.stub(:_protobuf_convert_attributes_to_fields)
           user.fields_from_record
         end
       end

data/spec/protoable/transformation_spec.rb

@@ -185,11 +185,13 @@ describe Protoable::Transformation do
 
   describe ".convert_int64_to_datetime" do
     let(:datetime) { DateTime.current }
-    let(:int64) { datetime.to_time.to_i }
+    let(:int64) { datetime.to_i }
 
     it "initializes a new DateTime object from the value" do
       Timecop.freeze(DateTime.current) do
-        User.convert_int64_to_datetime(int64).should eq datetime
+        expected_datetime = Time.at(datetime.to_i)
+        converted_datetime = User.convert_int64_to_datetime(int64)
+        converted_datetime.should eq expected_datetime
       end
     end
   end
@@ -211,4 +213,4 @@ describe Protoable::Transformation do
       user.attributes_from_proto(proto)
     end
   end
-end
+end

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc2
-  prerelease: 6
+  version: 2.1.0
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: heredity
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: geminabox
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-pride
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -244,30 +219,26 @@ files:
 - spec/support/protobuf/user.pb.rb
 homepage: http://github.com/liveh2o/protobuf-activerecord
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1857702975333087595
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Google Protocol Buffers integration for Active Record
 test_files:
 - spec/protoable/columns_spec.rb