protobuf-activerecord 1.2.4 → 1.2.5

data/.gitignore

@@ -3,6 +3,7 @@
 .DS_Store
 .bundle
 .config
+.rvmrc
 .yardoc
 Gemfile.lock
 coverage

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

@@ -22,10 +22,6 @@ module Protoable
     #   end
     #
     def field_scope(field, scope_name)
-      unless self.respond_to?(scope_name)
-        raise Protoable::SearchScopeError, "Undefined scope :#{scope_name}. :#{scope_name} must be defined before it can be used as a field scope."
-      end
-
       searchable_fields[field] = scope_name
     end
 
@@ -47,6 +43,10 @@ module Protoable
       searchable_fields.each do |field, scope_name|
         next unless proto.respond_to_and_has_and_present?(field)
 
+        unless self.respond_to?(scope_name)
+          raise Protoable::SearchScopeError, "Undefined scope :#{scope_name}."
+        end
+
         values = [ proto.__send__(field) ].flatten
         values.map!(&:to_i) if proto.get_field_by_name(field).enum?
 

data/lib/protobuf/activerecord/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module ActiveRecord
-    VERSION = "1.2.4"
+    VERSION = "1.2.5"
   end
 end

data/spec/protoable/scope_spec.rb

@@ -21,17 +21,20 @@ describe Protoable::Scope do
         User.search_scope(request).should eq User.by_email("foo@test.co")
       end
     end
-  end
 
-  describe ".field_scope" do
-    before { @fields = User.instance_variable_get("@_searchable_fields") }
-    after { User.instance_variable_set("@_searchable_fields", @fields) }
+    context "when a searchable field uses a non-existant scope" do
+      let(:request) { UserSearchMessage.new(:email => ["foo@test.co"]) }
 
-    context "when given a search scope that is not defined" do
       it "raises an exception" do
-        expect { User.field_scope :name, :foo }.to raise_exception(/Undefined scope :foo/)
+        User.stub(:searchable_fields).and_return({ :email =>  :by_hullabaloo })
+        expect { User.search_scope(request) }.to raise_exception(/Undefined scope :by_hullabaloo/)
       end
     end
+  end
+
+  describe ".field_scope" do
+    before { @fields = User.instance_variable_get("@_searchable_fields") }
+    after { User.instance_variable_set("@_searchable_fields", @fields) }
 
     it "stores the search scope in the searchable fields hash using the field as the key" do
       User.field_scope :guid, :by_guid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -197,7 +197,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -240,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 811709440297212247
+      hash: 262184748097554895
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -249,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 811709440297212247
+      hash: 262184748097554895
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3@protobuf-activerecord --create