enju_resource_merge 0.0.17 → 0.1.0.pre

data/app/models/patron_merge.rb

@@ -5,9 +5,7 @@ class PatronMerge < ActiveRecord::Base
   validates_presence_of :patron, :patron_merge_list
   validates_associated :patron, :patron_merge_list
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 end
 
 # == Schema Information

data/app/models/patron_merge_list.rb

@@ -4,9 +4,7 @@ class PatronMergeList < ActiveRecord::Base
   has_many :patrons, :through => :patron_merges
   validates_presence_of :title
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def merge_patrons(selected_patron)
     self.patrons.each do |patron|

data/app/models/series_statement_merge.rb

@@ -5,9 +5,7 @@ class SeriesStatementMerge < ActiveRecord::Base
   validates_presence_of :series_statement, :series_statement_merge_list
   validates_associated :series_statement, :series_statement_merge_list
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 end
 
 # == Schema Information

data/app/models/series_statement_merge_list.rb

@@ -4,9 +4,7 @@ class SeriesStatementMergeList < ActiveRecord::Base
   has_many :series_statements, :through => :series_statement_merges
   validates_presence_of :title
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def merge_series_statements(selected_series_statement)
     series_statements.each do |series_statement|

data/app/views/patron_merge_lists/index.html.erb

@@ -22,7 +22,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@patron_merge_lists) -%>
+<%= paginate(@patron_merge_lists) -%>
 </div>
 </div>
 

data/app/views/patron_merges/index.html.erb

@@ -19,7 +19,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@patron_merges) -%>
+<%= paginate(@patron_merges) -%>
 </div>
 </div>
 

data/app/views/series_statement_merge_lists/index.html.erb

@@ -22,7 +22,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@series_statement_merge_lists) -%>
+<%= paginate(@series_statement_merge_lists) -%>
 </div>
 </div>
 

data/app/views/series_statement_merges/index.html.erb

@@ -19,7 +19,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@series_statement_merges) -%>
+<%= paginate(@series_statement_merges) -%>
 </div>
 </div>
 

data/lib/enju_resource_merge/version.rb

@@ -1,3 +1,3 @@
 module EnjuResourceMerge
-  VERSION = "0.0.17"
+  VERSION = "0.1.0.pre"
 end

data/lib/enju_resource_merge.rb

@@ -1,5 +1,4 @@
 require "enju_resource_merge/engine"
-require "will_paginate/array"
 
 module EnjuResourceMerge
   def self.included(base)

data/lib/generators/enju_resource_merge/views_generator.rb

@@ -0,0 +1,20 @@
+module EnjuResourceMerge
+  module Generators
+    class ViewsGenerator < Rails::Generators::Base
+      source_root File.expand_path('../../../../app/views', __FILE__)
+
+      def copy_files
+        directories = %w(
+          patron_merge_lists
+          patron_merges
+          series_statement_merge_lists
+          series_statement_merges
+        )
+
+        directories.each do |dir|
+          directory dir, "app/views/#{dir}"
+        end
+      end
+    end
+  end
+end

data/spec/views/series_statement_merge_lists/index.html.erb_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "series_statement_merge_lists/index" do
   before(:each) do
-    assign(:series_statement_merge_lists, [
+    assign(:series_statement_merge_lists, Kaminari::paginate_array([
       stub_model(SeriesStatementMergeList,
         :title => "Title",
         :created_at => Time.zone.now
@@ -11,7 +11,7 @@ describe "series_statement_merge_lists/index" do
         :title => "Title",
         :created_at => Time.zone.now
       )
-    ].paginate(:page => 1))
+    ]).page(1))
   end
 
   it "renders a list of series_statement_merge_lists" do

data/spec/views/series_statement_merges/index.html.erb_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "series_statement_merges/index" do
   before(:each) do
-    assign(:series_statement_merges, [
+    assign(:series_statement_merges, Kaminari::paginate_array([
       stub_model(SeriesStatementMerge,
         :series_statement_id => 1,
         :series_statement_merge_list_id => 1
@@ -11,7 +11,7 @@ describe "series_statement_merges/index" do
         :series_statement_id => 1,
         :series_statement_merge_list_id => 2
       )
-    ].paginate(:page => 1))
+    ]).page(1))
     @ability = Object.new
     @ability.extend(CanCan::Ability)
     controller.stub(:current_ability) { @ability }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: enju_resource_merge
 version: !ruby/object:Gem::Version
-  version: 0.0.17
-  prerelease: 
+  version: 0.1.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -60,21 +60,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: enju_core
+  name: enju_biblio
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -139,22 +139,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0.pre.120417
-- !ruby/object:Gem::Dependency
-  name: enju_biblio
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -215,6 +199,7 @@ files:
 - lib/enju_resource_merge/engine.rb
 - lib/enju_resource_merge/version.rb
 - lib/enju_resource_merge.rb
+- lib/generators/enju_resource_merge/views_generator.rb
 - lib/tasks/enju_resource_merge_tasks.rake
 - MIT-LICENSE
 - Rakefile
@@ -395,9 +380,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23