enju_message 0.1.14.pre21 → 0.1.14.pre22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d0de5a1be581117c88d8248ba3a1193a46d01cc
-  data.tar.gz: 7f34459be7f74429a00d1ffbd34e0e470f1223aa
+  metadata.gz: e4e17deaa2e5acb3f17aa513c1183be7717ac472
+  data.tar.gz: 0d6c83e9f32d2a03b205961a39d36345cf5c158e
 SHA512:
-  metadata.gz: c823f55c8d1343a20f137b62d3808f78ec16b090984fcade586a355e06bfd2c7099ec4deb3fa2bb1391cf02c64af65806e4d7c5ab26574a61da672d1786c77ab
-  data.tar.gz: ce8622fe902ffe36a3947feb6ab3d4ed50c7e5804d2ad8376df6eddeabc0182424930e39c6bea8de9e579e6334add1218882396e454414155342a94025a4ca94
+  metadata.gz: 81fe897c5a5f0020c5c1c3a414ddcdef96c912a256bbcd5e7713f807129b1323161736f73ddd6010fd910a850575dee534b51fa1191f08474249f4eaa4da8355
+  data.tar.gz: 81ce43967dca2b249f11b8631a13e798ca00470a224672f1a1ce62df545a4e2044c2023cd7042d2fc8e4e132f444d87dfe050ad08a0df70bb520b3094f2c7fa2

data/app/controllers/message_requests_controller.rb

@@ -37,7 +37,7 @@ class MessageRequestsController < ApplicationController
   # PUT /message_requests/1.json
   def update
     respond_to do |format|
-      if @message_request.update_attributes(params[:message_request])
+      if @message_request.update_attributes(message_request_params)
         flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.message_request'))
         format.html { redirect_to(@message_request) }
         format.json { head :no_content }
@@ -59,4 +59,12 @@ class MessageRequestsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def message_request_params
+    params.require(:message_request).permit(
+      :body,
+      :sender, :receiver, :message_template, :body #, as: :admin
+    )
+  end
 end

data/app/controllers/message_templates_controller.rb

@@ -38,7 +38,7 @@ class MessageTemplatesController < ApplicationController
   # POST /message_templates
   # POST /message_templates.json
   def create
-    @message_template = MessageTemplate.new(params[:message_template])
+    @message_template = MessageTemplate.new(message_template_params)
 
     respond_to do |format|
       if @message_template.save
@@ -60,7 +60,7 @@ class MessageTemplatesController < ApplicationController
     end
 
     respond_to do |format|
-      if @message_template.update_attributes(params[:message_template])
+      if @message_template.update_attributes(message_template_params)
         format.html { redirect_to @message_template, notice:  t('controller.successfully_updated', model:  t('activerecord.models.message_template')) }
         format.json { head :no_content }
       else
@@ -80,4 +80,9 @@ class MessageTemplatesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def message_template_params
+    params.require(:message_template).permit(:status, :title, :body, :locale)
+  end
 end

data/app/controllers/messages_controller.rb

@@ -78,7 +78,7 @@ class MessagesController < ApplicationController
   # POST /messages
   # POST /messages.json
   def create
-    @message = Message.new(params[:message])
+    @message = Message.new(message_params)
     @message.sender = current_user
     get_parent(@message.parent_id)
     @message.receiver = User.where(username: @message.recipient).first
@@ -99,7 +99,7 @@ class MessagesController < ApplicationController
   def update
     @message = current_user.received_messages.find(params[:id])
 
-    if @message.update_attributes(params[:message])
+    if @message.update_attributes(message_params)
       format.html { redirect_to @message, notice: t('controller.successfully_updated', model: t('activerecord.models.message')) }
       format.json { head :no_content }
     else
@@ -147,6 +147,12 @@ class MessagesController < ApplicationController
   end
 
   private
+  def message_params
+    params.require(:message).permit(
+      :subject, :body, :sender, :recipient, :parent_id
+    )
+  end
+
   def get_parent(id)
     parent = Message.where(id: id).first
     unless current_user.has_role?('Librarian')

data/app/models/message.rb

@@ -1,7 +1,6 @@
 # -*- encoding: utf-8 -*-
 class Message < ActiveRecord::Base
-  include Statesman::Adapters::ActiveRecordModel
-  attr_accessible :subject, :body, :sender, :recipient
+  include Statesman::Adapters::ActiveRecordQueries
   scope :unread, -> {in_state('unread')}
   belongs_to :message_request
   belongs_to :sender, class_name: 'User'
@@ -17,10 +16,6 @@ class Message < ActiveRecord::Base
   acts_as_nested_set
   attr_accessor :recipient
 
-  def state_machine
-    ResourceImportFileStateMachine.new(self, transition_class: ResourceImportFileTransition)
-  end
-
   delegate :can_transition_to?, :transition_to!, :transition_to, :current_state,
     to: :state_machine
 
@@ -70,6 +65,10 @@ class Message < ActiveRecord::Base
     MessageTransition
   end
 
+  def self.initial_state
+    :pending
+  end
+
   def set_default_state
     transition_to!(:unread)
   end

data/app/models/message_request.rb

@@ -1,8 +1,6 @@
 require 'erubis'
 class MessageRequest < ActiveRecord::Base
-  include Statesman::Adapters::ActiveRecordModel
-  attr_accessible :body
-  attr_accessible :sender, :receiver, :message_template, :body, as: :admin
+  include Statesman::Adapters::ActiveRecordQueries
   scope :not_sent, -> {in_state(:pending).where('sent_at IS NULL')}
   scope :sent, -> {in_state(:sent)}
   belongs_to :message_template, validate: true
@@ -74,6 +72,10 @@ class MessageRequest < ActiveRecord::Base
   def self.transition_class
     MessageRequestTransition
   end
+
+  def self.initial_state
+    :pending
+  end
 end
 
 # == Schema Information

data/app/models/message_request_transition.rb

@@ -3,7 +3,7 @@ class MessageRequestTransition < ActiveRecord::Base
 
   
   belongs_to :message_request, inverse_of: :message_request_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/message_template.rb

@@ -1,5 +1,4 @@
 class MessageTemplate < ActiveRecord::Base
-  attr_accessible :status, :title, :body, :locale
   default_scope {order("message_templates.position")}
   has_many :message_requests
 

data/app/models/message_transition.rb

@@ -3,7 +3,7 @@ class MessageTransition < ActiveRecord::Base
 
   
   belongs_to :message, inverse_of: :message_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/lib/enju_message/engine.rb

@@ -1,4 +1,3 @@
-require 'enju_seed'
 require 'statesman'
 require 'awesome_nested_set'
 require 'resque_mailer'

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.1.14.pre21"
+  VERSION = "0.1.14.pre22"
 end

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

@@ -6,8 +6,6 @@ class User < ActiveRecord::Base
          :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
-
   enju_leaf_user_model
   enju_message_user_model
 end

data/spec/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: enju_message
 version: !ruby/object:Gem::Version
-  version: 0.1.14.pre21
+  version: 0.1.14.pre22
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: enju_seed
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1.pre11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1.pre11
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc16
+        version: 1.1.0.rc17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc16
+        version: 1.1.0.rc17
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -322,6 +308,10 @@ files:
 - spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/application.yml
@@ -476,8 +466,6 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/script/delayed_job
-- spec/dummy/script/rails
 - spec/factories/library.rb
 - spec/factories/message.rb
 - spec/factories/message_request.rb
@@ -520,7 +508,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: enju_message plugin
@@ -536,6 +524,10 @@ test_files:
 - spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
 - spec/dummy/config/application.rb
 - spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
@@ -691,8 +683,6 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
-- spec/dummy/script/delayed_job
-- spec/dummy/script/rails
 - spec/factories/library.rb
 - spec/factories/message.rb
 - spec/factories/message_request.rb

data/spec/dummy/script/delayed_job

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
-require 'delayed/command'
-Delayed::Command.new(ARGV).daemonize

data/spec/dummy/script/rails

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'