lines-engine 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2359c769847dc2a7b09ea2b6145ba5b6f87901f5
-  data.tar.gz: 2a447e55eed87365319c16de18e11a17e65dce24
+  metadata.gz: 100fdfe0b263d92149bee9c26acc26d08a96c41a
+  data.tar.gz: d28174c5c5d2d5bc0fe4e2f9cddf999e401f8532
 SHA512:
-  metadata.gz: d2d70715f45718f8a49c513df2e52765fa7d4f5d55bac1262cc42f6340e39d2503090d5e26f5a5fcaa1e686f452bebb8370968a466a29237159e216b0ed0972e
-  data.tar.gz: b53b567c1468d9949450d7e2e22e80bff1662456712a34a8010cb04de14b6ef7c48d745a96e1b592a408eae43f2308b2d611fbb97fe787287ff52ba2494e37c2
+  metadata.gz: 3f7a9e5b4ca8f3b6164cc3569798ef58b10eb7adae89c78fd76b6d5cb45eee51e4611a967539927e07abe7d119daa4e48a8372c0dde9afc076d297c47d3cf076
+  data.tar.gz: 3086da633d6c042cd89a76857c4212820b514003cbf3e3e01ae43f0ffacf9fadc15ffbc01e5578bbb110929526a76a55932533f5580bb813db8643d4ab43664a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lines-engine (0.1.14)
+    lines-engine (0.1.16)
       acts-as-taggable-on (~> 3.2.6, >= 3.2.6)
       bcrypt (~> 3.1.0, >= 3.1.0)
       carrierwave (~> 0.10.0, >= 0.10.0)
@@ -248,91 +248,6 @@ GEM
     tins (1.1.0)
     treetop (1.4.15)
       polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
       polyglot (>= 0.3.1)
     tzinfo (1.1.0)
       thread_safe (~> 0.1)

data/app/controllers/lines/application_controller.rb

@@ -3,15 +3,15 @@ module Lines
 
     private
 
-      # sets the current_user if one exists in session
-      def current_user
-        @current_user ||= User.find(session[:user_id]) if session[:user_id]
+      # sets the current_lines_user if one exists in session
+      def current_lines_user
+        @current_lines_user ||= User.find(session[:user_id]) if session[:user_id]
       end
-      helper_method :current_user
+      helper_method :current_lines_user
 
       # checks if current user is authorized. Redirects to login_url if not
       def authorize
-        redirect_to login_url, alert: "Not authorized" if current_user.nil?
+        redirect_to login_url, alert: "Not authorized" if current_lines_user.nil?
       end
 
   end

data/app/helpers/lines/application_helper.rb

@@ -57,8 +57,8 @@ module Lines
       end
       html = content_tag(:div, id: 'navbar') do
         content_tag(:div, class: 'navbar-inner') do
-          if current_user
-            content_tag(:span, link_to('', admin_articles_path), class: 'backlink', title: 'Dashboard') + content_tag(:span, action_link, class: 'actionlink') + content_tag(:span, class: 'buttons', &block) + content_tag(:span, link_to('Logout', logout_path), class: 'logout') + content_tag(:span, "Logged in as #{current_user.email}", class: 'logged-in-as')
+          if current_lines_user
+            content_tag(:span, link_to('', admin_articles_path), class: 'backlink', title: 'Dashboard') + content_tag(:span, action_link, class: 'actionlink') + content_tag(:span, class: 'buttons', &block) + content_tag(:span, link_to('Logout', logout_path), class: 'logout') + content_tag(:span, "Logged in as #{current_lines_user.email}", class: 'logged-in-as')
           else
             content_tag(:span, link_to('', lines.root_path), class: 'backlink') + content_tag(:span, action_link, class: 'actionlink')
           end

data/app/views/layouts/lines/application.html.erb

@@ -17,7 +17,7 @@
   <%= csrf_meta_tags %>
 </head>
 <body>
-<% if current_user %>
+<% if current_lines_user %>
   <%= render_navbar { "" } %>
   <div class="spacer"></div>
 <% end %>

data/app/views/lines/shared/_navigation.html.erb

@@ -4,8 +4,8 @@
       <a class="brand" href="/admin"><%= CONFIG[:title_short] %></a>
 
       <ul class="user-info">
-        <% if current_user %>
-          <li><%= current_user.email %></li>
+        <% if current_lines_user %>
+          <li><%= current_lines_user.email %></li>
           <li><a href="<%= logout_path %>">Logout</a></li>
         <% end %>
       </ul>

data/lib/lines/version.rb

@@ -1,3 +1,3 @@
 module Lines
-  VERSION = "0.1.14"
+  VERSION = "0.1.16"
 end

data/spec/features/user_logs_in_spec.rb

@@ -8,7 +8,7 @@ feature 'user logs in' do
   end
 
   scenario 'with invalid email' do
-    @_current_user = FactoryGirl.create(:user)
+    @_current_lines_user = FactoryGirl.create(:user)
     visit lines.login_path
     fill_in "Email", with: "invalid_email"
     fill_in "Password", with: 'sekret'
@@ -18,7 +18,7 @@ feature 'user logs in' do
   end
 
   scenario 'with blank password' do
-    @_current_user = FactoryGirl.create(:user, email: 'valid@example.com')
+    @_current_lines_user = FactoryGirl.create(:user, email: 'valid@example.com')
     visit lines.login_path
     fill_in "Email", with: "valid@example.com"
     fill_in "Password", with: ''

data/spec/support/auth_macros.rb

@@ -1,21 +1,21 @@
 module AuthMacros
 
   def log_in(attributes = {})
-    @_current_user = FactoryGirl.create(:user, attributes)
+    @_current_lines_user = FactoryGirl.create(:user, attributes)
     visit lines.login_path
-    fill_in "Email", with: @_current_user.email
-    fill_in "Password", with: @_current_user.password
+    fill_in "Email", with: @_current_lines_user.email
+    fill_in "Password", with: @_current_lines_user.password
     click_button "Login"
     page.should have_content "Logged in"
   end
 
   def authorize(attributes = {})
-    @current_user = FactoryGirl.create(:user, attributes)
-    controller.stub(:current_user).and_return(@current_user)
+    @current_lines_user = FactoryGirl.create(:user, attributes)
+    controller.stub(:current_lines_user).and_return(@current_lines_user)
     controller.stub(:authorize).and_return(true)
   end
 
-  def current_user
-    @current_user
+  def current_lines_user
+    @current_lines_user
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lines-engine
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors:
 - Opoloo GbR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -832,7 +832,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: LINES is the open source blog platform you have been waiting for