editstore 1.1.8 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTcyOGQ0NjQ0NzdiMDhmNWFiYjkxNjE4ZGI0OWQ1YWQxMWVhZDNiMg==
+    ODNlOTUwNGIyOGRhODk5ZDVkNjc0NDg3MzIyODA3ZDg0MzZhMDY1OQ==
   data.tar.gz: !binary |-
-    YzJlY2U5NGY4ZGE5OWM2OThjZGYzYjdiYzdiMDAzYWI5NzU2Y2JlNw==
+    MzM0NTkzNjkzYWQ0ODA0MjM2MzI2OTUxNDZjMjQ1MjVhYmJjMDJjNw==
 SHA512:
   metadata.gz: !binary |-
-    MWYxZjcxMWE4ODZjMzRmNTE1NWUwYTQzNDRlYTY4NDdjZGQ0ZjMwZDcwZDkw
-    NWIzN2Q1MmE2Njg3OGNmNDk1ZTFlZTBkNjE1ZDZlNGNhZDBhNDI3YjlhYzQ5
-    NjQwYzRiYmU0YzQwYjVlYWJiNWU3ZjA2ZGVmOWVmM2QyODg4YjE=
+    Yzg1MDcxNzZmZDJlNjViN2U0Nzc4NDI2OWE5YjFkMjViMzA3NGZhOWY2ODdh
+    NzNmYWQ5OWU2NDZjMzEwODQ0NGNjZTAzZjgwN2YyNTliZmY1YmIzMmZjMjg0
+    MGU0Y2E1OTZkZDk1NDg2YTg1MTQzZDBiNTYwODU5NTYwNTg3MTM=
   data.tar.gz: !binary |-
-    MWZjYWI5ZGNkMWE5OTZjNmIzNzliMTM1MGM2NDgzNDYwNjMwZmM0ZjFmNDc3
-    NDdhN2UxODNhMzc0NDIxMzU5NDdjMGE0OTQ3YzAwODJkZjFiZWMxNDhlZDky
-    OTIyM2UyYTU0M2JlMWJkZWQ0Yjc3MzIxMjVhZDZkMTQ1YTY5NmY=
+    NDBmZTZhOGI2Y2VjYzgwZDk0ZTc2NDBiYmYxOTEzNDM3OTg3MzFlMGI5ODU5
+    MGE1MzQ4MTk1NzBhNzBmNDU4YzkyYzVmMWZiYTE1OTM0Njk4ZDE5MGEyZmQ3
+    YTlmNmQ3ZjhhZTNiOTdiOWFjOGUxNjA2OWNkMTAxMzIzNjk4ZGE=

data/Rakefile

@@ -4,6 +4,7 @@ begin
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
+
 begin
   require 'rdoc/task'
 rescue LoadError
@@ -23,22 +24,15 @@ end
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+task :ci do
+  ENV['RAILS_ENV'] = "test"
+  Rake::Task["db:migrate"].invoke
+  Rake::Task["spec"].invoke
 end
 
-
-task :default => :test
-
-# DLSS specific stuff
-require 'dlss/rake/dlss_release'
-Dlss::Release.new
+task :default => :ci

data/app/models/editstore/change.rb

@@ -5,7 +5,11 @@ module Editstore
     belongs_to :state
     belongs_to :project
     belongs_to :object_lock, :primary_key=>:druid, :foreign_key=>:druid
-    attr_accessible :field,:project_id,:old_value,:new_value,:operation,:client_note,:druid,:state_id,:error,:pending
+
+    # THESE REALLY BELONG IN THE CONTROLLER and are only necessary for mass assignment
+    # def change_params
+    #      params.require(:change).permit(:field,:project_id,:old_value,:new_value,:operation,:client_note,:druid,:state_id,:error,:pending)
+    # end
 
     OPERATIONS=%w{create update delete}
     
@@ -29,7 +33,8 @@ module Editstore
     
     def self.by_project_id(project_id)
       if project_id.to_s.empty?
-        scoped
+        #scoped
+        where(nil)
       else
         where(:project_id=>project_id)
       end
@@ -37,7 +42,8 @@ module Editstore
 
     def self.by_state_id(state_id)
       if state_id.to_s.empty?
-        scoped
+        #scoped
+        where(nil)
       else
         where(:state_id=>state_id)
       end
@@ -52,7 +58,8 @@ module Editstore
       project_id=params[:project_id]
       druid=params[:druid]
        
-      changes = scoped
+      #changes = scoped
+      changes = where(nil)
       changes = changes.includes(:project)
       changes = changes.where(:state_id=>state_id) if state_id != '*'
       changes = changes.where(:project_id=>project_id) if project_id
@@ -70,7 +77,8 @@ module Editstore
       limit=params[:limit]
       project_id=params[:project_id]
       
-      changes = scoped
+      #changes = scoped
+      changes = where(nil)
       changes = changes.includes(:project)
       changes = changes.where(:state_id=>state_id) if state_id != '*'
       changes = changes.where(:project_id=>project_id) if project_id

data/app/models/editstore/connection.rb

@@ -1,6 +1,6 @@
 module Editstore
   class Connection < ActiveRecord::Base
     self.abstract_class = true
-    establish_connection "editstore_#{Rails.env}"
+    establish_connection "editstore_#{Rails.env}".parameterize.underscore.to_sym
   end
 end

data/app/models/editstore/field.rb

@@ -1,6 +1,10 @@
 module Editstore
   class Field < Connection
     belongs_to :project
-    attr_accessible :project_id,:name
+
+    # THESE REALLY BELONG IN THE CONTROLLER and are only necessary for mass assignment
+    # def field_params
+    #      params.require(:field).permit(:project_id,:name)
+    # end
   end
 end

data/app/models/editstore/object_lock.rb

@@ -1,6 +1,10 @@
 module Editstore
   class ObjectLock < Connection
-    attr_accessible :locked, :druid
+
+    # THESE REALLY BELONG IN THE CONTROLLER and are only necessary for mass assignment
+    # def objectlock_params
+    #      params.require(:objectlock).permit(:locked, :druid)
+    # end
   
     def self.prune_all
       self.destroy_all(:locked=>nil) # anything that is not locked

data/app/models/editstore/project.rb

@@ -1,8 +1,14 @@
 module Editstore
   class Project < Connection
-     has_many :changes, :dependent => :destroy
+
+     has_many :alterations, :dependent => :destroy, :foreign_key => :changes     
      has_many :fields, :dependent => :destroy
-     attr_accessible :name, :template
+     
+     # THESE REALLY BELONG IN THE CONTROLLER and are only necessary for mass assignment
+      # def project_params
+      #      params.require(:project).permit(:name, :template)
+      # end
+     
      validates :name, presence: true
      validates :template, presence: true
   end

data/app/models/editstore/run_log.rb

@@ -1,21 +1,30 @@
 module Editstore
   class RunLog < Connection
-    attr_accessible :started,:ended,:total_druids,:total_changes,:num_errors,:num_pending,:note
+  
+    # THESE REALLY BELONG IN THE CONTROLLER and are only necessary for mass assignment    
+    # def runlog_params
+    #      params.require(:runlog).permit(:started,:ended,:total_druids,:total_changes,:num_errors,:num_pending,:note)
+    # end
+
     def self.currently_running
       Editstore::RunLog.where(:ended=>nil).order('ended DESC')
     end
+    
     def self.last_completed_run
       Editstore::RunLog.where('ended IS NOT NULL').order('ended DESC').limit(1).first
     end
+    
     def self.prune
       self.where('updated_at < ?',1.day.ago).where('ended IS NULL').each {|obj| obj.destroy} # anything older than 1 day that is not marked as finished running (but must be crashed and not actually running)
       self.where('updated_at < ?',1.month.ago).each {|obj| obj.destroy} # anything older than 1 month
       self.where(:total_druids=>0).where('updated_at < ?',1.day.ago).each {|obj| obj.destroy} # anything older than 1 day with no activity
       self.where('total_changes = num_pending').where('updated_at < ?',1.day.ago).each {|obj| obj.destroy} # anything older than 1 day where all the changes are pending
     end
+    
     def self.prune_all
       self.where('ended IS NOT NULL').each {|obj| obj.destroy} # anything that is done
     end
+    
   end
 end                 
                     

data/app/models/editstore/state.rb

@@ -1,7 +1,13 @@
 module Editstore
   class State < Connection
-     has_many :changes
-     attr_accessible :name
+
+     has_many :alterations, :foreign_key => :changes  #Using an alias and pointed to changes
+
+     # THESE REALLY BELONG IN THE CONTROLLER and are only necessary for mass assignment    
+     # def editstore_params
+     #      params.require(:editstore).permit(:name)
+     # end
+     
      validates :name, presence: true
 
      # these helper methods allow you to easily refer to a particular state like this, with the query cached in the object:

data/lib/editstore/version.rb

@@ -1,3 +1,3 @@
 module Editstore
-  VERSION = "1.1.8"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editstore
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 2.0.0
 platform: ruby
 authors:
 - Peter Mangiafico
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: druid-tools
   requirement: !ruby/object:Gem::Requirement
@@ -52,48 +52,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: lyberteam-devel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: lyberteam-gems-devel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -146,14 +118,6 @@ files:
 - lib/editstore/version.rb
 - lib/tasks/editstore_tasks.rake
 - lib/validators/is_druid_validator.rb
-- test/editstore_test.rb
-- test/fixtures/editstore/editstore_fields.yml
-- test/fixtures/editstore/editstore_projects.yml
-- test/test_helper.rb
-- test/unit/editstore/change_test.rb
-- test/unit/editstore/field_test.rb
-- test/unit/editstore/project_test.rb
-- test/unit/editstore/state_test.rb
 homepage: ''
 licenses: []
 metadata: {}
@@ -178,12 +142,5 @@ signing_key:
 specification_version: 4
 summary: The editstore gem is used by client web applications (like Revs Digital Library)
   to stage changes to descriptive metadata in DOR
-test_files:
-- test/editstore_test.rb
-- test/fixtures/editstore/editstore_fields.yml
-- test/fixtures/editstore/editstore_projects.yml
-- test/test_helper.rb
-- test/unit/editstore/change_test.rb
-- test/unit/editstore/field_test.rb
-- test/unit/editstore/project_test.rb
-- test/unit/editstore/state_test.rb
+test_files: []
+has_rdoc: 

data/test/editstore_test.rb

@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class EditstoreTest < ActiveSupport::TestCase
-  test "truth" do
-    assert_kind_of Module, Editstore
-  end
-end

data/test/fixtures/editstore/editstore_fields.yml

@@ -1,23 +0,0 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
-
-# This model initially had no columns defined.  If you add columns to the
-# model remove the '{}' from the fixture names and add the columns immediately
-# below each fixture, per the syntax in the comments below
-#
-title:
-  name: title
-  project_id: 1 # generic
-  created_at: <%=Time.now%>
-  updated_at: <%=Time.now%>
-      
-description:
-  name: description
-  project_id: 1 # generic
-  created_at: <%=Time.now%>
-  updated_at: <%=Time.now%>
-
-title_revs:
-  name: title
-  project_id: 2 # revs
-  created_at: <%=Time.now%>
-  updated_at: <%=Time.now%>  

data/test/fixtures/editstore/editstore_projects.yml

@@ -1,20 +0,0 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
-
-# This model initially had no columns defined.  If you add columns to the
-# model remove the '{}' from the fixture names and add the columns immediately
-# below each fixture, per the syntax in the comments below
-#
-generic: 
-  id: 1
-  name: generic
-  template: generic
-  created_at: <%=Time.now%>
-  updated_at: <%=Time.now%>
-    
-revs: 
-  id: 2
-  name: revs
-  template: revs
-  created_at: <%=Time.now%>
-  updated_at: <%=Time.now%>
-  

data/test/test_helper.rb

@@ -1,15 +0,0 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-
-require File.expand_path("../spec/dummy/config/environment.rb",  __FILE__)
-require "rails/test_help"
-
-Rails.backtrace_cleaner.remove_silencers!
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-# Load fixtures from the engine
-if ActiveSupport::TestCase.method_defined?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-end

data/test/unit/editstore/change_test.rb

@@ -1,9 +0,0 @@
-require 'test_helper'
-
-module Editstore
-  class ChangeTest < ActiveSupport::TestCase
-    # test "the truth" do
-    #   assert true
-    # end
-  end
-end

data/test/unit/editstore/field_test.rb

@@ -1,9 +0,0 @@
-require 'test_helper'
-
-module Editstore
-  class FieldTest < ActiveSupport::TestCase
-    # test "the truth" do
-    #   assert true
-    # end
-  end
-end

data/test/unit/editstore/project_test.rb

@@ -1,9 +0,0 @@
-require 'test_helper'
-
-module Editstore
-  class ProjectTest < ActiveSupport::TestCase
-    # test "the truth" do
-    #   assert true
-    # end
-  end
-end

data/test/unit/editstore/state_test.rb

@@ -1,9 +0,0 @@
-require 'test_helper'
-
-module Editstore
-  class StateTest < ActiveSupport::TestCase
-    # test "the truth" do
-    #   assert true
-    # end
-  end
-end