enju_biblio 0.1.0.pre5 → 0.1.0.pre6

data/spec/controllers/carrier_types_controller_spec.rb

@@ -0,0 +1,166 @@
+require 'spec_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
+
+describe CarrierTypesController do
+  login_admin
+
+  # This should return the minimal set of attributes required to create a valid
+  # CarrierType. As you add validations to CarrierType, be sure to
+  # update the return value of this method accordingly.
+  def valid_attributes
+    FactoryGirl.attributes_for(:carrier_type)
+  end
+
+  describe "GET index" do
+    it "assigns all carrier_types as @carrier_types" do
+      carrier_type = CarrierType.create! valid_attributes
+      get :index
+      assigns(:carrier_types).should eq(CarrierType.all)
+    end
+  end
+
+  describe "GET show" do
+    it "assigns the requested carrier_type as @carrier_type" do
+      carrier_type = CarrierType.create! valid_attributes
+      get :show, :id => carrier_type.id
+      assigns(:carrier_type).should eq(carrier_type)
+    end
+  end
+
+  describe "GET new" do
+    it "assigns a new carrier_type as @carrier_type" do
+      get :new
+      assigns(:carrier_type).should be_a_new(CarrierType)
+    end
+  end
+
+  describe "GET edit" do
+    it "assigns the requested carrier_type as @carrier_type" do
+      carrier_type = CarrierType.create! valid_attributes
+      get :edit, :id => carrier_type.id
+      assigns(:carrier_type).should eq(carrier_type)
+    end
+  end
+
+  describe "POST create" do
+    describe "with valid params" do
+      it "creates a new CarrierType" do
+        expect {
+          post :create, :carrier_type => valid_attributes
+        }.to change(CarrierType, :count).by(1)
+      end
+
+      it "assigns a newly created carrier_type as @carrier_type" do
+        post :create, :carrier_type => valid_attributes
+        assigns(:carrier_type).should be_a(CarrierType)
+        assigns(:carrier_type).should be_persisted
+      end
+
+      it "redirects to the created carrier_type" do
+        post :create, :carrier_type => valid_attributes
+        response.should redirect_to(CarrierType.last)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns a newly created but unsaved carrier_type as @carrier_type" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        CarrierType.any_instance.stub(:save).and_return(false)
+        post :create, :carrier_type => {}
+        assigns(:carrier_type).should be_a_new(CarrierType)
+      end
+
+      it "re-renders the 'new' template" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        CarrierType.any_instance.stub(:save).and_return(false)
+        post :create, :carrier_type => {}
+        #response.should render_template("new")
+      end
+    end
+  end
+
+  describe "PUT update" do
+    describe "with valid params" do
+      it "updates the requested carrier_type" do
+        carrier_type = CarrierType.create! valid_attributes
+        # Assuming there are no other carrier_types in the database, this
+        # specifies that the CarrierType created on the previous line
+        # receives the :update_attributes message with whatever params are
+        # submitted in the request.
+        CarrierType.any_instance.should_receive(:update_attributes).with({'these' => 'params'})
+        put :update, :id => carrier_type.id, :carrier_type => {'these' => 'params'}
+      end
+
+      it "assigns the requested carrier_type as @carrier_type" do
+        carrier_type = CarrierType.create! valid_attributes
+        put :update, :id => carrier_type.id, :carrier_type => valid_attributes
+        assigns(:carrier_type).should eq(carrier_type)
+      end
+
+      it "redirects to the carrier_type" do
+        carrier_type = CarrierType.create! valid_attributes
+        put :update, :id => carrier_type.id, :carrier_type => valid_attributes
+        response.should redirect_to(carrier_type)
+      end
+
+      it "moves its position when specified" do
+        carrier_type = CarrierType.create! valid_attributes
+        position = carrier_type.position
+        put :update, :id => carrier_type.id, :move => 'higher'
+        response.should redirect_to carrier_types_url
+        assigns(:carrier_type).position.should eq position - 1
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns the carrier_type as @carrier_type" do
+        carrier_type = CarrierType.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        CarrierType.any_instance.stub(:save).and_return(false)
+        put :update, :id => carrier_type.id, :carrier_type => {}
+        assigns(:carrier_type).should eq(carrier_type)
+      end
+
+      it "re-renders the 'edit' template" do
+        carrier_type = CarrierType.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        CarrierType.any_instance.stub(:save).and_return(false)
+        put :update, :id => carrier_type.id, :carrier_type => {}
+        #response.should render_template("edit")
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    it "destroys the requested carrier_type" do
+      carrier_type = CarrierType.create! valid_attributes
+      expect {
+        delete :destroy, :id => carrier_type.id
+      }.to change(CarrierType, :count).by(-1)
+    end
+
+    it "redirects to the carrier_types list" do
+      carrier_type = CarrierType.create! valid_attributes
+      delete :destroy, :id => carrier_type.id
+      response.should redirect_to(carrier_types_url)
+    end
+  end
+
+end

data/spec/dummy/app/controllers/application_controller.rb

@@ -82,7 +82,7 @@ class ApplicationController < ActionController::Base
   def convert_charset
     case params[:format]
     when 'csv'
-      return unless configatron.csv_charset_conversion
+      return unless Setting.csv_charset_conversion
       # TODO: 他の言語
       if @locale.to_sym == :ja
         headers["Content-Type"] = "text/csv; charset=Shift_JIS"

