enju_subject 0.1.0.pre27 → 0.1.0.pre28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f39a539208950c30df82cb40b7f4679ec04bd02d
-  data.tar.gz: 03750a9a61b0ad202afee9606d6efb8903a13d71
+  metadata.gz: 24b1cedd55fd1965984d3d805c1da038a09ceee5
+  data.tar.gz: fbb78976e497cdfa186125ca56a7471089452479
 SHA512:
-  metadata.gz: 9b4d3ae6aab37057222b13e7b45cdb65d465b43f2070bd3ad8c16a9e967d4f7d5c390abcd1018ce9f25c60b960f01dd9f3da6427f1d3ec13dae30f5ba70d8656
-  data.tar.gz: 156338c0e07072ddd799353638bad7cce20e8d1e59dd21d1272ae0299d06896c73ee18f35f132e23614b5b6970ba544d7ca36488c3e69c4f614770ec1bcda5bc
+  metadata.gz: 71182abc88a3fe014facbf64b9f50c941f5bb1c6d6e44f285b1c8e2da5ea57c97379e82d641f74e08827f558e1c55059fc2b46295778b427e4314db06f403020
+  data.tar.gz: aa4e989f8c95c9038ca7109b8def5140add32dfaa500fccc45f7026ef6c1d80bb593071457d443c813476d6728f5e1d902afa140470b95b1405f76fc1efff8a3

data/app/models/classification_type.rb

@@ -1,9 +1,9 @@
 class ClassificationType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  default_scope order: 'classification_types.position'
+  default_scope { order('classification_types.position') }
   has_many :classifications
-  validates :name, :format => {:with => /\A[0-9a-z][0-9a-z_\-]*[0-9a-z]\Z/}
+  validates :name, format: { with: /\A[0-9a-z][0-9a-z_\-]*[0-9a-z]\Z/ }
 end
 
 # == Schema Information

data/app/models/subject_heading_type.rb

@@ -1,6 +1,7 @@
 class SubjectHeadingType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
+  default_scope { order("subject_heading_types.position") }
   has_many :subjects
   validates :name, format: {with: /\A[0-9a-z][0-9a-z_\-]*[0-9a-z]\Z/}
 end

data/app/models/subject_type.rb

@@ -1,7 +1,7 @@
 class SubjectType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  default_scope order: "position"
+  default_scope { order("subject_types.position") }
   has_many :subjects
   validates :name, format: {with: /\A[0-9A-Za-z][0-9a-z_\-]*[0-9a-z]\Z/}
 end

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.1.0.pre27"
+  VERSION = "0.1.0.pre28"
 end

data/spec/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+gemfile = ENV['BUNDLE_GEMFILE'] || File.expand_path('../../../../Gemfile', __FILE__)
 
 if File.exist?(gemfile)
   ENV['BUNDLE_GEMFILE'] = gemfile
@@ -7,4 +7,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/routes.rb

@@ -50,7 +50,7 @@ Dummy::Application.routes.draw do
 
   # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
-  root :to => 'subjects#index'
+  # root :to => 'page#index'
 
   # See how all your routes lay out with "rake routes"
 

data/spec/dummy/db/migrate/133_create_agent_merges.rb

@@ -0,0 +1,15 @@
+class CreateAgentMerges < ActiveRecord::Migration
+  def self.up
+    create_table :agent_merges do |t|
+      t.integer :agent_id, :agent_merge_list_id, :null => false
+
+      t.timestamps
+    end
+    add_index :agent_merges, :agent_id
+    add_index :agent_merges, :agent_merge_list_id
+  end
+
+  def self.down
+    drop_table :agent_merges
+  end
+end

data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb

@@ -0,0 +1,13 @@
+class CreateAgentMergeLists < ActiveRecord::Migration
+  def self.up
+    create_table :agent_merge_lists do |t|
+      t.string :title
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :agent_merge_lists
+  end
+end

data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb

@@ -7,6 +7,6 @@ class CreateSeriesStatementMerges < ActiveRecord::Migration
       t.timestamps
     end
     add_index :series_statement_merges, :series_statement_id
-    add_index :series_statement_merges, :series_statement_merge_list_id
+    add_index :series_statement_merges, :series_statement_merge_list_id, name: "index_series_statement_merges_on_list_id"
   end
 end