enju_bookmark 0.1.2.pre15 → 0.1.2.pre16

data/spec/controllers/tags_controller_spec.rb

@@ -13,7 +13,7 @@ describe TagsController do
 
       it "assigns all tags as @tags" do
         get :index
-        assigns(:tags).should_not be_nil
+        expect(assigns(:tags)).not_to be_nil
       end
     end
 
@@ -22,7 +22,7 @@ describe TagsController do
 
       it "assigns all tags as @tags" do
         get :index
-        assigns(:tags).should_not be_nil
+        expect(assigns(:tags)).not_to be_nil
       end
     end
 
@@ -31,14 +31,14 @@ describe TagsController do
 
       it "assigns all tags as @tags" do
         get :index
-        assigns(:tags).should_not be_nil
+        expect(assigns(:tags)).not_to be_nil
       end
     end
 
     describe "When not logged in" do
       it "assigns all tags as @tags" do
         get :index
-        assigns(:tags).should_not be_nil
+        expect(assigns(:tags)).not_to be_nil
       end
     end
   end
@@ -50,7 +50,7 @@ describe TagsController do
       it "assigns the requested tag as @tag" do
         tag = FactoryGirl.create(:tag)
         get :show, :id => tag.id
-        assigns(:tag).should eq(tag)
+        expect(assigns(:tag)).to eq(tag)
       end
     end
 
@@ -60,7 +60,7 @@ describe TagsController do
       it "assigns the requested tag as @tag" do
         tag = FactoryGirl.create(:tag)
         get :show, :id => tag.id
-        assigns(:tag).should eq(tag)
+        expect(assigns(:tag)).to eq(tag)
       end
     end
 
@@ -70,7 +70,7 @@ describe TagsController do
       it "assigns the requested tag as @tag" do
         tag = FactoryGirl.create(:tag)
         get :show, :id => tag.id
-        assigns(:tag).should eq(tag)
+        expect(assigns(:tag)).to eq(tag)
       end
     end
 
@@ -78,7 +78,7 @@ describe TagsController do
       it "assigns the requested tag as @tag" do
         tag = FactoryGirl.create(:tag)
         get :show, :id => tag.id
-        assigns(:tag).should eq(tag)
+        expect(assigns(:tag)).to eq(tag)
       end
     end
   end
@@ -90,7 +90,7 @@ describe TagsController do
       it "assigns the requested tag as @tag" do
         tag = FactoryGirl.create(:tag)
         get :edit, :id => tag.id
-        assigns(:tag).should eq(tag)
+        expect(assigns(:tag)).to eq(tag)
       end
     end
 
@@ -100,7 +100,7 @@ describe TagsController do
       it "assigns the requested tag as @tag" do
         tag = FactoryGirl.create(:tag)
         get :edit, :id => tag.id
-        assigns(:tag).should eq(tag)
+        expect(assigns(:tag)).to eq(tag)
       end
     end
 
@@ -110,7 +110,7 @@ describe TagsController do
       it "assigns the requested tag as @tag" do
         tag = FactoryGirl.create(:tag)
         get :edit, :id => tag.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -118,7 +118,7 @@ describe TagsController do
       it "should not assign the requested tag as @tag" do
         tag = FactoryGirl.create(:tag)
         get :edit, :id => tag.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -140,8 +140,8 @@ describe TagsController do
 
         it "assigns the requested tag as @tag" do
           put :update, :id => @tag.id, :tag => @attrs
-          assigns(:tag).should eq(@tag)
-          response.should redirect_to(assigns(:tag))
+          expect(assigns(:tag)).to eq(@tag)
+          expect(response).to redirect_to(assigns(:tag))
         end
       end
 
@@ -152,7 +152,7 @@ describe TagsController do
 
         it "re-renders the 'edit' template" do
           put :update, :id => @tag.id, :tag => @invalid_attrs
-          response.should render_template("edit")
+          expect(response).to render_template("edit")
         end
       end
     end
@@ -167,20 +167,20 @@ describe TagsController do
 
         it "assigns the requested tag as @tag" do
           put :update, :id => @tag.id, :tag => @attrs
-          assigns(:tag).should eq(@tag)
-          response.should redirect_to(assigns(:tag))
+          expect(assigns(:tag)).to eq(@tag)
+          expect(response).to redirect_to(assigns(:tag))
         end
       end
 
       describe "with invalid params" do
         it "assigns the tag as @tag" do
           put :update, :id => @tag.id, :tag => @invalid_attrs
-          assigns(:tag).should_not be_valid
+          expect(assigns(:tag)).not_to be_valid
         end
 
         it "re-renders the 'edit' template" do
           put :update, :id => @tag.id, :tag => @invalid_attrs
