enju_event 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d269df27c60a7c506d3d044bf17281813b219ca
-  data.tar.gz: 656f871d708debe326e69562469271b4c0cdd630
+  metadata.gz: 9c5ca64abbdb144da8c651302bac1f9b84f08d9b
+  data.tar.gz: 49ac326fbb96292f11d7a30edf68c69815187984
 SHA512:
-  metadata.gz: 99763687d4b7c29f9bc9ee5c58daf57302398fea413864fc89551658adec3d818df7ba7a131a2067a9d40b390546030326ccb3c0c7c26748a8d8e9865a96b9a6
-  data.tar.gz: e13fcbe4e62d8a7b92930ab80386ae5485de797ecafc46f8ccd0f5bbf65980a8fa692ee02758e4e2b8bbe459bb0f717e72458db6adeb803389092bdb3acf17e3
+  metadata.gz: 750c60f77facace33e17b66fff6bef369d922ea6e88309de83a413216960878981f496e0d5c7a63bcc6451c48c65d417cd7334c1e958ea6f182a6374605c8b3a
+  data.tar.gz: e35be4f9bcb447e4c02f1291edd43517701f7675e79d8317b7d3d9c13beb8aa0c5b6db6e8f96ba9b0744fd9c9d8cd33c5e8dc3faab2b0fe43f9b613ae3b8d82c

data/README.rdoc

@@ -1,6 +1,6 @@
 = EnjuEvent
-{<img src="https://secure.travis-ci.org/next-l/enju_event.png?branch=1.1" alt="Build Status" />}[http://travis-ci.org/next-l/enju_event]
-{<img src="https://coveralls.io/repos/next-l/enju_event/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_event?branch=1.1]
+{<img src="https://travis-ci.org/next-l/enju_event.svg?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_event]
+{<img src="https://coveralls.io/repos/next-l/enju_event/badge.svg?branch=1.1&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_event?branch=1.1]
 {<img src="https://hakiri.io/github/next-l/enju_event/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_event/1.1]
 
 This project rocks and uses MIT-LICENSE.

data/app/models/event.rb

@@ -64,18 +64,20 @@ class Event < ActiveRecord::Base
       start_at
       end_at
       all_day
-    ).join("\t")
-    events = Event.all.map{|e|
-      lines = []
-      lines << e.name
-      lines << e.event_category.name
-      lines << e.library.name
-      lines << e.start_at
-      lines << e.end_at
-      lines << e.all_day
+    )
+    lines = []
+    Event.all.map{|e|
+      line = []
+      line << e.name
+      line << e.event_category.name
+      line << e.library.name
+      line << e.start_at
+      line << e.end_at
+      line << e.all_day
+      lines << line
     }
     if options[:format] == :txt
-      events.map{|e| e.join("\t")}.unshift(header).join("\r\n")
+      lines.map{|line| line.to_csv(col_sep: "\t")}.unshift(header.to_csv(col_sep: "\t")).join
     else
       event
     end

data/app/views/events/index.html.erb

@@ -58,8 +58,10 @@
         <%= l(event.end_at, format: :short) -%>
       </td>
       <td>
-        <%- if can? :delete, event -%>
+        <%- if can? :update, event -%>
           <%= link_to t('page.edit'), edit_event_path(event) -%>
+        <%- end -%>
+        <%- if can? :destroy, event -%>
           <%= link_to t('page.destroy'), event, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>

data/app/views/events/show.html.erb

@@ -55,7 +55,12 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.edit'), edit_event_path(@event) -%></li>
+    <%- if can?(:update, @event) -%>
+      <li><%= link_to t('page.edit'), edit_event_path(@event) -%></li>
+    <% end %>
+    <%- if can?(:destroy, @event) -%>
+      <li><%= link_to t('page.destroy'), @event, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
+    <% end %>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
 </div>

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.1.17"
+  VERSION = "0.1.18"
 end

data/lib/enju_event.rb

@@ -12,6 +12,8 @@ module EnjuEvent
   end
 
   module InstanceMethods
+    private
+
     def get_event
       @event = Event.find(params[:event_id]) if params[:event_id]
     end

data/spec/models/event_spec.rb

@@ -17,6 +17,13 @@ describe Event do
     event.set_all_day
     event.start_at.should eq event.end_at.beginning_of_day
   end
+
+  it "should export events" do
+    lines = Event.export
+    CSV.parse(lines, col_sep: "\t")
+    expect(lines).not_to be_empty
+    expect(lines.split(/\n/).size).to eq Event.all.count + 1
+  end
 end
 
 # == Schema Information

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_event
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_message
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14
+        version: 0.1.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14
+        version: 0.1.15
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: statesman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: ri_cal
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -170,28 +170,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -382,7 +382,6 @@ files:
 - spec/dummy/bin/setup
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
-- spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
@@ -642,7 +641,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: enju_event plugin
@@ -665,7 +664,6 @@ test_files:
 - spec/dummy/bin/rake
 - spec/dummy/bin/setup
 - spec/dummy/config/application.rb
-- spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb

data/spec/dummy/config/application.yml

@@ -1,38 +0,0 @@
-defaults: &defaults
-  enju:
-    web_hostname: localhost
-    web_port_number: 3000
-
-  family_name_first: true
-  max_number_of_results: 500
-  write_search_log_to_file: true
-  csv_charset_conversion: true
-
-# Choose a locale from 'ca', 'de', 'fr', 'jp', 'uk', 'us'
-#AMAZON_AWS_HOSTNAME = 'ecs.amazonaws.com'
-  amazon:
-    aws_hostname: ecs.amazonaws.jp
-    hostname: www.amazon.co.jp
-    access_key: REPLACE_WITH_YOUR_AMAZON_ACCESS_KEY
-    secret_access_key: REPLACE_WITH_YOUR_AMAZON_SECRET_ACCESS_KEY
-
-# :google, :amazon
-  book_jacket:
-    source: :google
-    unknown_resource:
-
-# :mozshot, :simpleapi, :heartrails, :thumbalizr
-  screenshot:
-    generator: :mozshot
-
-  uploaded_file:
-    storage: :local
-
-development:
-  <<: *defaults
-
-test:
-  <<: *defaults
-
-production:
-  <<: *defaults