enju_purchase_request 0.1.0.pre12 → 0.1.0.pre13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f74e42ffa9480f2801523fac551de5bbe9af26e1
-  data.tar.gz: e581e2ffa496002b0c4672b2a780efb857bb3955
+  metadata.gz: 5d14c994ffd330f2e3330a232c2855772cfa8ecc
+  data.tar.gz: 248fc50b7cea04eeca2680445653dca587a43c48
 SHA512:
-  metadata.gz: ec6404e706c78fb6a10e3dd176820d11cbbcb4e1b1554c32fb35d644c0b3e11aae2cbd71799c7e4fc21767fa05d1ab146c6c7e3574d736924dab418f8f82b31e
-  data.tar.gz: 17ff02694aa1505e21e03393c255197d9109dd4c3ddd59ab232b970a9591b09f3b3ea3e666efa844cdb3cea4b1881b546846742a8b12b8f1d0365a43eb7b467b
+  metadata.gz: ad4459558e4b8fd82c2c3290cfde160fb170070f8fcc33a77f3c4242f1e6856df451462cecaa1c52aef3e0ac3fae775e85902d6697d0f9c87c0b72310f8889ba
+  data.tar.gz: 7d8b079f4efcca5ee7f78fc595ee7fdec8a7e9cc33adafb8699e9ccf98ca05be30a20d303c53788034e6f579fb55a243755062b00351fe2d3452b02dc8932838

data/README.rdoc

@@ -1,3 +1,10 @@
-= EnjuPurchaseRequest {<img src="https://secure.travis-ci.org/nabeta/enju_purchase_request.png?branch=master" alt="Build Status" />}[http://travis-ci.org/nabeta/enju_purchase_request]
+= EnjuPurchaseRequest
+{<img src="https://secure.travis-ci.org/next-l/enju_purchase_request.png?branch=1.1" alt="Build Status" />}[http://travis-ci.org/next-l/enju_purchase_request]
+{<img src="https://coveralls.io/repos/next-l/enju_purchase_request/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_purchase_request?branch=1.1]
+{<img src="https://hakiri.io/github/next-l/enju_purchase_request/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_purchase_request/1.1]
 
 This project rocks and uses MIT-LICENSE.
+
+== 製作者・貢献者 (Authors and contributors)
+* {TANABE, Kosuke}[https://github.com/nabeta] ({@nabeta}[https://twitter.com/nabeta])
+* {Project Next-L}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/app/controllers/order_lists_controller.rb

@@ -48,7 +48,7 @@ class OrderListsController < ApplicationController
   # POST /order_lists
   # POST /order_lists.json
   def create
-    @order_list = OrderList.new(params[:order_list])
+    @order_list = OrderList.new(order_list_params)
     @order_list.user = current_user
 
     respond_to do |format|
@@ -68,7 +68,7 @@ class OrderListsController < ApplicationController
   def update
 
     respond_to do |format|
-      if @order_list.update_attributes(params[:order_list])
+      if @order_list.update_attributes(order_list_params)
         if @order_list.edit_mode == 'order'
           @order_list.transition_to(:ordered)
           @order_list.save(validate: false)
@@ -97,6 +97,12 @@ class OrderListsController < ApplicationController
   end
 
   private
+  def order_list_params
+    params.require(:order_list).permit(
+      :user_id, :bookstore_id, :title, :note, :ordered_at, :edit_mode
+    )
+  end
+
   def prepare_options
     @bookstores = Bookstore.all
   end

data/app/controllers/orders_controller.rb

@@ -66,7 +66,7 @@ class OrdersController < ApplicationController
   # POST /orders
   # POST /orders.json
   def create
-    @order = Order.new(params[:order])
+    @order = Order.new(order_params)
 
     respond_to do |format|
       if @order.save
@@ -92,7 +92,7 @@ class OrdersController < ApplicationController
     @order = Order.find(params[:id])
 
     respond_to do |format|
-      if @order.update_attributes(params[:order])
+      if @order.update_attributes(order_params)
         flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.order'))
         if @purchase_request
           format.html { redirect_to purchase_request_order_url(@order.purchase_request, @order) }
@@ -126,4 +126,9 @@ class OrdersController < ApplicationController
       end
     end
   end
+
+  private
+  def order_params
+    params.require(:order).permit(:order_list_id, :purchase_request_id)
+  end
 end

data/app/controllers/purchase_requests_controller.rb

@@ -97,7 +97,7 @@ class PurchaseRequestsController < ApplicationController
   # POST /purchase_requests
   # POST /purchase_requests.json
   def create
-    @purchase_request = current_user.purchase_requests.new(params[:purchase_request])
+    @purchase_request = current_user.purchase_requests.new(purchase_request_params)
 
     respond_to do |format|
       if @purchase_request.save
@@ -116,7 +116,7 @@ class PurchaseRequestsController < ApplicationController
   # PUT /purchase_requests/1.json
   def update
     respond_to do |format|
-      if @purchase_request.update_attributes(params[:purchase_request])
+      if @purchase_request.update_attributes(purchase_request_params)
         @order_list.purchase_requests << @purchase_request if @order_list
         flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.purchase_request'))
         format.html { redirect_to(@purchase_request) }
@@ -138,4 +138,11 @@ class PurchaseRequestsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def purchase_request_params
+    params.require(:purchase_request).permit(
+      :title, :author, :publisher, :isbn, :price, :url, :note, :pub_date
+    )
+  end
 end

data/app/models/order.rb

@@ -1,5 +1,4 @@
 class Order < ActiveRecord::Base
-  attr_accessible :order_list_id, :purchase_request_id
   belongs_to :order_list, validate: true
   belongs_to :purchase_request, validate: true
 

data/app/models/order_list.rb

@@ -1,7 +1,5 @@
 class OrderList < ActiveRecord::Base
-  include Statesman::Adapters::ActiveRecordModel
-  attr_accessible :user_id, :bookstore_id, :title, :note, :ordered_at,
-    :edit_mode
+  include Statesman::Adapters::ActiveRecordQueries
   scope :not_ordered, -> {in_state(:not_ordered)}
 
   has_many :orders, dependent: :destroy
@@ -46,6 +44,10 @@ class OrderList < ActiveRecord::Base
   def self.transition_class
     OrderListTransition
   end
+
+  def self.initial_state
+    :pending
+  end
 end
 
 # == Schema Information

data/app/models/order_list_transition.rb

@@ -3,7 +3,6 @@ class OrderListTransition < ActiveRecord::Base
 
   
   belongs_to :order_list, inverse_of: :order_list_transitions
-  attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/purchase_request.rb

@@ -1,8 +1,6 @@
 class PurchaseRequest < ActiveRecord::Base
-  attr_accessible :title, :author, :publisher, :isbn, :price, :url,
-    :note, :pub_date
-  scope :not_ordered, includes(:order_list).where('order_lists.ordered_at IS NULL')
-  scope :ordered, includes(:order_list).where('order_lists.ordered_at IS NOT NULL')
+  scope :not_ordered, -> {includes(:order_list).where('order_lists.ordered_at IS NULL') }
+  scope :ordered, -> { includes(:order_list).where('order_lists.ordered_at IS NOT NULL') }
 
   belongs_to :user, validate: true
   has_one :order, dependent: :destroy

data/lib/enju_purchase_request/version.rb

@@ -1,3 +1,3 @@
 module EnjuPurchaseRequest
-  VERSION = "0.1.0.pre12"
+  VERSION = "0.1.0.pre13"
 end

data/spec/controllers/purchase_requests_controller_spec.rb

@@ -437,12 +437,12 @@ describe PurchaseRequestsController do
       end
 
       it "should update my purchase_request" do
-        put :update, :id => purchase_requests(:purchase_request_00003).id, :purchase_request => { }
+        put :update, :id => purchase_requests(:purchase_request_00003).id, :purchase_request => { note: "test" }
         response.should redirect_to purchase_request_url(assigns(:purchase_request))
       end
 
       it "should not update other user's purchase_request" do
-        put :update, :id => purchase_requests(:purchase_request_00002).id, :purchase_request => { }
+        put :update, :id => purchase_requests(:purchase_request_00002).id, :purchase_request => { note: "test" }
         response.should be_forbidden
       end
     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

data/spec/fixtures/users.yml

@@ -48,4 +48,4 @@ user4:
   username: user4
   email: user4@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:34.637413 +09:00
-  locked_at: <%= 1.day.ago %>
+  locked_at: <%= 1.day.ago.to_s(:db) %>

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 require 'simplecov'
+require 'coveralls'
 SimpleCov.start 'rails'
+Coveralls.wear!
 
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_purchase_request
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre12
+  version: 0.1.0.pre13
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-12 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statesman
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc15
+        version: 1.1.0.rc17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc15
+        version: 1.1.0.rc17
 - !ruby/object:Gem::Dependency
   name: enju_bookmark
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2.pre18
+        version: 0.1.2.pre21
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2.pre18
+        version: 0.1.2.pre21
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !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
@@ -227,6 +255,10 @@ files:
 - spec/dummy/app/views/page/404.html.erb
 - spec/dummy/app/views/page/404.mobile.erb
 - spec/dummy/app/views/page/404.xml.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
@@ -383,7 +415,6 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/script/rails
 - spec/factories/bookstore.rb
 - spec/factories/library.rb
 - spec/factories/order.rb
@@ -428,7 +459,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_purchase_request plugin
@@ -450,6 +481,10 @@ test_files:
 - spec/dummy/app/views/page/404.html.erb
 - spec/dummy/app/views/page/404.mobile.erb
 - spec/dummy/app/views/page/404.xml.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
@@ -607,7 +642,6 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
-- spec/dummy/script/rails
 - spec/factories/bookstore.rb
 - spec/factories/library.rb
 - spec/factories/order.rb

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'