-          response.should render_template("edit")
+          expect(response).to render_template("edit")
         end
       end
     end
@@ -195,15 +195,15 @@ describe TagsController do
 
         it "assigns the requested tag as @tag" do
           put :update, :id => @tag.id, :tag => @attrs
-          assigns(:tag).should eq(@tag)
-          response.should be_forbidden
+          expect(assigns(:tag)).to eq(@tag)
+          expect(response).to be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested tag as @tag" do
           put :update, :id => @tag.id, :tag => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -216,14 +216,14 @@ describe TagsController do
 
         it "should be forbidden" do
           put :update, :id => @tag.id, :tag => @attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested tag as @tag" do
           put :update, :id => @tag.id, :tag => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
@@ -243,7 +243,7 @@ describe TagsController do
 
       it "redirects to the tags list" do
         delete :destroy, :id => @tag.name
-        response.should redirect_to(tags_url)
+        expect(response).to redirect_to(tags_url)
       end
     end
 
@@ -256,7 +256,7 @@ describe TagsController do
 
       it "redirects to the tags list" do
         delete :destroy, :id => @tag.name
-        response.should redirect_to(tags_url)
+        expect(response).to redirect_to(tags_url)
       end
     end
 
@@ -269,7 +269,7 @@ describe TagsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @tag.name
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -280,7 +280,7 @@ describe TagsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @tag.name
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end

data/spec/fixtures/languages.yml

@@ -2,7 +2,7 @@
 language_00001: 
   position: 1
   name: unknown  
-  display_name: "en :unknown\r\n\
+  display_name: "en: unknown\r\n\
     ja: 不明"
   iso_639_1: unknown
   iso_639_2: unknown

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start 'rails'
+
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_bookmark
 version: !ruby/object:Gem::Version
-  version: 0.1.2.pre15
+  version: 0.1.2.pre16
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: statesman
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc13
+        version: 1.1.0.rc14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc13
+        version: 1.1.0.rc14
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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: sunspot-rails-tester
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +188,7 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- app/assets/stylesheets/enju_bookmark/acts_as_taggable_stylesheet.css
 - app/controllers/bookmark_stat_has_manifestations_controller.rb
 - app/controllers/bookmark_stats_controller.rb
 - app/controllers/bookmarks_controller.rb
@@ -185,11 +200,6 @@ files:
 - app/models/bookmark_stat_transition.rb
 - app/models/enju_bookmark/ability.rb
 - app/models/tag.rb
-- app/views/bookmark_stat_has_manifestations/_form.html.erb
-- app/views/bookmark_stat_has_manifestations/edit.html.erb
-- app/views/bookmark_stat_has_manifestations/index.html.erb
-- app/views/bookmark_stat_has_manifestations/new.html.erb
-- app/views/bookmark_stat_has_manifestations/show.html.erb
 - app/views/bookmark_stats/_form.html.erb
 - app/views/bookmark_stats/edit.html.erb
 - app/views/bookmark_stats/index.html.erb
@@ -239,7 +249,6 @@ files:
 - lib/generators/enju_bookmark/setup/USAGE
 - lib/generators/enju_bookmark/setup/setup_generator.rb
 - lib/tasks/enju_bookmark_tasks.rake
-- spec/controllers/bookmark_stat_has_manifestations_controller_spec.rb
 - spec/controllers/bookmark_stats_controller_spec.rb
 - spec/controllers/bookmarks_controller_spec.rb
 - spec/controllers/tags_controller_spec.rb
@@ -442,17 +451,17 @@ files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/default/data/index/segments.gen
-- spec/dummy/solr/default/data/index/segments_1bi
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001699
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001700
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001701
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001702
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001703
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001704
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001705
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001706
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001707
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001708
+- spec/dummy/solr/default/data/index/segments_1i0
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001933
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001934
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001935
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001936
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001937
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001938
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001939
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001940
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001941
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001942
 - spec/dummy/solr/development/data/index/segments.gen
 - spec/dummy/solr/development/data/index/segments_1
 - spec/dummy/solr/solr.xml
@@ -517,7 +526,6 @@ signing_key:
 specification_version: 4
 summary: enju_bookmark plugin
 test_files:
-- spec/controllers/bookmark_stat_has_manifestations_controller_spec.rb
 - spec/controllers/bookmark_stats_controller_spec.rb
 - spec/controllers/bookmarks_controller_spec.rb
 - spec/controllers/tags_controller_spec.rb
@@ -720,17 +728,17 @@ test_files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/default/data/index/segments.gen
-- spec/dummy/solr/default/data/index/segments_1bi
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001699
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001700
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001701
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001702
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001703
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001704
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001705
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001706
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001707
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001708
+- spec/dummy/solr/default/data/index/segments_1i0
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001933
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001934
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001935
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001936
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001937
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001938
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001939
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001940
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001941
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001942
 - spec/dummy/solr/development/data/index/segments.gen
 - spec/dummy/solr/development/data/index/segments_1
 - spec/dummy/solr/solr.xml

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

