Merge branch 'qrcode_feature'

Gemfile

@@ -25,6 +25,7 @@ gem 'html_truncator'
 gem 'nokogiri'
 gem 'angularjs-rails'
 gem 'figaro'
+gem 'rqrcode-with-patches', require: 'rqrcode'
 
 group :development do
   gem 'quiet_assets'

app/assets/javascripts/angularjs/qrcodes.js.coffee

@@ -0,0 +1,3 @@
+@app.controller 'QRCodesController', ($scope)->
+  $scope.show = ->
+    $scope.qrcode = ! $scope.qrcode

app/assets/stylesheets/blogs.css.scss

@@ -51,3 +51,17 @@
     border-bottom: 1px solid #dddddd;
   }
 }
+
+.qrcode {
+  display: inline-block;
+  float: right;
+  margin-top: -5.5rem;
+  i {
+    margin-right: 0.5rem;
+  }
+}
+
+.qrcode-wrapper {
+  float: right;
+  margin-top: -2rem;
+}

app/assets/stylesheets/qrcodes.css.scss

@@ -0,0 +1,20 @@
+.qrcode-image {
+  table {
+    border-width: 0;
+    border-style: none;
+    border-color: #0000ff;
+    border-collapse: collapse;
+   }
+   td {
+     border-width: 0;
+     border-style: none;
+     border-color: #0000ff;
+     border-collapse: collapse;
+     padding: 0;
+     margin: 0;
+     width: 0.3rem;
+     height: 0.3rem;
+   }
+   td.black { background-color: #000; }
+   td.white { background-color: #fff; }
+}

app/views/blogs/_post.html.slim

@@ -19,3 +19,13 @@ p ng-controller="LikesController"
   button.like-button ng-show=" is_liked " ng-click="cancel()" 
     |{{ count }}
     span Liked
+  div ng-controller = "QRCodesController"
+    .qrcode
+      span.has-tip data-tooltip="" title="使用手机继续阅读 or 帮我分享至微信朋友圈"
+        i.fi-link
+        a href="#" ng-model="qrcode" ng-init="qrcode=false" ng-click="show()" 二维码
+    .social-share ng-show='qrcode'
+      .qrcode-wrapper
+        = render partial: "qrcode", locals: { str: blog_url(post) }
+      
+    

app/views/blogs/_qrcode.html.slim

@@ -0,0 +1,3 @@
+.qrcode-image
+  - qr = RQRCode::QRCode.new(str)
+  == qr.as_html

spec/controllers/admin/dashboard_controller_spec.rb

@@ -2,6 +2,9 @@ require 'spec_helper'
 
 describe Admin::DashboardController do
 
+  before do
+    session[:login] = true
+  end
   describe "GET 'index'" do
     it "returns http success" do
       get 'index'

spec/controllers/admin/posts_controller_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe Admin::PostsController do
+
+  before do
+    session[:login] = true
+  end
   it "preview should return ok" do
     post :preview
     response.body.should == ""

spec/controllers/admin/sessions_controller_spec.rb

@@ -2,6 +2,9 @@ require 'spec_helper'
 
 describe Admin::SessionsController do
 
+  before do
+    session[:login] = true
+  end
   describe "GET 'new'" do
     it "returns http success" do
       get 'new'