data/spec/dummy/app/models/local_patron.rb

@@ -1,13 +1,27 @@
 class LocalPatron
-  def initialize(user)
-    @user = user
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
+  extend ActiveModel::Naming
+
+  attr_accessor :username, :full_name, :address, :email
+
+  def initialize(attributes = {})
+    if attributes[:username]
+      user = User.where(:username => attributes[:username]).first
+      if user
+        send('email=', user.email)
+      end
+    else
+      attributes.each do |name, value|
+        send("#{name}=", value)
+      end
+    end
   end
 
-  def id 
+  def persisted?
+    false
   end
 
-  def full_name
-    # TODO: 外部サービスから取得
-    @user.email
+  def id
   end
 end

data/spec/dummy/solr/conf/schema.xml

@@ -60,7 +60,12 @@
     <fieldType name="rand" class="solr.RandomSortField" omitNorms="true"/>
     <!-- *** This fieldType is used by Sunspot! *** -->
     <fieldType name="text" class="solr.TextField" omitNorms="false">
-      <analyzer>
+      <analyzer type="index" class="org.apache.lucene.analysis.cjk.CJKAnalyzer">
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.StandardFilterFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+      </analyzer>
+      <analyzer type="query" class="org.apache.lucene.analysis.cjk.CJKAnalyzer">
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.StandardFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
@@ -235,4 +240,5 @@
   <!-- copyField commands copy one field to another at the time a document
         is added to the index.  It's used either to index the same field differently,
         or to add multiple fields to the same field for easier/faster searching.  -->
+  <copyField source="*_text" dest="text" />
 </schema>

data/spec/views/accepts/new.html.erb_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe "accepts/new" do
+  fixtures :all
+
   before(:each) do
     assign(:accept, stub_model(Accept,
       :item_id => 1

data/spec/views/manifestations/show.html.erb_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe "manifestations/show" do
+  fixtures :all
+
   before(:each) do
     @manifestation = assign(:manifestation, FactoryGirl.create(:manifestation))
     @ability = Object.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre5
+  version: 0.1.0.pre6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000 Z
+date: 2012-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,17 +192,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre2
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
@@ -370,7 +370,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre2
+        version: 0.1.0.pre3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -378,55 +378,55 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre2
+        version: 0.1.0.pre3
 - !ruby/object:Gem::Dependency
   name: enju_inventory
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.11.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.11.pre
 - !ruby/object:Gem::Dependency
   name: enju_bookmark
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.2.pre2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.2.pre2
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.17.pre2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.17.pre2
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -448,33 +448,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre2
 - !ruby/object:Gem::Dependency
   name: enju_export
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1.pre
 - !ruby/object:Gem::Dependency
   name: enju_circulation
   requirement: !ruby/object:Gem::Requirement
@@ -482,7 +482,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre
+        version: 0.1.0.pre4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -490,7 +490,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre
+        version: 0.1.0.pre4
 description: Bibliographic record module for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -746,6 +746,7 @@ files:
 - app/views/medium_of_performances/index.html.erb
 - app/views/medium_of_performances/new.html.erb
 - app/views/medium_of_performances/show.html.erb
+- app/views/ndl_books/index.html.erb
 - app/views/owns/_form.html.erb
 - app/views/owns/edit.html.erb
 - app/views/owns/index.html.erb
@@ -959,7 +960,10 @@ files:
 - README.rdoc
 - spec/cassette_library/enju_ndl/manifestation.yml
 - spec/cassette_library/enju_ndl/ndl_search.yml
+- spec/cassette_library/enju_ndl2/manifestation.yml
+- spec/cassette_library/enju_ndl2/ndl_search.yml
 - spec/controllers/accepts_controller_spec.rb
+- spec/controllers/carrier_types_controller_spec.rb
 - spec/controllers/content_types_controller_spec.rb
 - spec/controllers/countries_controller_spec.rb
 - spec/controllers/create_types_controller_spec.rb
@@ -1103,7 +1107,6 @@ files:
 - spec/dummy/db/migrate/20120415060342_rename_event_import_file_imported_at_to_executed_at.rb
 - spec/dummy/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb
 - spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
-- spec/dummy/db/production.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/plugins/ext/event-calendar.rb
@@ -1153,7 +1156,7 @@ files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_5px
+- spec/dummy/solr/data/test/index/segments_1em
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4F7/F90/default_role
@@ -1399,7 +1402,10 @@ summary: enju_biblio plugin
 test_files:
 - spec/cassette_library/enju_ndl/manifestation.yml
 - spec/cassette_library/enju_ndl/ndl_search.yml
+- spec/cassette_library/enju_ndl2/manifestation.yml
+- spec/cassette_library/enju_ndl2/ndl_search.yml
 - spec/controllers/accepts_controller_spec.rb
+- spec/controllers/carrier_types_controller_spec.rb
 - spec/controllers/content_types_controller_spec.rb
 - spec/controllers/countries_controller_spec.rb
 - spec/controllers/create_types_controller_spec.rb
@@ -1543,7 +1549,6 @@ test_files:
 - spec/dummy/db/migrate/20120415060342_rename_event_import_file_imported_at_to_executed_at.rb
 - spec/dummy/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb
 - spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
-- spec/dummy/db/production.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/plugins/ext/event-calendar.rb
@@ -1593,7 +1598,7 @@ test_files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_5px
+- spec/dummy/solr/data/test/index/segments_1em
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4F7/F90/default_role