@@ -1,15 +0,0 @@
-<%= form_for(@bookmark_stat_has_manifestation) do |f| -%>
-  <%= f.error_messages -%>
-
-  <div class="field">
-    <%= f.label t('activerecord.models.bookmark_stat') -%><br />
-    <%= f.text_field :bookmark_stat_id -%>
-  </div>
-  <div class="field">
-    <%= f.label t('activerecord.models.manifestation') -%><br />
-    <%= f.text_field :manifestation_id -%>
-  </div>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<%- end -%>

data/app/views/bookmark_stat_has_manifestations/edit.html.erb

@@ -1,13 +0,0 @@
-<div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', model: t('activerecord.models.bookmark_stat_has_manifestation')) -%></h1>
-<div id="content_list">
-  <%= render 'form' %>
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all ui-widget-content">
-  <ul>
-    <li><%= link_to t('page.show'), @bookmark_stat_has_manifestation -%></li>
-    <li><%= link_to t('page.back'), bookmark_stat_has_manifestations_path -%></li>
-  </ul>
-</div>

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

@@ -1,32 +0,0 @@
-<div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', model: t('activerecord.models.bookmark_stat_has_manifestation')) -%></h1>
-<div id="content_list">
-
-<table class="table table-striped index">
-  <tr>
-    <th><%= t('activerecord.models.bookmark_stat') -%></th>
-    <th><%= t('activerecord.models.manifestation') -%></th>
-    <th><%= t('activerecord.attributes.bookmark_stat_has_manifestation.bookmarks_count') -%></th>
-  </tr>
-
-<%- @bookmark_stat_has_manifestations.each do |bookmark_stat_has_manifestation| -%>
-  <tr class="line<%= cycle("0", "1") -%>">
-    <td><%= link_to bookmark_stat_has_manifestation.bookmark_stat.id, bookmark_stat_has_manifestation.bookmark_stat -%></td>
-    <td><%= link_to bookmark_stat_has_manifestation.manifestation.original_title, bookmark_stat_has_manifestation.manifestation -%></td>
-    <td><%= bookmark_stat_has_manifestation.bookmarks_count -%></td>
-    <td><%= link_to t('page.show'), bookmark_stat_has_manifestation -%></td>
-    <td><%= link_to t('page.edit'), edit_bookmark_stat_has_manifestation_path(bookmark_stat_has_manifestation) -%></td>
-    <td><%= link_to t('page.destroy'), bookmark_stat_has_manifestation, data: {confirm: t('page.are_you_sure')}, method: :delete -%></td>
-  </tr>
-<%- end -%>
-</table>
-
-<%= paginate(@bookmark_stat_has_manifestations) -%>
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all ui-widget-content">
-  <ul>
-    <li><%= link_to t('page.new', model: t('activerecord.models.bookmark_stat_has_manifestation')), new_bookmark_stat_has_manifestation_path -%></li>
-  </ul>
-</div>

data/app/views/bookmark_stat_has_manifestations/new.html.erb

@@ -1,12 +0,0 @@
-<div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', model: t('activerecord.models.bookmark_stat_has_manifestation')) -%></h1>
-<div id="content_list">
-  <%= render 'form' %>
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all ui-widget-content">
-  <ul>
-    <li><%= link_to t('page.back'), bookmark_stat_has_manifestations_path -%></li>
-  </ul>
-</div>

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

@@ -1,29 +0,0 @@
-<div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', model: t('activerecord.models.bookmark_stat_has_manifestation')) -%></h1>
-<div id="content_list">
-<p id="notice"><%= notice %></p>
-
-<p>
-  <strong><%= t('activerecord.models.bookmark_stat') -%>:</strong>
-  <%= link_to @bookmark_stat_has_manifestation.bookmark_stat.id, @bookmark_stat_has_manifestation.bookmark_stat -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.models.manifestation') -%>:</strong>
-  <%= link_to @bookmark_stat_has_manifestation.manifestation.original_title, @bookmark_stat_has_manifestation.manifestation -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.bookmark_stat_has_manifestation.bookmarks_count') -%>:</strong>
-  <%= @bookmark_stat_has_manifestation.bookmarks_count -%>
-</p>
-
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all ui-widget-content">
-  <ul>
-    <li><%= link_to t('page.edit'), edit_bookmark_stat_has_manifestation_path(@bookmark_stat_has_manifestation) -%></li>
-    <li><%= back_to_index(flash[:page_info]) -%></li>
-  </ul>
-</div>