enju_bookmark 0.0.15 → 0.0.16

data/app/models/bookmark.rb

@@ -162,16 +162,19 @@ class Bookmark < ActiveRecord::Base
     Manifestation.transaction do
       manifestation.save
       self.manifestation = manifestation
-      item = Item.create(
-        :shelf => Shelf.web,
+      item = Item.new(
         :manifestation_id => manifestation.id
       )
+      item.shelf = Shelf.web
+      item.manifestation = manifestation
       if defined?(EnjuCirculation)
         item.circulation_status = CirculationStatus.where(:name => 'Not Available').first
-        item.use_restriction = UseRestriction.where(:name => 'Not For Loan').first
       end
-      item.manifestation = manifestation
+
       item.save!
+      if defined?(EnjuCirculation)
+        item.use_restriction = UseRestriction.where(:name => 'Not For Loan').first
+      end
     end
   end
 

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

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

@@ -1,5 +1,9 @@
 # -*- encoding: utf-8 -*-
 class Item < ActiveRecord::Base
+  attr_accessible :call_number, :item_identifier, :circulation_status_id,
+    :checkout_type_id, :shelf_id, :include_supplements, :note, :url, :price,
+    :acquired_at, :bookstore_id, :missing_since, :budget_type_id,
+    :manifestation_id #,:exemplify_attributes
   scope :on_shelf, where('shelf_id != 1')
   scope :on_web, where(:shelf_id => 1)
 

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

@@ -0,0 +1,27 @@
+class ItemHasUseRestriction < ActiveRecord::Base
+  attr_accessible
+  attr_accessible :item_id, :use_restriction_id, :as => :admin
+  belongs_to :item, :validate => true
+  belongs_to :use_restriction, :validate => true
+  accepts_nested_attributes_for :use_restriction
+
+  validates_associated :item, :use_restriction
+  validates_presence_of :use_restriction
+  validates_presence_of :item, :on => :update
+
+  def self.per_page
+    10
+  end
+end
+
+# == Schema Information
+#
+# Table name: item_has_use_restrictions
+#
+#  id                 :integer         not null, primary key
+#  item_id            :integer         not null
+#  use_restriction_id :integer         not null
+#  created_at         :datetime
+#  updated_at         :datetime
+#
+

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

@@ -0,0 +1,22 @@
+class UseRestriction < ActiveRecord::Base
+  attr_accessible :name, :display_name, :note
+  include MasterModel
+  default_scope :order => 'use_restrictions.position'
+  scope :available, where(:name => ['Not For Loan', 'Limited Circulation, Normal Loan Period'])
+  has_many :item_has_use_restrictions
+  has_many :items, :through => :item_has_use_restrictions
+end
+
+# == Schema Information
+#
+# Table name: use_restrictions
+#
+#  id           :integer         not null, primary key
+#  name         :string(255)     not null
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime
+#  updated_at   :datetime
+#
+

data/spec/fixtures/languages.yml

@@ -2,8 +2,8 @@
 language_00001: 
   position: 1
   name: unknown  
-  display_name: "en:unknown\r\n\
-    ja:不明"
+  display_name: "en :unknown\r\n\
+    ja: 不明"
   iso_639_1: unknown
   iso_639_2: unknown
   iso_639_3: unknown
@@ -1355,8 +1355,8 @@ language_00160:
 language_00077: 
   position: 77
   name: Japanese  
-  display_name: "en:Japanese\r\n\
-    ja:日本語"
+  display_name: "en: Japanese\r\n\
+    ja: 日本語"
   iso_639_1: ja
   iso_639_2: jpn
   iso_639_3: jpn

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_bookmark
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-26 00:00:00.000000000 Z
+date: 2012-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -343,6 +343,7 @@ files:
 - spec/dummy/app/models/circulation_status.rb
 - spec/dummy/app/models/exemplify.rb
 - spec/dummy/app/models/item.rb
+- spec/dummy/app/models/item_has_use_restriction.rb
 - spec/dummy/app/models/language.rb
 - spec/dummy/app/models/library.rb
 - spec/dummy/app/models/library_group.rb
@@ -353,6 +354,7 @@ files:
 - spec/dummy/app/models/series_has_manifestation.rb
 - spec/dummy/app/models/series_statement.rb
 - spec/dummy/app/models/shelf.rb
+- spec/dummy/app/models/use_restriction.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_group.rb
 - spec/dummy/app/models/user_has_role.rb
@@ -527,6 +529,7 @@ test_files:
 - spec/dummy/app/models/circulation_status.rb
 - spec/dummy/app/models/exemplify.rb
 - spec/dummy/app/models/item.rb
+- spec/dummy/app/models/item_has_use_restriction.rb
 - spec/dummy/app/models/language.rb
 - spec/dummy/app/models/library.rb
 - spec/dummy/app/models/library_group.rb
@@ -537,6 +540,7 @@ test_files:
 - spec/dummy/app/models/series_has_manifestation.rb
 - spec/dummy/app/models/series_statement.rb
 - spec/dummy/app/models/shelf.rb
+- spec/dummy/app/models/use_restriction.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_group.rb
 - spec/dummy/app/models/user_has_role.rb