enju_nii 0.1.0.pre10 → 0.1.0.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c4c399a91a60bf56dea0741ce748ed124589b3d
-  data.tar.gz: 0439f9d85637b5d3a54d42037c56f4557b44eda8
+  metadata.gz: 5ca4b76d89be9270d7d461b92a99b954e8ad23f5
+  data.tar.gz: 7fabd04e6df18842071a3f253fc4620fd8265f4c
 SHA512:
-  metadata.gz: c2ced9552932744f1845daf3be34cdd804271a67db92cad54e61522c9f3cff541002bfcd451369a8844229ef8e525b4a64a7a164b66f3f14ea08f37326efc77f
-  data.tar.gz: 10bbcd72fac0c003b50ed93aea1ddeb7a04fad6d3e2dad4e1290c36b475cfbe8d437a08d9524f352a25905461214968983f6d3b5e94f1f829c87ceb5b52c9b23
+  metadata.gz: 46bedd5230aecfa4c0b3ed34143ae5cd0e130d8f6a0cf33cf2fb5121a80e11369cd1946473b363883e73aeb413ea2b819ae0618fff351877dbf64d7ab0497f43
+  data.tar.gz: 23ccb56a1a96bc72896507732a6cfefa25b7aaaf638d74db98d120c4c79d7d1e5062039c7e199429f29a14bc72b21bcc52b2863fd7c6246b78860e81d64a580a

data/app/controllers/nii_types_controller.rb

@@ -1,20 +1,83 @@
-class NiiTypesController < InheritedResources::Base
-  respond_to :html, :json
-  before_filter :check_client_ip_address
+class NiiTypesController < ApplicationController
   load_and_authorize_resource
+  # GET /nii_types
+  # GET /nii_types.json
+  def index
+    @nii_types = NiiType.all
 
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @nii_types }
+    end
+  end
+
+  # GET /nii_types/1
+  # GET /nii_types/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @nii_type }
+    end
+  end
+
+  # GET /nii_types/new
+  # GET /nii_types/new.json
+  def new
+    @nii_type = NiiType.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @nii_type }
+    end
+  end
+
+  # GET /nii_types/1/edit
+  def edit
+  end
+
+  # POST /nii_types
+  # POST /nii_types.json
+  def create
+    @nii_type = NiiType.new(params[:nii_type])
+
+    respond_to do |format|
+      if @nii_type.save
+        format.html { redirect_to @nii_type, notice:  t('controller.successfully_created', model:  t('activerecord.models.nii_type')) }
+        format.json { render json: @nii_type, status: :created, location: @nii_type }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @nii_type.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /nii_types/1
+  # PUT /nii_types/1.json
   def update
-    @nii_type = NiiType.find(params[:id])
-    if params[:position]
-      @nii_type.insert_at(params[:position])
-      redirect_to nii_types_url
+    if params[:move]
+      move_position(@nii_type, params[:move])
       return
     end
-    update!
+
+    respond_to do |format|
+      if @nii_type.update_attributes(params[:nii_type])
+        format.html { redirect_to @nii_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.nii_type')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @nii_type.errors, status: :unprocessable_entity }
+      end
+    end
   end
 
-  private
-  def interpolation_options
-    {:resource_name => t('activerecord.models.nii_type')}
+  # DELETE /nii_types/1
+  # DELETE /nii_types/1.json
+  def destroy
+    @nii_type.destroy
+
+    respond_to do |format|
+      format.html { redirect_to nii_types_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.nii_type')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/models/cinii_book.rb

@@ -41,21 +41,21 @@ class CiniiBook
     if query
       cnt = self.per_page
       page = 1 if page.to_i < 1
-      doc = Nokogiri::XML(Manifestation.search_cinii_book(query, {:p => page, :count => cnt, :raw => true}).to_s)
+      doc = Nokogiri::XML(Manifestation.search_cinii_book(query, {p: page, count: cnt, raw: true}).to_s)
       items = doc.xpath('//xmlns:item').collect{|node| self.new node }
       total_entries = doc.at('//opensearch:totalResults').content.to_i
 
-      {:items => items, :total_entries => total_entries}
+      {items: items, total_entries: total_entries}
     else
-      {:items => [], :total_entries => 0}
+      {items: [], total_entries: 0}
     end
   end
 
   def self.import_ncid(ncid)
-    manifestation = Manifestation.where(:ncid => ncid).first
+    manifestation = Manifestation.where(ncid: ncid).first
     return if manifestation
     url = "http://ci.nii.ac.jp/ncid/#{ncid}.rdf"
-    doc = Nokogiri::XML(open(url).read)
+    doc = Nokogiri::XML(Faraday.get(url).body)
     Manifestation.import_record_from_cinii_books(doc)
   end
 

data/app/models/nii_type.rb

@@ -1,6 +1,6 @@
 class NiiType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  default_scope :order => 'nii_types.position'
+  default_scope { order('nii_types.position') }
   has_many :manifestations
 end

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('enju_nii.import_from_cinii_books') %></h1>
 <div id="content_list">
   <p id="notice"><%= notice %></p>
@@ -45,5 +45,5 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
 </div>

data/app/views/nii_types/edit.html.erb

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.nii_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @nii_type -%></li>
     <li><%= link_to t('page.back'), nii_types_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.nii_type')) -%></h1>
 <div id="content_list">
 
@@ -38,7 +38,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.new', :model => t('activerecord.models.nii_type')), new_nii_type_path -%></li>
   </ul>

data/app/views/nii_types/new.html.erb

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.nii_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), nii_types_path -%></li>
   </ul>

data/app/views/nii_types/show.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.nii_type')) -%></h1>
 <div id="content_list">
 <p>
@@ -19,7 +19,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_nii_type_path(@nii_type) -%></li>
     <li><%= back_to_index -%></li>

data/lib/enju_nii/cinii_book.rb

@@ -104,7 +104,7 @@ module EnjuNii
           rss = self.search_cinii_by_isbn(normalize_isbn(isbn))
         end
         if rss.items.first
-          Nokogiri::XML(open("#{rss.items.first.link}.rdf").read)
+          Nokogiri::XML(Faraday.get("#{rss.items.first.link}.rdf").body)
         end
       end
 

data/lib/enju_nii/version.rb

@@ -1,3 +1,3 @@
 module EnjuNii
-  VERSION = "0.1.0.pre10"
+  VERSION = "0.1.0.pre11"
 end

data/lib/enju_nii.rb

@@ -15,7 +15,7 @@ module EnjuNii
       end
 
       def import_isbn(isbn)
-        manifestation = Manifestation.import_from_ndl_search(:isbn => isbn)
+        manifestation = Manifestation.import_from_cinii_books(isbn: isbn)
         manifestation
       end
     end