enju_resource_merge 0.0.5 → 0.0.6

data/lib/enju_resource_merge/version.rb

@@ -1,3 +1,3 @@
 module EnjuResourceMerge
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/support/controller_macros.rb

@@ -2,14 +2,14 @@ module ControllerMacros
   def login_admin
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:admin]
-      sign_in Factory.create(:admin)
+      sign_in FactoryGirl.create(:admin)
     end
   end
 
   def login_librarian
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      user = Factory.create(:librarian)
+      user = FactoryGirl.create(:librarian)
       sign_in user
     end
   end
@@ -17,7 +17,7 @@ module ControllerMacros
   def login_user
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      user = Factory.create(:user)
+      user = FactoryGirl.create(:user)
       sign_in user
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_resource_merge
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70339189830760 !ruby/object:Gem::Requirement
+  requirement: &70314004333280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70339189830760
+  version_requirements: *70314004333280
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70339189830260 !ruby/object:Gem::Requirement
+  requirement: &70314004332580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339189830260
+  version_requirements: *70314004332580
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70339189829800 !ruby/object:Gem::Requirement
+  requirement: &70314004348420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70339189829800
+  version_requirements: *70314004348420
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70339189829420 !ruby/object:Gem::Requirement
+  requirement: &70314004347800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339189829420
+  version_requirements: *70314004347800
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70339189828960 !ruby/object:Gem::Requirement
+  requirement: &70314004346780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339189828960
+  version_requirements: *70314004346780
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &70339189828540 !ruby/object:Gem::Requirement
+  requirement: &70314004345520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339189828540
+  version_requirements: *70314004345520
 - !ruby/object:Gem::Dependency
   name: attribute_normalizer
-  requirement: &70339189828040 !ruby/object:Gem::Requirement
+  requirement: &70314004343840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70339189828040
+  version_requirements: *70314004343840
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &70339189827620 !ruby/object:Gem::Requirement
+  requirement: &70314004343200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339189827620
+  version_requirements: *70314004343200
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &70339189827160 !ruby/object:Gem::Requirement
+  requirement: &70314004342700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339189827160
+  version_requirements: *70314004342700
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70339189826740 !ruby/object:Gem::Requirement
+  requirement: &70314004341820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339189826740
+  version_requirements: *70314004341820
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70339189826320 !ruby/object:Gem::Requirement
+  requirement: &70314004357060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339189826320
+  version_requirements: *70314004357060
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70339189825900 !ruby/object:Gem::Requirement
+  requirement: &70314004355740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,21 +142,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339189825900
+  version_requirements: *70314004355740
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70339189841780 !ruby/object:Gem::Requirement
+  requirement: &70314004354560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70339189841780
+  version_requirements: *70314004354560
 - !ruby/object:Gem::Dependency
   name: sunspot-rails-tester
-  requirement: &70339189841360 !ruby/object:Gem::Requirement
+  requirement: &70314004353840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339189841360
+  version_requirements: *70314004353840
 description: Merge resource records for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp