hydra-editor 0.5.2 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1de46f211fcb46c498abbd028ab0648efe381bc7
-  data.tar.gz: 2747c05d3cb87d8be8f5408d53d19dc3f2004d9a
+  metadata.gz: 9a019714d3a9953d60b3ec89910581f30917d704
+  data.tar.gz: 2ea18791705d16c26af05d51aafb692c5d1c99de
 SHA512:
-  metadata.gz: 51dc5f83a5dd3c650c3a70dc944073e6f4a940c2967d2c9e933372ad0b8ca57f1e09817db2e66c17f3b91e2c51d5980cb45229da5351219117665d02775a801c
-  data.tar.gz: 5bcfccc581f76ae8d116246f2a0199e15337ae3964781668b4c8c01914718ad0a9b3b8d097d6fcdf87c4f83787a9f4a9f6664a8a980c23ed7a59912f8b6766f2
+  metadata.gz: 0b51da1e6c2d35e090980d3540175ce8f39ff083a3d868beb63f45a0f88dcbbc6441ed5bdbbfc53b2f6c78a17c3c4196c6f8250fee8fae7cce32f216e224d019
+  data.tar.gz: 775e159e509e65587cb2bd1d42f25e3a5f5d956be12aeb5521a53ed0ec18112cdc27b725daccb5a6c8fde3b635c9979ef65bf1466425b4cc19d7c23b10262a94

data/Rakefile

@@ -20,18 +20,22 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
+require 'jettywrapper'
+Jettywrapper.hydra_jetty_version = "v8.1.1"
+
 require 'engine_cart/rake_task'
 
-task ci: ['engine_cart:generate'] do
+task ci: ['engine_cart:generate', 'jetty:clean'] do
   ENV['environment'] = "test"
-  # run the tests
-  Rake::Task["spec"].invoke
+  jetty_params = Jettywrapper.load_config
+  error = Jettywrapper.wrap(jetty_params) do
+    Rake::Task['spec'].invoke
+  end
 end
 
 task default: :ci

data/app/controllers/concerns/records_controller_behavior.rb

@@ -7,7 +7,7 @@ module RecordsControllerBehavior
     rescue_from HydraEditor::InvalidType do
       render 'records/choose_type'
     end
-    helper_method :resource
+    helper_method :form
   end
 
   module ClassMethods
@@ -20,12 +20,12 @@ module RecordsControllerBehavior
   end
 
   def new
-    initialize_fields
+    @form = build_form
     render 'records/new'
   end
 
   def edit
-    initialize_fields
+    @form = build_form
     render 'records/edit'
   end
 
@@ -60,8 +60,7 @@ module RecordsControllerBehavior
   protected
 
   def object_as_json
-    # ActiveFedora::Base#to_json causes a circular reference (before 7.0).  Do something easy
-    resource.terms_for_editing.each_with_object({}) { |term, h|  h[term] = resource[term] }
+    resource.to_json
   end
 
   # Override this method if you want to set different metadata on the object
@@ -70,13 +69,7 @@ module RecordsControllerBehavior
   end
 
   def collect_form_attributes
-    # removes attributes that were only changed by initialize_fields
-    permitted_attributes.reject { |key, value| resource[key].empty? and value == [""] }
-  end
-
-  # we could probably do this with strong parameters if the gemspec depends on Rails 4+
-  def permitted_attributes
-    resource.terms_for_editing.each_with_object({}) { |key, attrs| attrs[key] = raw_attributes[key] if raw_attributes[key] }
+    form_class.model_attributes(raw_attributes)
   end
 
   def raw_attributes
@@ -97,13 +90,34 @@ module RecordsControllerBehavior
     HydraEditor.models.include? params[:type]
   end
 
-  def initialize_fields
-    resource.terms_for_editing.each do |key|
-      # if value is empty, we create an one element array to loop over for output
-      resource[key] = [''] if resource[key].empty?
+  def build_form
+    form_class.new(resource)
+  end
+
+  def form_class
+    @form_class ||= form_name.constantize
+  rescue NameError
+    raise NameError, "Unable to find a #{form_name} class"
+  end
+
+  def form_name
+    if resource_instance_name == 'record'.freeze
+      if params[:id]
+        "#{resource.class.name}Form"
+      elsif has_valid_type?
+        "#{params[:type]}Form"
+      else
+        'RecordForm'
+      end
+    else
+      "#{resource_instance_name.camelize}Form"
     end
   end
 
+  def form
+    @form
+  end
+
   def resource
     get_resource_ivar
   end

data/app/forms/hydra_editor/form.rb

@@ -0,0 +1,73 @@
+module HydraEditor
+  module Form
+    extend ActiveSupport::Concern
+    include Hydra::Presenter
+    included do
+      class_attribute :required_fields
+    end
+
+    def initialize(model)
+      super
+      initialize_fields
+    end
+
+    def required?(key)
+      required_fields.include?(key)
+    end
+
+    def [](key)
+      @attributes[key.to_s]
+    end
+
+    def []=(key, value)
+      @attributes[key.to_s] = value
+    end
+
+    module ClassMethods
+      def model_attributes(form_params)
+        clean_params = sanitize_params(form_params)
+        terms.each do |key|
+          if clean_params[key] == ['']
+            clean_params[key] = []
+          end
+        end
+        clean_params
+      end
+
+      def sanitize_params(form_params)
+        form_params.permit(*permitted_params)
+      end
+
+      def permitted_params
+        @permitted ||= build_permitted_params
+      end
+
+      def build_permitted_params
+        permitted = []
+        terms.each do |term|
+          if multiple?(term)
+            permitted << { term => [] }
+          else
+            permitted << term
+          end
+        end
+        permitted << { permissions_attributes: [:type, :name, :access] }
+        permitted
+      end
+    end
+
+    protected
+      # override this method if you need to initialize more complex RDF assertions (b-nodes)
+      def initialize_fields
+        @attributes = model.attributes
+        terms.select { |key| self[key].blank? }.each do |key|
+          # if value is empty, we create an one element array to loop over for output
+          if self.class.multiple?(key)
+            self[key] = ['']
+          else
+            self[key] = ''
+          end
+        end
+      end
+  end
+end

data/app/helpers/concerns/records_helper_behavior.rb

@@ -35,7 +35,7 @@ module RecordsHelperBehavior
 
   def record_form_action_url(record)
     router = respond_to?(:hydra_editor) ? hydra_editor : self
-    record.new_record? ? router.records_path : router.record_path(record)
+    record.persisted? ? router.record_path(record) : router.records_path
   end
 
   def new_record_title
@@ -47,7 +47,7 @@ module RecordsHelperBehavior
   end
 
   def render_record_title
-    Array(resource.title).first
+    Array(form.title).first
   end
 
  protected
@@ -56,7 +56,7 @@ module RecordsHelperBehavior
   # if no partial exists for the record_type it tries using "records" as a default
   def render_edit_field_partial_with_action(record_type, field_name, locals)
     partial = find_edit_field_partial(record_type, field_name)
-    render partial: partial, locals: locals.merge({key: field_name})
+    render partial, locals.merge(key: field_name)
   end
 
   def find_edit_field_partial(record_type, field_name)

data/app/presenters/hydra/presenter.rb

@@ -0,0 +1,85 @@
+module Hydra
+  module ActiveModelPresenter
+    extend ActiveSupport::Concern
+    included do
+      attr_reader :model
+      class_attribute :model_class
+    end
+
+    def initialize(object)
+      @model = object
+    end
+
+    def to_key
+      model.to_key
+    end
+
+    def to_param
+      model.to_param
+    end
+
+    def to_model
+      model.to_model
+    end
+
+    def persisted?
+      model.persisted?
+    end
+
+    def [](key)
+      model[key]
+    end
+
+    module ClassMethods
+      def model_name
+        if model_class.nil?
+          raise "You must set `self.model_class = ' after including Hydra::Presenter on #{self}."
+        end
+        model_class.model_name
+      end
+    end
+  end
+
+  module Presenter
+    extend ActiveSupport::Concern
+    include ActiveModelPresenter
+    included do
+      class_attribute :_terms, instance_accessor: false
+    end
+
+    def terms
+      self.class._terms
+    end
+
+    module ClassMethods
+      def multiple?(field)
+        model_class.multiple?(field)
+      end
+
+      def unique?(field)
+        model_class.unique?(field)
+      end
+
+      def terms=(terms)
+        self._terms = terms
+        create_term_accessors(terms)
+      end
+
+      def terms
+        self._terms
+      end
+
+      private
+
+        def create_term_accessors(terms)
+          # we delegate to the array accessor, because the array accessor is overridden in MultiForm
+          # which is included by GenericFileEditForm
+          terms.each do |term|
+            define_method term do
+              self[term]
+            end
+          end
+        end
+    end
+  end
+end

data/app/views/records/_form.html.erb

@@ -1,9 +1,9 @@
-<%= bootstrap_form_for resource, url: record_form_action_url(resource), html: {class: 'form-inline editor'} do |f| %>
+<%= bootstrap_form_for form, url: record_form_action_url(form), html: {class: 'form-inline editor'} do |f| %>
   <div id="descriptions_display">
 	<%= render 'records/form_header' %>
     <div class="well">
-      <% f.object.terms_for_editing.each do |term| %>
-        <%= render partial: "records/edit_field", locals: {f: f, render_req: true, key: term } %>
+      <% f.object.terms.each do |term| %>
+        <%= render "records/edit_field", f: f, render_req: true, key: term %>
       <% end %>
     </div> <!-- /well -->
   </div>

data/config/jetty.yml

@@ -0,0 +1,6 @@
+default:
+  startup_wait: 90
+  jetty_port: 8983
+  java_opts:
+    - "-Xmx256m" 
+    - "-XX:MaxPermSize=128m"

data/lib/hydra_editor/controller_resource.rb

@@ -1,6 +1,6 @@
 class HydraEditor::ControllerResource < CanCan::ControllerResource
   def find_resource
-    ActiveFedora::Base.find(id_param, cast: true)
+    ActiveFedora::Base.find(id_param)
   end
 
   def resource_class

data/lib/hydra_editor/engine.rb

@@ -1,10 +1,9 @@
 module HydraEditor
   class Engine < ::Rails::Engine
     engine_name 'hydra_editor'
-    config.autoload_paths += %W(
+    config.eager_load_paths += %W(
        #{config.root}/app/helpers/concerns
-       #{config.root}/app/controllers/concerns
-       #{config.root}/app/models/concerns
+       #{config.root}/app/presenters
     )
     initializer "hydra-editor.initialize" do
       require "cancan"

data/lib/hydra_editor/version.rb

@@ -1,3 +1,3 @@
 module HydraEditor
-  VERSION = "0.5.2"
+  VERSION = "1.0.0.beta1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-editor
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,28 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
@@ -51,20 +45,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '9.0'
+        version: 9.0.0.beta8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '9.0'
+        version: 9.0.0.beta8
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -155,14 +143,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 9.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 9.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +165,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jettywrapper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: A basic metadata editor for hydra-head
 email:
 - hydra-tech@googlegroups.com
@@ -194,8 +196,10 @@ files:
 - app/assets/stylesheets/hydra-editor/hydra-editor.css
 - app/controllers/concerns/records_controller_behavior.rb
 - app/controllers/records_controller.rb
+- app/forms/hydra_editor/form.rb
 - app/helpers/concerns/records_helper_behavior.rb
 - app/helpers/records_helper.rb
+- app/presenters/hydra/presenter.rb
 - app/views/records/_edit_field.html.erb
 - app/views/records/_form.html.erb
 - app/views/records/_form_header.html.erb
@@ -204,6 +208,7 @@ files:
 - app/views/records/edit_fields/_default.html.erb
 - app/views/records/edit_fields/_suffix.html.erb
 - app/views/records/new.html.erb
+- config/jetty.yml
 - config/locales/hydra_editor.yml
 - config/routes.rb
 - lib/hydra-editor.rb
@@ -225,12 +230,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A basic metadata editor for hydra-head